diff --git "a/air_case/b5_spd3_core_business_flow/a_b3\346\265\201\347\250\213\345\215\201\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\350\276\271\344\273\223.air/a_b3\346\265\201\347\250\213\345\215\201\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\350\276\271\344\273\223.py" "b/air_case/b5_spd3_core_business_flow/a_b3\346\265\201\347\250\213\345\215\201\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\350\276\271\344\273\223.air/a_b3\346\265\201\347\250\213\345\215\201\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\350\276\271\344\273\223.py" index fd8b63fa5164ea3192c0e70aaf35d5f234eda5c2..7beba2eb2b694f92735b364aeba7566414815999 100644 --- "a/air_case/b5_spd3_core_business_flow/a_b3\346\265\201\347\250\213\345\215\201\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\350\276\271\344\273\223.air/a_b3\346\265\201\347\250\213\345\215\201\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\350\276\271\344\273\223.py" +++ "b/air_case/b5_spd3_core_business_flow/a_b3\346\265\201\347\250\213\345\215\201\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\350\276\271\344\273\223.air/a_b3\346\265\201\347\250\213\345\215\201\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\350\276\271\344\273\223.py" @@ -330,7 +330,7 @@ def main(): approval_center() check_buyWayText()#验证出库渠道是否为边仓 commonFuc().check_text_exist_result_text('succees', 'succees') - + print('==========================流程十结束==============================') except: commonFuc().check_text_exist_result_text('error', 'succees') diff --git "a/air_case/b5_spd3_core_business_flow/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\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\347\233\264\351\200\201.air/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\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\347\233\264\351\200\201.py" "b/air_case/b5_spd3_core_business_flow/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\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\347\233\264\351\200\201.air/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\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\347\233\264\351\200\201.py" index c45c7eb2c8a147eb975d377db13f7bdcae5d2abd..c6fc67635148aac2758f165e1d82c24211617060 100644 --- "a/air_case/b5_spd3_core_business_flow/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\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\347\233\264\351\200\201.air/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\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\347\233\264\351\200\201.py" +++ "b/air_case/b5_spd3_core_business_flow/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\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\347\233\264\351\200\201.air/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\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\347\233\264\351\200\201.py" @@ -843,5 +843,6 @@ def main(): second_dept_one_key_in() second_dept_one_key_in() commonFuc().check_text_exist_result_text('succees', 'succees') + print('==========================流程十一结束==============================') except: commonFuc().check_text_exist_result_text('error', '1') diff --git a/air_case/b5_spd3_core_business_flow/execute.air/execute.py b/air_case/b5_spd3_core_business_flow/execute.air/execute.py index 9c87eb5a5a69878c922463b9e1e0905ccb8e93e5..7f7147f293f65527e6cf3cd73436791638fa151c 100644 --- a/air_case/b5_spd3_core_business_flow/execute.air/execute.py +++ b/air_case/b5_spd3_core_business_flow/execute.air/execute.py @@ -178,4 +178,4 @@ def flow21(): # commonFuc().check_text_exist_result_text('succees', 'succees') # except: # commonFuc().check_text_exist_result_text('error', 'succees') -# flow8() \ No newline at end of file +flow1() \ No newline at end of file diff --git a/data/a2_mdm3_ea/message b/data/a2_mdm3_ea/message index fd58ca7f70439325f58c64a55b2b8bd1793e2574..617feba1d7d8412774387502258f300169661339 100644 --- a/data/a2_mdm3_ea/message +++ b/data/a2_mdm3_ea/message @@ -1,3 +1,3 @@ 企业信息: - e_id: CR202407050338 - cname: 国药集团公司GxzLS + e_id: CR202407050355 + cname: 国药集团公司Kp9af diff --git a/data/a3_mdm3_hs/message b/data/a3_mdm3_hs/message index 08bb86618bd4401667627c1cbc3b3b6c31112d8a..0575111a94c71cc74a31dbfa399ad91e1512b995 100644 --- a/data/a3_mdm3_hs/message +++ b/data/a3_mdm3_hs/message @@ -1,3 +1,3 @@ 医院信息: - h_id: 湖南省人民医院nSOQy - h_name: 湖南省人民医院nSOQy + h_id: 湖南省人民医院8Hkj& + h_name: 湖南省人民医院8Hkj& diff --git a/data/b5_spd3_core_business_flow/message10 b/data/b5_spd3_core_business_flow/message10 index 9e4c733fd4720944be6f5a565d9b9c35ce4736c7..224d19fd65d54874443f0dd1be2ddfd7faaee723 100644 --- a/data/b5_spd3_core_business_flow/message10 +++ b/data/b5_spd3_core_business_flow/message10 @@ -1,12 +1,9 @@ 低值配送单号: - distrBillId1: PSh0347202407050026 - distrBillId2: PSh0347202407050026 + distrBillId1: PSh0347202407050063 + distrBillId2: PSh0347202407050063 高值配送单号: - distrBillId1: PSh0347202407050027 - distrBillId2: PSh0347202407050027 + distrBillId1: PSh0347202407050064 + distrBillId2: PSh0347202407050064 试剂配送单号: - distrBillId1: PSh0347202407050028 - distrBillId2: PSh0347202407050028 -高值跟台配送单号: - distrBillId1: PSh0347202407050029 - distrBillId2: PSh0347202407050029 + distrBillId1: PSh0347202407050065 + distrBillId2: PSh0347202407050065 diff --git a/data/b5_spd3_core_business_flow/message11 b/data/b5_spd3_core_business_flow/message11 index 918ba93f3cf72212344e7fe43228cd84a09005e2..9a12cabd2568372f418d4adade4d6bfc0f04a8b9 100644 --- a/data/b5_spd3_core_business_flow/message11 +++ b/data/b5_spd3_core_business_flow/message11 @@ -1,3 +1,3 @@ 采购计划单号高值: - orderNo1: PLAN2024070531411 - orderNo2: PLAN2024070531411 + orderNo1: PLAN2024070531447 + orderNo2: PLAN2024070531447 diff --git a/data/b5_spd3_core_business_flow/message12 b/data/b5_spd3_core_business_flow/message12 index 1a2bb4b60548b43845cf51c458c815a23a16a445..e2b48ed6370b69ce3dbd5cbeba07b055b1c91a21 100644 --- a/data/b5_spd3_core_business_flow/message12 +++ b/data/b5_spd3_core_business_flow/message12 @@ -1,3 +1,3 @@ 采购计划单号试剂: - orderNo1: PLAN2024070531412 - orderNo2: PLAN2024070531412 + orderNo1: PLAN2024070531449 + orderNo2: PLAN2024070531449 diff --git a/data/b5_spd3_core_business_flow/message13 b/data/b5_spd3_core_business_flow/message13 index 6a43301308d1eaa822266d4d7f22699c98704482..bdf93ce61c2760b25b7c2c4d1fdf9842517760f1 100644 --- a/data/b5_spd3_core_business_flow/message13 +++ b/data/b5_spd3_core_business_flow/message13 @@ -8,28 +8,29 @@ taskType: 1 sourceOrgId: p1e31d sourceOrgName: 国药集团公司GxzLS - sourceOrderNo: PSh0347202407050029 - billMode: '25' + sourceOrderNo: PSh0347202407050065 + billMode: '66' stockKind: purMode: - sourceId: PSh0347202407050029 + sourceId: PSh0347202407050065 sourceDetailId: sourceType: PSD sourceTypeName: 配送单 sourceVersion: 1 - planOrderNo: SSSQ202407050327 - purOrderNo: SSTZ202407050303 + planOrderNo: PLAN2024070531449 + purOrderNo: CG2024070520656 recOrgId: 232328e5ceb44b799efba96c512618bf recOrgName: 二级检验科002 - billRelationJson: '{"operationApplyOrderNo":"SSSQ202407050327","operationNoticeBillId":"Nh034720240705000002","distrBillId":"PSh0347202407050029","operationNoticeOrderNo":"SSTZ202407050303","distrOrderNo":"PSh0347202407050029","operationApplyBillId":"Oh034720240705000002"}' - taskDate: '2024-07-05 10:38:38' + billRelationJson: '{"buyBillId":"Bh03472024070500093","planBillId":"Ph034720240705028094","planOrderNo":"PLAN2024070531449","buyOrderNo":"BUY2024070505892","purOrderNo":"CG2024070520656","purBillId":"Ch034720240705000091","purBillDate":"2024-07-05 + 12:24:49","distrBillId":"PSh0347202407050065","distrOrderNo":"PSh0347202407050065"}' + taskDate: '2024-07-05 12:25:21' taskDateStart: taskDateEnd: billModeList: viewIdList: - supplierFlag: false + supplierFlag: true tbStatus: 20 - remark: + remark: '' pdaFlag: list_b: - *id001 diff --git a/data/b5_spd3_core_business_flow/message14 b/data/b5_spd3_core_business_flow/message14 index ecb57758a06c1b89797e117d6762a3fcf28499da..dedadcfb86d482e336b835ae281b21eca904a689 100644 --- a/data/b5_spd3_core_business_flow/message14 +++ b/data/b5_spd3_core_business_flow/message14 @@ -1,13 +1,13 @@ 验收单详情信息: list_a: - &id001 - - purMode: 20 - unitName: 1支 - hosGoodsId: h034700004461 + - purMode: 60 + unitName: 100支/100 + hosGoodsId: h034700004463 mdmGoodsCode: - spdGoodsCode: '11661414' - goodsCode: '00004461' - goodsName: 高值牙钻机rY4w$ + spdGoodsCode: '11661416' + goodsCode: '00004463' + goodsName: 新型冠状病毒检测试剂a7oLM goodsGg: G-31891 mfrsId: mfrsName: 德国歌德公司 Geuder AG @@ -16,27 +16,27 @@ goodsDi: '01123456789012' miCode: miDjmc: - certificateCode: + certificateCode: '' rfidFlag: 0 pkgDefId: - pkgDefName: - pkgDefQty: 1.0 - batchCode: '2222' + pkgDefName: '100' + pkgDefQty: 100.0 + batchCode: '4444' expdtDate: '2025-01-11' productDate: '2024-07-05' provName: 国药集团公司GxzLS provId: - viewId: '03839283' + viewId: '03839319' verifyFlag: 0 hasSterilize: 0 - id: '03839283' + id: '03839319' detailRelationJson: - extInfo: '{"ygptCode":"","transCond":"","storageCond":"","erpCode":""}' + extInfo: '{"goodsGg":"G-31891","goodsCode":"00004463","purMode":60,"goodsName":"新型冠状病毒检测试剂a7oLM","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661416","ybDefId":""}' recTemperature: 20 recHumidity: 30 distrPrice: 99.9999 distrPkgQty: 1.0 - distrQty: 1.0 + distrQty: 100.0 price: 99.9999 checkQty: 0.0 checkPkgQty: 0 @@ -44,7 +44,7 @@ initQty: totalQty: rowNum: - settlement: 3 + settlement: 1 hdiBarcodeList: detailId: pkgCode: diff --git a/data/b5_spd3_core_business_flow/message15 b/data/b5_spd3_core_business_flow/message15 index 8db8a026573228e1b6b92a69b318087d0e9574bf..5ee62d5501143493f36f48f08ec3b951ca2286c2 100644 --- a/data/b5_spd3_core_business_flow/message15 +++ b/data/b5_spd3_core_business_flow/message15 @@ -1,3 +1,3 @@ 验收单号: - CHECK_NO1: CHECKh03472024070500034 - CHECK_NO2: CHECKh03472024070500034 + CHECK_NO1: CHECKh03472024070500070 + CHECK_NO2: CHECKh03472024070500070 diff --git a/data/b5_spd3_core_business_flow/message21 b/data/b5_spd3_core_business_flow/message21 index 295694495421fd1492458aaecad9af3ec8b213ff..3c9fabc3ae7210d07649fa048a3047032ed2c3d0 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: 200.0 + qty: 1400.0 goodsImg: [] pkgDefId: fdfa9805e01946bba3c5b8bd487a6dc7 buyPkgQty: @@ -34,14 +34,14 @@ targetStockName: 东土城路院区)Gl$!中心库房 purchaseFlag: 1 tempFlag: 0 - grantWay: 1 + grantWay: 3 deptGoodsStatus: codingType: 0 purModeText: 检验试剂 goodsGeneralName: 检测试剂 provName: 国药集团公司GxzLS - noRecPkgQty: 1.0 - noRecQty: 100.0 + noRecPkgQty: 2.0 + noRecQty: 200.0 autoUnpack: 0 consumeQty: consumePkgQty: diff --git a/data/b5_spd3_core_business_flow/message7 b/data/b5_spd3_core_business_flow/message7 index b32ef0fc1b0e0fb82f06290724fc7e7c247dbc5a..a8a53ffd75f5553cc6dc2adb1c23fbb017a6b9ec 100644 --- a/data/b5_spd3_core_business_flow/message7 +++ b/data/b5_spd3_core_business_flow/message7 @@ -1,3 +1,3 @@ 采购计划单号: - orderNo1: PLAN2024070531410 - orderNo2: PLAN2024070531410 + orderNo1: PLAN2024070531448 + orderNo2: PLAN2024070531448 diff --git a/data/b5_spd3_core_business_flow/message8 b/data/b5_spd3_core_business_flow/message8 index 3f3cec28c14aba8c19ffe892f04d312304b73576..8d2cd57f7cc44fb9f53499c46354a0da5acc3808 100644 --- a/data/b5_spd3_core_business_flow/message8 +++ b/data/b5_spd3_core_business_flow/message8 @@ -1,38 +1,53 @@ 配送订单信息: list_a: - &id001 - - id: Nh034720240705000002 - orderNo: SSTZ202407050303 - sourceOrderNo: SSSQ202407050327 - hosId: h0347 - hosName: 邹城市人民医院(test) - branchName: 东土城路院区)Gl$! - recDeptName: 二级检验科002 - operName: 血管扩张术 - operDate: '2024-07-06' - operDoctor: 李* - patientName: 张* - status: 10 - statusText: 待确认 + - id: Ch034720240705000091 + lastModified: '2024-07-05 12:24:49' version: 0 - patientInHosId: '123456' - surDeptName: '' - remark: 自动化测试 - createUserName: 自动化测试pwnfB - distPriority: 0 - distPriorityText: - distId: - distNo: - hosVersion: 3 - createTime: '2024-07-05 10:37:52' - sumQty: - sumAmount: - operationPkg: 0 + createTime: '2024-07-05 12:24:49' + createUser: h0347_UID-051395 + lastModifiedUser: + orderNo: CG2024070520656 + billMode: '66' + recType: HDI + hosId: h0347 + branchId: h0347-3729 + deptId: + deptName: + recOrgId: 232328e5ceb44b799efba96c512618bf + recOrgName: 二级检验科002 + areaCode: + areaName: + billExpdtDate: + sourceId: Ph034720240705028094 + sourceType: + inSettlement: + recUser: + recPhone: + recAddr: 自动化测试 provId: p1e31d provName: 国药集团公司GxzLS - subProvId: '' - subProvName: '' - recDeptId: 232328e5ceb44b799efba96c512618bf + subSendFlag: + exeProvId: p1e31d + exeProvName: 国药集团公司GxzLS + billRelationJson: + extInfo: + barcodeFlag: 1 + pkgFlag: + remark: '' + priority: + closeStatus: 0 + closeDate: + upStatus: + tbStatus: 30 + hosVersion: 3 + billType: CGD + hosName: 邹城市人民医院(test) + branchName: 东土城路院区)Gl$! + sumQty: 100.0 + sumPkgQty: 1.0 + sumAmount: '9999.9900' + planOrderNo: PLAN2024070531449 list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message9 b/data/b5_spd3_core_business_flow/message9 index 14584fe9a37f4bea3ef01774358200d42457c769..b80cac325c0cd7b213e2664f40eb5bb0922a7b33 100644 --- a/data/b5_spd3_core_business_flow/message9 +++ b/data/b5_spd3_core_business_flow/message9 @@ -1,70 +1,87 @@ 配送订单详细信息: list_a: - &id001 - id: Nh034720240705000002 - orderNo: SSTZ202407050303 - sourceOrderNo: SSSQ202407050327 - hosId: h0347 - hosName: 邹城市人民医院(test) - branchName: 东土城路院区)Gl$! - recDeptName: 二级检验科002 - operName: 血管扩张术 - operDate: '2024-07-06' - operDoctor: 李* - patientName: 张* - status: 20 - statusText: 待配送 - version: 1 - patientInHosId: '123456' - surDeptName: '' - remark: 自动化测试 - createUserName: 自动化测试pwnfB - distPriority: 0 - distPriorityText: 否 - distId: - distNo: - hosVersion: 3 - createTime: '2024-07-05 10:37:52' - sumQty: 1 - sumAmount: '99.9999' - operationPkg: 0 - provId: p1e31d - provName: 国药集团公司GxzLS - subProvId: '' - subProvName: '' - recDeptId: 232328e5ceb44b799efba96c512618bf - list_b: - - *id001 - list_c: - - *id001 -配送订单详细信息2: - list_a: - - &id001 - - id: h034720240705000002 - hosGoodsId: h034700004461 - goodsNum: 1 + - id: d47eda7d43ed425891b15c22811baadc + lastModified: + version: + createTime: + createUser: + lastModifiedUser: + pid: Ch034720240705000091 + orderNo: CG2024070520656 + sourceId: a2498f4f92d0443f83addbf792b4624f + hosGoodsId: h034700004463 + mdmGoodsCode: '11661416' + goodsCode: '00004463' + purMode: 60 price: '99.9999' - inSettlement: 3 - inSettlementText: 消耗结算 - goodsName: 高值牙钻机rY4w$ - goodsSpec: G-31891 - goodsCode: '00004461' - goodsMfrsId: mfrs-11229 - goodsMfrsName: 德国歌德公司 Geuder AG + supplyId: 1bbd4f2de4ee40b2a90b1138d7722393 + pkgDefId: fdfa9805e01946bba3c5b8bd487a6dc7 + pkgDefName: '100' + pkgDefQty: 100.0 + pkgQty: 1.0 + qty: 100.0 + conPkgQty: 1.0 + conQty: 100.0 + checkPkgQty: 0.0 + checkQty: 0.0 + distrPkgQty: 0.0 + distrQty: 0.0 + notSendQty: 0.0 + notSendPkgQty: 0.0 + inSettlement: 1 + closeType: 1 + detailRelationJson: '{"planBillId":"Ph034720240705028094","buyDetailId":"Bh034720240705000930001","planDetailId":"a2498f4f92d0443f83addbf792b4624f"}' + extInfo: '{"goodsGg":"G-31891","goodsCode":"00004463","purMode":60,"goodsName":"新型冠状病毒检测试剂a7oLM"}' + remark: + tbStatus: + hosVersion: unit: 支 - subProvId: p1e31d - subProvName: 国药集团公司GxzLS - totalAmount: '99.9999' - spdGoodsCode: '11661414' - barCodeMng: 2 - erpCode: '11661414' + goodsName: 新型冠状病毒检测试剂a7oLM + mfrsId: mfrs-11229 + mfrsName: 德国歌德公司 Geuder AG + goodsGg: G-31891 + mdmGoodsSpecCode: '11661416' + erpCode: '11661416' + made: 德国 + goodsDi: '01123456789012' + miDjmc: + miGoodsGg: + miGoodsXh: + miCode: + miTwentyCode: + miTwentysevenCode: '' + miKindCode: + purchaseContent: + purchaseUnit: + buyContent: + buyUnit: + transferRatio: + extend: + hitCode: '12' + hitPrice: 99.9999 + barCodeMng: '2' + rfidFlag: + goodsRegCert: '' + transCond: '' + storageCond: '' + diType: + diUse: '01123456789012' multiChargeFlag: 0 useFrequency: 1 chargeUnit: - hitCode: '12' - hitPrice: '99.999900' - diUse: - goodsDi: '01123456789012' + amount: '9999.9900' + unitName: 100支/100 + subProvId: p1e31d + subProvName: 国药集团公司GxzLS + subPrice: 99.9999 + replPkgQty: 1.0 + replQty: 100.0 + ybDefId: + logicId: + provGoodsId: + sendFlag: + curQry: list_b: - *id001 list_c: diff --git a/main1/main_text.py b/main1/main_text.py index cbd520ae7eb40d2fea30474315794b7c46412fb1..33b8f299e05dc508c6c9944ac3083c0a2aec85a5 100644 --- a/main1/main_text.py +++ b/main1/main_text.py @@ -86,6 +86,7 @@ def main_text(): def flow8(): from execute import flow11 flow11() + tkinter.messagebox.showinfo('流程十一执行完毕','流程十一执行完毕') # sys.exit(0) def flow9(): from execute import flow12 @@ -118,6 +119,7 @@ def main_text(): def flow16(): from execute import flow19 flow19() + tkinter.messagebox.showinfo('流程十六执行完毕') # sys.exit(0) def flow17(): from execute import flow20 diff --git a/report/summary.html b/report/summary.html index 0d4e888032c6f21a5694514625892a295c3d8e74..650a295794027f7dfc2c2d16b49daf95fe5fba58 100644 --- a/report/summary.html +++ b/report/summary.html @@ -76,9 +76,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 1 - 0 - 0分2秒 - 0.0% + 1 + 0分18秒 + 100.0% @@ -93,9 +93,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 - r_b6科室管理_科室人员查询_按科室查询人员_设置科室负责人 - 失败 - 2.788 + execute + 成功 + 18.756 xiaohesheng