脚本优化

air_case/b5_spd3_core_business_flow/a_b4流程十一请领业务流_二级库向直送.air/a_b4流程十一请领业务流_二级库向直送.py

@@ -819,7 +819,7 @@ try:
     # 从下面开始,上面的暂时注释
     goods_move2()  # 设置产品出库渠道为直送
     updateUserLoginDefaultRange(get_listUserMgrRangePage(2))  # 设置登录账号默认权限是二级库
-    for i in range(3):
+    for i in range(6):
         # # 低值
         second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'], 1)
         # # 高值

air_case/b5_spd3_core_business_flow/a_b9流程十六退库业务_二级库向一级库退库.air/a_b9流程十六退库业务_二级库向一级库退库.py

@@ -244,8 +244,10 @@ def second_dept_return_Out_Stock(type):  # 二级库退库出库
         extInfo = commonFuc().analysis_json('extInfo', list_a)
         print('extInfo', extInfo)
         # inStockTime = commonFuc().analysis_json('inStockTime', extInfo)
-        inStockTime = reGetString(extInfo, r'inStockTime": "', r'",')
+        inStockTime = reGetString(extInfo, r'inStockTime": "', r'", "')
         print('inStockTime', inStockTime)
+        # import pdb
+        # pdb.set_trace()
         # 从message18文件中获取信息
         url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
                                                                                  "dept_stock_out_submit_url")

data/a2_mdm3_ea/message

 企业信息:
-  e_id: CR202406280038
-  cname: 国药集团公司HcKed
+  e_id: CR202407010038
+  cname: 国药集团公司fehK^

data/a3_mdm3_hs/message

 医院信息:
-  h_id: 湖南省人民医院wlTDM
-  h_name: 湖南省人民医院wlTDM
+  h_id: 湖南省人民医院Al7n0
+  h_name: 湖南省人民医院Al7n0

data/a5_mdm3_pdm/message2

 产品审核信息:
-  MSPid: MSP2406280011_1
+  MSPid: MSP2407010011_1
   hosId: h0347
-  hosGoodsId: h034700004302
-  provGoodsid: provGood-99221495
-  goodsAuditBillId: MSP2406280011
-  targetId: MSP2406280011_1
+  hosGoodsId: h034700004335
+  provGoodsid: provGood-99221528
+  goodsAuditBillId: MSP2407010011
+  targetId: MSP2407010011_1

data/a6_mdm3_si/message

@@ -2,10 +2,10 @@
   list_a:
   - &id001
     settleMonth: '202407'
-    pid: OBh0347202406260028
-    hosGoodsId: h034700004280
-    goodsCode: '00004280'
-    goodsName: 一次性注射器_低值#c!$C
+    pid: OBh0347202407010004
+    hosGoodsId: h034700004332
+    goodsCode: '00004332'
+    goodsName: 一次性注射器_低值49V0u
     goodsGg: G-31891
     mfrsName: 德国歌德公司 Geuder AG
     unit: 支
@@ -20,14 +20,14 @@
     normalContractId:
     normalContract: '1'
     detailList:
-    - pid: OBh0347202406260028
+    - pid: OBh0347202407010004
       settleMonth: '202407'
-      accountDate: '2024-06-26'
-      hosGoodsId: h034700004280
+      accountDate: '2024-07-01'
+      hosGoodsId: h034700004332
       batchCode: '333'
-      distrDetailId: '03838870'
-      distrId: PSh0347202406260019
-      distrOrderNo: PSh0347202406260019
+      distrDetailId: '03838975'
+      distrId: PSh0347202407010006
+      distrOrderNo: PSh0347202407010006
       settlePrice: 99.9999
       maxSettleQty: -100.0
       maxSettleAmount: -9999.99
@@ -36,11 +36,11 @@
       leftSettleQty: -100.0
       leftSettleAmount: -9999.99
       hosId: h0347
-      provId: p1e2d0
-      branchId: h0347-3701
-      balanceDetId: OBh0347202406260028-000001
+      provId: p1e2e2
+      branchId: h0347-3709
+      balanceDetId: OBh0347202407010004-000001
       purMode: 10
-      barCode: 013701000004280010333112406261725010221UT240626001002
+      barCode: 013709000004332010333112407011725010721UT240701000202
       batchId:
       price:
       maxQty:
