20240618外网在配送的时候增加了DI验证，加入维护di的脚本

air_case/b5_spd3_core_business_flow/a_a3_流程三_产品导入和审批.air/a_a3_流程三_产品导入和审批.py

@@ -393,7 +393,7 @@ try:
     #20240618外网在配送的时候增加了DI验证，加入维护di的脚本
     supplyProvHosGoods_add_DI()
     # ==============分割线 暂时注释===============
-    commonFuc().check_text_exist_result_text('succeed', 'succeed')
+    commonFuc().check_text_exist_result_text('succees', 'succees')
 except:
     print('新增产品信息出现异常,后续的脚本必然无法走通,需要检查程序或者脚本或者环境是否出现问题')
     commonFuc().check_text_exist_result_text('产品新增失败', '产品新增成功')

data/a2_mdm3_ea/message

 企业信息:
-  e_id: CR202406170038
-  cname: 国药集团公司AKO54
+  e_id: CR202406180076
+  cname: 国药集团公司gFOwi

data/a3_mdm3_hs/message

 医院信息:
-  h_id: 湖南省人民医院HRwjx
-  h_name: 湖南省人民医院HRwjx
+  h_id: 湖南省人民医院GF(j)
+  h_name: 湖南省人民医院GF(j)

data/a5_mdm3_pdm/message2

 产品审核信息:
-  MSPid: MSP2406170011_1
+  MSPid: MSP2406180021_1
   hosId: h0347
-  hosGoodsId: h034700004152
-  provGoodsid: provGood-99221340
-  goodsAuditBillId: MSP2406170011
-  targetId: MSP2406170011_1
+  hosGoodsId: h034700004173
+  provGoodsid: provGood-99221361
+  goodsAuditBillId: MSP2406180021
+  targetId: MSP2406180021_1

data/a6_mdm3_si/message

@@ -2,10 +2,10 @@
   list_a:
   - &id001
     settleMonth: '202407'
-    pid: OBh0347202406170004
-    hosGoodsId: h034700004149
-    goodsCode: '00004149'
-    goodsName: 一次性注射器_低值RO^f5
+    pid: OBh0347202406180005
+    hosGoodsId: h034700004170
+    goodsCode: '00004170'
+    goodsName: 一次性注射器_低值D4tGq
     goodsGg: G-31891
     mfrsName: 德国歌德公司 Geuder AG
     unit: 支
@@ -20,13 +20,14 @@
     normalContractId:
     normalContract: '1'
     detailList:
-    - pid: OBh0347202406170004
+    - pid: OBh0347202406180005
       settleMonth: '202407'
-      hosGoodsId: h034700004149
+      accountDate: '2024-06-18'
+      hosGoodsId: h034700004170
       batchCode: '333'
-      distrDetailId: '03838516'
-      distrId: PSh0347202406170005
-      distrOrderNo: PSh0347202406170005
+      distrDetailId: '03838557'
+      distrId: PSh0347202406180020
+      distrOrderNo: PSh0347202406180020
       settlePrice: 99.9999
       maxSettleQty: -100.0
       maxSettleAmount: -9999.99
@@ -35,11 +36,11 @@
       leftSettleQty: -100.0
       leftSettleAmount: -9999.99
       hosId: h0347
-      provId: p1e2a2
-      branchId: h0347-3677
-      balanceDetId: OBh0347202406170004-000001
+      provId: p1e2aa
+      branchId: h0347-3681
+      balanceDetId: OBh0347202406180005-000001
       purMode: 10
-      barCode: 013677000004149010333112406171724122421UT240617000202
+      barCode: 013681000004170010333112406181724122521UT240618000802
       batchId:
       price:
       maxQty:
@@ -52,14 +53,15 @@
       volumeFlag:
       onlineKind:
       invoicePrice: 99.9999
-      viewId: 202407OBh0347202406170004h034700004149
-    - pid: OBh0347202406170004
+      viewId: 202407OBh0347202406180005h034700004170
+    - pid: OBh0347202406180005
       settleMonth: '202407'
