流程十二脚本编写

air_case/b5_spd3_core_business_flow/a_b5流程十二请领业务流_二级库向二级库.air/a_b5流程十二请领业务流_二级库向二级库.py

@@ -14,7 +14,7 @@ from airtest.core.api import using
 __author__ = "xiaohesheng"
 
 """
-case_tag:api,spd_core1,a_b5流程十二请领业务流_二级库向二级库,id2302,id2302-15,sit,on
+case_tag:api,spd_core,a_b5流程十二请领业务流_二级库向二级库,id2302,id2302-15,sit,on
 核心业务流:a_b5流程十二请领业务流_二级库向二级库
 python runner_test.py tag id2302-15 debug mdm3
 """

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

@@ -65,7 +65,8 @@ def second_dept_consume_Out_Stock(type):  # 二级库消耗出库
     if type == 2:
         udi_code = get_udi2(2)  # 获取条码 低值1 高值2 试剂3
     elif type == 3:
-        udi_code = get_udi2(3)  # 获取条码 低值1 高值2 试剂3
+        # udi_code = get_udi2(3)  # 获取条码 低值1 高值2 试剂3
+        print('下面处理')
     else:
         udi_code = 'udi_code'
     if type == 2:
@@ -304,6 +305,7 @@ def second_dept_consume_Out_Stock(type):  # 二级库消耗出库
         udi_code = get_udi2(4)#试剂单瓶条码
         data1 = pickScan4(udi_code)
         print('试剂data1',data1)
+
         # 获取必要信息
         areaCode = commonFuc().analysis_json('areaCode', data1)
         UTid = commonFuc().analysis_json('id', data1)

data/b5_spd3_core_business_flow/message10

 低值配送单号:
-  distrBillId1: PSh0347202406060050
-  distrBillId2: PSh0347202406060050
+  distrBillId1: PSh0347202406060059
+  distrBillId2: PSh0347202406060059
 高值配送单号:
-  distrBillId1: PSh0347202406060051
-  distrBillId2: PSh0347202406060051
+  distrBillId1: PSh0347202406060060
+  distrBillId2: PSh0347202406060060
 试剂配送单号:
-  distrBillId1: PSh0347202406060052
-  distrBillId2: PSh0347202406060052
+  distrBillId1: PSh0347202406060061
+  distrBillId2: PSh0347202406060061

data/b5_spd3_core_business_flow/message11

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

data/b5_spd3_core_business_flow/message12

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

data/b5_spd3_core_business_flow/message13

@@ -8,22 +8,22 @@
       taskType: 1
       sourceOrgId: p1e276
       sourceOrgName: 国药集团公司LK05j
-      sourceOrderNo: PSh0347202406060052
-      billMode: '66'
+      sourceOrderNo: PSh0347202406060059
+      billMode: '16'
       stockKind:
       purMode:
-      sourceId: PSh0347202406060052
+      sourceId: PSh0347202406060059
       sourceDetailId:
       sourceType: PSD
       sourceTypeName: 配送单
       sourceVersion: 1
-      planOrderNo: PLAN2024060625811
-      purOrderNo: CG2024060617993
+      planOrderNo: PLAN2024060625837
+      purOrderNo: CG2024060618004
       recOrgId: 82394e14fcd94eb6ad2474304cb2a808
       recOrgName: 二级检验科002
-      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'
+      billRelationJson: '{"buyBillId":"Bh03472024060600055","planBillId":"Ph034720240606022482","planOrderNo":"PLAN2024060625837","buyOrderNo":"BUY2024060604777","purOrderNo":"CG2024060618004","purBillId":"Ch034720240606000119","purBillDate":"2024-06-06
+        16:04:54","distrBillId":"PSh0347202406060059","distrOrderNo":"PSh0347202406060059"}'
+      taskDate: '2024-06-06 16:05:16'
       taskDateStart:
       taskDateEnd:
       billModeList:

data/b5_spd3_core_business_flow/message14

 验收单详情信息:
   list_a:
   - &id001
-    - purMode: 60
+    - purMode: 10
       unitName: 100支/100
-      hosGoodsId: h034700004010
+      hosGoodsId: h034700004009
       mdmGoodsCode:
-      spdGoodsCode: '11660958'
-      goodsCode: '00004010'
-      goodsName: 新型冠状病毒检测试剂20zyQ
+      spdGoodsCode: '11660957'
+      goodsCode: '00004009'
+      goodsName: 一次性注射器_低值vYh04
       goodsGg: G-31891
       mfrsId:
       mfrsName: 德国歌德公司 Geuder AG
@@ -21,17 +21,17 @@
       pkgDefId:
       pkgDefName: '100'
       pkgDefQty: 100.0
-      batchCode: '4444'
+      batchCode: '333'
       expdtDate: '2024-12-13'
       productDate: '2024-06-06'
       provName: 国药集团公司LK05j
       provId:
-      viewId: '03838188'
+      viewId: '03838195'
       verifyFlag: 0
       hasSterilize: 0
-      id: '03838188'
+      id: '03838195'
       detailRelationJson:
-      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004010","purMode":60,"goodsName":"新型冠状病毒检测试剂20zyQ","ygptCode":"","transCond":"","storageCond":"","erpCode":"11660958","ybDefId":""}'
+      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004009","purMode":10,"goodsName":"一次性注射器_低值vYh04","ygptCode":"","transCond":"","storageCond":"","erpCode":"11660957","ybDefId":""}'
       recTemperature: 20
       recHumidity: 30
       distrPrice: 99.9999

data/b5_spd3_core_business_flow/message15

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

data/b5_spd3_core_business_flow/message18

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

data/b5_spd3_core_business_flow/message21

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

data/b5_spd3_core_business_flow/message7

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

data/b5_spd3_core_business_flow/message8

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

data/b5_spd3_core_business_flow/message9

 配送订单详细信息:
   list_a:
   - &id001
-    - id: 74ce4346828645b4aa9faf0b0040decf
+    - id: bcf54e1f97c44b45a27aab2196b85d5a
       lastModified:
       version:
       createTime:
       createUser:
       lastModifiedUser:
-      pid: Ch034720240606000108
-      orderNo: CG2024060617993
-      sourceId: c2c97dd621024113aa3929c4760602de
+      pid: Ch034720240606000117
+      orderNo: CG2024060618002
+      sourceId: ac632ff3271f4ec19bfa562555e8b993
       hosGoodsId: h034700004010
       mdmGoodsCode: '11660958'
       goodsCode: '00004010'
@@ -31,7 +31,7 @@
       notSendPkgQty: 0.0
       inSettlement: 1
       closeType: 1
-      detailRelationJson: '{"planBillId":"Ph034720240606022456","buyDetailId":"Bh034720240606000460001","planDetailId":"c2c97dd621024113aa3929c4760602de"}'
+      detailRelationJson: '{"planBillId":"Ph034720240606022484","buyDetailId":"Bh034720240606000560001","planDetailId":"ac632ff3271f4ec19bfa562555e8b993"}'
       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'>4分15秒</td>
+            <td class='details-col-elapsed'>2分50秒</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">254.973</td>
+            <td class="details-col-elapsed">170.653</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>