流程十四脚本编写

air_case/b5_spd3_core_business_flow/a_b1流程八_高值跟台业务流程.air/a_b1流程八_高值跟台业务流程.py

@@ -257,7 +257,7 @@ def second_dept_in_warehouse():
     info = FileUtils().r_info8('b5_spd3_core_business_flow', "二级库条码信息", 'message20')
     list_a = info['list_a']
     extInfo=commonFuc().analysis_json('extInfo',list_a)
-    distrOrderNo = reGetString(extInfo,r'"distrBillId":"',r'","pkgDefQty"')
+    distrOrderNo = reGetString(extInfo,r'distrBillId": "',r'", ')
     print('distrOrderNo',distrOrderNo)
     provId=commonFuc().analysis_json('provId',list_a)
     provName=commonFuc().analysis_json('provName',list_a)

data/b5_spd3_core_business_flow/message10

@@ -7,3 +7,6 @@
 试剂配送单号:
   distrBillId1: PSh0347202406190048
   distrBillId2: PSh0347202406190048
+高值跟台配送单号:
+  distrBillId1: PSh0347202406200010
+  distrBillId2: PSh0347202406200010

data/b5_spd3_core_business_flow/message13

@@ -8,29 +8,28 @@
       taskType: 1
       sourceOrgId: p1e2ae
       sourceOrgName: 国药集团公司Z6F#v
-      sourceOrderNo: PSh0347202406190048
-      billMode: '66'
+      sourceOrderNo: PSh0347202406200010
+      billMode: '25'
       stockKind:
       purMode:
-      sourceId: PSh0347202406190048
+      sourceId: PSh0347202406200010
       sourceDetailId:
       sourceType: PSD
       sourceTypeName: 配送单
       sourceVersion: 1
-      planOrderNo: PLAN2024061929301
-      purOrderNo: CG2024061919213
+      planOrderNo: SSSQ202406200303
+      purOrderNo: SSTZ202406200279
       recOrgId: f30e982dcac741ccab5c8ad19e52bc08
       recOrgName: 二级检验科002
-      billRelationJson: '{"buyBillId":"Bh03472024061900013","planBillId":"Ph034720240619025946","planOrderNo":"PLAN2024061929301","buyOrderNo":"BUY2024061905134","purOrderNo":"CG2024061919213","purBillId":"Ch034720240619000084","purBillDate":"2024-06-19
-        11:18:07","distrBillId":"PSh0347202406190048","distrOrderNo":"PSh0347202406190048"}'
-      taskDate: '2024-06-19 11:18:52'
+      billRelationJson: '{"operationApplyOrderNo":"SSSQ202406200303","operationNoticeBillId":"Nh034720240620000001","distrBillId":"PSh0347202406200010","operationNoticeOrderNo":"SSTZ202406200279","distrOrderNo":"PSh0347202406200010","operationApplyBillId":"Oh034720240620000001"}'
+      taskDate: '2024-06-20 15:38:10'
       taskDateStart:
       taskDateEnd:
       billModeList:
       viewIdList:
-      supplierFlag: true
+      supplierFlag: false
       tbStatus: 20
-      remark: ''
+      remark:
       pdaFlag:
   list_b:
   - *id001

data/b5_spd3_core_business_flow/message14

 验收单详情信息:
   list_a:
   - &id001
-    - purMode: 60
-      unitName: 100支/100
-      hosGoodsId: h034700004182
+    - purMode: 20
+      unitName: 1支
+      hosGoodsId: h034700004180
       mdmGoodsCode:
-      spdGoodsCode: '11661131'
-      goodsCode: '00004182'
-      goodsName: 新型冠状病毒检测试剂)IWA8
+      spdGoodsCode: '11661129'
+      goodsCode: '00004180'
+      goodsName: 高值牙钻机PU$H^
       goodsGg: G-31891
       mfrsId:
       mfrsName: 德国歌德公司 Geuder AG
@@ -16,27 +16,27 @@
       goodsDi: '01123456789012'
       miCode:
       miDjmc:
-      certificateCode: ''
+      certificateCode:
       rfidFlag: 0
       pkgDefId:
