脚本优化

dc47b1cd · xiao-hesheng · 6221902b · dc47b1cd · dc47b1cd · dc47b1cd
Commit dc47b1cd authored Jul 02, 2024 by xiao-hesheng
--- a/air_case/public1/public1/public1.py
+++ b/air_case/public1/public1/public1.py
@@ -2563,8 +2563,9 @@ def pickScan2(PICK_ID, udi_code, type=1):  # 二级库出库拣货扫码

    # # # # 发送请求
    result = commonFuc().http_post(url, request_body, headers)
+    print('result', '拣货扫码', result)
    code=commonFuc().analysis_json('code',result)
-    if code==200:
+    if code==0:
        print('拣货扫码','ok')
    else:
        commonFuc().check_text_exist_result_text('error', 'succees')

--- a/data/b2_herp3_bs/message6
+++ b/data/b2_herp3_bs/message6
@@ -3,8 +3,10 @@
  deptid2: 08398b8842854e85b738846cbcbb97f7
  deptid3: 90ffdd89a239466983c18d20c1730a3d
  deptid4: 271b96c808c94c4092c0d0c8f55aa397
+  deptid5: 5e2a2dfd8379430e8d7c76ad095c74da
 所有科室name:
  deptid1: 设备科001
  deptid2: 二级检验科002
  deptid3: 三级检测组003
  deptid4: 科室004
+  deptid5: 二级科室005
--- a/data/b5_spd3_core_business_flow/message10
+++ b/data/b5_spd3_core_business_flow/message10
 低值配送单号:
-  distrBillId1: PSh0347202407020049
-  distrBillId2: PSh0347202407020049
+  distrBillId1: PSh0347202407020072
+  distrBillId2: PSh0347202407020072
 高值配送单号:
-  distrBillId1: PSh0347202407020050
-  distrBillId2: PSh0347202407020050
+  distrBillId1: PSh0347202407020073
+  distrBillId2: PSh0347202407020073
 试剂配送单号:
-  distrBillId1: PSh0347202407020051
-  distrBillId2: PSh0347202407020051
-高值跟台配送单号:
-  distrBillId1: PSh0347202407020053
-  distrBillId2: PSh0347202407020053
+  distrBillId1: PSh0347202407020074
+  distrBillId2: PSh0347202407020074
--- a/data/b5_spd3_core_business_flow/message11
+++ b/data/b5_spd3_core_business_flow/message11
 采购计划单号高值:
-  orderNo1: PLAN2024070230996
-  orderNo2: PLAN2024070230996
+  orderNo1: PLAN2024070231020
+  orderNo2: PLAN2024070231020
--- a/data/b5_spd3_core_business_flow/message12
+++ b/data/b5_spd3_core_business_flow/message12
 采购计划单号试剂:
-  orderNo1: PLAN2024070230997
-  orderNo2: PLAN2024070230997
+  orderNo1: PLAN2024070231021
+  orderNo2: PLAN2024070231021
--- a/data/b5_spd3_core_business_flow/message13
+++ b/data/b5_spd3_core_business_flow/message13
@@ -8,28 +8,29 @@
      taskType: 1
      sourceOrgId: p1e2e8
      sourceOrgName: 国药集团公司kGTpV
-      sourceOrderNo: PSh0347202407020053
-      billMode: '25'
+      sourceOrderNo: PSh0347202407020074
+      billMode: '66'
      stockKind:
      purMode:
-      sourceId: PSh0347202407020053
+      sourceId: PSh0347202407020074
      sourceDetailId:
      sourceType: PSD
      sourceTypeName: 配送单
      sourceVersion: 1
-      planOrderNo: SSSQ202407020319
-      purOrderNo: SSTZ202407020295
+      planOrderNo: PLAN2024070231021
+      purOrderNo: CG2024070220362
      recOrgId: 08398b8842854e85b738846cbcbb97f7
      recOrgName: 二级检验科002
