脚本优化

air_case/b5_spd3_core_business_flow/a_b9流程十六退库业务_二级库向一级库退库.air/a_b9流程十六退库业务_二级库向一级库退库.py

@@ -559,9 +559,11 @@ try:
     second_dept_return_Out_Stock(2)#高值耗材退货出库
     approval_center()#审批
     putaway()#中心库上架
+    updateUserLoginDefaultRange(get_listUserMgrRangePage1(2))#设置登录账号默认权限是二级库
     second_dept_return_Out_Stock(1)#低值耗材退货出库
     approval_center()  # 审批
     putaway()  # 中心库上架
+    updateUserLoginDefaultRange(get_listUserMgrRangePage1(2))#设置登录账号默认权限是二级库
     second_dept_return_Out_Stock(3)#试剂耗材退货出库
     approval_center()#审批
     putaway()#中心库上架

data/b5_spd3_core_business_flow/message10

 低值配送单号:
-  distrBillId1: PSh0347202407010025
-  distrBillId2: PSh0347202407010025
+  distrBillId1: PSh0347202407010031
+  distrBillId2: PSh0347202407010031
 高值配送单号:
-  distrBillId1: PSh0347202407010026
-  distrBillId2: PSh0347202407010026
+  distrBillId1: PSh0347202407010032
+  distrBillId2: PSh0347202407010032
 试剂配送单号:
-  distrBillId1: PSh0347202407010027
-  distrBillId2: PSh0347202407010027
+  distrBillId1: PSh0347202407010033
+  distrBillId2: PSh0347202407010033

data/b5_spd3_core_business_flow/message11

 采购计划单号高值:
-  orderNo1: PLAN2024070130737
-  orderNo2: PLAN2024070130737
+  orderNo1: PLAN2024070130743
+  orderNo2: PLAN2024070130743

data/b5_spd3_core_business_flow/message12

 采购计划单号试剂:
-  orderNo1: PLAN2024070130738
-  orderNo2: PLAN2024070130738
+  orderNo1: PLAN2024070130744
+  orderNo2: PLAN2024070130744

data/b5_spd3_core_business_flow/message13

@@ -8,22 +8,22 @@
       taskType: 1
       sourceOrgId: p1e2e2
       sourceOrgName: 国药集团公司fehK^
-      sourceOrderNo: PSh0347202407010026
-      billMode: '20'
+      sourceOrderNo: PSh0347202407010033
+      billMode: '66'
       stockKind:
       purMode:
-      sourceId: PSh0347202407010026
+      sourceId: PSh0347202407010033
       sourceDetailId:
       sourceType: PSD
       sourceTypeName: 配送单
       sourceVersion: 1
-      planOrderNo: PLAN2024070130737
-      purOrderNo: CG2024070120135
+      planOrderNo: PLAN2024070130744
+      purOrderNo: CG2024070120140
       recOrgId: e5eebc1820824b4e9e2b3f3b9da0ad4b
       recOrgName: 二级检验科002
-      billRelationJson: '{"buyBillId":"Bh03472024070100022","planBillId":"Ph034720240701027382","planOrderNo":"PLAN2024070130737","buyOrderNo":"BUY2024070105388","purOrderNo":"CG2024070120135","purBillId":"Ch034720240701000081","purBillDate":"2024-07-01
-        09:02:01","distrBillId":"PSh0347202407010026","distrOrderNo":"PSh0347202407010026"}'
-      taskDate: '2024-07-01 09:02:37'
+      billRelationJson: '{"buyBillId":"Bh03472024070100029","planBillId":"Ph034720240701027389","planOrderNo":"PLAN2024070130744","buyOrderNo":"BUY2024070105395","purOrderNo":"CG2024070120140","purBillId":"Ch034720240701000086","purBillDate":"2024-07-01
+        09:09:11","distrBillId":"PSh0347202407010033","distrOrderNo":"PSh0347202407010033"}'
+      taskDate: '2024-07-01 09:10:01'
       taskDateStart:
       taskDateEnd:
       billModeList:

data/b5_spd3_core_business_flow/message14

 验收单详情信息:
   list_a:
   - &id001
-    - purMode: 10
+    - purMode: 60
       unitName: 100支/100
