脚本优化

0ce97df5 · xiao-hesheng · 88e463c4 · 0ce97df5 · 0ce97df5 · 0ce97df5
Commit 0ce97df5 authored Jul 04, 2024 by xiao-hesheng
--- a/air_case/b5_spd3_core_business_flow/a_b2流程九请领业务流_二级库向中心库.air/a_b2流程九请领业务流_二级库向中心库.py
+++ b/air_case/b5_spd3_core_business_flow/a_b2流程九请领业务流_二级库向中心库.air/a_b2流程九请领业务流_二级库向中心库.py
@@ -399,7 +399,6 @@ try:
    # 设置库区联系人
    set_stockShelf_Linkman()
    # 低值
-
    second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'], 1)
    # 高值
    second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'], 2)

--- a/air_case/b6_spd3_core_business_flow_database_check/a_b2流程九请领业务流_二级库向中心库_数据库验证.air/a_b2流程九请领业务流_二级库向中心库_数据库验证.py
+++ b/air_case/b6_spd3_core_business_flow_database_check/a_b2流程九请领业务流_二级库向中心库_数据库验证.air/a_b2流程九请领业务流_二级库向中心库_数据库验证.py
--- a/data/a2_mdm3_ea/message
+++ b/data/a2_mdm3_ea/message
 企业信息:
-  e_id: CR202407030038
-  cname: 国药集团公司MPah7
+  e_id: CR202407040182
+  cname: 国药集团公司ASrWh
--- a/data/a3_mdm3_hs/message
+++ b/data/a3_mdm3_hs/message
 医院信息:
-  h_id: 湖南省人民医院!^KoE
-  h_name: 湖南省人民医院!^KoE
+  h_id: 湖南省人民医院ejaH9
+  h_name: 湖南省人民医院ejaH9
--- a/data/a5_mdm3_pdm/message2
+++ b/data/a5_mdm3_pdm/message2
 产品审核信息:
-  MSPid: MSP2407030011_1
+  MSPid: MSP2407040052_1
  hosId: h0347
-  hosGoodsId: h034700004382
-  provGoodsid: provGood-99221577
-  goodsAuditBillId: MSP2407030011
-  targetId: MSP2407030011_1
+  hosGoodsId: h034700004436
+  provGoodsid: provGood-99221632
+  goodsAuditBillId: MSP2407040052
+  targetId: MSP2407040052_1
--- a/data/a6_mdm3_si/message
+++ b/data/a6_mdm3_si/message
@@ -2,45 +2,45 @@
  list_a:
  - &id001
    settleMonth: '202407'
