From 24fc14ce8f3b57c5034e04a3a87d35e1e960af5b Mon Sep 17 00:00:00 2001 From: xiao-hesheng Date: Fri, 5 Jul 2024 15:53:36 +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 --- ...47\345\272\223\351\200\200\345\272\223.py" | 2 + ...47\345\272\223\351\200\200\345\272\223.py" | 2 + ...00\344\276\233\345\272\224\345\225\206.py" | 2 + ...06\345\214\205\345\212\237\350\203\275.py" | 2 + data/b5_spd3_core_business_flow/message16 | 24 +-- data/b5_spd3_core_business_flow/message17 | 97 ++++++----- data/b5_spd3_core_business_flow/message18 | 160 +++++++++++++----- main1/main_text.py | 3 + 8 files changed, 189 insertions(+), 103 deletions(-) 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 69b8d5f7..72df7686 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" @@ -432,6 +432,8 @@ def main(): second_dept_one_key_in(2) second_dept_one_key_in(2) commonFuc().check_text_exist_result_text('succees', 'succees') + print('================流程十五执行完毕===================') + except: commonFuc().check_text_exist_result_text('error', '1') # main() \ No newline at end of file diff --git "a/air_case/b5_spd3_core_business_flow/a_b9\346\265\201\347\250\213\345\215\201\345\205\255\351\200\200\345\272\223\344\270\232\345\212\241_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\200\347\272\247\345\272\223\351\200\200\345\272\223.air/a_b9\346\265\201\347\250\213\345\215\201\345\205\255\351\200\200\345\272\223\344\270\232\345\212\241_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\200\347\272\247\345\272\223\351\200\200\345\272\223.py" "b/air_case/b5_spd3_core_business_flow/a_b9\346\265\201\347\250\213\345\215\201\345\205\255\351\200\200\345\272\223\344\270\232\345\212\241_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\200\347\272\247\345\272\223\351\200\200\345\272\223.air/a_b9\346\265\201\347\250\213\345\215\201\345\205\255\351\200\200\345\272\223\344\270\232\345\212\241_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\200\347\272\247\345\272\223\351\200\200\345\272\223.py" index b83e3629..52a7c614 100644 --- "a/air_case/b5_spd3_core_business_flow/a_b9\346\265\201\347\250\213\345\215\201\345\205\255\351\200\200\345\272\223\344\270\232\345\212\241_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\200\347\272\247\345\272\223\351\200\200\345\272\223.air/a_b9\346\265\201\347\250\213\345\215\201\345\205\255\351\200\200\345\272\223\344\270\232\345\212\241_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\200\347\272\247\345\272\223\351\200\200\345\272\223.py" +++ "b/air_case/b5_spd3_core_business_flow/a_b9\346\265\201\347\250\213\345\215\201\345\205\255\351\200\200\345\272\223\344\270\232\345\212\241_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\200\347\272\247\345\272\223\351\200\200\345\272\223.air/a_b9\346\265\201\347\250\213\345\215\201\345\205\255\351\200\200\345\272\223\344\270\232\345\212\241_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\200\347\272\247\345\272\223\351\200\200\345\272\223.py" @@ -569,6 +569,8 @@ def main(): putaway()#中心库上架 # ===============上面调通了================================ commonFuc().check_text_exist_result_text('succees', 'succees') + print('================流程十六执行完毕===================') + except: commonFuc().check_text_exist_result_text('error', '1') # main() \ No newline at end of file diff --git "a/air_case/b5_spd3_core_business_flow/a_c0\346\265\201\347\250\213\345\215\201\344\270\203\351\200\200\350\264\247\344\270\232\345\212\241_\344\270\255\345\277\203\345\272\223\351\200\200\344\276\233\345\272\224\345\225\206.air/a_c0\346\265\201\347\250\213\345\215\201\344\270\203\351\200\200\350\264\247\344\270\232\345\212\241_\344\270\255\345\277\203\345\272\223\351\200\200\344\276\233\345\272\224\345\225\206.py" "b/air_case/b5_spd3_core_business_flow/a_c0\346\265\201\347\250\213\345\215\201\344\270\203\351\200\200\350\264\247\344\270\232\345\212\241_\344\270\255\345\277\203\345\272\223\351\200\200\344\276\233\345\272\224\345\225\206.air/a_c0\346\265\201\347\250\213\345\215\201\344\270\203\351\200\200\350\264\247\344\270\232\345\212\241_\344\270\255\345\277\203\345\272\223\351\200\200\344\276\233\345\272\224\345\225\206.py" index f54f244f..65c93167 100644 --- "a/air_case/b5_spd3_core_business_flow/a_c0\346\265\201\347\250\213\345\215\201\344\270\203\351\200\200\350\264\247\344\270\232\345\212\241_\344\270\255\345\277\203\345\272\223\351\200\200\344\276\233\345\272\224\345\225\206.air/a_c0\346\265\201\347\250\213\345\215\201\344\270\203\351\200\200\350\264\247\344\270\232\345\212\241_\344\270\255\345\277\203\345\272\223\351\200\200\344\276\233\345\272\224\345\225\206.py" +++ "b/air_case/b5_spd3_core_business_flow/a_c0\346\265\201\347\250\213\345\215\201\344\270\203\351\200\200\350\264\247\344\270\232\345\212\241_\344\270\255\345\277\203\345\272\223\351\200\200\344\276\233\345\272\224\345\225\206.air/a_c0\346\265\201\347\250\213\345\215\201\344\270\203\351\200\200\350\264\247\344\270\232\345\212\241_\344\270\255\345\277\203\345\272\223\351\200\200\344\276\233\345\272\224\345\225\206.py" @@ -633,6 +633,8 @@ def main(): second_center_Stock_return_Out(1) #低值耗材退货出库 second_center_Stock_return_Out(3) #试剂耗材退货出库 commonFuc().check_text_exist_result_text('succees', 'succees') + print('================流程十七执行完毕===================') + except: commonFuc().check_text_exist_result_text('error', '1') # main() \ No newline at end of file diff --git "a/air_case/b5_spd3_core_business_flow/a_c1\346\265\201\347\250\213\345\215\201\345\205\253\344\270\255\345\277\203\345\272\223\344\270\232\345\212\241_\346\213\206\345\214\205\345\212\237\350\203\275.air/a_c1\346\265\201\347\250\213\345\215\201\345\205\253\344\270\255\345\277\203\345\272\223\344\270\232\345\212\241_\346\213\206\345\214\205\345\212\237\350\203\275.py" "b/air_case/b5_spd3_core_business_flow/a_c1\346\265\201\347\250\213\345\215\201\345\205\253\344\270\255\345\277\203\345\272\223\344\270\232\345\212\241_\346\213\206\345\214\205\345\212\237\350\203\275.air/a_c1\346\265\201\347\250\213\345\215\201\345\205\253\344\270\255\345\277\203\345\272\223\344\270\232\345\212\241_\346\213\206\345\214\205\345\212\237\350\203\275.py" index b729ebb1..363a71f9 100644 --- "a/air_case/b5_spd3_core_business_flow/a_c1\346\265\201\347\250\213\345\215\201\345\205\253\344\270\255\345\277\203\345\272\223\344\270\232\345\212\241_\346\213\206\345\214\205\345\212\237\350\203\275.air/a_c1\346\265\201\347\250\213\345\215\201\345\205\253\344\270\255\345\277\203\345\272\223\344\270\232\345\212\241_\346\213\206\345\214\205\345\212\237\350\203\275.py" +++ "b/air_case/b5_spd3_core_business_flow/a_c1\346\265\201\347\250\213\345\215\201\345\205\253\344\270\255\345\277\203\345\272\223\344\270\232\345\212\241_\346\213\206\345\214\205\345\212\237\350\203\275.air/a_c1\346\265\201\347\250\213\345\215\201\345\205\253\344\270\255\345\277\203\345\272\223\344\270\232\345\212\241_\346\213\206\345\214\205\345\212\237\350\203\275.py" @@ -369,6 +369,8 @@ def main(): center_Stock_unpack(1) # 低值耗材扫码发放 center_Stock_unpack(3) # 试剂耗材扫码发放 commonFuc().check_text_exist_result_text('succees', 'succees') + print('================流程十八执行完毕===================') + except: commonFuc().check_text_exist_result_text('error', '1') # main() \ No newline at end of file diff --git a/data/b5_spd3_core_business_flow/message16 b/data/b5_spd3_core_business_flow/message16 index abe265a1..fa7e3860 100644 --- a/data/b5_spd3_core_business_flow/message16 +++ b/data/b5_spd3_core_business_flow/message16 @@ -7,13 +7,13 @@ createTime: createUser: h0347_UID-051395 lastModifiedUser: - billMode: '16' + billMode: '66' recType: stockKind: purMode: - sourceId: CHECKh03472024070500029 - sourceType: PSD - sourceVersion: 0 + sourceId: DRh034720240705000171 + sourceType: CK_TK + sourceVersion: 1 batchList: billRelationJson: hosId: h0347 @@ -21,18 +21,18 @@ deptName: branchId: h0347-3729 branchName: - taskType: 1 - sourceOrgId: p1e31d - sourceOrgName: 国药集团公司GxzLS - sourceOrderNo: YS240705029 - taskSourceNo: PSh0347202407050026 - areaCode: areah03472634 - areaName: 自动化测试 + taskType: 2 + sourceOrgId: 232328e5ceb44b799efba96c512618bf + sourceOrgName: 二级检验科002 + sourceOrderNo: DN20240705000171 + taskSourceNo: DN20240705000171 + areaCode: + areaName: goodsName: goodsGg: startDate: endDate: - taskDate: '2024-07-05 10:19:37' + taskDate: '2024-07-05 15:48:53' pkgTaskId: pkgFlag: remark: '' diff --git a/data/b5_spd3_core_business_flow/message17 b/data/b5_spd3_core_business_flow/message17 index fc8a48b6..864d2b1e 100644 --- a/data/b5_spd3_core_business_flow/message17 +++ b/data/b5_spd3_core_business_flow/message17 @@ -1,36 +1,36 @@ 验收单库存详情信息: list_a: - &id001 - - id: CHECKh034720240705000290001 + - id: DRh0347202407050001710001 lastModified: version: createTime: createUser: lastModifiedUser: rowIdx: - purMode: 10 + purMode: 60 unitName: 100支/100 - pid: CHECKh03472024070500029 - hosGoodsId: h034700004462 - batchCode: '333' + pid: DRh034720240705000171 + hosGoodsId: h034700004463 + batchCode: '4444' expdtDate: '2025-01-11' productDate: '2024-07-05' batchPrice: 99.9999 settlement: 1 - batchType: 20 - srcBatchId: '03839280' + batchType: 40 + srcBatchId: Ph034724070500050 srcBatchPrice: 99.9999 shelfCode: areah03472634-2-01-01 shelfKind: - barcodeId: UT240705000213 + barcodeId: UT240705000418 subBarcodeId: - qty: 10000.0 - pkgQty: 100 - distrId: PSh0347202407050026 - distrDetailId: '03839280' - pkgDefQty: 100.0 - pkgDefName: '100' - viewId: h0347000044623332025-01-11100支/100 + qty: 100.0 + pkgQty: 1 + distrId: PSh0347202407050038 + distrDetailId: '03839292' + pkgDefQty: + pkgDefName: + viewId: h03470000446344442025-01-11100支/100 codingType: batchFlag: hasSterilize: 0 @@ -38,53 +38,60 @@ sterilizePassQty: sterilizeRejectQty: orderNo: - sourceDetailId: '03839280' - mdmGoodsCode: '11661415' - goodsCode: '00004462' - tbStatus: 1 - billMode: '16' - hosId: h0347 - branchId: h0347-3729 - purBillId: Ch034720240705000055 + sourceDetailId: PICKh03472407050093660001 + mdmGoodsCode: '11661416' + goodsCode: '00004463' + tbStatus: + billMode: + hosId: + branchId: + purBillId: Ch034720240705000064 provId: p1e31d - provName: 国药集团公司GxzLS - subSendFlag: 10 - exeProvId: p1e31d - exeProvName: 国药集团公司GxzLS - purDetailId: e35ec319b7fa458e96c1051ef8b5e4f9 - goodsName: 一次性注射器_低值C2g9i + provName: + subProvId: p1e31d + purDetailId: + goodsName: 新型冠状病毒检测试剂a7oLM goodsGg: G-31891 mfrsId: mfrs-11229 mfrsName: 德国歌德公司 Geuder AG made: 德国 unit: 支 - purPrice: 99.9999 - pkgDefId: db284f5e13594188b4aa09a5832293ec - supplyId: bec1283b1f3440539ef0962c6e9d92d4 - subProvId: p1e31d - subProvName: 国药集团公司GxzLS - subPrice: 99.9999 - distrPrice: 99.9999 - distrPkgQty: 100.0 - distrQty: 10000.0 + sourceBatchId: Ph034724070500050 + targetBatchId: Ph034724070500050 + pkgDefId: certificateCode: '' productCertCode: - detailRelationJson: extInfo: psiPrice: 99.9999 ext: goodsGg: G-31891 - goodsCode: '00004462' - purMode: 10 - goodsName: 一次性注射器_低值C2g9i + goodsCode: '00004463' + purMode: 60 + goodsName: 新型冠状病毒检测试剂a7oLM ygptCode: '' transCond: '' storageCond: '' - erpCode: '11661415' + erpCode: '11661416' ybDefId: '' - purTaskId: - multiChargeFlag: + contractId: '' + normalContractId: '' + fcatId: '' + fcatName: '' + goodsKindId: '' + goodsKindName: '' + miTwentysevenCode: '' + focus_control: '0' + focus_control_type: + rtnQty: + hisChargeNo: trustMrfsName: + pkgCodeSee: + chargeFlag: + stockKind: CK_TK + sourceDeptId: 232328e5ceb44b799efba96c512618bf + targetDeptId: d5e1acc8708f47a7b152e103204ee4cb + ableDelFlag: + pickType: KS_TK list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message18 b/data/b5_spd3_core_business_flow/message18 index 6a6a20e7..66378fc4 100644 --- a/data/b5_spd3_core_business_flow/message18 +++ b/data/b5_spd3_core_business_flow/message18 @@ -1,52 +1,120 @@ 条码信息: list_a: - &id001 - id: UT2407050004140001 - snCode: UT2407050004140001 - ssccCode: '010839000019149519' - pkgCodeSee: 0101123456789012104444112407051725011121UT240705000414 - hosGoodsId: h034700004463 - hosGoodsCode: '00004463' - goodsCode: '00004463' - goodsName: 新型冠状病毒检测试剂a7oLM - goodsSpec: G-31891 - goodsMfrsName: 德国歌德公司 Geuder AG - unit: 支 - purMode: 60 - batchCode: '4444' - productDate: '2024-07-05' - expdtDate: '2025-01-11' - pkgDefName: - pkgDefQty: 1.0 - stockId: 6898e3a36c3c4b36bf1ea0648b26cba4 - stockName: 二级检验科002库房 - areaName: 默认库区 - areaCode: areah03472631 - lockStatus: 0 - unitName: 1支 - shelfCode: areah03472631-A-01-01 - shelfNo: A01-A-01-01 - pkgDefId: - extInfo: '{"pkgUdi": "0101123456789012104444112407051725011121UT240705000414", - "pkgDefId": "", "pkgDefQty": 1, "pkgDefName": "", "inStockTime": "2024-07-05 - 15:34:08", "pkgBarcodeId": "UT240705000414"}' - bottleId: UT2407050004140001 - pkgType: '67' - miDjmc: '' - miCode: '' - transferRatio: 1.0 - qty: 1 - shelfKind: 0 - shelfKindName: 普通货位 - provName: 国药集团公司GxzLS - provId: p1e31d - inStockDate: '2024-07-05 15:34:07' - mfrCode: - made: 德国 - price: - barName: 1支 - purModeText: 检验试剂 - codeType: 67 + - id: UT240705000316 + lastModified: + version: + createTime: '2024-07-05 10:19:12' + createUser: + lastModifiedUser: + snCode: UT240705000316 + hosId: h0347 + branchId: + stockId: 9b3e40528eff4ed1bf4ee12b587e00d0 + areaCode: areah03472634 + areaName: 自动化测试 + shelfCode: areah03472634-2-01-01 + codeType: 66 + tagType: 0 + hosGoodsId: h034700004463 + mdmGoodsCode: '11661416' + goodsCode: '00004463' + goodsDi: '01123456789012' + barName: 100支/100 + batchCode: '4444' + expdtDate: '2025-01-11' + productDate: '2024-07-05' + mfrCode: + mfrCodeSee: + pkgCode: "0101123456789012104444\x1D112407051725011121UT240705000316" + pkgCodeSee: 0101123456789012104444112407051725011121UT240705000316 + ssccCode: '010839000187066625' + extInfo: + outId: + tbStatus: 20 + goodsCodeDi: + barcodeId: + ext: + pkgDefId: fdfa9805e01946bba3c5b8bd487a6dc7 + pkgDefQty: 100 + purBillId: CG2024070520622 + pkgDefName: '100' + distrBillId: PSh0347202407050028 + inStockTime: '2024-07-05 10:20:42' + distrDetailId: '03839282' + certificateCode: '' + sourceDetailId: + purMode: 60 + purModes: + price: + pid: + goodsMfrsName: 德国歌德公司 Geuder AG + mfrsName: + goodsSpec: G-31891 + unit: 支 + goodsName: 新型冠状病毒检测试剂a7oLM + pkgDefId: fdfa9805e01946bba3c5b8bd487a6dc7 + pkgDefQty: 100 + defaultPkgDefQty: + defaultQty: + defaultSurplusQty: + defaultPkgDefId: + purDetailId: + pkgDefName: '100' + printNum: 0 + deptId: + deptName: + billId: + taskId: + made: 德国 + provId: p1e31d + provName: 国药集团公司GxzLS + subProvId: p1e31d + subProvName: 国药集团公司GxzLS + provHosGoodsId: + sourceType: + taskDate: + sourceOrderNo: + taskType: + detailId: + branchGoodsPkgDefList: + unitName: + areaCodeList: + diType: + mdmGoodsSpecCode: + hosGoodsCode: '00004463' + 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 list_b: - *id001 list_c: diff --git a/main1/main_text.py b/main1/main_text.py index b28979bb..d0821ecb 100644 --- a/main1/main_text.py +++ b/main1/main_text.py @@ -118,6 +118,7 @@ def main_text(): def flow15(): from execute import flow18 flow18() + tkinter.messagebox.showinfo('流程十五执行完毕') # sys.exit(0) def flow16(): from execute import flow19 @@ -127,10 +128,12 @@ def main_text(): def flow17(): from execute import flow20 flow20() + tkinter.messagebox.showinfo('流程十七执行完毕') # sys.exit(0) def flow18(): from execute import flow21 flow21() + tkinter.messagebox.showinfo('流程十八执行完毕') # sys.exit(0) def flow0(): execute_command("python runner_test.py tag id2302-23 debug mdm3") -- GitLab