脚本优化

air_case/b5_spd3_core_business_flow/a_c1流程十八中心库业务_拆包功能.air/a_c1流程十八中心库业务_拆包功能.py

@@ -14,7 +14,7 @@ from airtest.core.api import using
 __author__ = "xiaohesheng"
 
 """
-case_tag:api,spd_core1,a_c1流程十八中心库业务_拆包功能,id2302,id2302-21,sit,on
+case_tag:api,spd_core,a_c1流程十八中心库业务_拆包功能,id2302,id2302-21,sit,on
 核心业务流:a_c1流程十八中心库业务_拆包功能
 python runner_test.py tag id2302-21 debug mdm3
 """

data/a2_mdm3_ea/message

 企业信息:
-  e_id: CR202407050389
-  cname: 国药集团公司u9Dtn
+  e_id: CR202407080038
+  cname: 国药集团公司^n1@F

data/a3_mdm3_hs/message

 医院信息:
-  h_id: 湖南省人民医院IMFSr
-  h_name: 湖南省人民医院IMFSr
+  h_id: 湖南省人民医院1b&Ew
+  h_name: 湖南省人民医院1b&Ew

data/a5_mdm3_pdm/message2

 产品审核信息:
-  MSPid: MSP2407050029_1
+  MSPid: MSP2407080011_1
   hosId: h0347
-  hosGoodsId: h034700004465
-  provGoodsid: provGood-99221661
-  goodsAuditBillId: MSP2407050029
-  targetId: MSP2407050029_1
+  hosGoodsId: h034700004503
+  provGoodsid: provGood-99221699
+  goodsAuditBillId: MSP2407080011
+  targetId: MSP2407080011_1

data/a6_mdm3_si/message

@@ -2,10 +2,10 @@
   list_a:
   - &id001
     settleMonth: '202407'
-    pid: OBh0347202407050007
-    hosGoodsId: h034700004462
-    goodsCode: '00004462'
-    goodsName: 一次性注射器_低值C2g9i
+    pid: OBh0347202407080004
+    hosGoodsId: h034700004500
+    goodsCode: '00004500'
+    goodsName: 一次性注射器_低值wExpg
     goodsGg: G-31891
     mfrsName: 德国歌德公司 Geuder AG
     unit: 支
@@ -20,14 +20,14 @@
     normalContractId:
     normalContract: '1'
     detailList:
-    - pid: OBh0347202407050007
+    - pid: OBh0347202407080004
       settleMonth: '202407'
-      accountDate: '2024-07-05'
-      hosGoodsId: h034700004462
+      accountDate: '2024-07-08'
+      hosGoodsId: h034700004500
       batchCode: '333'
-      distrDetailId: '03839280'
-      distrId: PSh0347202407050026
-      distrOrderNo: PSh0347202407050026
+      distrDetailId: '03839343'
+      distrId: PSh0347202407080002
+      distrOrderNo: PSh0347202407080002
       settlePrice: 99.9999
       maxSettleQty: -100.0
       maxSettleAmount: -9999.99
@@ -36,11 +36,11 @@
       leftSettleQty: -100.0
       leftSettleAmount: -9999.99
       hosId: h0347
-      provId: p1e31d
-      branchId: h0347-3729
-      balanceDetId: OBh0347202407050007-000001
+      provId: p1e32e
+      branchId: h0347-3736
+      balanceDetId: OBh0347202407080004-000001
       purMode: 10
-      barCode: 010112345678901210333112407051725011121UT240705000214
+      barCode: 010112345678901210333112407081725011421UT240708000002
       batchId:
       price:
       maxQty:
@@ -53,15 +53,15 @@
       volumeFlag:
       onlineKind:
       invoicePrice: 99.9999
-      viewId: 202407OBh0347202407050007h034700004462
-    - pid: OBh0347202407050007
+      viewId: 202407OBh0347202407080004h034700004500
+    - pid: OBh0347202407080004
       settleMonth: '202407'