-      hosGoodsId: h034700004149
+      accountDate: '2024-06-18'
+      hosGoodsId: h034700004170
       batchCode: '333'
-      distrDetailId: '03838516'
-      distrId: PSh0347202406170005
-      distrOrderNo: PSh0347202406170005
+      distrDetailId: '03838557'
+      distrId: PSh0347202406180020
+      distrOrderNo: PSh0347202406180020
       settlePrice: 99.9999
       maxSettleQty: 100.0
       maxSettleAmount: 9999.99
@@ -68,11 +70,11 @@
       leftSettleQty: 100.0
       leftSettleAmount: 9999.99
       hosId: h0347
-      provId: p1e2a2
-      branchId: h0347-3677
-      balanceDetId: OBh0347202406170004-000002
+      provId: p1e2aa
+      branchId: h0347-3681
+      balanceDetId: OBh0347202406180005-000002
       purMode: 10
-      barCode: 013677000004149010333112406171724122421UT240617000243
+      barCode: 013681000004170010333112406181724122521UT240618000846
       batchId:
       price:
       maxQty:
@@ -85,10 +87,10 @@
       volumeFlag:
       onlineKind:
       invoicePrice: 99.9999
-      viewId: 202407OBh0347202406170004h034700004149
-    unique: 202407OBh0347202406170004h034700004149
+      viewId: 202407OBh0347202406180005h034700004170
+    unique: 202407OBh0347202406180005h034700004170
     onlineKind: '10'
-    viewId: 202407OBh0347202406170004h034700004149
+    viewId: 202407OBh0347202406180005h034700004170
   list_b:
   - *id001
   list_c:

data/b2_herp3_bs/message

 院区新增:
-  branch_id: h0347-3677
-  branch_name: 东土城路院区Y4EjC
+  branch_id: h0347-3681
+  branch_name: 东土城路院区!IhMl
 科室信息:
-  dept2_id: 93e0ba6cbd5b4fefabbfdf16d67d9c5c
+  dept2_id: 841867446f2943f98fc5e32eb3d096a4
   dept2_name: 二级检验科002

data/b2_herp3_bs/message3

 用户名信息:
-  username1: 自动化测试1EWs4
-  username2: 自动化测试1EWs4
+  username1: 自动化测试8M)(@
+  username2: 自动化测试8M)(@

data/b2_herp3_bs/message4

 一级科室信息:
-  dept1_id: d4f47a79620b4b4e8a797ce80d9d9b02
+  dept1_id: fc63d8b32f764950916d8ebd54cfb292
   dept1_name: 设备科001

data/b2_herp3_bs/message5

 部门和库区信息:
-  dept1_id: d4f47a79620b4b4e8a797ce80d9d9b02
-  stockAreaId: 77f668239c8f4d8eac3623a2607d24ad
+  dept1_id: fc63d8b32f764950916d8ebd54cfb292
+  stockAreaId: 748ea274a2cd4f1e809dc34eaf6f71df

data/b2_herp3_bs/message6

 所有科室id:
-  deptid1: d4f47a79620b4b4e8a797ce80d9d9b02
-  deptid2: 93e0ba6cbd5b4fefabbfdf16d67d9c5c
-  deptid3: 05296212d9a947e6bac56b79ff8b0fc4
-  deptid4: 6d973e90b8ea457a8870c91548b47d6d
-  deptid5: 753cbb636cb243c896e8a921074d0436
+  deptid1: fc63d8b32f764950916d8ebd54cfb292
+  deptid2: 841867446f2943f98fc5e32eb3d096a4
+  deptid3: ec3821ff59384808871a2a10458b564b
+  deptid4: 3e3d90abd5744f59b3f8a747df56bdd0
+  deptid5: 34fc2c77ac44430382834b2282846ede
 所有科室name:
   deptid1: 设备科001
   deptid2: 二级检验科002

data/b2_herp3_bs/message7

 shelfinfo:
-  shelfid: 77f668239c8f4d8eac3623a2607d24ad
-  shelfCode: areah03472355
+  shelfid: 748ea274a2cd4f1e809dc34eaf6f71df
+  shelfCode: areah03472376
   areaName: 自动化测试

data/b5_spd3_core_business_flow/message

 供货关系申请2:
-  e_corpId: p1e2a2
+  e_corpId: p1e2aa
   h_corpId: h0347
-  e_username: 国药集团公司7X@tw
+  e_username: 国药集团公司gFOwi
   h_name: test001

data/b5_spd3_core_business_flow/message1

 产品审核信息:
-  MSPid: MSP2406170007_1
+  MSPid: MSP2406180017_1
   hosId: h0347
-  hosGoodsId: h034700004148
-  provGoodsid: provGood-99221336
-  goodsAuditBillId: MSP2406170007
-  targetId: MSP2406170007_1
+  hosGoodsId: h034700004169
+  provGoodsid: provGood-99221357
+  goodsAuditBillId: MSP2406180017
+  targetId: MSP2406180017_1

data/b5_spd3_core_business_flow/message10

 低值配送单号:
-  distrBillId1: PSh0347202406170021
-  distrBillId2: PSh0347202406170021
+  distrBillId1: PSh0347202406180036
+  distrBillId2: PSh0347202406180036
 高值配送单号:
-  distrBillId1: PSh0347202406170022
-  distrBillId2: PSh0347202406170022
+  distrBillId1: PSh0347202406180037
+  distrBillId2: PSh0347202406180037
 试剂配送单号:
-  distrBillId1: PSh0347202406170023
-  distrBillId2: PSh0347202406170023
+  distrBillId1: PSh0347202406180038
+  distrBillId2: PSh0347202406180038

data/b5_spd3_core_business_flow/message11

 采购计划单号高值:
-  orderNo1: PLAN2024061728987
-  orderNo2: PLAN2024061728987
+  orderNo1: PLAN2024061829162
+  orderNo2: PLAN2024061829162

data/b5_spd3_core_business_flow/message12

 采购计划单号试剂:
-  orderNo1: PLAN2024061728989
-  orderNo2: PLAN2024061728989
+  orderNo1: PLAN2024061829164
+  orderNo2: PLAN2024061829164

data/b5_spd3_core_business_flow/message13

@@ -3,27 +3,27 @@
   - &id001
     - id:
       hosId: h0347
-      branchId: h0347-3677
+      branchId: h0347-3681
       deptId:
       taskType: 1
-      sourceOrgId: p1e2a2
-      sourceOrgName: 国药集团公司7X@tw
-      sourceOrderNo: PSh0347202406170023
+      sourceOrgId: p1e2aa
+      sourceOrgName: 国药集团公司gFOwi
+      sourceOrderNo: PSh0347202406180038
       billMode: '66'
       stockKind:
       purMode:
-      sourceId: PSh0347202406170023
+      sourceId: PSh0347202406180038
       sourceDetailId:
       sourceType: PSD
       sourceTypeName: 配送单
       sourceVersion: 1
-      planOrderNo: PLAN2024061728989
-      purOrderNo: CG2024061718990
-      recOrgId: 93e0ba6cbd5b4fefabbfdf16d67d9c5c
+      planOrderNo: PLAN2024061829164
+      purOrderNo: CG2024061819122
+      recOrgId: 841867446f2943f98fc5e32eb3d096a4
       recOrgName: 二级检验科002
-      billRelationJson: '{"buyBillId":"Bh03472024061700015","planBillId":"Ph034720240617025634","planOrderNo":"PLAN2024061728989","buyOrderNo":"BUY2024061705078","purOrderNo":"CG2024061718990","purBillId":"Ch034720240617000081","purBillDate":"2024-06-17
-        07:42:59","distrBillId":"PSh0347202406170023","distrOrderNo":"PSh0347202406170023"}'
-      taskDate: '2024-06-17 07:43:57'
+      billRelationJson: '{"buyBillId":"Bh03472024061800015","planBillId":"Ph034720240618025809","planOrderNo":"PLAN2024061829164","buyOrderNo":"BUY2024061805110","purOrderNo":"CG2024061819122","purBillId":"Ch034720240618000120","purBillDate":"2024-06-18
+        10:44:44","distrBillId":"PSh0347202406180038","distrOrderNo":"PSh0347202406180038"}'
+      taskDate: '2024-06-18 10:45:24'
       taskDateStart:
       taskDateEnd:
       billModeList:

data/b5_spd3_core_business_flow/message14

@@ -3,17 +3,17 @@
   - &id001
     - purMode: 60
       unitName: 100支/100
-      hosGoodsId: h034700004150
+      hosGoodsId: h034700004171
       mdmGoodsCode:
-      spdGoodsCode: '11661099'
-      goodsCode: '00004150'
-      goodsName: 新型冠状病毒检测试剂(xFLb
+      spdGoodsCode: '11661120'
+      goodsCode: '00004171'
+      goodsName: 新型冠状病毒检测试剂IkfpG
       goodsGg: G-31891
       mfrsId:
       mfrsName: 德国歌德公司 Geuder AG
       made:
       unit: 支
-      goodsDi:
+      goodsDi: '01123456789012'
       miCode:
       miDjmc:
       certificateCode: ''
@@ -22,16 +22,16 @@
       pkgDefName: '100'
       pkgDefQty: 100.0
       batchCode: '4444'
-      expdtDate: '2024-12-24'
-      productDate: '2024-06-17'
-      provName: 国药集团公司7X@tw
+      expdtDate: '2024-12-25'
+      productDate: '2024-06-18'
+      provName: 国药集团公司gFOwi
       provId:
-      viewId: '03838534'
+      viewId: '03838575'
       verifyFlag: 0
       hasSterilize: 0
-      id: '03838534'
+      id: '03838575'
       detailRelationJson:
-      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004150","purMode":60,"goodsName":"新型冠状病毒检测试剂(xFLb","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661099","ybDefId":""}'
+      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004171","purMode":60,"goodsName":"新型冠状病毒检测试剂IkfpG","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661120","ybDefId":""}'
       recTemperature: 20
       recHumidity: 30
       distrPrice: 99.9999

data/b5_spd3_core_business_flow/message15

 验收单号:
-  CHECK_NO1: CHECKh03472024061700014
-  CHECK_NO2: CHECKh03472024061700014
+  CHECK_NO1: CHECKh03472024061800016
+  CHECK_NO2: CHECKh03472024061800016

data/b5_spd3_core_business_flow/message16

@@ -5,34 +5,34 @@
       lastModified:
       version:
       createTime:
-      createUser: h0347_UID-051341
+      createUser: h0347_UID-051346
       lastModifiedUser:
       billMode: '16'
       recType:
       stockKind:
       purMode:
-      sourceId: CHECKh03472024061700002
+      sourceId: CHECKh03472024061800004
       sourceType: PSD
       sourceVersion: 0
       batchList:
       billRelationJson:
       hosId: h0347
-      deptId: d4f47a79620b4b4e8a797ce80d9d9b02
+      deptId: fc63d8b32f764950916d8ebd54cfb292
       deptName:
-      branchId: h0347-3677
+      branchId: h0347-3681
       branchName:
       taskType: 1
-      sourceOrgId: p1e2a2
-      sourceOrgName: 国药集团公司7X@tw
-      sourceOrderNo: YS240617002
-      taskSourceNo: PSh0347202406170005
-      areaCode: areah03472355
+      sourceOrgId: p1e2aa
+      sourceOrgName: 国药集团公司gFOwi
+      sourceOrderNo: YS240618004
+      taskSourceNo: PSh0347202406180020
+      areaCode: areah03472376
       areaName: 自动化测试
       goodsName:
       goodsGg:
       startDate:
       endDate:
-      taskDate: '2024-06-17 07:12:13'
+      taskDate: '2024-06-18 10:16:19'
       pkgTaskId:
       pkgFlag:
       remark: ''