-      pkgDefName: '100'
-      pkgDefQty: 100.0
-      batchCode: '4444'
-      expdtDate: '2024-12-26'
-      productDate: '2024-06-19'
+      pkgDefName:
+      pkgDefQty: 1.0
+      batchCode: '2222'
+      expdtDate: '2024-12-27'
+      productDate: '2024-06-20'
       provName: 国药集团公司Z6F#v
       provId:
-      viewId: '03838618'
+      viewId: '03838651'
       verifyFlag: 0
       hasSterilize: 0
-      id: '03838618'
+      id: '03838651'
       detailRelationJson:
-      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004182","purMode":60,"goodsName":"新型冠状病毒检测试剂)IWA8","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661131","ybDefId":""}'
+      extInfo: '{"ygptCode":"","transCond":"","storageCond":"","erpCode":""}'
       recTemperature: 20
       recHumidity: 30
       distrPrice: 99.9999
       distrPkgQty: 1.0
-      distrQty: 100.0
+      distrQty: 1.0
       price: 99.9999
       checkQty: 0.0
       checkPkgQty: 0
@@ -44,7 +44,7 @@
       initQty:
       totalQty:
       rowNum:
-      settlement: 1
+      settlement: 3
       hdiBarcodeList:
       detailId:
       pkgCode:

data/b5_spd3_core_business_flow/message15

 验收单号:
-  CHECK_NO1: CHECKh03472024061900019
-  CHECK_NO2: CHECKh03472024061900019
+  CHECK_NO1: CHECKh03472024062000011
+  CHECK_NO2: CHECKh03472024062000011

data/b5_spd3_core_business_flow/message20

 二级库条码信息:
   list_a:
   - &id001
-    id: '8800000001068614'
-    snCode: '8800000001068614'
-    ssccCode: '010839000184974725'
-    pkgCodeSee: '01000000000041801022221124061917241226218800000001068614'
+    id: '8800000001068651'
+    snCode: '8800000001068651'
+    ssccCode: '010839000184981822'
+    pkgCodeSee: '01000000000041801022221124062017241227218800000001068651'
     hosGoodsId: h034700004180
     hosGoodsCode: '00004180'
     goodsCode: '00004180'
@@ -14,8 +14,8 @@
     unit: 支
     purMode: 20
     batchCode: '2222'
-    productDate: '2024-06-19'
-    expdtDate: '2024-12-26'
+    productDate: '2024-06-20'
+    expdtDate: '2024-12-27'
     pkgDefName:
     pkgDefQty: 1.0
     stockId: 19846ed1d3434641bdf5745ddadb00c1
@@ -27,8 +27,8 @@
     shelfCode: areah03472393-A-01-01
     shelfNo: A01-A-01-01
     pkgDefId:
-    extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202406190014", "inStockTime":
-      "2024-06-19 11:03:20", "useFrequency": 1, "distrDetailId": "03838593", "multiChargeFlag":
+    extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202406200010", "inStockTime":
+      "2024-06-20 15:38:54", "useFrequency": 1, "distrDetailId": "03838651", "multiChargeFlag":
       0}'
     bottleId:
     pkgType: '25'
@@ -40,7 +40,7 @@
     shelfKindName: 普通货位
     provName: 国药集团公司Z6F#v
     provId: p1e2ae
-    inStockDate: '2024-06-19 11:03:20'
+    inStockDate: '2024-06-20 15:38:53'
     mfrCode:
     made: 德国
     price:

data/b5_spd3_core_business_flow/message22

 库区信息:
   list_a:
   - &id001
-    - id: 98534bb3804a40448b6d2dfbd19590f4
-      lastModified: '2024-06-19 11:24:20'
+    - id: 2a010f35ea3943fbadb6c23fbc087ebb
+      lastModified: '2024-06-19 11:03:34'
       version: 1
       createTime: '2024-06-19 07:05:11'
       createUser: h0347_UID-051348
       lastModifiedUser: h0347_UID-051348
-      stockId: e357dee580394540ad29b7184286d134
-      shelfCode: areah03472394
+      stockId: 19846ed1d3434641bdf5745ddadb00c1
+      shelfCode: areah03472393
       shelfName: 默认库区
-      address: 三级检测组003
+      address: 二级检验科002
       shelfType:
       stockType: 0
       defaultFlag: 1
@@ -24,7 +24,7 @@
       shelfNo: A01
       shelfKind: 0
       hosId:
-      deptId: f5ed5089eb4d41ea807d13923e5b4fc4
+      deptId: f30e982dcac741ccab5c8ad19e52bc08
       areaCode:
       areaName:
       stockName:

data/b5_spd3_core_business_flow/message8

 配送订单信息:
   list_a:
   - &id001
-    - id: Ch034720240619000084
-      lastModified: '2024-06-19 11:18:07'
-      version: 0
-      createTime: '2024-06-19 11:18:07'
-      createUser: h0347_UID-051348
-      lastModifiedUser:
-      orderNo: CG2024061919213
-      billMode: '66'
-      recType: HDI
+    - id: Nh034720240620000001
+      orderNo: SSTZ202406200279
+      sourceOrderNo: SSSQ202406200303
       hosId: h0347
-      branchId: h0347-3684
-      deptId:
-      deptName:
-      recOrgId: f30e982dcac741ccab5c8ad19e52bc08
-      recOrgName: 二级检验科002
-      areaCode:
-      areaName:
-      billExpdtDate:
-      sourceId: Ph034720240619025946
-      sourceType:
-      inSettlement:
-      recUser:
-      recPhone:
-      recAddr: 自动化测试
-      provId: p1e2ae
-      provName: 国药集团公司Z6F#v
-      subSendFlag:
-      exeProvId: p1e2ae
-      exeProvName: 国药集团公司Z6F#v
-      billRelationJson:
-      extInfo:
-      barcodeFlag: 1
-      pkgFlag:
-      remark: ''
-      priority:
-      closeStatus: 0
-      closeDate:
-      upStatus:
-      tbStatus: 30
-      hosVersion: 3
-      billType: CGD
       hosName: 邹城市人民医院(test)
       branchName: 东土城路院区L3*Gp
-      sumQty: 100.0
-      sumPkgQty: 1.0
-      sumAmount: '9999.9900'
-      planOrderNo: PLAN2024061929301
+      recDeptName: 二级检验科002
+      operName: 血管扩张术
+      operDate: '2024-06-21'
+      operDoctor: 李*
+      patientName: 张*
+      status: 10
+      statusText: 待确认
+      version: 0
+      patientInHosId: '123456'
+      surDeptName: ''
+      remark: 自动化测试
+      createUserName: 自动化测试71LE8
+      distPriority: 0
+      distPriorityText:
+      distId:
+      distNo:
+      hosVersion: 3
+      createTime: '2024-06-20 15:37:48'
+      sumQty:
+      sumAmount:
+      operationPkg: 0
+      provId: p1e2ae
+      provName: 国药集团公司Z6F#v
+      subProvId: ''
+      subProvName: ''
+      recDeptId: f30e982dcac741ccab5c8ad19e52bc08
   list_b:
   - *id001
   list_c:

data/b5_spd3_core_business_flow/message9

 配送订单详细信息:
   list_a:
   - &id001
-    - id: 724e3fd8c8144de99ba547f750133c5e
-      lastModified:
-      version:
-      createTime:
-      createUser:
-      lastModifiedUser:
-      pid: Ch034720240619000084
-      orderNo: CG2024061919213
-      sourceId: 576efbcacac8494681cef2c1ca1120f0
-      hosGoodsId: h034700004182
-      mdmGoodsCode: '11661131'
-      goodsCode: '00004182'
-      purMode: 60
+    id: Nh034720240620000001
+    orderNo: SSTZ202406200279
+    sourceOrderNo: SSSQ202406200303
+    hosId: h0347
+    hosName: 邹城市人民医院(test)
+    branchName: 东土城路院区L3*Gp
+    recDeptName: 二级检验科002
+    operName: 血管扩张术
+    operDate: '2024-06-21'
+    operDoctor: 李*
+    patientName: 张*
+    status: 20
+    statusText: 待配送
+    version: 1
+    patientInHosId: '123456'
+    surDeptName: ''
+    remark: 自动化测试
+    createUserName: 自动化测试71LE8
+    distPriority: 0
+    distPriorityText: 否
+    distId:
+    distNo:
+    hosVersion: 3
+    createTime: '2024-06-20 15:37:48'
+    sumQty: 1
+    sumAmount: '99.9999'
+    operationPkg: 0
+    provId: p1e2ae
+    provName: 国药集团公司Z6F#v
+    subProvId: ''
+    subProvName: ''
+    recDeptId: f30e982dcac741ccab5c8ad19e52bc08
+  list_b:
+  - *id001
+  list_c:
+  - *id001
+配送订单详细信息2:
+  list_a:
+  - &id001
+    - id: h034720240620000001
+      hosGoodsId: h034700004180
+      goodsNum: 1
       price: '99.9999'