-      accountDate: '2024-07-05'
-      hosGoodsId: h034700004462
+      accountDate: '2024-07-08'
+      hosGoodsId: h034700004500
       batchCode: '333'
-      distrDetailId: '03839280'
-      distrId: PSh0347202407050026
-      distrOrderNo: PSh0347202407050026
+      distrDetailId: '03839343'
+      distrId: PSh0347202407080002
+      distrOrderNo: PSh0347202407080002
       settlePrice: 99.9999
       maxSettleQty: 100.0
       maxSettleAmount: 9999.99
@@ -70,11 +70,11 @@
       leftSettleQty: 100.0
       leftSettleAmount: 9999.99
       hosId: h0347
-      provId: p1e31d
-      branchId: h0347-3729
-      balanceDetId: OBh0347202407050007-000002
+      provId: p1e32e
+      branchId: h0347-3736
+      balanceDetId: OBh0347202407080004-000002
       purMode: 10
-      barCode: 010112345678901210333112407051725011121UT240705000251
+      barCode: 010112345678901210333112407081725011421UT240708000035
       batchId:
       price:
       maxQty:
@@ -87,10 +87,10 @@
       volumeFlag:
       onlineKind:
       invoicePrice: 99.9999
-      viewId: 202407OBh0347202407050007h034700004462
-    unique: 202407OBh0347202407050007h034700004462
+      viewId: 202407OBh0347202407080004h034700004500
+    unique: 202407OBh0347202407080004h034700004500
     onlineKind: '10'
-    viewId: 202407OBh0347202407050007h034700004462
+    viewId: 202407OBh0347202407080004h034700004500
   list_b:
   - *id001
   list_c:

data/b2_herp3_bs/message

 院区新增:
-  branch_id: h0347-3729
-  branch_name: 东土城路院区)Gl$!
+  branch_id: h0347-3736
+  branch_name: 东土城路院区IjnkG
 科室信息:
-  dept2_id: 232328e5ceb44b799efba96c512618bf
+  dept2_id: b3e6c5f2887148389f8535862f789f0a
   dept2_name: 二级检验科002

data/b2_herp3_bs/message3

 用户名信息:
-  username1: 自动化测试pwnfB
-  username2: 自动化测试pwnfB
+  username1: 自动化测试xgQKu
+  username2: 自动化测试xgQKu

data/b2_herp3_bs/message4

 一级科室信息:
-  dept1_id: d5e1acc8708f47a7b152e103204ee4cb
+  dept1_id: a762aa0aa2df47dbac4a96173a89e85d
   dept1_name: 设备科001

data/b2_herp3_bs/message6

 所有科室id:
-  deptid1: d5e1acc8708f47a7b152e103204ee4cb
-  deptid2: 232328e5ceb44b799efba96c512618bf
-  deptid3: eefab2fb6d6e423da8e3df5e433a01a5
-  deptid4: 6cea679813db435099a2a3c0bcf1de0e
-  deptid5: feca3d1dcffb49ddba9052d401e60d8f
+  deptid1: a762aa0aa2df47dbac4a96173a89e85d
+  deptid2: b3e6c5f2887148389f8535862f789f0a
+  deptid3: b011a25d37e248d1aa1c94d01bb59466
+  deptid4: 096ad30186f448778c685c7d68c5bfe3
+  deptid5: b316f3f5225a45949077163a47655ad5
 所有科室name:
   deptid1: 设备科001
   deptid2: 二级检验科002

data/b2_herp3_bs/message7

 shelfinfo:
-  shelfid: 3b42810b4b854af5a2a95f104a2d7b6b
-  shelfCode: areah03472634
+  shelfid: 8bf86ca088f440c1874c09528445cf44
+  shelfCode: areah03472677
   areaName: 自动化测试

data/b5_spd3_core_business_flow/message

 供货关系申请2:
-  e_corpId: p1e31d
+  e_corpId: p1e32e
   h_corpId: h0347
