优化调整脚本

air_case/b5_spd3_core_business_flow/a_b2流程九请领业务流_二级库向中心库.air/a_b2流程九请领业务流_二级库向中心库.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)

air_case/b5_spd3_core_business_flow/a_b3流程十请领业务流_二级库向边仓.air/a_b3流程十请领业务流_二级库向边仓.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)

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]

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:

data/b5_spd3_core_business_flow/message15

 验收单号:
-  CHECK_NO1: CHECKh03472024080200010
-  CHECK_NO2: CHECKh03472024080200010
+  CHECK_NO1: CHECKh03472024080200013
+  CHECK_NO2: CHECKh03472024080200013