-      supplyId: 82e4fd96a89a40b5a8314d6c3115dd37
-      pkgDefId: 435edbc5f99541a29447e6d3703a461a
-      pkgDefName: '100'
-      pkgDefQty: 100.0
-      pkgQty: 1.0
-      qty: 100.0
-      conPkgQty: 1.0
-      conQty: 100.0
-      checkPkgQty: 0.0
-      checkQty: 0.0
-      distrPkgQty: 0.0
-      distrQty: 0.0
-      notSendQty: 0.0
-      notSendPkgQty: 0.0
-      inSettlement: 1
-      closeType: 1
-      detailRelationJson: '{"planBillId":"Ph034720240619025946","buyDetailId":"Bh034720240619000130001","planDetailId":"576efbcacac8494681cef2c1ca1120f0"}'
-      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004182","purMode":60,"goodsName":"新型冠状病毒检测试剂)IWA8"}'
-      remark:
-      tbStatus:
-      hosVersion:
+      inSettlement: 3
+      inSettlementText: 消耗结算
+      goodsName: 高值牙钻机PU$H^
+      goodsSpec: G-31891
+      goodsCode: '00004180'
+      goodsMfrsId: mfrs-11229
+      goodsMfrsName: 德国歌德公司 Geuder AG
       unit: 支
-      goodsName: 新型冠状病毒检测试剂)IWA8
-      mfrsId: mfrs-11229
-      mfrsName: 德国歌德公司 Geuder AG
-      goodsGg: G-31891
-      mdmGoodsSpecCode: '11661131'
-      erpCode: '11661131'
-      made: 德国
-      goodsDi: '01123456789012'
-      miDjmc:
-      miGoodsGg:
-      miGoodsXh:
-      miCode:
-      miTwentyCode:
-      miTwentysevenCode: ''
-      miKindCode:
-      purchaseContent:
-      purchaseUnit:
-      buyContent:
-      buyUnit:
-      transferRatio:
-      extend:
-      hitCode: '12'
-      hitPrice: 99.9999
-      barCodeMng: '2'
-      rfidFlag:
-      goodsRegCert: ''
-      transCond: ''
-      storageCond: ''
-      diType: gs1
-      diUse: '36840000041820'
+      subProvId: p1e2ae
+      subProvName: 国药集团公司Z6F#v
+      totalAmount: '99.9999'
+      spdGoodsCode: '11661129'
+      barCodeMng: 2
+      erpCode: '11661129'
       multiChargeFlag: 0
       useFrequency: 1
       chargeUnit:
-      amount: '9999.9900'
-      unitName: 100支/100
-      subProvId: p1e2ae
-      subProvName: 国药集团公司Z6F#v
-      subPrice: 99.9999
-      replPkgQty: 1.0
-      replQty: 100.0
-      ybDefId:
-      logicId:
-      provGoodsId:
-      sendFlag:
-      curQry:
+      hitCode: '12'
+      hitPrice: '99.999900'
+      diUse:
+      goodsDi: '01123456789012'
   list_b:
   - *id001
   list_c:

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'>1</td>
-            <td class='details-col-elapsed'>0分12秒</td>
+            <td class='details-col-elapsed'>1分35秒</td>
             <td class="details-col-elapsed">100.0%</td>
         </tr>
     </table>
@@ -93,9 +93,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
         </tr>
         
         <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/a_c0流程十七退货业务 中心库退供应商/log.html' target='_blank'>a_c0流程十七退货业务 中心库退供应商</a></td>
+            <td class="details-col-elapsed"><a href='../log/a_b1流程八_高值跟台业务流程/log.html' target='_blank'>a_b1流程八_高值跟台业务流程</a></td>
             <td class="success">成功</td>
-            <td class="details-col-elapsed">12.188</td>
+            <td class="details-col-elapsed">95.015</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>