-  e_username: 国药集团公司GxzLS
+  e_username: 国药集团公司^n1@F
   h_name: test001

data/b5_spd3_core_business_flow/message1

 产品审核信息:
-  MSPid: MSP2407050025_1
+  MSPid: MSP2407080007_1
   hosId: h0347
-  hosGoodsId: h034700004461
-  provGoodsid: provGood-99221657
-  goodsAuditBillId: MSP2407050025
-  targetId: MSP2407050025_1
+  hosGoodsId: h034700004499
+  provGoodsid: provGood-99221695
+  goodsAuditBillId: MSP2407080007
+  targetId: MSP2407080007_1

data/b5_spd3_core_business_flow/message10

 低值配送单号:
-  distrBillId1: PSh0347202407050063
-  distrBillId2: PSh0347202407050063
+  distrBillId1: PSh0347202407080002
+  distrBillId2: PSh0347202407080002
 高值配送单号:
-  distrBillId1: PSh0347202407050064
-  distrBillId2: PSh0347202407050064
+  distrBillId1: PSh0347202407080003
+  distrBillId2: PSh0347202407080003
 试剂配送单号:
-  distrBillId1: PSh0347202407050065
-  distrBillId2: PSh0347202407050065
+  distrBillId1: PSh0347202407080004
+  distrBillId2: PSh0347202407080004
+高值跟台配送单号:
+  distrBillId1: PSh0347202407080005
+  distrBillId2: PSh0347202407080005

data/b5_spd3_core_business_flow/message11

 采购计划单号高值:
-  orderNo1: PLAN2024070531447
-  orderNo2: PLAN2024070531447
+  orderNo1: PLAN2024070831693
+  orderNo2: PLAN2024070831693

data/b5_spd3_core_business_flow/message12

 采购计划单号试剂:
-  orderNo1: PLAN2024070531449
-  orderNo2: PLAN2024070531449
+  orderNo1: PLAN2024070831694
+  orderNo2: PLAN2024070831694

data/b5_spd3_core_business_flow/message13

@@ -3,34 +3,33 @@
   - &id001
     - id:
       hosId: h0347
-      branchId: h0347-3729
+      branchId: h0347-3736
       deptId:
       taskType: 1
-      sourceOrgId: p1e31d
-      sourceOrgName: 国药集团公司GxzLS
-      sourceOrderNo: PSh0347202407050065
-      billMode: '66'
+      sourceOrgId: p1e32e
+      sourceOrgName: 国药集团公司^n1@F
+      sourceOrderNo: PSh0347202407080005
+      billMode: '25'
       stockKind:
       purMode:
-      sourceId: PSh0347202407050065
+      sourceId: PSh0347202407080005
       sourceDetailId:
       sourceType: PSD
       sourceTypeName: 配送单
       sourceVersion: 1
-      planOrderNo: PLAN2024070531449
-      purOrderNo: CG2024070520656
-      recOrgId: 232328e5ceb44b799efba96c512618bf
+      planOrderNo: SSSQ202407080331
+      purOrderNo: SSTZ202407080307
+      recOrgId: b3e6c5f2887148389f8535862f789f0a
       recOrgName: 二级检验科002
-      billRelationJson: '{"buyBillId":"Bh03472024070500093","planBillId":"Ph034720240705028094","planOrderNo":"PLAN2024070531449","buyOrderNo":"BUY2024070505892","purOrderNo":"CG2024070520656","purBillId":"Ch034720240705000091","purBillDate":"2024-07-05
-        12:24:49","distrBillId":"PSh0347202407050065","distrOrderNo":"PSh0347202407050065"}'
-      taskDate: '2024-07-05 12:25:21'
+      billRelationJson: '{"operationApplyOrderNo":"SSSQ202407080331","operationNoticeBillId":"Nh034720240708000001","distrBillId":"PSh0347202407080005","operationNoticeOrderNo":"SSTZ202407080307","distrOrderNo":"PSh0347202407080005","operationApplyBillId":"Oh034720240708000001"}'
+      taskDate: '2024-07-08 05:14:18'
       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: h034700004463
