From 34f308d298997c4e4ccbc0808a89488abee93755 Mon Sep 17 00:00:00 2001 From: xiao-hesheng Date: Mon, 8 Jul 2024 08:53:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=84=9A=E6=9C=AC=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...21\344\270\255\345\277\203\345\272\223.py" | 8 +- data/b5_spd3_core_business_flow/message18 | 161 +++++------------- data/b5_spd3_core_business_flow/message21 | 8 +- data/b5_spd3_core_business_flow/message22 | 4 +- 4 files changed, 59 insertions(+), 122 deletions(-) diff --git "a/air_case/b5_spd3_core_business_flow/a_b2\346\265\201\347\250\213\344\271\235\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\255\345\277\203\345\272\223.air/a_b2\346\265\201\347\250\213\344\271\235\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\255\345\277\203\345\272\223.py" "b/air_case/b5_spd3_core_business_flow/a_b2\346\265\201\347\250\213\344\271\235\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\255\345\277\203\345\272\223.air/a_b2\346\265\201\347\250\213\344\271\235\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\255\345\277\203\345\272\223.py" index 88ba5044..a5d481d4 100644 --- "a/air_case/b5_spd3_core_business_flow/a_b2\346\265\201\347\250\213\344\271\235\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\255\345\277\203\345\272\223.air/a_b2\346\265\201\347\250\213\344\271\235\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\255\345\277\203\345\272\223.py" +++ "b/air_case/b5_spd3_core_business_flow/a_b2\346\265\201\347\250\213\344\271\235\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\255\345\277\203\345\272\223.air/a_b2\346\265\201\347\250\213\344\271\235\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\255\345\277\203\345\272\223.py" @@ -414,8 +414,12 @@ def main(): approval_center() updateUserLoginDefaultRange(get_listUserMgrRangePage(1)) #设置登录账号默认权限是中心库 #获取拣货单列表个数 - for i in range(get_centeStock_pick_list_counts()): - centeStock_pick()#中心库拣货 + try: + for i in range(get_centeStock_pick_list_counts()): + centeStock_pick()#中心库拣货 + except: + for i in range(3): # 三个单据共审批3次 + approval_center() #低值拣货执行 hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'] GoodsId = hosGoodsId.replace(get_hosid(), '') diff --git a/data/b5_spd3_core_business_flow/message18 b/data/b5_spd3_core_business_flow/message18 index a61acc21..d62d8a8e 100644 --- a/data/b5_spd3_core_business_flow/message18 +++ b/data/b5_spd3_core_business_flow/message18 @@ -1,120 +1,53 @@ 条码信息: list_a: - &id001 - - id: UT240708000101 - lastModified: - version: - createTime: '2024-07-08 05:06:21' - createUser: - lastModifiedUser: - snCode: UT240708000101 - hosId: h0347 - branchId: - stockId: 3a4ab96db19047cc9c36e92a6cc5ea06 - areaCode: areah03472677 - areaName: 自动化测试 - shelfCode: areah03472677-2-01-01 - codeType: 66 - tagType: 0 - hosGoodsId: h034700004501 - mdmGoodsCode: '11661454' - goodsCode: '00004501' - goodsDi: '01123456789012' - barName: 100支/100 - batchCode: '4444' - expdtDate: '2025-01-14' - productDate: '2024-07-08' - mfrCode: - mfrCodeSee: - pkgCode: "0101123456789012104444\x1D112407081725011421UT240708000101" - pkgCodeSee: 0101123456789012104444112407081725011421UT240708000101 - ssccCode: '010839000187194625' - extInfo: - outId: - tbStatus: 20 - goodsCodeDi: - barcodeId: - ext: - pkgDefId: 2d4d3bd0ebe745efa73bb7123cf21f6a - pkgDefQty: 100 - purBillId: CG2024070820770 - pkgDefName: '100' - distrBillId: PSh0347202407080004 - inStockTime: '2024-07-08 05:08:08' - distrDetailId: '03839345' - certificateCode: '' - sourceDetailId: - purMode: 60 - purModes: - price: - pid: - goodsMfrsName: 德国歌德公司 Geuder AG - mfrsName: - goodsSpec: G-31891 - unit: 支 - goodsName: 新型冠状病毒检测试剂hO3Tu - pkgDefId: 2d4d3bd0ebe745efa73bb7123cf21f6a - pkgDefQty: 100 - defaultPkgDefQty: - defaultQty: - defaultSurplusQty: - defaultPkgDefId: - purDetailId: - pkgDefName: '100' - printNum: 0 - deptId: - deptName: - billId: - taskId: - made: 德国 - provId: p1e32e - provName: 国药集团公司^n1@F - subProvId: p1e32e - subProvName: 国药集团公司^n1@F - provHosGoodsId: - sourceType: - taskDate: - sourceOrderNo: - taskType: - detailId: - branchGoodsPkgDefList: - unitName: - areaCodeList: - diType: - mdmGoodsSpecCode: - hosGoodsCode: '00004501' - supplyId: - inSettlement: - spdGoodsCode: - codeKind: - brand: - miCode: - transferRatio: 1.0 - miDjmc: - tbStatusList: - purModeText: - stockName: - tbStatusText: - pkgType: - bottleId: - pkgStatus: - qty: - packUnit: - minSaleQty: - rfidFlag: - mfrCodeFlag: - scanStatus: - scanId: - multiChargeFlag: - useFrequency: - chargeUnit: - lockStatus: - remark: - hosBatchId: - settleFlag: - inStockTime: - verifyFlag: - subSendFlag: 10 + id: UT240708000102 + snCode: UT240708000102 + ssccCode: '010839000187194724' + pkgCodeSee: 0101123456789012104444112407081725011421UT240708000102 + hosGoodsId: h034700004501 + hosGoodsCode: '00004501' + goodsCode: '00004501' + goodsName: 新型冠状病毒检测试剂hO3Tu + goodsSpec: G-31891 + goodsMfrsName: 德国歌德公司 Geuder AG + unit: 支 + purMode: 60 + batchCode: '4444' + productDate: '2024-07-08' + expdtDate: '2025-01-14' + pkgDefName: '100' + pkgDefQty: 100.0 + stockId: 3a4ab96db19047cc9c36e92a6cc5ea06 + stockName: 东土城路院区IjnkG中心库房 + areaName: 自动化测试 + areaCode: areah03472677 + lockStatus: 0 + unitName: 100支/100 + shelfCode: areah03472677-2-01-01 + shelfNo: 自动化测试-2-01-01 + pkgDefId: 2d4d3bd0ebe745efa73bb7123cf21f6a + extInfo: '{"pkgDefId": "2d4d3bd0ebe745efa73bb7123cf21f6a", "pkgDefQty": 100, "purBillId": + "CG2024070820770", "pkgDefName": "100", "distrBillId": "PSh0347202407080004", + "inStockTime": "2024-07-08 05:08:08", "distrDetailId": "03839345", "certificateCode": + ""}' + bottleId: + pkgType: '66' + miDjmc: '' + miCode: '' + transferRatio: 1.0 + qty: 1 + shelfKind: 0 + shelfKindName: 普通货位 + provName: 国药集团公司^n1@F + provId: p1e32e + inStockDate: + mfrCode: + made: 德国 + price: + barName: 100支/100 + purModeText: 检验试剂 + codeType: 66 list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message21 b/data/b5_spd3_core_business_flow/message21 index 2f6f76be..b32007b1 100644 --- a/data/b5_spd3_core_business_flow/message21 +++ b/data/b5_spd3_core_business_flow/message21 @@ -16,7 +16,7 @@ pkgDefName: '100' pkgDefQty: 100.0 pkgQty: - qty: 0 + qty: 100.0 goodsImg: [] pkgDefId: 2d4d3bd0ebe745efa73bb7123cf21f6a buyPkgQty: @@ -34,14 +34,14 @@ targetStockName: 东土城路院区IjnkG中心库房 purchaseFlag: 1 tempFlag: 0 - grantWay: 1 + grantWay: 2 deptGoodsStatus: codingType: 0 purModeText: 检验试剂 goodsGeneralName: 检测试剂 provName: 国药集团公司^n1@F - noRecPkgQty: 4.0 - noRecQty: 400.0 + noRecPkgQty: 5.0 + noRecQty: 500.0 autoUnpack: 0 consumeQty: consumePkgQty: diff --git a/data/b5_spd3_core_business_flow/message22 b/data/b5_spd3_core_business_flow/message22 index e9392d4f..3804a408 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: 84695465c4144015943479b370abbed2 - lastModified: '2024-07-08 08:36:15' - version: 3 + lastModified: '2024-07-08 08:48:49' + version: 4 createTime: '2024-07-08 05:03:31' createUser: h0347_UID-051402 lastModifiedUser: h0347_UID-051402 -- GitLab