-    pid: OBh0347202407030004
-    hosGoodsId: h034700004379
-    goodsCode: '00004379'
-    goodsName: 一次性注射器_低值KBYLs
+    pid: OBh0347202407040010
+    hosGoodsId: h034700004433
+    goodsCode: '00004433'
+    goodsName: 一次性注射器_低值7QT@(
    goodsGg: G-31891
    mfrsName: 德国歌德公司 Geuder AG
    unit: 支
-    leftSettleAmount: 0.0
+    leftSettleAmount: 19999.98
    batchCode:
    kindName:
    factName:
    cacheleftAmount: 19999.98
    purMode: 10
-    waitInvoicingNum: 0.0
+    waitInvoicingNum: 200.0
    invoicingPrice:
    normalContractId:
    normalContract: '1'
    detailList:
-    - pid: OBh0347202407030004
+    - pid: OBh0347202407040010
      settleMonth: '202407'
-      accountDate: '2024-07-03'
-      hosGoodsId: h034700004379
+      accountDate: '2024-07-04'
+      hosGoodsId: h034700004433
      batchCode: '333'
-      distrDetailId: '03839114'
-      distrId: PSh0347202407030002
-      distrOrderNo: PSh0347202407030002
+      distrDetailId: '03839233'
+      distrId: PSh0347202407040093
+      distrOrderNo: PSh0347202407040093
      settlePrice: 99.9999
-      maxSettleQty: -100.0
-      maxSettleAmount: -9999.99
-      curSettleQty: -100.0
-      curSettleAmount: -9999.99
-      leftSettleQty: -100.0
-      leftSettleAmount: -9999.99
+      maxSettleQty: 100.0
+      maxSettleAmount: 9999.99
+      curSettleQty: 100.0
+      curSettleAmount: 9999.99
+      leftSettleQty: 100.0
+      leftSettleAmount: 9999.99
      hosId: h0347
-      provId: p1e2ec
-      branchId: h0347-3714
-      balanceDetId: OBh0347202407030004-000001
+      provId: p1e2fe
+      branchId: h0347-3725
+      balanceDetId: OBh0347202407040010-000001
      purMode: 10
-      barCode: 013714000004379010333112407031725010921UT240703000002
+      barCode: 010112345678901210333112407041725011021UT240704000894
      batchId:
      price:
      maxQty:
@@ -53,15 +53,15 @@
      volumeFlag:
      onlineKind:
      invoicePrice: 99.9999
-      viewId: 202407OBh0347202407030004h034700004379
-    - pid: OBh0347202407030004
+      viewId: 202407OBh0347202407040010h034700004433
+    - pid: OBh0347202407040010
      settleMonth: '202407'
-      accountDate: '2024-07-03'
-      hosGoodsId: h034700004379
+      accountDate: '2024-07-04'
+      hosGoodsId: h034700004433
      batchCode: '333'
-      distrDetailId: '03839114'
-      distrId: PSh0347202407030002
-      distrOrderNo: PSh0347202407030002
+      distrDetailId: '03839233'
+      distrId: PSh0347202407040093
+      distrOrderNo: PSh0347202407040093
      settlePrice: 99.9999
      maxSettleQty: 100.0
      maxSettleAmount: 9999.99
@@ -70,11 +70,11 @@
      leftSettleQty: 100.0
      leftSettleAmount: 9999.99
      hosId: h0347
-      provId: p1e2ec
-      branchId: h0347-3714
-      balanceDetId: OBh0347202407030004-000002
+      provId: p1e2fe
+      branchId: h0347-3725
+      balanceDetId: OBh0347202407040010-000002
      purMode: 10
-      barCode: 013714000004379010333112407031725010921UT240703000025
+      barCode: 010112345678901210333112407041725011021UT240704000916
      batchId:
      price:
      maxQty:
@@ -87,10 +87,10 @@
      volumeFlag:
      onlineKind:
      invoicePrice: 99.9999
-      viewId: 202407OBh0347202407030004h034700004379
-    unique: 202407OBh0347202407030004h034700004379
+      viewId: 202407OBh0347202407040010h034700004433
+    unique: 202407OBh0347202407040010h034700004433
    onlineKind: '10'
-    viewId: 202407OBh0347202407030004h034700004379
+    viewId: 202407OBh0347202407040010h034700004433
  list_b:
  - *id001
  list_c:

--- a/data/b2_herp3_bs/message
+++ b/data/b2_herp3_bs/message
 院区新增:
-  branch_id: h0347-3714
-  branch_name: 东土城路院区QJH)#
+  branch_id: h0347-3725
+  branch_name: 东土城路院区ftZkF
 科室信息:
-  dept2_id: b8cbdc0117e8499cb1ccac00cb6166ca
+  dept2_id: f8324b9a0bff4ed7a43350b91a04426f
  dept2_name: 二级检验科002
--- a/data/b2_herp3_bs/message3
+++ b/data/b2_herp3_bs/message3
 用户名信息:
-  username1: 自动化测试lPIo0
-  username2: 自动化测试lPIo0
+  username1: 自动化测试AZlIj
+  username2: 自动化测试AZlIj
--- a/data/b2_herp3_bs/message4
+++ b/data/b2_herp3_bs/message4
 一级科室信息:
-  dept1_id: 0b61ab7ea9b746a3844426111c5ec6db
+  dept1_id: 3e559b76a8fc42819e9c1370d488cab8
  dept1_name: 设备科001
--- a/data/b2_herp3_bs/message6
+++ b/data/b2_herp3_bs/message6
 所有科室id:
-  deptid1: 0b61ab7ea9b746a3844426111c5ec6db
-  deptid2: b8cbdc0117e8499cb1ccac00cb6166ca
-  deptid3: f10f9bac7ca3421093f6f20e4f71d1ca
-  deptid4: 3e5f25d08e33424288d9d0f223eb3b00
-  deptid5: fe6d1b6f141d4f0490bbaae4fd23de77
+  deptid1: 3e559b76a8fc42819e9c1370d488cab8
+  deptid2: f8324b9a0bff4ed7a43350b91a04426f
+  deptid3: cc17aab4a5b74b14a5168897a9e6d8f3
+  deptid4: 65f9bd02a2104011a8e11754db3a8a48
+  deptid5: 8a687d0771fe40e49568fbfd6c2b3560
 所有科室name:
  deptid1: 设备科001
  deptid2: 二级检验科002

