流程十二脚本编写

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

@@ -65,7 +65,7 @@ def second_dept_consume_Out_Stock(type):  # 二级库消耗出库
     if type == 2:
         udi_code = get_udi2(2)  # 获取条码 低值1 高值2 试剂3
     elif type == 3:
-        udi_code = get_udi(3)  # 获取条码 低值1 高值2 试剂3
+        udi_code = get_udi2(3)  # 获取条码 低值1 高值2 试剂3
     else:
         udi_code = 'udi_code'
     if type == 2:
@@ -294,18 +294,16 @@ def second_dept_consume_Out_Stock(type):  # 二级库消耗出库
                                                      hosGoodsId, goodsCode, batchCode, expdtDate, goodsSpec, goodsName,
                                                      goodsMfrsName, unit, mdmGoodsCode, availableQty, transferRatio
                                                      )
-        # import pdb
-        # pdb.set_trace()  # 设置断点
+
         print('request_body', request_body)
         # # # # 发送请求
         result = commonFuc().http_post(url, request_body, headers)
         print('result', result)
     elif type == 3:
         print('检验试剂消耗出库')
-        udi_code = get_udi2(3)
+        udi_code = get_udi2(4)#试剂单瓶条码
         data1 = pickScan4(udi_code)
-        import pdb
-        pdb.set_trace()  # 设置断点
+        print('试剂data1',data1)
         # 获取必要信息
         areaCode = commonFuc().analysis_json('areaCode', data1)
         UTid = commonFuc().analysis_json('id', data1)
@@ -357,10 +355,17 @@ def second_dept_consume_Out_Stock(type):  # 二级库消耗出库
         # print('info', info)
         list_a = info['list_a']
         extInfo = commonFuc().analysis_json('extInfo', list_a)
+        pkgBarcodeId=commonFuc().analysis_json('id', list_a)
         print('extInfo', extInfo)
         # inStockTime = commonFuc().analysis_json('inStockTime', extInfo)
-        inStockTime = reGetString(extInfo, 'inStockTime\"\: \"', '\"\, \"distrDetailId')
-        print('inStockTime', inStockTime)
+        inStockTime = reGetString(extInfo, r'inStockTime": "', r'",')
+        shelfNo= commonFuc().analysis_json('shelfNo', list_a)
+        pkgUdi= reGetString(extInfo, r'pkgDefId": "', r'",')
+        bottleId=commonFuc().analysis_json('bottleId', list_a)
+        shelfKindName=commonFuc().analysis_json('shelfKindName', list_a)
+        provName=commonFuc().analysis_json('provName', list_a)
+        provId=commonFuc().analysis_json('provId', list_a)
+        inStockDate=commonFuc().analysis_json('inStockDate', list_a)
         # 从message18文件中获取信息
         url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
                                                                                  "dept_stock_out_submit_url")
@@ -381,22 +386,8 @@ def second_dept_consume_Out_Stock(type):  # 二级库消耗出库
         cname = username
         orgCode1 = get_orgCode()
         orgName1 = get_orgName()
-        url2 = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
-                                                                                  "herpService_stockpile_list_url")
-
-        request_body2 = commonFuc().get_business_data(module, "payload62", stockId, stockName2, areaCode, areaName,
-                                                      get_hosid())
-        # # # # 发送请求
-        result2 = commonFuc().http_post(url2, request_body2, headers)
-        availableQty = commonFuc().analysis_json('availableQty', commonFuc().analysis_json('data',
-                                                                                           commonFuc().analysis_json(
-                                                                                               'data', result2)))
-        transferRatio = commonFuc().analysis_json('transferRatio', commonFuc().analysis_json('data',
-                                                                                             commonFuc().analysis_json(
-                                                                                                 'data', result2)))
-        print('result2', result2)
         request_body = commonFuc().get_business_data(module, "payload50_1_5", stockId, stockName2, areaCode,
-                                                     areaName, get_hosid(), deptid2,
+                                                     areaName,
                                                      uxid, userLoginCode, cname, get_hosid(), get_branch_id(),
                                                      deptid1,
                                                      orgCode1, orgName1, get_hosid(), get_hosid(), mgrCorpName,
@@ -412,7 +403,8 @@ def second_dept_consume_Out_Stock(type):  # 二级库消耗出库
                                                      barName,
                                                      purModeText
                                                      )
-
+        import pdb
+        pdb.set_trace()  # 设置断点
         print('request_body', request_body)
         # # # # 发送请求
         result = commonFuc().http_post(url, request_body, headers)

air_case/public1/public1/public1.py

@@ -624,7 +624,10 @@ def get_udi2(type=1):  # 二级科室库存明细查询获取条码
         hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId']
         GoodsId = hosGoodsId.replace(get_hosid(), '')
         request_body = commonFuc().get_business_data(module, "payload17_2", GoodsId, get_branch_id(), deptid2)
-
+    elif type == 4:#试剂单瓶条码
+        hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId']
+        GoodsId = hosGoodsId.replace(get_hosid(), '')
+        request_body = commonFuc().get_business_data(module, "payload17_3", GoodsId, get_branch_id(), deptid2)
     print('getudi_request_body', request_body)
 
     # # # # 发送请求

data/b5_spd3_core_business_flow/data

@@ -105,7 +105,9 @@ json_headers2: {
 "payload16": {"invoiceBillIdList":["%s"],"payChannelEnum":"YGPT","hosId":"%s"}
 "payload17": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["","","","","",""],"goodsName":"%s","branchId":"%s","purModes":[],"ssccCode":"","deptId":"","deptQuery":false,"bottleId":"","billModes":null,"provId":"","goodsSpec":"","batchCode":"","mfrCode":""}}
 "payload17_1": {"pageNum":1,"pageSize":50,"queryObject":{"goodsName":"%s","branchId":"%s","purModes":[""],"ssccCode":"","deptId":"","deptQuery":false,"stockId":"","bottleId":"","billModes":null,"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}}
-"payload17_2": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["",""],"goodsName":"%s","branchId":"%s","ssccCode":"","deptId":"%s","deptQuery":true,"bottleId":"","billModes":null,"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}}
+"payload17_2": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["",""],"goodsName":"%s","branchId":"%s","ssccCode":"","deptId":"%s","deptQuery":true,"bottleId":"","billModes":["66"],"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}}
+"payload17_3": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["",""],"goodsName":"%s","branchId":"%s","ssccCode":"","deptId":"%s","deptQuery":true,"bottleId":"","billModes":["67"],"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}}
+
 "payload17_2_1": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["",""],"goodsName":"%s","branchId":"%s","ssccCode":"","deptId":"%s","deptQuery":true,"bottleId":"","billModes":["20"],"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}}
 
 "payload18": {"areaCode":"%s","code":"%s","pickType":"TH","stockId":"%s"}

data/b5_spd3_core_business_flow/message10

 低值配送单号:
-  distrBillId1: PSh0347202406060036
-  distrBillId2: PSh0347202406060036
+  distrBillId1: PSh0347202406060050
+  distrBillId2: PSh0347202406060050
 高值配送单号:
-  distrBillId1: PSh0347202406060037
-  distrBillId2: PSh0347202406060037
+  distrBillId1: PSh0347202406060051
+  distrBillId2: PSh0347202406060051
 试剂配送单号:
-  distrBillId1: PSh0347202406060038
-  distrBillId2: PSh0347202406060038
+  distrBillId1: PSh0347202406060052
+  distrBillId2: PSh0347202406060052

data/b5_spd3_core_business_flow/message11

 采购计划单号高值:
-  orderNo1: PLAN2024060625755
-  orderNo2: PLAN2024060625755
+  orderNo1: PLAN2024060625809
+  orderNo2: PLAN2024060625809

data/b5_spd3_core_business_flow/message12

 采购计划单号试剂:
-  orderNo1: PLAN2024060625757
-  orderNo2: PLAN2024060625757
+  orderNo1: PLAN2024060625811
+  orderNo2: PLAN2024060625811

data/b5_spd3_core_business_flow/message13

@@ -8,22 +8,22 @@
       taskType: 1
       sourceOrgId: p1e276
       sourceOrgName: 国药集团公司LK05j
-      sourceOrderNo: PSh0347202406060038
+      sourceOrderNo: PSh0347202406060052
       billMode: '66'
       stockKind:
       purMode:
-      sourceId: PSh0347202406060038
+      sourceId: PSh0347202406060052
       sourceDetailId:
       sourceType: PSD
       sourceTypeName: 配送单
       sourceVersion: 1
-      planOrderNo: PLAN2024060625757
-      purOrderNo: CG2024060617979
+      planOrderNo: PLAN2024060625811
+      purOrderNo: CG2024060617993
       recOrgId: 82394e14fcd94eb6ad2474304cb2a808
       recOrgName: 二级检验科002
-      billRelationJson: '{"buyBillId":"Bh03472024060600032","planBillId":"Ph034720240606022402","planOrderNo":"PLAN2024060625757","buyOrderNo":"BUY2024060604754","purOrderNo":"CG2024060617979","purBillId":"Ch034720240606000094","purBillDate":"2024-06-06
-        11:30:03","distrBillId":"PSh0347202406060038","distrOrderNo":"PSh0347202406060038"}'
-      taskDate: '2024-06-06 11:30:42'
+      billRelationJson: '{"buyBillId":"Bh03472024060600046","planBillId":"Ph034720240606022456","planOrderNo":"PLAN2024060625811","buyOrderNo":"BUY2024060604768","purOrderNo":"CG2024060617993","purBillId":"Ch034720240606000108","purBillDate":"2024-06-06
+        14:47:32","distrBillId":"PSh0347202406060052","distrOrderNo":"PSh0347202406060052"}'
+      taskDate: '2024-06-06 14:48:07'
       taskDateStart:
       taskDateEnd:
       billModeList:

data/b5_spd3_core_business_flow/message14

@@ -26,10 +26,10 @@
       productDate: '2024-06-06'
       provName: 国药集团公司LK05j
       provId:
-      viewId: '03838174'
+      viewId: '03838188'
       verifyFlag: 0
       hasSterilize: 0
-      id: '03838174'
+      id: '03838188'
       detailRelationJson:
       extInfo: '{"goodsGg":"G-31891","goodsCode":"00004010","purMode":60,"goodsName":"新型冠状病毒检测试剂20zyQ","ygptCode":"","transCond":"","storageCond":"","erpCode":"11660958","ybDefId":""}'
       recTemperature: 20

data/b5_spd3_core_business_flow/message15

 验收单号:
-  CHECK_NO1: CHECKh03472024060600031
-  CHECK_NO2: CHECKh03472024060600031
+  CHECK_NO1: CHECKh03472024060600045
+  CHECK_NO2: CHECKh03472024060600045

data/b5_spd3_core_business_flow/message18

 条码信息:
   list_a:
   - &id001
-    id: UT2406060007010002
-    snCode: UT2406060007010002
-    ssccCode: '010839000018686114'
-    pkgCodeSee: 0136550000040100104444112406061724121321UT240606000701
+    id: UT240606000802
+    snCode: UT240606000802
+    ssccCode: '010839000183231225'
+    pkgCodeSee: 0136550000040100104444112406061724121321UT240606000802
     hosGoodsId: h034700004010
     hosGoodsCode: '00004010'
     goodsCode: '00004010'
@@ -16,22 +16,23 @@
     batchCode: '4444'
     productDate: '2024-06-06'
     expdtDate: '2024-12-13'
-    pkgDefName:
-    pkgDefQty: 1.0
+    pkgDefName: '100'
+    pkgDefQty: 100.0
     stockId: 4d5e04c549d04b3f8e0aee9e280d2cb6
     stockName: 二级检验科002库房
     areaName: 默认库区
     areaCode: areah03472218
     lockStatus: 0
-    unitName: 1支
+    unitName: 100支/100
     shelfCode: areah03472218-A-01-01
     shelfNo: A01-A-01-01
-    pkgDefId:
-    extInfo: '{"pkgUdi": "0136550000040100104444112406061724121321UT240606000701",
-      "pkgDefId": "", "pkgDefQty": 1, "pkgDefName": "", "inStockTime": "2024-06-06
-      13:37:25", "pkgBarcodeId": "UT240606000701"}'
-    bottleId: UT2406060007010002
-    pkgType: '67'
+    pkgDefId: 60abe88ab2b5432da8f7e75a74e92584
+    extInfo: '{"pkgDefId": "60abe88ab2b5432da8f7e75a74e92584", "pkgDefQty": 100, "purBillId":
+      "CG2024060617957", "pkgDefName": "100", "distrBillId": "PSh0347202406060017",
+      "inStockTime": "2024-06-06 07:33:07", "distrDetailId": "03838153", "certificateCode":
+      ""}'
+    bottleId:
+    pkgType: '66'
     miDjmc: ''
     miCode: ''
     transferRatio: 1.0
@@ -40,13 +41,13 @@
     shelfKindName: 普通货位
     provName: 国药集团公司LK05j
     provId: p1e276
-    inStockDate: '2024-06-06 13:37:25'
+    inStockDate: '2024-06-06 07:33:06'
     mfrCode:
     made: 德国
     price:
-    barName: 1支
+    barName: 100支/100
     purModeText: 检验试剂
-    codeType: 67
+    codeType: 66
   list_b:
   - *id001
   list_c:

data/b5_spd3_core_business_flow/message21

@@ -16,7 +16,7 @@
       pkgDefName: '100'
       pkgDefQty: 100.0
       pkgQty:
-      qty: 600.0
+      qty: 899.0
       goodsImg: []
       pkgDefId: 60abe88ab2b5432da8f7e75a74e92584
       buyPkgQty:

data/b5_spd3_core_business_flow/message7

 采购计划单号:
-  orderNo1: PLAN2024060625756
-  orderNo2: PLAN2024060625756
+  orderNo1: PLAN2024060625810
+  orderNo2: PLAN2024060625810

data/b5_spd3_core_business_flow/message8

 配送订单信息:
   list_a:
   - &id001
-    - id: Ch034720240606000094
-      lastModified: '2024-06-06 11:30:03'
+    - id: Ch034720240606000108
+      lastModified: '2024-06-06 14:47:32'
       version: 0
-      createTime: '2024-06-06 11:30:03'
+      createTime: '2024-06-06 14:47:32'
       createUser: h0347_UID-051316
       lastModifiedUser:
-      orderNo: CG2024060617979
+      orderNo: CG2024060617993
       billMode: '66'
       recType: HDI
       hosId: h0347
@@ -19,7 +19,7 @@
       areaCode:
       areaName:
       billExpdtDate:
-      sourceId: Ph034720240606022402
+      sourceId: Ph034720240606022456
       sourceType:
       inSettlement:
       recUser:
@@ -47,7 +47,7 @@
       sumQty: 100.0
       sumPkgQty: 1.0
       sumAmount: '9999.9900'
-      planOrderNo: PLAN2024060625757
+      planOrderNo: PLAN2024060625811
   list_b:
   - *id001
   list_c:

data/b5_spd3_core_business_flow/message9

 配送订单详细信息:
   list_a:
   - &id001
-    - id: 9971233e6bc94476b9028c70aea97160
+    - id: 74ce4346828645b4aa9faf0b0040decf
       lastModified:
       version:
       createTime:
       createUser:
       lastModifiedUser:
-      pid: Ch034720240606000094
-      orderNo: CG2024060617979
-      sourceId: 8cae32ce2202487aa5f0321f035572c0
+      pid: Ch034720240606000108
+      orderNo: CG2024060617993
+      sourceId: c2c97dd621024113aa3929c4760602de
       hosGoodsId: h034700004010
       mdmGoodsCode: '11660958'
       goodsCode: '00004010'
@@ -31,7 +31,7 @@
       notSendPkgQty: 0.0
       inSettlement: 1
       closeType: 1
-      detailRelationJson: '{"planBillId":"Ph034720240606022402","buyDetailId":"Bh034720240606000320001","planDetailId":"8cae32ce2202487aa5f0321f035572c0"}'
+      detailRelationJson: '{"planBillId":"Ph034720240606022456","buyDetailId":"Bh034720240606000460001","planDetailId":"c2c97dd621024113aa3929c4760602de"}'
       extInfo: '{"goodsGg":"G-31891","goodsCode":"00004010","purMode":60,"goodsName":"新型冠状病毒检测试剂20zyQ"}'
       remark:
       tbStatus:

report/summary.html

@@ -77,7 +77,7 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
         <tr width="600">
             <td class='details-col-elapsed'>1</td>
             <td class='details-col-elapsed'>0</td>
-            <td class='details-col-elapsed'>0分6秒</td>
+            <td class='details-col-elapsed'>4分15秒</td>
             <td class="details-col-elapsed">0.0%</td>
         </tr>
     </table>
@@ -95,7 +95,7 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
         <tr width="600">
             <td class="details-col-elapsed"><a href='../log/a_b7流程十四退库业务_消耗退库/log.html' target='_blank'>a_b7流程十四退库业务_消耗退库</a></td>
             <td class="fail">失败</td>
-            <td class="details-col-elapsed">6.157</td>
+            <td class="details-col-elapsed">254.973</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>