-      billRelationJson: '{"operationApplyOrderNo":"SSSQ202407020319","operationNoticeBillId":"Nh034720240702000003","distrBillId":"PSh0347202407020053","operationNoticeOrderNo":"SSTZ202407020295","distrOrderNo":"PSh0347202407020053","operationApplyBillId":"Oh034720240702000003"}'
-      taskDate: '2024-07-02 15:29:23'
+      billRelationJson: '{"buyBillId":"Bh03472024070200115","planBillId":"Ph034720240702027666","planOrderNo":"PLAN2024070231021","buyOrderNo":"BUY2024070205552","purOrderNo":"CG2024070220362","purBillId":"Ch034720240702000158","purBillDate":"2024-07-02
+        16:49:14","distrBillId":"PSh0347202407020074","distrOrderNo":"PSh0347202407020074"}'
+      taskDate: '2024-07-02 16:50:11'
      taskDateStart:
      taskDateEnd:
      billModeList:
      viewIdList:
-      supplierFlag: false
+      supplierFlag: true
      tbStatus: 20
-      remark:
+      remark: ''
      pdaFlag:
  list_b:
  - *id001

--- a/data/b5_spd3_core_business_flow/message14
+++ b/data/b5_spd3_core_business_flow/message14
 验收单详情信息:
  list_a:
  - &id001
-    - purMode: 20
-      unitName: 1支
-      hosGoodsId: h034700004352
+    - purMode: 60
+      unitName: 100支/100
+      hosGoodsId: h034700004354
      mdmGoodsCode:
-      spdGoodsCode: '11661305'
-      goodsCode: '00004352'
-      goodsName: 高值牙钻机q*iy$
+      spdGoodsCode: '11661307'
+      goodsCode: '00004354'
+      goodsName: 新型冠状病毒检测试剂j(r&Q
      goodsGg: G-31891
      mfrsId:
      mfrsName: 德国歌德公司 Geuder AG
@@ -16,27 +16,27 @@
      goodsDi: '01123456789012'
      miCode:
      miDjmc:
-      certificateCode:
+      certificateCode: ''
      rfidFlag: 0
      pkgDefId:
-      pkgDefName:
-      pkgDefQty: 1.0
-      batchCode: '2222'
+      pkgDefName: '100'
+      pkgDefQty: 100.0
+      batchCode: '4444'
      expdtDate: '2025-01-08'
      productDate: '2024-07-02'
      provName: 国药集团公司kGTpV
      provId:
-      viewId: '03839090'
+      viewId: '03839111'
      verifyFlag: 0
      hasSterilize: 0
-      id: '03839090'
+      id: '03839111'
      detailRelationJson:
-      extInfo: '{"ygptCode":"","transCond":"","storageCond":"","erpCode":""}'
+      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004354","purMode":60,"goodsName":"新型冠状病毒检测试剂j(r&Q","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661307","ybDefId":""}'
      recTemperature: 20
      recHumidity: 30
      distrPrice: 99.9999
      distrPkgQty: 1.0
-      distrQty: 1.0
+      distrQty: 100.0
      price: 99.9999
      checkQty: 0.0
      checkPkgQty: 0
@@ -44,7 +44,7 @@
      initQty:
      totalQty:
      rowNum:
-      settlement: 3
+      settlement: 1
      hdiBarcodeList:
      detailId:
      pkgCode:

--- a/data/b5_spd3_core_business_flow/message15
+++ b/data/b5_spd3_core_business_flow/message15
 验收单号:
-  CHECK_NO1: CHECKh03472024070200034
-  CHECK_NO2: CHECKh03472024070200034
+  CHECK_NO1: CHECKh03472024070200055
+  CHECK_NO2: CHECKh03472024070200055
--- a/data/b5_spd3_core_business_flow/message18
+++ b/data/b5_spd3_core_business_flow/message18
 条码信息:
  list_a:
  - &id001
-    id: UT240702000705
-    snCode: UT240702000705
-    ssccCode: '010839000186667922'
-    pkgCodeSee: 0137120000043540104444112407021725010821UT240702000705
-    hosGoodsId: h034700004354
-    hosGoodsCode: '00004354'
-    goodsCode: '00004354'
-    goodsName: 新型冠状病毒检测试剂j(r&Q
+    id: UT240702001507
+    snCode: UT240702001507
+    ssccCode: '010839000186788528'
+    pkgCodeSee: 013712000004353010333112407021725010821UT240702001507
+    hosGoodsId: h034700004353
+    hosGoodsCode: '00004353'
+    goodsCode: '00004353'
+    goodsName: 一次性注射器_低值NaZMe
    goodsSpec: G-31891
    goodsMfrsName: 德国歌德公司 Geuder AG
    unit: 支
-    purMode: 60
-    batchCode: '4444'
+    purMode: 10
+    batchCode: '333'
    productDate: '2024-07-02'
    expdtDate: '2025-01-08'
    pkgDefName: '100'
    pkgDefQty: 100.0
-    stockId: fe0b489d59cd48d08960e5096a714487
-    stockName: 东土城路院区$!ZNd中心库房
-    areaName: 自动化测试
-    areaCode: areah03472553
+    stockId: 75bd1e5c39dd4fff9389707ba69fba03
+    stockName: 二级检验科002库房
+    areaName: 默认库区
+    areaCode: areah03472550
    lockStatus: 0
    unitName: 100支/100
-    shelfCode: areah03472553-2-01-01
-    shelfNo: 自动化测试-2-01-01
-    pkgDefId: 96c4ca2199a14150a1cdabff56136aaf
-    extInfo: '{"pkgDefId": "96c4ca2199a14150a1cdabff56136aaf", "pkgDefQty": 100, "purBillId":
-      "CG2024070220277", "pkgDefName": "100", "distrBillId": "PSh0347202407020017",
-      "inStockTime": "2024-07-02 11:13:19", "distrDetailId": "03839054", "certificateCode":
+    shelfCode: areah03472550-A-01-01
+    shelfNo: A01-A-01-01
+    pkgDefId: ee7fb81570664e758bd2642f4dab3ed3
+    extInfo: '{"pkgDefId": "ee7fb81570664e758bd2642f4dab3ed3", "pkgDefQty": 100, "purBillId":
+      "CG2024070220324", "pkgDefName": "100", "distrBillId": "PSh0347202407020037",
+      "inStockTime": "2024-07-02 14:46:15", "distrDetailId": "03839074", "certificateCode":
      ""}'
    bottleId:
-    pkgType: '66'
+    pkgType: '16'
    miDjmc: ''
    miCode: ''
    transferRatio: 1.0
@@ -41,13 +41,13 @@
    shelfKindName: 普通货位
    provName: 国药集团公司kGTpV
    provId: p1e2e8
-    inStockDate:
+    inStockDate: '2024-07-02 14:46:14'
    mfrCode:
    made: 德国
    price:
    barName: 100支/100
-    purModeText: 检验试剂
-    codeType: 66
+    purModeText: 低值耗材
+    codeType: 16
  list_b:
  - *id001
  list_c:

--- a/data/b5_spd3_core_business_flow/message21
+++ b/data/b5_spd3_core_business_flow/message21
@@ -16,7 +16,7 @@
      pkgDefName: '100'
      pkgDefQty: 100.0
      pkgQty:
-      qty: 700.0
+      qty: 1200.0
      goodsImg: []
      pkgDefId: 96c4ca2199a14150a1cdabff56136aaf
      buyPkgQty:

--- a/data/b5_spd3_core_business_flow/message22
+++ b/data/b5_spd3_core_business_flow/message22
 库区信息:
  list_a:
  - &id001
-    - id: b3aa53e872c14aaeb7e79ba367af6c65
-      lastModified: '2024-07-02 16:19:45'
-      version: 11
-      createTime: '2024-07-02 07:03:40'
+    - id: 1717bd4bba1349bf8f4fbea9a1fa4407
+      lastModified: '2024-07-02 17:21:53'
+      version: 4
+      createTime: '2024-07-02 11:26:36'
      createUser: h0347_UID-051378
      lastModifiedUser: h0347_UID-051378
-      stockId: 75bd1e5c39dd4fff9389707ba69fba03
-      shelfCode: areah03472550
+      stockId: 956128c70a3e4a20916a390292d6a66f
+      shelfCode: areah03472554
      shelfName: 默认库区
-      address: 二级检验科002
+      address: 二级科室005
      shelfType:
      stockType: 0
      defaultFlag: 1
@@ -24,7 +24,7 @@
      shelfNo: A01
      shelfKind: 0
      hosId:
-      deptId: 08398b8842854e85b738846cbcbb97f7
+      deptId: 5e2a2dfd8379430e8d7c76ad095c74da
      areaCode:
      areaName:
      stockName:

--- a/data/b5_spd3_core_business_flow/message7
+++ b/data/b5_spd3_core_business_flow/message7
 采购计划单号:
-  orderNo1: PLAN2024070230995
-  orderNo2: PLAN2024070230995
+  orderNo1: PLAN2024070231019
+  orderNo2: PLAN2024070231019
--- a/data/b5_spd3_core_business_flow/message8
+++ b/data/b5_spd3_core_business_flow/message8
 配送订单信息:
  list_a:
  - &id001
-    - id: Nh034720240702000003
-      orderNo: SSTZ202407020295
-      sourceOrderNo: SSSQ202407020319
-      hosId: h0347
-      hosName: 邹城市人民医院(test)
-      branchName: 东土城路院区$!ZNd
-      recDeptName: 二级检验科002
-      operName: 血管扩张术
-      operDate: '2024-07-03'
-      operDoctor: 李*
-      patientName: 张*
-      status: 10
-      statusText: 待确认
+    - id: Ch034720240702000158
+      lastModified: '2024-07-02 16:49:14'
      version: 0
-      patientInHosId: '123456'
-      surDeptName: ''
-      remark: 自动化测试
-      createUserName: 自动化测试0oUY#
-      distPriority: 0
-      distPriorityText:
-      distId:
-      distNo:
-      hosVersion: 3
-      createTime: '2024-07-02 15:28:38'
-      sumQty:
-      sumAmount:
-      operationPkg: 0
+      createTime: '2024-07-02 16:49:14'
+      createUser: h0347_UID-051378
+      lastModifiedUser:
+      orderNo: CG2024070220362
+      billMode: '66'
+      recType: HDI
+      hosId: h0347
+      branchId: h0347-3712
+      deptId:
+      deptName:
+      recOrgId: 08398b8842854e85b738846cbcbb97f7
+      recOrgName: 二级检验科002
+      areaCode:
+      areaName:
+      billExpdtDate:
+      sourceId: Ph034720240702027666
+      sourceType:
+      inSettlement:
+      recUser:
+      recPhone:
+      recAddr: 自动化测试
      provId: p1e2e8
      provName: 国药集团公司kGTpV
-      subProvId: ''
-      subProvName: ''
-      recDeptId: 08398b8842854e85b738846cbcbb97f7
+      subSendFlag:
+      exeProvId: p1e2e8
+      exeProvName: 国药集团公司kGTpV
+      billRelationJson:
+      extInfo:
+      barcodeFlag: 1
+      pkgFlag:
+      remark: ''
+      priority:
+      closeStatus: 0
+      closeDate:
+      upStatus:
+      tbStatus: 30
+      hosVersion: 3
+      billType: CGD
+      hosName: 邹城市人民医院(test)
+      branchName: 东土城路院区$!ZNd
+      sumQty: 100.0
+      sumPkgQty: 1.0
+      sumAmount: '9999.9900'
+      planOrderNo: PLAN2024070231021
  list_b:
  - *id001
  list_c:

--- a/data/b5_spd3_core_business_flow/message9
+++ b/data/b5_spd3_core_business_flow/message9
 配送订单详细信息:
  list_a:
  - &id001
-    id: Nh034720240702000003
-    orderNo: SSTZ202407020295
-    sourceOrderNo: SSSQ202407020319
-    hosId: h0347
-    hosName: 邹城市人民医院(test)
-    branchName: 东土城路院区$!ZNd
-    recDeptName: 二级检验科002
-    operName: 血管扩张术
-    operDate: '2024-07-03'
-    operDoctor: 李*
-    patientName: 张*
-    status: 20
-    statusText: 待配送
-    version: 1
-    patientInHosId: '123456'
-    surDeptName: ''
-    remark: 自动化测试
-    createUserName: 自动化测试0oUY#
-    distPriority: 0
-    distPriorityText: 否
-    distId:
-    distNo:
-    hosVersion: 3
-    createTime: '2024-07-02 15:28:38'
-    sumQty: 1
-    sumAmount: '99.9999'
-    operationPkg: 0
-    provId: p1e2e8
-    provName: 国药集团公司kGTpV
-    subProvId: ''
-    subProvName: ''
-    recDeptId: 08398b8842854e85b738846cbcbb97f7
-  list_b:
-  - *id001
-  list_c:
-  - *id001
-配送订单详细信息2:
-  list_a:
-  - &id001
-    - id: h034720240702000003
-      hosGoodsId: h034700004352
-      goodsNum: 1
+    - id: 2cc1941cede74b17af348f0c5be1eaa5
+      lastModified:
+      version:
+      createTime:
+      createUser:
+      lastModifiedUser:
+      pid: Ch034720240702000158
+      orderNo: CG2024070220362
+      sourceId: 418b068872dd4474a0b38b97e15b1778
+      hosGoodsId: h034700004354
+      mdmGoodsCode: '11661307'
+      goodsCode: '00004354'
+      purMode: 60
      price: '99.9999'
-      inSettlement: 3
-      inSettlementText: 消耗结算
-      goodsName: 高值牙钻机q*iy$
-      goodsSpec: G-31891
-      goodsCode: '00004352'
-      goodsMfrsId: mfrs-11229
-      goodsMfrsName: 德国歌德公司 Geuder AG
+      supplyId: 0f816c0134484a158ea0d09a275c4c0e
+      pkgDefId: 96c4ca2199a14150a1cdabff56136aaf
+      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":"Ph034720240702027666","buyDetailId":"Bh034720240702001150001","planDetailId":"418b068872dd4474a0b38b97e15b1778"}'
+      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004354","purMode":60,"goodsName":"新型冠状病毒检测试剂j(r&Q"}'
+      remark:
+      tbStatus:
+      hosVersion:
      unit: 支
-      subProvId: p1e2e8
-      subProvName: 国药集团公司kGTpV
-      totalAmount: '99.9999'
-      spdGoodsCode: '11661305'
-      barCodeMng: 2
-      erpCode: '11661305'
+      goodsName: 新型冠状病毒检测试剂j(r&Q
+      mfrsId: mfrs-11229
+      mfrsName: 德国歌德公司 Geuder AG
+      goodsGg: G-31891
+      mdmGoodsSpecCode: '11661307'
+      erpCode: '11661307'
+      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: '37120000043540'
      multiChargeFlag: 0
      useFrequency: 1
      chargeUnit:
-      hitCode: '12'
-      hitPrice: '99.999900'
-      diUse:
-      goodsDi: '01123456789012'
+      amount: '9999.9900'
+      unitName: 100支/100
+      subProvId: p1e2e8
+      subProvName: 国药集团公司kGTpV
+      subPrice: 99.9999
+      replPkgQty: 1.0
+      replQty: 100.0
+      ybDefId:
+      logicId:
+      provGoodsId:
+      sendFlag:
+      curQry:
  list_b:
  - *id001
  list_c:

--- a/report/summary.html
+++ b/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'>1分2秒</td>
-            <td class="details-col-elapsed">100.0%</td>
+            <td class='details-col-elapsed'>0</td>
+            <td class='details-col-elapsed'>1分36秒</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_b3流程十请领业务流_二级库向边仓/log.html' target='_blank'>a_b3流程十请领业务流_二级库向边仓</a></td>
-            <td class="success">成功</td>
-            <td class="details-col-elapsed">62.43</td>
+            <td class="details-col-elapsed"><a href='../log/a_b5流程十二请领业务流_二级库向二级库/log.html' target='_blank'>a_b5流程十二请领业务流_二级库向二级库</a></td>
+            <td class="fail">失败</td>
+            <td class="details-col-elapsed">96.703</td>
            <td class="details-col-elapsed">xiaohesheng</td>
        </tr>