--- a/data/b2_herp3_bs/message7
+++ b/data/b2_herp3_bs/message7
 shelfinfo:
-  shelfid: 8125a0cfb1d74982abbd67e19f2547e8
-  shelfCode: areah03472565
+  shelfid: 2303b7e9bd6c4d49b3791eecea8a6bb5
+  shelfCode: areah03472615
  areaName: 自动化测试
--- a/data/b5_spd3_core_business_flow/message
+++ b/data/b5_spd3_core_business_flow/message
 供货关系申请2:
-  e_corpId: p1e2ec
+  e_corpId: p1e2fe
  h_corpId: h0347
-  e_username: 国药集团公司MPah7
+  e_username: 国药集团公司ASrWh
  h_name: test001
--- a/data/b5_spd3_core_business_flow/message1
+++ b/data/b5_spd3_core_business_flow/message1
 产品审核信息:
-  MSPid: MSP2407030007_1
+  MSPid: MSP2407040048_1
  hosId: h0347
-  hosGoodsId: h034700004378
-  provGoodsid: provGood-99221573
-  goodsAuditBillId: MSP2407030007
-  targetId: MSP2407030007_1
+  hosGoodsId: h034700004432
+  provGoodsid: provGood-99221628
+  goodsAuditBillId: MSP2407040048
+  targetId: MSP2407040048_1
--- a/data/b5_spd3_core_business_flow/message10
+++ b/data/b5_spd3_core_business_flow/message10
 低值配送单号:
-  distrBillId1: PSh0347202407030021
-  distrBillId2: PSh0347202407030021
+  distrBillId1: PSh0347202407040112
+  distrBillId2: PSh0347202407040112
 高值配送单号:
-  distrBillId1: PSh0347202407030022
-  distrBillId2: PSh0347202407030022
+  distrBillId1: PSh0347202407040113
+  distrBillId2: PSh0347202407040113
 试剂配送单号:
-  distrBillId1: PSh0347202407030023
-  distrBillId2: PSh0347202407030023
+  distrBillId1: PSh0347202407040114
+  distrBillId2: PSh0347202407040114
--- a/data/b5_spd3_core_business_flow/message11
+++ b/data/b5_spd3_core_business_flow/message11
 采购计划单号高值:
-  orderNo1: PLAN2024070331116
-  orderNo2: PLAN2024070331116
+  orderNo1: PLAN2024070431307
+  orderNo2: PLAN2024070431307
--- a/data/b5_spd3_core_business_flow/message12
+++ b/data/b5_spd3_core_business_flow/message12
 采购计划单号试剂:
-  orderNo1: PLAN2024070331114
-  orderNo2: PLAN2024070331114
+  orderNo1: PLAN2024070431308
+  orderNo2: PLAN2024070431308
--- a/data/b5_spd3_core_business_flow/message13
+++ b/data/b5_spd3_core_business_flow/message13
@@ -3,27 +3,27 @@
  - &id001
    - id:
      hosId: h0347
-      branchId: h0347-3714
+      branchId: h0347-3725
      deptId:
      taskType: 1
-      sourceOrgId: p1e2ec
-      sourceOrgName: 国药集团公司MPah7
-      sourceOrderNo: PSh0347202407030023
+      sourceOrgId: p1e2fe
+      sourceOrgName: 国药集团公司ASrWh
+      sourceOrderNo: PSh0347202407040114
      billMode: '66'
      stockKind:
      purMode:
-      sourceId: PSh0347202407030023
+      sourceId: PSh0347202407040114
      sourceDetailId:
      sourceType: PSD
      sourceTypeName: 配送单
      sourceVersion: 1
-      planOrderNo: PLAN2024070331114
-      purOrderNo: CG2024070320422
-      recOrgId: b8cbdc0117e8499cb1ccac00cb6166ca
+      planOrderNo: PLAN2024070431308
+      purOrderNo: CG2024070420563
+      recOrgId: f8324b9a0bff4ed7a43350b91a04426f
      recOrgName: 二级检验科002
