diff --git "a/air_case/b5_spd3_core_business_flow/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.py" "b/air_case/b5_spd3_core_business_flow/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.py" index cd8c4cef0ca9f5a99622635a4ba532152991d8be..7f3c925e3615560ef80ba5b88645d8375a8ba277 100644 --- "a/air_case/b5_spd3_core_business_flow/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.py" +++ "b/air_case/b5_spd3_core_business_flow/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.py" @@ -5,6 +5,7 @@ import traceback from air_case.b1_herp3_login.登录内网系统.登录内网系统 import login_system from air_case.public1.public1.public1 import * from common.db.sql.sql_del_branch_info import delData +from common.db.sql.sql_tools import get_id, process_tuple from common.fileUtls import FileUtils from common.run_cmd_script import execute_command @@ -70,7 +71,9 @@ def second_dept_Request(hosGoodsId, type): # 高值 # hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'] GoodsId = hosGoodsId.replace(get_hosid(), '') - areaCode = get_stockAreaId_new(deptid3, deptname3, 3) + # areaCode = get_stockAreaId_new(deptid3, deptname3, 3) + areaCode =process_tuple(get_id("select shelf_code from mcms_stock_shelf where address='三级检测组003'and shelf_name='默认库区'order by create_time desc LIMIT 1;")) + request_body = commonFuc().get_business_data(module, "payload39", GoodsId, get_hosid(), deptid3, areaCode) print('我要请领_手工请领_列表查询', 'request_body', request_body) result = commonFuc().http_post(url, request_body, headers) @@ -96,6 +99,7 @@ def second_dept_Request(hosGoodsId, type): goodsGeneralName = commonFuc().analysis_json('goodsGeneralName', data1) provName = commonFuc().analysis_json('provName', data1) pkgDefId = commonFuc().analysis_json('pkgDefId', data1) + pkgDefName= commonFuc().analysis_json('pkgDefName', data1) # 信息写入文件 list_a = [] list_b = [] @@ -113,22 +117,24 @@ def second_dept_Request(hosGoodsId, type): "herpService_buy_createBuyCar_url") print('添加到请领车=================', url) if type == 1: - request_body = commonFuc().get_business_data(module, "payload40", hosGoodsId, goodsName, goodsSpec, + request_body = commonFuc().get_business_data(module, "payload40", hosGoodsId, purMode, goodsName, goodsSpec, mdmGoodsCode, - goodsCode, unit, purMode, goodsMfrsName, pkgDefId, unitName, price, + goodsCode, unit, goodsMfrsName, pkgDefName, pkgDefId, unitName, + price, deptId, areaCode, areaName, targetDeptId, targetDeptName, targetStockId, targetStockName, purModeText, goodsGeneralName, provName) elif type == 2: - request_body = commonFuc().get_business_data(module, "payload41", hosGoodsId, goodsName, goodsSpec, + request_body = commonFuc().get_business_data(module, "payload41", hosGoodsId, purMode, goodsName, goodsSpec, mdmGoodsCode, - goodsCode, unit, purMode, goodsMfrsName, unitName, price, deptId, + goodsCode, unit, goodsMfrsName, unitName, price, deptId, areaCode, areaName, targetDeptId, targetDeptName, targetStockId, targetStockName, purModeText, goodsGeneralName, provName) elif type == 3: - request_body = commonFuc().get_business_data(module, "payload42", hosGoodsId, goodsName, goodsSpec, + request_body = commonFuc().get_business_data(module, "payload42", hosGoodsId, purMode, goodsName, goodsSpec, mdmGoodsCode, - goodsCode, unit, purMode, goodsMfrsName, pkgDefId, unitName, price, + goodsCode, unit, goodsMfrsName, pkgDefName, pkgDefId, unitName, + price, deptId, areaCode, areaName, targetDeptId, targetDeptName, targetStockId, targetStockName, purModeText, goodsGeneralName, provName)