-      hosGoodsId: h034700004332
+      hosGoodsId: h034700004333
       mdmGoodsCode:
-      spdGoodsCode: '11661285'
-      goodsCode: '00004332'
-      goodsName: 一次性注射器_低值49V0u
+      spdGoodsCode: '11661286'
+      goodsCode: '00004333'
+      goodsName: 新型冠状病毒检测试剂P@whV
       goodsGg: G-31891
       mfrsId:
       mfrsName: 德国歌德公司 Geuder AG
@@ -21,17 +21,17 @@
       pkgDefId:
       pkgDefName: '100'
       pkgDefQty: 100.0
-      batchCode: '333'
+      batchCode: '4444'
       expdtDate: '2025-01-07'
       productDate: '2024-07-01'
       provName: 国药集团公司fehK^
       provId:
-      viewId: '03838994'
+      viewId: '03839002'
       verifyFlag: 0
       hasSterilize: 0
-      id: '03838994'
+      id: '03839002'
       detailRelationJson:
-      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004332","purMode":10,"goodsName":"一次性注射器_低值49V0u","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661285","ybDefId":""}'
+      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004333","purMode":60,"goodsName":"新型冠状病毒检测试剂P@whV","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661286","ybDefId":""}'
       recTemperature: 20
       recHumidity: 30
       distrPrice: 99.9999

data/b5_spd3_core_business_flow/message15

 验收单号:
-  CHECK_NO1: CHECKh03472024070100015
-  CHECK_NO2: CHECKh03472024070100015
+  CHECK_NO1: CHECKh03472024070100023
+  CHECK_NO2: CHECKh03472024070100023

data/b5_spd3_core_business_flow/message16

@@ -7,11 +7,11 @@
       createTime:
       createUser: h0347_UID-051375
       lastModifiedUser:
-      billMode: '20'
+      billMode: '66'
       recType:
       stockKind:
       purMode:
-      sourceId: DRh034720240701000047
+      sourceId: DRh034720240701000060
       sourceType: CK_TK
       sourceVersion: 1
       batchList:
@@ -24,15 +24,15 @@
       taskType: 2
       sourceOrgId: e5eebc1820824b4e9e2b3f3b9da0ad4b
       sourceOrgName: 二级检验科002
-      sourceOrderNo: DN20240701000047
-      taskSourceNo: DN20240701000047
+      sourceOrderNo: DN20240701000060
+      taskSourceNo: DN20240701000060
       areaCode:
       areaName:
       goodsName:
       goodsGg:
       startDate:
       endDate:
-      taskDate: '2024-07-01 08:42:17'
+      taskDate: '2024-07-01 09:27:20'
       pkgTaskId:
       pkgFlag:
       remark: ''

data/b5_spd3_core_business_flow/message17

 验收单库存详情信息:
   list_a:
   - &id001
-    - id: DRh0347202407010000470001
+    - id: DRh0347202407010000600001
       lastModified:
       version:
       createTime:
       createUser:
       lastModifiedUser:
       rowIdx:
-      purMode: 20
-      unitName: 1支
-      pid: DRh034720240701000047
-      hosGoodsId: h034700004331
-      batchCode: '222'
+      purMode: 60
+      unitName: 100支/100
+      pid: DRh034720240701000060
+      hosGoodsId: h034700004333
+      batchCode: '4444'
       expdtDate: '2025-01-07'
       productDate: '2024-07-01'
       batchPrice: 99.9999
       settlement: 1
       batchType: 40
-      srcBatchId: Ph034724070100014
+      srcBatchId: Ph034724070100012
       srcBatchPrice: 99.9999
       shelfCode: areah03472536-2-01-01
       shelfKind:
-      barcodeId: '8800000001073531'
+      barcodeId: UT240701000804
       subBarcodeId:
-      qty: 1.0
+      qty: 100.0
       pkgQty: 1
-      distrId: PSh0347202407010023
-      distrDetailId: '03838992'
+      distrId: PSh0347202407010021
+      distrDetailId: '03838990'
       pkgDefQty:
       pkgDefName:
-      viewId: h0347000043312222025-01-071支
+      viewId: h03470000433344442025-01-07100支/100
       codingType:
       batchFlag:
       hasSterilize: 0
@@ -38,26 +38,26 @@
       sterilizePassQty:
       sterilizeRejectQty:
       orderNo:
-      sourceDetailId: PICKh03472407010025200001
-      mdmGoodsCode: '11661284'
-      goodsCode: '00004331'
+      sourceDetailId: PICKh03472407010029660001
+      mdmGoodsCode: '11661286'
+      goodsCode: '00004333'
       tbStatus:
       billMode:
       hosId:
       branchId:
-      purBillId: Ch034720240701000078
+      purBillId: Ch034720240701000074
       provId: p1e2e2
       provName:
       subProvId: p1e2e2
       purDetailId:
-      goodsName: 高值牙钻机sGoxC
+      goodsName: 新型冠状病毒检测试剂P@whV
       goodsGg: G-31891
       mfrsId: mfrs-11229
       mfrsName: 德国歌德公司 Geuder AG
       made: 德国
       unit: 支
-      sourceBatchId: Ph034724070100014
-      targetBatchId: Ph034724070100014
+      sourceBatchId: Ph034724070100012
+      targetBatchId: Ph034724070100012
       pkgDefId:
       certificateCode: ''
       productCertCode:
@@ -65,13 +65,13 @@
       psiPrice: 99.9999
       ext:
         goodsGg: G-31891
-        goodsCode: '00004331'
-        purMode: 20
-        goodsName: 高值牙钻机sGoxC
+        goodsCode: '00004333'
+        purMode: 60
+        goodsName: 新型冠状病毒检测试剂P@whV
         ygptCode: ''
         transCond: ''
         storageCond: ''
-        erpCode: '11661284'
+        erpCode: '11661286'
         ybDefId: ''
         contractId: ''
         normalContractId: ''

data/b5_spd3_core_business_flow/message18

 条码信息:
   list_a:
   - &id001
-    id: '8800000001073531'
-    snCode: '8800000001073531'
-    ssccCode: '010839000186424327'
-    pkgCodeSee: '0101123456789012102221124070117250107218800000001073531'
-    hosGoodsId: h034700004331
-    hosGoodsCode: '00004331'
-    goodsCode: '00004331'
-    goodsName: 高值牙钻机sGoxC
+    id: UT240701000804
+    snCode: UT240701000804
+    ssccCode: '010839000186424129'
+    pkgCodeSee: 0137090000043330104444112407011725010721UT240701000804
+    hosGoodsId: h034700004333
+    hosGoodsCode: '00004333'
+    goodsCode: '00004333'
+    goodsName: 新型冠状病毒检测试剂P@whV
     goodsSpec: G-31891
     goodsMfrsName: 德国歌德公司 Geuder AG
     unit: 支
-    purMode: 20
-    batchCode: '222'
+    purMode: 60
+    batchCode: '4444'
     productDate: '2024-07-01'
     expdtDate: '2025-01-07'
-    pkgDefName:
-    pkgDefQty: 1.0
+    pkgDefName: '100'
+    pkgDefQty: 100.0
     stockId: bf9e6e9cd33e4a8ba0321cd45c27d22c
     stockName: 二级检验科002库房
     areaName: 默认库区
     areaCode: areah03472535
     lockStatus: 0
-    unitName: 1支
+    unitName: 100支/100
     shelfCode: areah03472535-A-01-01
     shelfNo: A01-A-01-01
-    pkgDefId:
-    extInfo: '{"pkgDefQty": 1, "purBillId": "CG2024070120132", "distrBillId": "PSh0347202407010023",
-      "inStockTime": "2024-07-01 07:43:29", "useFrequency": 1, "distrDetailId": "03838992",
-      "certificateCode": "", "multiChargeFlag": 0}'
+    pkgDefId: 3f89b14a38ca4fe3a12889896eab18af
+    extInfo: '{"pkgDefId": "3f89b14a38ca4fe3a12889896eab18af", "pkgDefQty": 100, "purBillId":
+      "CG2024070120128", "pkgDefName": "100", "distrBillId": "PSh0347202407010021",
+      "inStockTime": "2024-07-01 07:38:53", "distrDetailId": "03838990", "certificateCode":
+      ""}'
     bottleId:
-    pkgType: '20'
+    pkgType: '66'
     miDjmc: ''
     miCode: ''
     transferRatio: 1.0