@@ -53,15 +53,15 @@
       volumeFlag:
       onlineKind:
       invoicePrice: 99.9999
-      viewId: 202407OBh0347202406260028h034700004280
-    - pid: OBh0347202406260028
+      viewId: 202407OBh0347202407010004h034700004332
+    - pid: OBh0347202407010004
       settleMonth: '202407'
-      accountDate: '2024-06-26'
-      hosGoodsId: h034700004280
+      accountDate: '2024-07-01'
+      hosGoodsId: h034700004332
       batchCode: '333'
-      distrDetailId: '03838870'
-      distrId: PSh0347202406260019
-      distrOrderNo: PSh0347202406260019
+      distrDetailId: '03838975'
+      distrId: PSh0347202407010006
+      distrOrderNo: PSh0347202407010006
       settlePrice: 99.9999
       maxSettleQty: 100.0
       maxSettleAmount: 9999.99
@@ -70,11 +70,11 @@
       leftSettleQty: 100.0
       leftSettleAmount: 9999.99
       hosId: h0347
-      provId: p1e2d0
-      branchId: h0347-3701
-      balanceDetId: OBh0347202406260028-000002
+      provId: p1e2e2
+      branchId: h0347-3709
+      balanceDetId: OBh0347202407010004-000002
       purMode: 10
-      barCode: 013701000004280010333112406261725010221UT240626001005
+      barCode: 013709000004332010333112407011725010721UT240701000282
       batchId:
       price:
       maxQty:
@@ -87,10 +87,10 @@
       volumeFlag:
       onlineKind:
       invoicePrice: 99.9999
-      viewId: 202407OBh0347202406260028h034700004280
-    unique: 202407OBh0347202406260028h034700004280
+      viewId: 202407OBh0347202407010004h034700004332
+    unique: 202407OBh0347202407010004h034700004332
     onlineKind: '10'
-    viewId: 202407OBh0347202406260028h034700004280
+    viewId: 202407OBh0347202407010004h034700004332
   list_b:
   - *id001
   list_c:

data/b2_herp3_bs/message

 院区新增:
-  branch_id: h0347-3703
-  branch_name: 东土城路院区O!1FP
+  branch_id: h0347-3709
+  branch_name: 东土城路院区NJphn
 科室信息:
-  dept2_id: af321aaaec034d90aa1aef29b752bd3f
+  dept2_id: e5eebc1820824b4e9e2b3f3b9da0ad4b
   dept2_name: 二级检验科002

data/b2_herp3_bs/message3

 用户名信息:
-  username1: 自动化测试jFbwJ
-  username2: 自动化测试jFbwJ
+  username1: 自动化测试icT*y
+  username2: 自动化测试icT*y

data/b2_herp3_bs/message4

 一级科室信息:
-  dept1_id: f72c2b5cf1e74269bbea7fb380eb229c
+  dept1_id: 0aaf0e3db3d44d53b8fbbb4b3ddd6805
   dept1_name: 设备科001

data/b2_herp3_bs/message6

 所有科室id:
-  deptid1: f72c2b5cf1e74269bbea7fb380eb229c
-  deptid2: af321aaaec034d90aa1aef29b752bd3f
-  deptid3: e46e777be6424aa999f8167984c192cf
-  deptid4: 6ab8feb3db4d4fb990d94ea190b7e861
-  deptid5: 11f9d75d2dde4699b459ebe03dd4229b
+  deptid1: 0aaf0e3db3d44d53b8fbbb4b3ddd6805
+  deptid2: e5eebc1820824b4e9e2b3f3b9da0ad4b
+  deptid3: 6065c04f35d64c8f9414bc4111065147
+  deptid4: 72574a47bf6c4a7ba85815761aeed64e
+  deptid5: d4ef5b2ec109474090811a4b7131ac9a
 所有科室name:
   deptid1: 设备科001
   deptid2: 二级检验科002

data/b2_herp3_bs/message7

 shelfinfo:
-  shelfid: 3ed05211f813494bbec61c704fe227bf
-  shelfCode: areah03472500
+  shelfid: 6d727fe831bd4703819da144dd0a1b12
+  shelfCode: areah03472536
   areaName: 自动化测试

