优化调整脚本

air_case/b5_spd3_core_business_flow/a_b7流程十四退库业务_消耗退库.air/a_b7流程十四退库业务_消耗退库.py

@@ -43,7 +43,7 @@ def second_dept_consume_Out_Stock(type):  # 二级库消耗出库
     # else:
     #     udi_code = 'udi_code'
     if type == 2:
-        udi_code = get_udi2(2)  # 获取条码 低值1 高值2 试剂3
+        udi_code = get_udi2(2,token)  # 获取条码 低值1 高值2 试剂3
         # import pdb
         # pdb.set_trace()
         info = (udi_code, udi_code)
@@ -384,9 +384,9 @@ def sCan_grant(type=1):  # 获取条码and扫码发放高值不能发放
     token, projectCode, uxid, corpId, info = login(username, password, 2)
     # 登录获取用户id等信息，使用创建的用户登录============结束
     if type == 1:
-        udi_code = get_udi2(1)  # 获取条码 低值1 高值2 试剂3
+        udi_code = get_udi2(1,token)  # 获取条码 低值1 高值2 试剂3
     elif type == 3:
-        udi_code = get_udi2(3)  # 获取条码 低值1 高值2 试剂3
+        udi_code = get_udi2(3,token)  # 获取条码 低值1 高值2 试剂3
     else:
         udi_code = 'udi_code'
     if type == 1:

air_case/public1/public1/public1.py

@@ -2997,7 +2997,7 @@ def pickScan4(udi_code):  # 二级库扫码 只扫码不发放
     deptName = FileUtils().r_info8('b2_herp3_bs', '所有科室name', 'message6')["deptid2"]
     stockId = get_stockId(deptName + '库房', 2)
     deptName2 = deptName + '库房'
-    areaCode = get_stockAreaId_new(deptid2, deptName, 2)
+    areaCode = get_stockAreaId_new_fromDb(deptName, 2)
     request_body = commonFuc().get_business_data(module, "payload60", udi_code, stockId, deptName2, areaCode)
     print('获取条码信息request_body', request_body)
     result = commonFuc().http_post(url, request_body, headers)
@@ -3025,9 +3025,9 @@ def pickScan3(udi_code, type=1):  # 二级库扫码发放(高值产品不能扫
 
     deptid2 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid2"]
     deptName = FileUtils().r_info8('b2_herp3_bs', '所有科室name', 'message6')["deptid2"]
-    stockId = get_stockId(deptName + '库房', 2)
-    deptName2 = deptName + '库房'
-    areaCode = get_stockAreaId_new(deptid2, deptName, 2)
+    stockId = get_stockId_fromdb(deptName + '库房')
+    deptName2 = deptName+'库房'
+    areaCode =get_stockAreaId_new_fromDb(deptName, 2)
     request_body = commonFuc().get_business_data(module, "payload60", udi_code, stockId, deptName2, areaCode)
     print('获取条码信息request_body', request_body)
     result = commonFuc().http_post(url, request_body, headers)
@@ -3147,7 +3147,7 @@ def pickScan3(udi_code, type=1):  # 二级库扫码发放(高值产品不能扫
 
     # # # # 发送请求
     result = commonFuc().http_post(url, request_body, headers)
-    print('result', result)
+    print('二级库扫码发放提交result', result)
     return data1
 
 

data/b5_spd3_core_business_flow/message13

@@ -8,21 +8,22 @@
       taskType: 1
       sourceOrgId: p1e37e
       sourceOrgName: 国药集团公司sya!$
-      sourceOrderNo: PSh0347202408050044
-      billMode: '25'
+      sourceOrderNo: PSh0347202408050066
+      billMode: '66'
       stockKind:
       purMode:
-      sourceId: PSh0347202408050044
+      sourceId: PSh0347202408050066
       sourceDetailId:
       sourceType: PSD
       sourceTypeName: 配送单
       sourceVersion: 1
-      planOrderNo: SSSQ202408050377
-      purOrderNo: SSTZ202408050355
+      planOrderNo: PLAN2024080534429
+      purOrderNo: CG2024080522606
       recOrgId: ea59fe790acd41719499e7278b8bb50b
       recOrgName: 二级检验科002
-      billRelationJson: '{"operationApplyOrderNo":"SSSQ202408050377","operationNoticeBillId":"Nh034720240805000002","distrBillId":"PSh0347202408050044","operationNoticeOrderNo":"SSTZ202408050355","distrOrderNo":"PSh0347202408050044","operationApplyBillId":"Oh034720240805000002"}'
-      taskDate: '2024-08-05 12:21:28'
+      billRelationJson: '{"buyBillId":"Bh03472024080500043","planBillId":"Ph034720240805031074","planOrderNo":"PLAN2024080534429","buyOrderNo":"BUY2024080510366","purOrderNo":"CG2024080522606","purBillId":"Ch034720240805000105","purBillDate":"2024-08-05
+        14:00:39","distrBillId":"PSh0347202408050066","distrOrderNo":"PSh0347202408050066"}'
+      taskDate: '2024-08-05 14:01:07'
       taskDateStart:
       taskDateEnd:
       billModeList:

data/b5_spd3_core_business_flow/message15

 验收单号:
-  CHECK_NO1: CHECKh03472024080500038
-  CHECK_NO2: CHECKh03472024080500038
+  CHECK_NO1: CHECKh03472024080500056
+  CHECK_NO2: CHECKh03472024080500056