-      billRelationJson: '{"buyBillId":"Bh03472024070300022","planBillId":"Ph034720240703027759","planOrderNo":"PLAN2024070331114","buyOrderNo":"BUY2024070305586","purOrderNo":"CG2024070320422","purBillId":"Ch034720240703000051","purBillDate":"2024-07-03
-        07:42:40","distrBillId":"PSh0347202407030023","distrOrderNo":"PSh0347202407030023"}'
-      taskDate: '2024-07-03 07:42:58'
+      billRelationJson: '{"buyBillId":"Bh03472024070400147","planBillId":"Ph034720240704027953","planOrderNo":"PLAN2024070431308","buyOrderNo":"BUY2024070405751","purOrderNo":"CG2024070420563","purBillId":"Ch034720240704000140","purBillDate":"2024-07-04
+        12:39:22","distrBillId":"PSh0347202407040114","distrOrderNo":"PSh0347202407040114"}'
+      taskDate: '2024-07-04 12:39:54'
      taskDateStart:
      taskDateEnd:
      billModeList:

--- a/data/b5_spd3_core_business_flow/message14
+++ b/data/b5_spd3_core_business_flow/message14
@@ -3,11 +3,11 @@
  - &id001
    - purMode: 60
      unitName: 100支/100
-      hosGoodsId: h034700004380
+      hosGoodsId: h034700004434
      mdmGoodsCode:
-      spdGoodsCode: '11661333'
-      goodsCode: '00004380'
-      goodsName: 新型冠状病毒检测试剂Gg(sT
+      spdGoodsCode: '11661387'
+      goodsCode: '00004434'
+      goodsName: 新型冠状病毒检测试剂)CVXH
      goodsGg: G-31891
      mfrsId:
      mfrsName: 德国歌德公司 Geuder AG
@@ -22,16 +22,16 @@
      pkgDefName: '100'
      pkgDefQty: 100.0
      batchCode: '4444'
-      expdtDate: '2025-01-09'
-      productDate: '2024-07-03'
-      provName: 国药集团公司MPah7
+      expdtDate: '2025-01-10'
+      productDate: '2024-07-04'
+      provName: 国药集团公司ASrWh
      provId:
-      viewId: '03839135'
+      viewId: '03839254'
      verifyFlag: 0
      hasSterilize: 0
-      id: '03839135'
+      id: '03839254'
      detailRelationJson:
-      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004380","purMode":60,"goodsName":"新型冠状病毒检测试剂Gg(sT","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661333","ybDefId":""}'
+      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004434","purMode":60,"goodsName":"新型冠状病毒检测试剂)CVXH","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661387","ybDefId":""}'
      recTemperature: 20
      recHumidity: 30
      distrPrice: 99.9999

--- a/data/b5_spd3_core_business_flow/message15
+++ b/data/b5_spd3_core_business_flow/message15
 验收单号:
-  CHECK_NO1: CHECKh03472024070300023
-  CHECK_NO2: CHECKh03472024070300023
+  CHECK_NO1: CHECKh03472024070400113
+  CHECK_NO2: CHECKh03472024070400113
--- a/data/b5_spd3_core_business_flow/message16
+++ b/data/b5_spd3_core_business_flow/message16
@@ -5,34 +5,34 @@
      lastModified:
      version:
      createTime:
-      createUser: h0347_UID-051380
+      createUser: h0347_UID-051391
      lastModifiedUser:
-      billMode: '66'
+      billMode: '16'
      recType:
      stockKind:
      purMode:
-      sourceId: DRh034720240703000050
-      sourceType: CK_TK
-      sourceVersion: 1
+      sourceId: CHECKh03472024070400092
+      sourceType: PSD
+      sourceVersion: 0
      batchList:
      billRelationJson:
      hosId: h0347
-      deptId: 0b61ab7ea9b746a3844426111c5ec6db
+      deptId: 3e559b76a8fc42819e9c1370d488cab8
      deptName:
-      branchId: h0347-3714
+      branchId: h0347-3725
      branchName:
-      taskType: 2
-      sourceOrgId: b8cbdc0117e8499cb1ccac00cb6166ca
-      sourceOrgName: 二级检验科002
-      sourceOrderNo: DN20240703000050
-      taskSourceNo: DN20240703000050
-      areaCode:
-      areaName:
+      taskType: 1
+      sourceOrgId: p1e2fe
+      sourceOrgName: 国药集团公司ASrWh
+      sourceOrderNo: YS240704092
+      taskSourceNo: PSh0347202407040093
+      areaCode: areah03472615
+      areaName: 自动化测试
      goodsName:
      goodsGg:
      startDate:
      endDate:
-      taskDate: '2024-07-03 07:55:08'
+      taskDate: '2024-07-04 12:06:38'
      pkgTaskId:
      pkgFlag:
      remark: ''