+    - purMode: 20
+      unitName: 1支
+      hosGoodsId: h034700004499
       mdmGoodsCode:
-      spdGoodsCode: '11661416'
-      goodsCode: '00004463'
-      goodsName: 新型冠状病毒检测试剂a7oLM
+      spdGoodsCode: '11661452'
+      goodsCode: '00004499'
+      goodsName: 高值牙钻机PFKHm
       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: '2025-01-11'
-      productDate: '2024-07-05'
-      provName: 国药集团公司GxzLS
+      pkgDefName:
+      pkgDefQty: 1.0
+      batchCode: '2222'
+      expdtDate: '2025-01-14'
+      productDate: '2024-07-08'
+      provName: 国药集团公司^n1@F
       provId:
-      viewId: '03839319'
+      viewId: '03839346'
       verifyFlag: 0
       hasSterilize: 0
-      id: '03839319'
+      id: '03839346'
       detailRelationJson:
-      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004463","purMode":60,"goodsName":"新型冠状病毒检测试剂a7oLM","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661416","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: CHECKh03472024070500070
-  CHECK_NO2: CHECKh03472024070500070
+  CHECK_NO1: CHECKh03472024070800005
+  CHECK_NO2: CHECKh03472024070800005

data/b5_spd3_core_business_flow/message16

@@ -5,34 +5,34 @@
       lastModified:
       version:
       createTime:
-      createUser: h0347_UID-051395
+      createUser: h0347_UID-051402
       lastModifiedUser:
-      billMode: '66'
+      billMode: '16'
       recType:
       stockKind:
       purMode:
-      sourceId: DRh034720240705000171
-      sourceType: CK_TK
-      sourceVersion: 1
+      sourceId: CHECKh03472024070800002
+      sourceType: PSD
+      sourceVersion: 0
       batchList:
       billRelationJson:
       hosId: h0347
-      deptId: d5e1acc8708f47a7b152e103204ee4cb
+      deptId: a762aa0aa2df47dbac4a96173a89e85d
       deptName:
-      branchId: h0347-3729
+      branchId: h0347-3736
       branchName:
-      taskType: 2
-      sourceOrgId: 232328e5ceb44b799efba96c512618bf
-      sourceOrgName: 二级检验科002
-      sourceOrderNo: DN20240705000171
-      taskSourceNo: DN20240705000171
-      areaCode:
-      areaName:
+      taskType: 1
+      sourceOrgId: p1e32e
+      sourceOrgName: 国药集团公司^n1@F
+      sourceOrderNo: YS240708002
+      taskSourceNo: PSh0347202407080002
+      areaCode: areah03472677
+      areaName: 自动化测试
       goodsName:
       goodsGg:
       startDate:
       endDate:
-      taskDate: '2024-07-05 15:48:53'
+      taskDate: '2024-07-08 05:07:01'
       pkgTaskId:
       pkgFlag:
       remark: ''

data/b5_spd3_core_business_flow/message17

 验收单库存详情信息:
   list_a:
   - &id001
-    - id: DRh0347202407050001710001
+    - id: CHECKh034720240708000020001
       lastModified:
       version:
       createTime:
       createUser:
       lastModifiedUser:
       rowIdx:
-      purMode: 60
+      purMode: 10
       unitName: 100支/100
-      pid: DRh034720240705000171
-      hosGoodsId: h034700004463
-      batchCode: '4444'
-      expdtDate: '2025-01-11'
-      productDate: '2024-07-05'
+      pid: CHECKh03472024070800002
+      hosGoodsId: h034700004500
+      batchCode: '333'
+      expdtDate: '2025-01-14'
+      productDate: '2024-07-08'
       batchPrice: 99.9999
       settlement: 1
-      batchType: 40
-      srcBatchId: Ph034724070500050
+      batchType: 20
+      srcBatchId: '03839343'
       srcBatchPrice: 99.9999