@@ -40,13 +41,13 @@
     shelfKindName: 普通货位
     provName: 国药集团公司fehK^
     provId: p1e2e2
-    inStockDate: '2024-07-01 07:43:28'
+    inStockDate: '2024-07-01 07:38:52'
     mfrCode:
     made: 德国
     price:
-    barName: 1支
-    purModeText: 高值耗材
-    codeType: 20
+    barName: 100支/100
+    purModeText: 检验试剂
+    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: 300.0
+      qty: 500.0
       goodsImg: []
       pkgDefId: 3f89b14a38ca4fe3a12889896eab18af
       buyPkgQty:

data/b5_spd3_core_business_flow/message7

 采购计划单号:
-  orderNo1: PLAN2024070130739
-  orderNo2: PLAN2024070130739
+  orderNo1: PLAN2024070130745
+  orderNo2: PLAN2024070130745

data/b5_spd3_core_business_flow/message8

 配送订单信息:
   list_a:
   - &id001
-    - id: Ch034720240701000080
-      lastModified: '2024-07-01 09:01:59'
+    - id: Ch034720240701000086
+      lastModified: '2024-07-01 09:09:11'
       version: 0
-      createTime: '2024-07-01 09:01:59'
+      createTime: '2024-07-01 09:09:11'
       createUser: h0347_UID-051375
       lastModifiedUser:
-      orderNo: CG2024070120134
+      orderNo: CG2024070120140
       billMode: '66'
       recType: HDI
       hosId: h0347
@@ -19,7 +19,7 @@
       areaCode:
       areaName:
       billExpdtDate:
-      sourceId: Ph034720240701027383
+      sourceId: Ph034720240701027389
       sourceType:
       inSettlement:
       recUser:
@@ -47,7 +47,7 @@
       sumQty: 100.0
       sumPkgQty: 1.0
       sumAmount: '9999.9900'
-      planOrderNo: PLAN2024070130738
+      planOrderNo: PLAN2024070130744
   list_b:
   - *id001
   list_c:

data/b5_spd3_core_business_flow/message9

 配送订单详细信息:
   list_a:
   - &id001
-    - id: d92e73e64f0648cd8e08ae6d0ff77e56
+    - id: 130fc58d0db241eaafa76e39e12ef388
       lastModified:
       version:
       createTime:
       createUser:
       lastModifiedUser:
-      pid: Ch034720240701000080
-      orderNo: CG2024070120134
-      sourceId: bf230ef4403847bd9f1b69aeac3ebc29
+      pid: Ch034720240701000086
+      orderNo: CG2024070120140
+      sourceId: b886689f283f4ddca1220dca07fc3e97
       hosGoodsId: h034700004333
       mdmGoodsCode: '11661286'
       goodsCode: '00004333'
@@ -31,7 +31,7 @@
       notSendPkgQty: 0.0
       inSettlement: 1
       closeType: 1
-      detailRelationJson: '{"planBillId":"Ph034720240701027383","buyDetailId":"Bh034720240701000230001","planDetailId":"bf230ef4403847bd9f1b69aeac3ebc29"}'
+      detailRelationJson: '{"planBillId":"Ph034720240701027389","buyDetailId":"Bh034720240701000290001","planDetailId":"b886689f283f4ddca1220dca07fc3e97"}'
       extInfo: '{"goodsGg":"G-31891","goodsCode":"00004333","purMode":60,"goodsName":"新型冠状病毒检测试剂P@whV"}'
       remark:
       tbStatus:

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'>0</td>
-            <td class='details-col-elapsed'>0分11秒</td>
-            <td class="details-col-elapsed">0.0%</td>
+            <td class='details-col-elapsed'>1</td>
+            <td class='details-col-elapsed'>1分22秒</td>
+            <td class="details-col-elapsed">100.0%</td>
         </tr>
     </table>
 
@@ -94,8 +94,8 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
         
         <tr width="600">
             <td class="details-col-elapsed"><a href='../log/a_b9流程十六退库业务_二级库向一级库退库/log.html' target='_blank'>a_b9流程十六退库业务_二级库向一级库退库</a></td>
-            <td class="fail">失败</td>
-            <td class="details-col-elapsed">11.835</td>
+            <td class="success">成功</td>
+            <td class="details-col-elapsed">82.423</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>