diff --git "a/air_case/b5_spd3_core_business_flow/a_b8\346\265\201\347\250\213\345\215\201\344\272\224\351\200\200\345\272\223\344\270\232\345\212\241_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223\351\200\200\345\272\223.air/a_b8\346\265\201\347\250\213\345\215\201\344\272\224\351\200\200\345\272\223\344\270\232\345\212\241_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223\351\200\200\345\272\223.py" "b/air_case/b5_spd3_core_business_flow/a_b8\346\265\201\347\250\213\345\215\201\344\272\224\351\200\200\345\272\223\344\270\232\345\212\241_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223\351\200\200\345\272\223.air/a_b8\346\265\201\347\250\213\345\215\201\344\272\224\351\200\200\345\272\223\344\270\232\345\212\241_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223\351\200\200\345\272\223.py" index 6cf5ff7d151d2107511b848252185a7b9fcb1633..817c99d99847da3541043ddf39d836ff719d6cf4 100644 --- "a/air_case/b5_spd3_core_business_flow/a_b8\346\265\201\347\250\213\345\215\201\344\272\224\351\200\200\345\272\223\344\270\232\345\212\241_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223\351\200\200\345\272\223.air/a_b8\346\265\201\347\250\213\345\215\201\344\272\224\351\200\200\345\272\223\344\270\232\345\212\241_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223\351\200\200\345\272\223.py" +++ "b/air_case/b5_spd3_core_business_flow/a_b8\346\265\201\347\250\213\345\215\201\344\272\224\351\200\200\345\272\223\344\270\232\345\212\241_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223\351\200\200\345\272\223.air/a_b8\346\265\201\347\250\213\345\215\201\344\272\224\351\200\200\345\272\223\344\270\232\345\212\241_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223\351\200\200\345\272\223.py" @@ -149,8 +149,7 @@ def second_dept_return_Out_Stock(type): # 三级库退货出库 # 从message18文件中获取信息 url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "dept_stock_out_submit_url") - # import pdb - # pdb.set_trace() + deptid1 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid1"] deptName2 = FileUtils().r_info8('b2_herp3_bs', '所有科室name', 'message6')["deptid2"] @@ -167,7 +166,9 @@ def second_dept_return_Out_Stock(type): # 三级库退货出库 cname = username orgCode1 = get_orgCode() orgName1 = get_orgName() - print(orgCode1, orgName1) + # print(orgCode1, orgName1) + # import pdb + # pdb.set_trace() request_body = commonFuc().get_business_data(module, "payload50_2_3", stockId, stockName2, areaCode, areaName,targetStockId,targetDeptId, @@ -188,8 +189,9 @@ def second_dept_return_Out_Stock(type): # 三级库退货出库 inStockTime, distrDetailId, purMode, price, goodsMfrsName, goodsSpec, unit, goodsName,made, unitName, hosGoodsCode, purModeText) - print('request_body', '高值消耗出库', request_body) - + print('request_body', '高值退库出库', request_body) + # import pdb + # pdb.set_trace() # # # # 发送请求 result = commonFuc().http_post(url, request_body, headers) print('result', result) diff --git a/data/b5_spd3_core_business_flow/data b/data/b5_spd3_core_business_flow/data index f0f1350847fe9819de15767ea46bd7fb38a429ae..c2774a94a741ae91d6d5dacdb313caf07889a2f9 100644 --- a/data/b5_spd3_core_business_flow/data +++ b/data/b5_spd3_core_business_flow/data @@ -165,186 +165,129 @@ json_headers2: { "payload52": {"batchList":[{"id":"%s","lastModified":null,"version":null,"createTime":"%s","createUser":null,"lastModifiedUser":null,"snCode":"%s","hosId":"%s","branchId":null,"stockId":"%s","areaCode":"%s","areaName":"%s","shelfCode":"%s","codeType":"%s","tagType":"%s","hosGoodsId":"%s","mdmGoodsCode":"%s","goodsCode":"%s","goodsDi":"%s","barName":"%s","batchCode":"%s","expdtDate":"%s","productDate":"%s","mfrCode":null,"mfrCodeSee":null,"pkgCode":"%s","pkgCodeSee":"%s","ssccCode":"%s","extInfo":null,"outId":null,"tbStatus":"%s","goodsCodeDi":null,"barcodeId":null,"ext":{"distrDetailId":"%s","distrBillId":"%s","certificateCode":"","purBillId":"%s","pkgDefQty":"%s","pkgDefId":"%s","pkgDefName":"%s"},"sourceDetailId":null,"purMode":"%s","purModes":null,"price":null,"pid":null,"goodsMfrsName":"%s","mfrsName":null,"goodsSpec":"%s","unit":"%s","goodsName":"%s","pkgDefId":"%s","pkgDefQty":"%s","purDetailId":null,"pkgDefName":"%s","printNum":0,"deptId":null,"deptName":null,"billId":null,"taskId":null,"made":"%s","provId":null,"provName":null,"subProvId":null,"subProvName":null,"provHosGoodsId":null,"sourceType":null,"taskDate":null,"sourceOrderNo":null,"taskType":null,"detailId":null,"branchGoodsPkgDefList":null,"unitName":null,"areaCodeList":null,"diType":null,"mdmGoodsSpecCode":null,"hosGoodsCode":"%s","supplyId":null,"inSettlement":null,"spdGoodsCode":null,"codeKind":null,"brand":null,"miCode":null,"transferRatio":1,"miDjmc":null,"tbStatusList":null,"purModeText":null,"stockName":null,"tbStatusText":null,"pkgType":null,"bottleId":null,"pkgStatus":null,"qty":null,"packUnit":null,"minSaleQty":null,"rfidFlag":null,"mfrCodeFlag":null,"scanStatus":null,"scanId":null,"multiChargeFlag":null,"useFrequency":null,"chargeUnit":null,"lockStatus":null,"remark":null}],"sourceId":"%s","sourceType":"KS","sourceVersion":"3","remark":"","reviewAll":0} "payload50_2": {"areaCode":"%s","hdiList":[{"id":"%s","lastModified":null,"version":null,"createTime":"%s","createUser":null,"lastModifiedUser":null,"snCode":"%s","hosId":"%s","branchId":null,"stockId":"%s","areaCode":"%s","areaName":"%s","shelfCode":"%s","codeType":"%s","tagType":"%s","hosGoodsId":"%s","mdmGoodsCode":"%s","goodsCode":"%s","goodsDi":"%s","barName":"%s","batchCode":"%s","expdtDate":"%s","productDate":"%s","mfrCode":null,"mfrCodeSee":null,"pkgCode":"%s","pkgCodeSee":"%s","ssccCode":"%s","extInfo":null,"outId":null,"tbStatus":"%s","goodsCodeDi":null,"barcodeId":null,"ext":{"distrDetailId":"%s","distrBillId":"%s","certificateCode":"","purBillId":"%s","pkgDefQty":"%s","multiChargeFlag":0,"useFrequency":1},"sourceDetailId":null,"purMode":"%s","purModes":null,"price":null,"pid":null,"goodsMfrsName":"%s","mfrsName":null,"goodsSpec":"%s","unit":"%s","goodsName":"%s","pkgDefId":null,"pkgDefQty":null,"purDetailId":null,"pkgDefName":null,"printNum":"%s","deptId":null,"deptName":null,"billId":null,"taskId":null,"made":"%s","provId":null,"provName":null,"subProvId":null,"subProvName":null,"provHosGoodsId":null,"sourceType":null,"taskDate":null,"sourceOrderNo":null,"taskType":null,"detailId":null,"branchGoodsPkgDefList":null,"unitName":null,"areaCodeList":null,"diType":null,"mdmGoodsSpecCode":null,"hosGoodsCode":"%s","supplyId":null,"inSettlement":null,"spdGoodsCode":null,"codeKind":null,"brand":null,"miCode":null,"transferRatio":1,"miDjmc":null,"tbStatusList":null,"purModeText":null,"stockName":null,"tbStatusText":null,"pkgType":null,"bottleId":null,"pkgStatus":null,"qty":null,"packUnit":null,"minSaleQty":null,"rfidFlag":null,"mfrCodeFlag":null,"scanStatus":null,"scanId":null,"multiChargeFlag":null,"useFrequency":null,"chargeUnit":null,"lockStatus":null,"remark":null}],"id":"%s","areaName":"%s","stockName":"%s"} "payload50_2_2": {"areaCode":"%s","areaName":"%s","hdiList":[{"id":"%s","lastModified":null,"version":null,"createTime":"%s","createUser":null,"lastModifiedUser":null,"snCode":"%s","hosId":"%s","branchId":null,"stockId":"%s","areaCode":"%s","areaName":"%s","shelfCode":"%s","codeType":"%s","tagType":0,"hosGoodsId":"%s","mdmGoodsCode":"%s","goodsCode":"%s","goodsDi":"%s","barName":"%s","batchCode":"%s","expdtDate":"%s","productDate":"%s","mfrCode":null,"mfrCodeSee":null,"pkgCode":"%s","pkgCodeSee":"%s","ssccCode":"%s","extInfo":null,"outId":null,"tbStatus":"%s","goodsCodeDi":null,"barcodeId":null,"ext":{"pkgDefQty":1,"purBillId":"%s","distrBillId":"%s","inStockTime":"%s","useFrequency":1,"distrDetailId":"%s","certificateCode":"","multiChargeFlag":0},"sourceDetailId":null,"purMode":"%s","purModes":null,"price":"%s","pid":null,"goodsMfrsName":"%s","mfrsName":null,"goodsSpec":"%s","unit":"%s","goodsName":"%s","pkgDefId":null,"pkgDefQty":null,"defaultPkgDefQty":null,"defaultQty":null,"defaultSurplusQty":null,"defaultPkgDefId":null,"purDetailId":null,"pkgDefName":null,"printNum":0,"deptId":null,"deptName":null,"billId":null,"taskId":null,"made":"%s","provId":null,"provName":null,"subProvId":null,"subProvName":null,"provHosGoodsId":null,"sourceType":null,"taskDate":null,"sourceOrderNo":null,"taskType":null,"detailId":null,"branchGoodsPkgDefList":null,"unitName":"%s","areaCodeList":null,"diType":null,"mdmGoodsSpecCode":null,"hosGoodsCode":"%s","supplyId":null,"inSettlement":null,"spdGoodsCode":null,"codeKind":null,"brand":null,"miCode":"","transferRatio":1,"miDjmc":"","tbStatusList":null,"purModeText":"%s","stockName":null,"tbStatusText":null,"pkgType":null,"bottleId":null,"pkgStatus":null,"qty":1,"packUnit":null,"minSaleQty":null,"rfidFlag":null,"mfrCodeFlag":null,"scanStatus":null,"scanId":null,"multiChargeFlag":null,"useFrequency":null,"chargeUnit":null,"lockStatus":null,"remark":null,"hosBatchId":null,"settleFlag":null,"inStockTime":null}],"id":"%s","pickerId":"%s","version":0,"stockName":"%s"} -"payload50_2_3": { - "remark": "", - "stockId": "%s", - "deptId": "%s", - "reasonKind": "11", - "areaCode": "%s", - "areaName": "%s", - "targetStockId": "%s", - "targetDeptId": "%s", - "sourceType": "CK_TK", - "user": { - "uxid": "%s", - "userLoginCode": "%s", - "employeeNo": null, - "cname": "%s", - "corpId": "%s", - "corpCode": null, - "corpKind": 1, - "corpName": null, - "branchId": "%s", - "branchName": null, - "orgId": "%s", - "orgCode": "%s", - "orgName": "%s", - "job": null, - "tel": "xhs0301", - "email": null, - "mgrCorpId": "%s", - "mgrCorpCode": "%s", - "mgrCorpKind": 1, - "mgrCorpName": "%s", - "mgrBranchId": "%s", - "mgrBranchName": "%s", - "mgrRangeId": "%s", - "mgrRangeName": "%s", - "extStr1": "%s", - "extStr2": null, - "extStr3": "%s", - "roles": [ - { - "roleCode": "ro00442", - "roleName": "医院管理员" - } - ], - "wechatNickName": null, - "mgrDeptKind": null, - "adminFlag": null, - "datascopeMap": null, - "dataGroupList": null, - "workFlowGroupSimpleVOList": null, - "extMap": null - }, - "hosId": "%s", - "pickType": "KS_TK", - "pickCreateVO": { - "remark": "", - "stockId": "%s",s - "deptId": "%s", - "reasonKind": "11", - "areaCode": "%s", - "areaName": "%s", - "targetStockId": "%s", - "targetDeptId": "%s", - "barCodeList": [ - { - "id": "%s", - "lastModified": null, - "version": null, - "createTime": "%s", - "createUser": null, - "lastModifiedUser": null, - "snCode": "%s", - "hosId": "%s", - "branchId": null, - "stockId": "%s", - "areaCode": "%s", - "areaName": "%s", - "shelfCode": "%s", - "codeType": "%s", - "tagType": 0, - "hosGoodsId": "%s", - "mdmGoodsCode": "%s", - "goodsCode": "%s", - "goodsDi": "%s", - "barName": "%s", - "batchCode": "%s", - "expdtDate": "%s", - "productDate": "%s", - "mfrCode": null, - "mfrCodeSee": null, - "pkgCode": "%s", - "pkgCodeSee": "%s", - "ssccCode": "%s", - "extInfo": null, - "outId": null, - "tbStatus": "%s", - "goodsCodeDi": null, - "barcodeId": null, - "ext": { - "pkgDefQty": 1, - "purBillId": "%s", - "distrBillId": "%s", - "inStockTime": "%s", - "useFrequency": 1, - "distrDetailId": "%s", - "certificateCode": "", - "multiChargeFlag": 0 - }, - "sourceDetailId": null, - "purMode": "%s", - "purModes": null, - "price": "%s", - "pid": null, - "goodsMfrsName": "%s", - "mfrsName": null, - "goodsSpec": "%s", - "unit": "%s", - "goodsName": "%s", - "pkgDefId": null, - "pkgDefQty": null, - "defaultPkgDefQty": null, - "defaultQty": null, - "defaultSurplusQty": null, - "defaultPkgDefId": null, - "purDetailId": null, - "pkgDefName": null, - "printNum": 0, - "deptId": null, - "deptName": null, - "billId": null, - "taskId": null, - "made": "%s", - "provId": null, - "provName": null, - "subProvId": null, - "subProvName": null, - "provHosGoodsId": null, - "sourceType": null, - "taskDate": null, - "sourceOrderNo": null, - "taskType": null, - "detailId": null, - "branchGoodsPkgDefList": null, - "unitName": "%s", - "areaCodeList": null, - "diType": null, - "mdmGoodsSpecCode": null, - "hosGoodsCode": "%s", - "supplyId": null, - "inSettlement": null, - "spdGoodsCode": null, - "codeKind": null, - "brand": null, - "miCode": "", - "transferRatio": 1, - "miDjmc": "", - "tbStatusList": null, - "purModeText": "%s", - "stockName": null, - "tbStatusText": null, - "pkgType": null, - "bottleId": null, - "pkgStatus": null, - "qty": 1, - "packUnit": null, - "minSaleQty": null, - "rfidFlag": null, - "mfrCodeFlag": null, - "scanStatus": null, - "scanId": null, - "multiChargeFlag": null, - "useFrequency": null, - "chargeUnit": null, - "lockStatus": null, - "remark": null, - "hosBatchId": null, - "settleFlag": null, - "inStockTime": null - } - ] +"payload50_2_3": {"remark": "","stockId": "%s","deptId": "%s","reasonKind": "11","areaCode": "%s","areaName": "%s","targetStockId": "%s","targetDeptId": "%s","sourceType": "CK_TK","user": {"uxid": "%s","userLoginCode": "%s","employeeNo": null,"cname": "%s", "corpId": "%s","corpCode": null,"corpKind": 1,"corpName": null,"branchId": "%s","branchName": null,"orgId": "%s","orgCode": "%s","orgName": "%s","job": null,"tel": "xhs0301","email": null,"mgrCorpId": "%s","mgrCorpCode": "%s","mgrCorpKind": 1,"mgrCorpName": "%s","mgrBranchId": "%s","mgrBranchName": "%s","mgrRangeId": "%s","mgrRangeName": "%s", "extStr1": "%s", "extStr2": null, "extStr3": "%s", "roles": [{"roleCode": "ro00442","roleName": "医院管理员"}], "wechatNickName": null,"mgrDeptKind": null,"adminFlag": null,"datascopeMap": null,"dataGroupList": null, "workFlowGroupSimpleVOList": null,"extMap": null},"hosId": "%s","pickType": "KS_TK","pickCreateVO": {"remark": "","stockId": "%s","deptId": "%s", +"reasonKind": "11", +"areaCode": "%s", +"areaName": "%s", +"targetStockId": "%s", +"targetDeptId": "%s", +"barCodeList": [ + { +"id": "%s", +"lastModified": null, +"version": null, +"createTime": "%s", +"createUser": null, +"lastModifiedUser": null, +"snCode": "%s", +"hosId": "%s", +"branchId": null, +"stockId": "%s", +"areaCode": "%s", +"areaName": "%s", +"shelfCode": "%s", +"codeType": "%s", +"tagType": 0, +"hosGoodsId": "%s", +"mdmGoodsCode": "%s", +"goodsCode": "%s", +"goodsDi": "%s", +"barName": "%s", +"batchCode": "%s", +"expdtDate": "%s", +"productDate": "%s", +"mfrCode": null, +"mfrCodeSee": null, +"pkgCode": "%s", +"pkgCodeSee": "%s", +"ssccCode": "%s", +"extInfo": null, +"outId": null, +"tbStatus": "%s", +"goodsCodeDi": null, +"barcodeId": null, +"ext": { + "pkgDefQty": 1, + "purBillId": "%s", + "distrBillId": "%s", + "inStockTime": "%s", + "useFrequency": 1, + "distrDetailId": "%s", + "certificateCode": "", + "multiChargeFlag": 0 +}, +"sourceDetailId": null, +"purMode": "%s", +"purModes": null, +"price": "%s", +"pid": null, +"goodsMfrsName": "%s", +"mfrsName": null, +"goodsSpec": "%s", +"unit": "%s", +"goodsName": "%s", +"pkgDefId": null, +"pkgDefQty": null, +"defaultPkgDefQty": null, +"defaultQty": null, +"defaultSurplusQty": null, +"defaultPkgDefId": null, +"purDetailId": null, +"pkgDefName": null, +"printNum": 0, +"deptId": null, +"deptName": null, +"billId": null, +"taskId": null, +"made": "%s", +"provId": null, +"provName": null, +"subProvId": null, +"subProvName": null, +"provHosGoodsId": null, +"sourceType": null, +"taskDate": null, +"sourceOrderNo": null, +"taskType": null, +"detailId": null, +"branchGoodsPkgDefList": null, +"unitName": "%s", +"areaCodeList": null, +"diType": null, +"mdmGoodsSpecCode": null, +"hosGoodsCode": "%s", +"supplyId": null, +"inSettlement": null, +"spdGoodsCode": null, +"codeKind": null, +"brand": null, +"miCode": "", +"transferRatio": 1, +"miDjmc": "", +"tbStatusList": null, +"purModeText": "%s", +"stockName": null, +"tbStatusText": null, +"pkgType": null, +"bottleId": null, +"pkgStatus": null, +"qty": 1, +"packUnit": null, +"minSaleQty": null, +"rfidFlag": null, +"mfrCodeFlag": null, +"scanStatus": null, +"scanId": null, +"multiChargeFlag": null, +"useFrequency": null, +"chargeUnit": null, +"lockStatus": null, +"remark": null, +"hosBatchId": null, +"settleFlag": null, +"inStockTime": null + } +] } } diff --git a/report/summary.html b/report/summary.html index 681773cce414263a31930ffce6c83a35ff5d86f5..fc540d18524f1f91c4651190eea2b019d9b05697 100644 --- a/report/summary.html +++ b/report/summary.html @@ -77,7 +77,7 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 1 0 - 15分26秒 + 8分17秒 0.0% @@ -95,7 +95,7 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 a_b8流程十五退库业务_三级库向二级库退库 失败 - 926.812 + 497.12 xiaohesheng