-      shelfCode: areah03472634-2-01-01
+      shelfCode: areah03472677-2-01-01
       shelfKind:
-      barcodeId: UT240705000418
+      barcodeId: UT240708000001
       subBarcodeId:
-      qty: 100.0
-      pkgQty: 1
-      distrId: PSh0347202407050038
-      distrDetailId: '03839292'
-      pkgDefQty:
-      pkgDefName:
-      viewId: h03470000446344442025-01-11100支/100
+      qty: 10000.0
+      pkgQty: 100
+      distrId: PSh0347202407080002
+      distrDetailId: '03839343'
+      pkgDefQty: 100.0
+      pkgDefName: '100'
+      viewId: h0347000045003332025-01-14100支/100
       codingType:
       batchFlag:
       hasSterilize: 0
@@ -38,60 +38,53 @@
       sterilizePassQty:
       sterilizeRejectQty:
       orderNo:
-      sourceDetailId: PICKh03472407050093660001
-      mdmGoodsCode: '11661416'
-      goodsCode: '00004463'
-      tbStatus:
-      billMode:
-      hosId:
-      branchId:
-      purBillId: Ch034720240705000064
-      provId: p1e31d
-      provName:
-      subProvId: p1e31d
-      purDetailId:
-      goodsName: 新型冠状病毒检测试剂a7oLM
+      sourceDetailId: '03839343'
+      mdmGoodsCode: '11661453'
+      goodsCode: '00004500'
+      tbStatus: 1
+      billMode: '16'
+      hosId: h0347
+      branchId: h0347-3736
+      purBillId: Ch034720240708000031
+      provId: p1e32e
+      provName: 国药集团公司^n1@F
+      subSendFlag: 10
+      exeProvId: p1e32e
+      exeProvName: 国药集团公司^n1@F
+      purDetailId: ce7f4604ecc3425fa637428e165eed27
+      goodsName: 一次性注射器_低值wExpg
       goodsGg: G-31891
       mfrsId: mfrs-11229
       mfrsName: 德国歌德公司 Geuder AG
       made: 德国
       unit: 支
-      sourceBatchId: Ph034724070500050
-      targetBatchId: Ph034724070500050
-      pkgDefId:
+      purPrice: 99.9999
+      pkgDefId: 34b26233759a4720920cc8328dd1f8d1
+      supplyId: 7be89fe4c5ee4689a5e249d3197b9947
+      subProvId: p1e32e
+      subProvName: 国药集团公司^n1@F
+      subPrice: 99.9999
+      distrPrice: 99.9999
+      distrPkgQty: 100.0
+      distrQty: 10000.0
       certificateCode: ''
       productCertCode:
+      detailRelationJson:
       extInfo:
       psiPrice: 99.9999
       ext:
         goodsGg: G-31891
-        goodsCode: '00004463'
-        purMode: 60
-        goodsName: 新型冠状病毒检测试剂a7oLM
+        goodsCode: '00004500'
+        purMode: 10
+        goodsName: 一次性注射器_低值wExpg
         ygptCode: ''
         transCond: ''
         storageCond: ''
-        erpCode: '11661416'
+        erpCode: '11661453'
         ybDefId: ''
-        contractId: ''
-        normalContractId: ''
-        fcatId: ''
-        fcatName: ''
-        goodsKindId: ''
-        goodsKindName: ''
-        miTwentysevenCode: ''
-        focus_control: '0'
-        focus_control_type:
-      rtnQty:
-      hisChargeNo:
+      purTaskId:
+      multiChargeFlag:
       trustMrfsName:
-      pkgCodeSee:
-      chargeFlag:
-      stockKind: CK_TK
-      sourceDeptId: 232328e5ceb44b799efba96c512618bf
-      targetDeptId: d5e1acc8708f47a7b152e103204ee4cb
-      ableDelFlag:
-      pickType: KS_TK
   list_b:
   - *id001
   list_c: