脚本优化

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

@@ -44,6 +44,8 @@ def second_dept_consume_Out_Stock(type):  # 二级库消耗出库
     #     udi_code = 'udi_code'
     if type == 2:
         udi_code = get_udi2(2)  # 获取条码 低值1 高值2 试剂3
+        # import pdb
+        # pdb.set_trace()
         info = (udi_code, udi_code)
         titlename = ('udi_code', 'udi_code')
         # 将高值消耗出库条码信息写入文件
@@ -52,7 +54,7 @@ def second_dept_consume_Out_Stock(type):  # 二级库消耗出库
         url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
                                                                                  "herpService_stock_pick_scan_url")
         # 从message18文件中获取信息
-        info = FileUtils().r_info8(module, "条码信息", 'message')
+        info = FileUtils().r_info8(module, "条码信息", 'message18')
         print('info', info)
         list_a = info['list_a']
         stockId = commonFuc().analysis_json('stockId', list_a)
@@ -111,7 +113,7 @@ def second_dept_consume_Out_Stock(type):  # 二级库消耗出库
         purModeText = commonFuc().analysis_json('purModeText', data1)
         version = commonFuc().analysis_json('version', data1)
         unitName = commonFuc().analysis_json('unitName', data1)
-        stockName = commonFuc().analysis_json('stockName', list_a)
+        stockName=commonFuc().analysis_json('stockName', data1)
         # ==============================获取条码信息
         # 从message18文件中获取信息
         info = FileUtils().r_info8(module, "条码信息", 'message18')

air_case/public1/public1/public1.py

@@ -628,7 +628,8 @@ def get_udi2(type=1):  # 二级科室库存明细查询获取条码
 
     # # 请求体
     request_body = 'request_body'
-
+    deptName2 = FileUtils().r_info8('b2_herp3_bs', '所有科室name', 'message6')["deptid2"]
+    stockId2 = get_stockId(deptName2 + '库房', 2)
     deptid2 = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2']
     if type == 1:
         hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId']
@@ -637,7 +638,7 @@ def get_udi2(type=1):  # 二级科室库存明细查询获取条码
     elif type == 2:
         hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId']
         GoodsId = hosGoodsId.replace(get_hosid(), '')
-        request_body = commonFuc().get_business_data(module, "payload17_2_1", GoodsId, get_branch_id(), deptid2)
+        request_body = commonFuc().get_business_data(module, "payload17_2_1", GoodsId, get_branch_id(), deptid2,stockId2)
 
     elif type == 3:
         hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId']

data/b5_spd3_core_business_flow/data

@@ -111,7 +111,7 @@ json_headers2: {
 "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","purModes":["10"],"ssccCode":"","deptId":"%s","deptQuery":true,"bottleId":"","billModes":null,"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}}
-"payload17_2_1": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["",""],"goodsName":"%s","branchId":"%s","purModes":["20"],"ssccCode":"","deptId":"%s","deptQuery":true,"bottleId":"","billModes":["20"],"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}}
+"payload17_2_1": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["",""],"goodsName":"%s","branchId":"%s","purModes":["20"],"ssccCode":"","deptId":"%s","deptQuery":true,"stockId":"%s","bottleId":"","billModes":["20"],"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}}
 "payload17_2_2": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["",""],"goodsName":"%s","branchId":"%s","purModes":["60"],"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","purModes":["60"],"ssccCode":"","deptId":"%s","deptQuery":true,"bottleId":"","billModes":["67"],"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}}
 

data/b5_spd3_core_business_flow/message18

 条码信息:
   list_a:
   - &id001
-    id: UT240701001619
-    snCode: UT240701001619
-    ssccCode: '010839000186546326'
-    pkgCodeSee: 013710000004337010333112407011725010721UT240701001619
-    hosGoodsId: h034700004337
-    hosGoodsCode: '00004337'
-    goodsCode: '00004337'
-    goodsName: 一次性注射器_低值xh*Uq
+    id: '8800000001073938'
+    snCode: '8800000001073938'
+    ssccCode: '010839000186546425'
+    pkgCodeSee: '0101123456789012102221124070117250107218800000001073938'
+    hosGoodsId: h034700004336
+    hosGoodsCode: '00004336'
+    goodsCode: '00004336'
+    goodsName: 高值牙钻机coh6B
     goodsSpec: G-31891
     goodsMfrsName: 德国歌德公司 Geuder AG
     unit: 支
-    purMode: 10
-    batchCode: '333'
+    purMode: 20
+    batchCode: '222'
     productDate: '2024-07-01'
     expdtDate: '2025-01-07'
-    pkgDefName: '100'
-    pkgDefQty: 100.0
-    stockId: 699dd747426940b282b69d7acc27d51d
-    stockName: 三级检测组003库房
+    pkgDefName:
+    pkgDefQty: 1.0
+    stockId: bd4c0744cee04b208483483dded13ff8
+    stockName: 二级检验科002库房
     areaName: 默认库区
-    areaCode: areah03472538
+    areaCode: areah03472540
     lockStatus: 0
-    unitName: 100支/100
-    shelfCode: areah03472538-A-01-01
+    unitName: 1支
+    shelfCode: areah03472540-A-01-01
     shelfNo: A01-A-01-01
-    pkgDefId: d7b778b300694f3c8351912c561a69a5
-    extInfo: '{"pkgDefId": "d7b778b300694f3c8351912c561a69a5", "pkgDefQty": 100, "purBillId":
-      "CG2024070120190", "pkgDefName": "100", "distrBillId": "PSh0347202407010054",
-      "inStockTime": "2024-07-01 11:15:02", "distrDetailId": "03839023", "certificateCode":
-      ""}'
+    pkgDefId:
+    extInfo: '{"pkgDefQty": 1, "purBillId": "CG2024070120188", "distrBillId": "PSh0347202407010055",
+      "inStockTime": "2024-07-01 10:16:53", "useFrequency": 1, "distrDetailId": "03839024",
+      "certificateCode": "", "multiChargeFlag": 0}'
     bottleId:
-    pkgType: '16'
+    pkgType: '20'
     miDjmc: ''
     miCode: ''
     transferRatio: 1.0
@@ -41,13 +40,13 @@
     shelfKindName: 普通货位
     provName: 国药集团公司l6AP(
     provId: p1e2e4
-    inStockDate: '2024-07-01 11:15:01'
+    inStockDate: '2024-07-01 10:16:52'
     mfrCode:
     made: 德国
     price:
-    barName: 100支/100
-    purModeText: 低值耗材
-    codeType: 16
+    barName: 1支
+    purModeText: 高值耗材
+    codeType: 20
   list_b:
   - *id001
   list_c:

data/b5_spd3_core_business_flow/message22

 库区信息:
   list_a:
   - &id001
-    - id: b02461affabe405ea14213049fe635f6
-      lastModified: '2024-07-01 11:22:47'
-      version: 4
+    - id: c24f8d62a9f341acb9bd8972ce1a86fe
+      lastModified: '2024-07-01 09:58:13'
+      version: 1
       createTime: '2024-07-01 09:35:35'
       createUser: h0347_UID-051376
       lastModifiedUser: h0347_UID-051376
-      stockId: 699dd747426940b282b69d7acc27d51d
-      shelfCode: areah03472538
+      stockId: bd4c0744cee04b208483483dded13ff8
+      shelfCode: areah03472540
       shelfName: 默认库区
-      address: 三级检测组003
+      address: 二级检验科002
       shelfType:
       stockType: 0
       defaultFlag: 1
@@ -24,7 +24,7 @@
       shelfNo: A01
       shelfKind: 0
       hosId:
-      deptId: 6cc782eb3fdf4ee6b234bd0402ee198b
+      deptId: b4f1b6b8aa274fb981d0bf879621f7a0
       areaCode:
       areaName:
       stockName:

report/summary.html

@@ -76,9 +76,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
 
         <tr width="600">
             <td class='details-col-elapsed'>1</td>
-            <td class='details-col-elapsed'>1</td>
-            <td class='details-col-elapsed'>2分7秒</td>
-            <td class="details-col-elapsed">100.0%</td>
+            <td class='details-col-elapsed'>0</td>
+            <td class='details-col-elapsed'>1分3秒</td>
+            <td class="details-col-elapsed">0.0%</td>
         </tr>
     </table>
 
@@ -93,9 +93,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
         </tr>
         
         <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/a_b6流程十三请领业务流_三级库向二级库/log.html' target='_blank'>a_b6流程十三请领业务流_三级库向二级库</a></td>
-            <td class="success">成功</td>
-            <td class="details-col-elapsed">127.372</td>
+            <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">63.097</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>