From aad4fde1943b62706ab7bbf5ddca58a423d4f6bf Mon Sep 17 00:00:00 2001 From: xiao-hesheng Date: Fri, 2 Aug 2024 15:25:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B0=83=E6=95=B4=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...5\220\221\344\270\255\345\277\203\345\272\223.py" | 3 ++- ...5\272\223\345\220\221\350\276\271\344\273\223.py" | 3 ++- air_case/public1/public1/public1.py | 1 + data/b5_spd3_core_business_flow/message13 | 12 ++++++------ data/b5_spd3_core_business_flow/message15 | 4 ++-- 5 files changed, 13 insertions(+), 10 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 c0bc1648..924410fe 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" @@ -163,7 +163,8 @@ def BuyCarSubmit(): print('请领车查询=================', url) deptid2 = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'] deptname2 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'] - areaCode = get_stockAreaId_new(deptid2, deptname2, 2) + # areaCode = get_stockAreaId_new(deptid2, deptname2, 2) + areaCode = get_stockAreaId_new_fromDb(deptname2, 2) request_body = commonFuc().get_business_data(module, "payload43", areaCode, get_hosid(), deptid2) print('请领车查询', 'request_body', request_body) 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 a0faf8b6..30c78752 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" @@ -194,7 +194,8 @@ def BuyCarSubmit(): print('请领车查询=================', url) deptid2 = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'] deptname2 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'] - areaCode = get_stockAreaId_new(deptid2, deptname2, 2) + # areaCode = get_stockAreaId_new(deptid2, deptname2, 2) + areaCode = get_stockAreaId_new_fromDb(deptname2, 2) request_body = commonFuc().get_business_data(module, "payload43", areaCode, get_hosid(), deptid2) print('请领车查询', 'request_body', request_body) diff --git a/air_case/public1/public1/public1.py b/air_case/public1/public1/public1.py index 1e6e5176..5e039e0e 100644 --- a/air_case/public1/public1/public1.py +++ b/air_case/public1/public1/public1.py @@ -652,6 +652,7 @@ def get_udi1(type=1): # 库存明细查询获取条码 result = commonFuc().http_post(url, request_body, headers) data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result)) total = commonFuc().analysis_json('total', commonFuc().analysis_json('data', result)) + if total >= 1: # pkgcode = data1['pkgCodeSee'] # pkgcode1 = pkgcode[0:20] diff --git a/data/b5_spd3_core_business_flow/message13 b/data/b5_spd3_core_business_flow/message13 index d0233819..81470f0b 100644 --- a/data/b5_spd3_core_business_flow/message13 +++ b/data/b5_spd3_core_business_flow/message13 @@ -8,21 +8,21 @@ taskType: 1 sourceOrgId: p1e37e sourceOrgName: 国药集团公司sya!$ - sourceOrderNo: PSh0347202408020011 + sourceOrderNo: PSh0347202408020015 billMode: '25' stockKind: purMode: - sourceId: PSh0347202408020011 + sourceId: PSh0347202408020015 sourceDetailId: sourceType: PSD sourceTypeName: 配送单 sourceVersion: 1 - planOrderNo: SSSQ202408020369 - purOrderNo: SSTZ202408020347 + planOrderNo: SSSQ202408020375 + purOrderNo: SSTZ202408020350 recOrgId: ea59fe790acd41719499e7278b8bb50b recOrgName: 二级检验科002 - billRelationJson: '{"operationApplyOrderNo":"SSSQ202408020369","operationNoticeBillId":"Nh034720240802000002","distrBillId":"PSh0347202408020011","operationNoticeOrderNo":"SSTZ202408020347","distrOrderNo":"PSh0347202408020011","operationApplyBillId":"Oh034720240802000002"}' - taskDate: '2024-08-02 14:09:04' + billRelationJson: '{"operationApplyOrderNo":"SSSQ202408020375","operationNoticeBillId":"Nh034720240802000005","distrBillId":"PSh0347202408020015","operationNoticeOrderNo":"SSTZ202408020350","distrOrderNo":"PSh0347202408020015","operationApplyBillId":"Oh034720240802000008"}' + taskDate: '2024-08-02 15:09:47' taskDateStart: taskDateEnd: billModeList: diff --git a/data/b5_spd3_core_business_flow/message15 b/data/b5_spd3_core_business_flow/message15 index 9edc6ac5..61b8d620 100644 --- a/data/b5_spd3_core_business_flow/message15 +++ b/data/b5_spd3_core_business_flow/message15 @@ -1,3 +1,3 @@ 验收单号: - CHECK_NO1: CHECKh03472024080200010 - CHECK_NO2: CHECKh03472024080200010 + CHECK_NO1: CHECKh03472024080200013 + CHECK_NO2: CHECKh03472024080200013 -- GitLab