diff --git a/air_case/public1/public1/public1.py b/air_case/public1/public1/public1.py index 5983547d638c03fd022ab893a6dd61596f4cec19..a76642e8a0ab87fcbbc24f260aa6c4e910b9b483 100644 --- a/air_case/public1/public1/public1.py +++ b/air_case/public1/public1/public1.py @@ -2477,17 +2477,15 @@ def pickScan2(PICK_ID, udi_code, type=1): # 二级库出库拣货扫码 unitName, hosGoodsCode, purModeText, PICK_ID, pickerId, stockName) elif type == 2: - request_body = commonFuc().get_business_data(module, "payload50_2", areaCode, UTid, createTime, UTid, - get_hosid(), - stockId, - areaCode, areaName, shelfCode, codeType, tagType, hosGoodsId, - mdmGoodsCode, goodsCode, goodsDi, barName, batchCode, expdtDate, - productDate, pkgCode, pkgCodeSee, ssccCode, tbStatus, - distrDetailId, - distrBillId, purBillId, pkgDefQty, purMode, - goodsMfrsName, goodsSpec, unit, goodsName, - printNum, made, - hosGoodsCode, PICK_ID, areaName, stockName) + request_body = commonFuc().get_business_data(module, "payload50_2_2", areaCode, areaName, UTid, createTime, + UTid, get_hosid(), stockId, areaCode, areaName, shelfCode, + codeType, hosGoodsId, mdmGoodsCode, goodsCode, goodsDi, barName, + batchCode, expdtDate, productDate, pkgCode, pkgCodeSee, ssccCode, + tbStatus, purBillId, pkgDefName, distrBillId, + inStockTime, distrDetailId, purMode, price, goodsMfrsName, + goodsSpec, unit, goodsName, pkgDefName, made, + unitName, hosGoodsCode, purModeText, PICK_ID, pickerId, + stockName) elif type == 3: request_body = commonFuc().get_business_data(module, "payload50", areaCode, UTid, createTime, UTid, get_hosid(), stockId, diff --git a/data/b5_spd3_core_business_flow/data b/data/b5_spd3_core_business_flow/data index f6ec4c44d2d81894b5e8d0e602eba0cd623cc37c..a03b2ee13846949b65f4ed906e1dc1c6df13c81d 100644 --- a/data/b5_spd3_core_business_flow/data +++ b/data/b5_spd3_core_business_flow/data @@ -148,6 +148,9 @@ json_headers2: { "payload51": "%s" "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"} + + "payload53": {"queryObject":{"goodsName":"%s","goodsMfrsName":"","purModes":[],"hosId":"%s","branchId":"%s","goodsSpec":"","importGrantRule":2,"deptId":"%s"},"pageNum":1,"pageSize":50} "payload53_2": {"queryObject":{"goodsName":"%s","goodsMfrsName":"","purModes":[],"hosId":"%s","branchId":"%s","grantRule":2,"goodsSpec":"","deptId":"%s"},"pageNum":1,"pageSize":50} diff --git a/data/b5_spd3_core_business_flow/message18 b/data/b5_spd3_core_business_flow/message18 index dc82d48595a795999068f22be7a91895cecc00db..0b86be9e60b98096a1cc7479302bdf43b79665a7 100644 --- a/data/b5_spd3_core_business_flow/message18 +++ b/data/b5_spd3_core_business_flow/message18 @@ -1,19 +1,19 @@ 条码信息: list_a: - &id001 - id: UT240531000701 - snCode: UT240531000701 - ssccCode: '010839000182118626' - pkgCodeSee: 0136430000039220104444112405311724120721UT240531000701 - hosGoodsId: h034700003922 - hosGoodsCode: '00003922' - goodsCode: '00003922' - goodsName: 新型冠状病毒检测试剂@q1Mc + id: UT240531000205 + snCode: UT240531000205 + ssccCode: '010839000182039020' + pkgCodeSee: 013643000003921010333112405311724120721UT240531000205 + hosGoodsId: h034700003921 + hosGoodsCode: '00003921' + goodsCode: '00003921' + goodsName: 一次性注射器_低值ga1u3 goodsSpec: G-31891 goodsMfrsName: 德国歌德公司 Geuder AG unit: 支 - purMode: 60 - batchCode: '4444' + purMode: 10 + batchCode: '333' productDate: '2024-05-31' expdtDate: '2024-12-07' pkgDefName: '100' @@ -26,13 +26,13 @@ unitName: 100支/100 shelfCode: areah03472140-A-01-01 shelfNo: A01-A-01-01 - pkgDefId: 1fa6b0cb864543e29e0c13633473169d - extInfo: '{"pkgDefId": "1fa6b0cb864543e29e0c13633473169d", "pkgDefQty": 100, "purBillId": - "CG2024053117269", "pkgDefName": "100", "distrBillId": "PSh0347202405310013", - "inStockTime": "2024-05-31 07:27:22", "distrDetailId": "03837860", "certificateCode": + pkgDefId: 175916cec2a645239c2f8bd189dbdbf2 + extInfo: '{"pkgDefId": "175916cec2a645239c2f8bd189dbdbf2", "pkgDefQty": 100, "purBillId": + "CG2024053117243", "pkgDefName": "100", "distrBillId": "PSh0347202405310005", + "inStockTime": "2024-05-31 15:26:41", "distrDetailId": "03837852", "certificateCode": ""}' bottleId: - pkgType: '66' + pkgType: '16' miDjmc: '' miCode: '' transferRatio: 1.0 @@ -41,13 +41,13 @@ shelfKindName: 普通货位 provName: 国药集团公司MRA4P provId: p1e25f - inStockDate: '2024-05-31 07:27:22' + inStockDate: '2024-05-31 15:26:40' mfrCode: made: 德国 price: barName: 100支/100 - purModeText: 检验试剂 - codeType: 66 + purModeText: 低值耗材 + codeType: 16 list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message22 b/data/b5_spd3_core_business_flow/message22 index a52089615c95187a52b3ff047230a76a1d0622aa..d81f26a9ef061b86e0d9e00a1a5aa7e9b7883289 100644 --- a/data/b5_spd3_core_business_flow/message22 +++ b/data/b5_spd3_core_business_flow/message22 @@ -2,8 +2,8 @@ list_a: - &id001 - id: 0702e472a3dd401ba00557cb70088ef9 - lastModified: '2024-05-31 16:14:10' - version: 8 + lastModified: '2024-05-31 16:18:34' + version: 9 createTime: '2024-05-31 08:42:09' createUser: h0347_UID-051304 lastModifiedUser: h0347_UID-051304 diff --git a/report/summary.html b/report/summary.html index b9ce6694f82d216a2639e5238c1f0498f78fd315..1232a0cf8937b3782f084d8f3483cbd6652b3923 100644 --- a/report/summary.html +++ b/report/summary.html @@ -76,9 +76,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 1 - 1 - 0分8秒 - 100.0% + 0 + 6分56秒 + 0.0% @@ -93,9 +93,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 - r_b8库房管理_库区设置_同步库房信息 - 成功 - 8.719 + a_b5流程十二请领业务流_二级库向二级库 + 失败 + 416.265 xiaohesheng