data/b5_spd3_core_business_flow/message

 供货关系申请2:
-  e_corpId: p1e2d6
+  e_corpId: p1e2e2
   h_corpId: h0347
-  e_username: 国药集团公司HcKed
+  e_username: 国药集团公司fehK^
   h_name: test001

data/b5_spd3_core_business_flow/message1

 产品审核信息:
-  MSPid: MSP2406280007_1
+  MSPid: MSP2407010007_1
   hosId: h0347
-  hosGoodsId: h034700004298
-  provGoodsid: provGood-99221491
-  goodsAuditBillId: MSP2406280007
-  targetId: MSP2406280007_1
+  hosGoodsId: h034700004331
+  provGoodsid: provGood-99221524
+  goodsAuditBillId: MSP2407010007
+  targetId: MSP2407010007_1

data/b5_spd3_core_business_flow/message10

 低值配送单号:
-  distrBillId1: PSh0347202406280018
-  distrBillId2: PSh0347202406280018
+  distrBillId1: PSh0347202407010025
+  distrBillId2: PSh0347202407010025
 高值配送单号:
-  distrBillId1: PSh0347202406280019
-  distrBillId2: PSh0347202406280019
+  distrBillId1: PSh0347202407010026
+  distrBillId2: PSh0347202407010026
 试剂配送单号:
-  distrBillId1: PSh0347202406280020
-  distrBillId2: PSh0347202406280020
+  distrBillId1: PSh0347202407010027
+  distrBillId2: PSh0347202407010027

data/b5_spd3_core_business_flow/message11

 采购计划单号高值:
-  orderNo1: PLAN2024062830378
-  orderNo2: PLAN2024062830378
+  orderNo1: PLAN2024070130737
+  orderNo2: PLAN2024070130737

data/b5_spd3_core_business_flow/message12

 采购计划单号试剂:
-  orderNo1: PLAN2024062830379
-  orderNo2: PLAN2024062830379
+  orderNo1: PLAN2024070130738
+  orderNo2: PLAN2024070130738

data/b5_spd3_core_business_flow/message13

@@ -3,32 +3,32 @@
   - &id001
     - id:
       hosId: h0347
-      branchId: h0347-3703
+      branchId: h0347-3709
       deptId:
       taskType: 1
-      sourceOrgId: p1e2d6
-      sourceOrgName: 国药集团公司HcKed
-      sourceOrderNo: PSh0347202406280020
-      billMode: '66'
+      sourceOrgId: p1e2e2
+      sourceOrgName: 国药集团公司fehK^
+      sourceOrderNo: PSh0347202407010026
+      billMode: '20'
       stockKind:
       purMode:
-      sourceId: PSh0347202406280020
+      sourceId: PSh0347202407010026
       sourceDetailId:
       sourceType: PSD
       sourceTypeName: 配送单
       sourceVersion: 1
-      planOrderNo: PLAN2024062830379
-      purOrderNo: CG2024062819898
-      recOrgId: f72c2b5cf1e74269bbea7fb380eb229c
-      recOrgName: 设备科001
-      billRelationJson: '{"planBillId":"Ph034720240628027024","planOrderNo":"PLAN2024062830379","purOrderNo":"CG2024062819898","purBillId":"Ch034720240628000091","purBillDate":"2024-06-28
-        09:00:58","distrBillId":"PSh0347202406280020","distrOrderNo":"PSh0347202406280020"}'
-      taskDate: '2024-06-28 09:01:14'
+      planOrderNo: PLAN2024070130737
+      purOrderNo: CG2024070120135
+      recOrgId: e5eebc1820824b4e9e2b3f3b9da0ad4b
+      recOrgName: 二级检验科002
+      billRelationJson: '{"buyBillId":"Bh03472024070100022","planBillId":"Ph034720240701027382","planOrderNo":"PLAN2024070130737","buyOrderNo":"BUY2024070105388","purOrderNo":"CG2024070120135","purBillId":"Ch034720240701000081","purBillDate":"2024-07-01
+        09:02:01","distrBillId":"PSh0347202407010026","distrOrderNo":"PSh0347202407010026"}'
+      taskDate: '2024-07-01 09:02:37'
       taskDateStart:
       taskDateEnd:
       billModeList:
       viewIdList:
-      supplierFlag: false
+      supplierFlag: true
       tbStatus: 20
       remark: ''
       pdaFlag:

data/b5_spd3_core_business_flow/message14

 验收单详情信息:
   list_a:
   - &id001
-    - purMode: 60
+    - purMode: 10
       unitName: 100支/100
-      hosGoodsId: h034700004300
+      hosGoodsId: h034700004332
       mdmGoodsCode:
-      spdGoodsCode: '11661253'
-      goodsCode: '00004300'
-      goodsName: 新型冠状病毒检测试剂NB9uU
+      spdGoodsCode: '11661285'
+      goodsCode: '00004332'
+      goodsName: 一次性注射器_低值49V0u
       goodsGg: G-31891
       mfrsId:
       mfrsName: 德国歌德公司 Geuder AG
@@ -21,22 +21,22 @@
       pkgDefId:
       pkgDefName: '100'
       pkgDefQty: 100.0
-      batchCode: '4444'
-      expdtDate: '2025-01-04'
-      productDate: '2024-06-28'
-      provName: 国药集团公司HcKed
+      batchCode: '333'
+      expdtDate: '2025-01-07'
+      productDate: '2024-07-01'
+      provName: 国药集团公司fehK^
       provId:
-      viewId: '03838924'
+      viewId: '03838994'
       verifyFlag: 0
       hasSterilize: 0
-      id: '03838924'
+      id: '03838994'
       detailRelationJson:
-      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004300","purMode":60,"goodsName":"新型冠状病毒检测试剂NB9uU","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661253","ybDefId":""}'
+      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004332","purMode":10,"goodsName":"一次性注射器_低值49V0u","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661285","ybDefId":""}'
       recTemperature: 20
       recHumidity: 30
       distrPrice: 99.9999
-      distrPkgQty: 100.0
-      distrQty: 10000.0
+      distrPkgQty: 1.0
+      distrQty: 100.0
       price: 99.9999
       checkQty: 0.0
       checkPkgQty: 0
@@ -55,7 +55,7 @@
       trustMrfsName:
       multiChargeFlag: 0
       useFrequency: 1
-      codingType:
+      codingType: 0
       limitMessage:
   list_b:
   - *id001

data/b5_spd3_core_business_flow/message15

 验收单号:
-  CHECK_NO1: CHECKh03472024062800004
-  CHECK_NO2: CHECKh03472024062800004
+  CHECK_NO1: CHECKh03472024070100015
+  CHECK_NO2: CHECKh03472024070100015

data/b5_spd3_core_business_flow/message16

@@ -5,34 +5,34 @@
       lastModified:
       version:
       createTime:
-      createUser: h0347_UID-051368
+      createUser: h0347_UID-051375
       lastModifiedUser:
-      billMode: '16'
+      billMode: '20'
       recType:
       stockKind:
       purMode:
-      sourceId: CHECKh03472024062800002
-      sourceType: PSD
-      sourceVersion: 0
+      sourceId: DRh034720240701000047
+      sourceType: CK_TK
+      sourceVersion: 1
       batchList:
       billRelationJson:
       hosId: h0347
-      deptId: f72c2b5cf1e74269bbea7fb380eb229c
+      deptId: 0aaf0e3db3d44d53b8fbbb4b3ddd6805
       deptName:
-      branchId: h0347-3703
+      branchId: h0347-3709
       branchName:
-      taskType: 1
-      sourceOrgId: p1e2d6
-      sourceOrgName: 国药集团公司HcKed
-      sourceOrderNo: YS240628002
-      taskSourceNo: PSh0347202406280012
-      areaCode: areah03472500
-      areaName: 自动化测试
+      taskType: 2
+      sourceOrgId: e5eebc1820824b4e9e2b3f3b9da0ad4b
+      sourceOrgName: 二级检验科002
+      sourceOrderNo: DN20240701000047
+      taskSourceNo: DN20240701000047
+      areaCode:
+      areaName:
       goodsName:
       goodsGg:
       startDate:
       endDate:
-      taskDate: '2024-06-28 08:56:19'
+      taskDate: '2024-07-01 08:42:17'
       pkgTaskId:
       pkgFlag:
       remark: ''