脚本优化

air_case/b5_spd3_core_business_flow/a_b6流程十三请领业务流_三级库向二级库.air/a_b6流程十三请领业务流_三级库向二级库.py

@@ -353,6 +353,7 @@ try:
     #二级科室领用出库
     # 低值拣货执行
     pick_execute()
+    updateUserLoginDefaultRange(get_listUserMgrRangePage1(3))  #设置登录账号默认权限是三级库
     second_dept_one_key_in(3)
     second_dept_one_key_in(3)
     second_dept_one_key_in(3)

air_case/b5_spd3_core_business_flow/a_b7流程十四退库业务_消耗退库.air/a_b7流程十四退库业务_消耗退库.py

@@ -52,8 +52,8 @@ def second_dept_consume_Out_Stock(type):  # 二级库消耗出库
         url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
                                                                                  "herpService_stock_pick_scan_url")
         # 从message18文件中获取信息
-        info = FileUtils().r_info8(module, "条码信息", 'message18')
-        # print('info', info)
+        info = FileUtils().r_info8(module, "条码信息", 'message')
+        print('info', info)
         list_a = info['list_a']
         stockId = commonFuc().analysis_json('stockId', list_a)
         stockName = commonFuc().analysis_json('stockName', list_a)
@@ -111,6 +111,7 @@ def second_dept_consume_Out_Stock(type):  # 二级库消耗出库
         purModeText = commonFuc().analysis_json('purModeText', data1)
         version = commonFuc().analysis_json('version', data1)
         unitName = commonFuc().analysis_json('unitName', data1)
+        stockName = commonFuc().analysis_json('stockName', list_a)
         # ==============================获取条码信息
         # 从message18文件中获取信息
         info = FileUtils().r_info8(module, "条码信息", 'message18')

air_case/public1/public1/public1.py

@@ -2557,6 +2557,11 @@ def pickScan2(PICK_ID, udi_code, type=1):  # 二级库出库拣货扫码
 
     # # # # 发送请求
     result = commonFuc().http_post(url, request_body, headers)
+    code=commonFuc().analysis_json('code',result)
+    if code==200:
+        print('拣货扫码','ok')
+    else:
+        commonFuc().check_text_exist_result_text('error', 'succees')
     print('result', result)
     return areaCode, pickerId
 

data/a2_mdm3_ea/message

 企业信息:
-  e_id: CR202407010038
-  cname: 国药集团公司fehK^
+  e_id: CR202407010057
+  cname: 国药集团公司l6AP(

data/a3_mdm3_hs/message

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

data/a5_mdm3_pdm/message2

 产品审核信息:
-  MSPid: MSP2407010011_1
+  MSPid: MSP2407010016_1
   hosId: h0347
-  hosGoodsId: h034700004335
-  provGoodsid: provGood-99221528
-  goodsAuditBillId: MSP2407010011
-  targetId: MSP2407010011_1
+  hosGoodsId: h034700004340
+  provGoodsid: provGood-99221533
+  goodsAuditBillId: MSP2407010016
+  targetId: MSP2407010016_1

data/a6_mdm3_si/message

@@ -2,10 +2,10 @@
   list_a:
   - &id001
     settleMonth: '202407'
-    pid: OBh0347202407010004
-    hosGoodsId: h034700004332
-    goodsCode: '00004332'
-    goodsName: 一次性注射器_低值49V0u
+    pid: OBh0347202407010008
+    hosGoodsId: h034700004337
+    goodsCode: '00004337'
+    goodsName: 一次性注射器_低值xh*Uq
     goodsGg: G-31891
     mfrsName: 德国歌德公司 Geuder AG
     unit: 支
@@ -20,14 +20,14 @@
     normalContractId:
     normalContract: '1'
     detailList:
-    - pid: OBh0347202407010004
+    - pid: OBh0347202407010008
       settleMonth: '202407'
       accountDate: '2024-07-01'
-      hosGoodsId: h034700004332
+      hosGoodsId: h034700004337
       batchCode: '333'
-      distrDetailId: '03838975'
-      distrId: PSh0347202407010006
-      distrOrderNo: PSh0347202407010006
+      distrDetailId: '03839007'
+      distrId: PSh0347202407010038
+      distrOrderNo: PSh0347202407010038
       settlePrice: 99.9999
       maxSettleQty: -100.0
       maxSettleAmount: -9999.99
@@ -36,11 +36,11 @@
       leftSettleQty: -100.0
       leftSettleAmount: -9999.99
       hosId: h0347
-      provId: p1e2e2
-      branchId: h0347-3709
-      balanceDetId: OBh0347202407010004-000001
+      provId: p1e2e4
+      branchId: h0347-3710
+      balanceDetId: OBh0347202407010008-000001
       purMode: 10
-      barCode: 013709000004332010333112407011725010721UT240701000202
+      barCode: 013710000004337010333112407011725010721UT240701001016
       batchId:
       price:
       maxQty:
@@ -53,15 +53,15 @@
       volumeFlag:
       onlineKind:
       invoicePrice: 99.9999
-      viewId: 202407OBh0347202407010004h034700004332
-    - pid: OBh0347202407010004
+      viewId: 202407OBh0347202407010008h034700004337
+    - pid: OBh0347202407010008
       settleMonth: '202407'
       accountDate: '2024-07-01'
-      hosGoodsId: h034700004332
+      hosGoodsId: h034700004337
       batchCode: '333'
-      distrDetailId: '03838975'
-      distrId: PSh0347202407010006
-      distrOrderNo: PSh0347202407010006
+      distrDetailId: '03839007'
+      distrId: PSh0347202407010038
+      distrOrderNo: PSh0347202407010038
       settlePrice: 99.9999
       maxSettleQty: 100.0
       maxSettleAmount: 9999.99
@@ -70,11 +70,11 @@
       leftSettleQty: 100.0
       leftSettleAmount: 9999.99
       hosId: h0347
-      provId: p1e2e2
-      branchId: h0347-3709
-      balanceDetId: OBh0347202407010004-000002
+      provId: p1e2e4
+      branchId: h0347-3710
+      balanceDetId: OBh0347202407010008-000002
       purMode: 10
-      barCode: 013709000004332010333112407011725010721UT240701000282
+      barCode: 013710000004337010333112407011725010721UT240701001016
       batchId:
       price:
       maxQty:
@@ -87,10 +87,10 @@
       volumeFlag:
       onlineKind:
       invoicePrice: 99.9999
-      viewId: 202407OBh0347202407010004h034700004332
-    unique: 202407OBh0347202407010004h034700004332
+      viewId: 202407OBh0347202407010008h034700004337
+    unique: 202407OBh0347202407010008h034700004337
     onlineKind: '10'
-    viewId: 202407OBh0347202407010004h034700004332
+    viewId: 202407OBh0347202407010008h034700004337
   list_b:
   - *id001
   list_c:

data/b2_herp3_bs/message

 院区新增:
-  branch_id: h0347-3709
-  branch_name: 东土城路院区NJphn
+  branch_id: h0347-3710
+  branch_name: 东土城路院区zmS@y
 科室信息:
-  dept2_id: e5eebc1820824b4e9e2b3f3b9da0ad4b
+  dept2_id: b4f1b6b8aa274fb981d0bf879621f7a0
   dept2_name: 二级检验科002

data/b2_herp3_bs/message3

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

data/b2_herp3_bs/message4

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

data/b2_herp3_bs/message6

 所有科室id:
-  deptid1: 0aaf0e3db3d44d53b8fbbb4b3ddd6805
-  deptid2: e5eebc1820824b4e9e2b3f3b9da0ad4b
-  deptid3: 6065c04f35d64c8f9414bc4111065147
-  deptid4: 72574a47bf6c4a7ba85815761aeed64e
-  deptid5: d4ef5b2ec109474090811a4b7131ac9a
+  deptid1: b0e510cc2a7a4122bf7f1a626884d075
+  deptid2: b4f1b6b8aa274fb981d0bf879621f7a0
+  deptid3: 6cc782eb3fdf4ee6b234bd0402ee198b
+  deptid4: 586dd2dcd2b3489e94ac66ea70107b03
+  deptid5: 5527f27b88ec4e1aaa2aecdbfab5908c
 所有科室name:
   deptid1: 设备科001
   deptid2: 二级检验科002

data/b2_herp3_bs/message7

 shelfinfo:
-  shelfid: 6d727fe831bd4703819da144dd0a1b12
-  shelfCode: areah03472536
+  shelfid: fc0d04aa11a647f98a1f27b5bf00de8c
+  shelfCode: areah03472541
   areaName: 自动化测试

data/b5_spd3_core_business_flow/message

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

data/b5_spd3_core_business_flow/message1

 产品审核信息:
-  MSPid: MSP2407010007_1
+  MSPid: MSP2407010012_1
   hosId: h0347
-  hosGoodsId: h034700004331
-  provGoodsid: provGood-99221524
-  goodsAuditBillId: MSP2407010007
-  targetId: MSP2407010007_1
+  hosGoodsId: h034700004336
+  provGoodsid: provGood-99221529
+  goodsAuditBillId: MSP2407010012
+  targetId: MSP2407010012_1

data/b5_spd3_core_business_flow/message10

 低值配送单号:
-  distrBillId1: PSh0347202407010031
-  distrBillId2: PSh0347202407010031
+  distrBillId1: PSh0347202407010063
+  distrBillId2: PSh0347202407010063
 高值配送单号:
-  distrBillId1: PSh0347202407010032
-  distrBillId2: PSh0347202407010032
+  distrBillId1: PSh0347202407010064
+  distrBillId2: PSh0347202407010064
 试剂配送单号:
-  distrBillId1: PSh0347202407010033
-  distrBillId2: PSh0347202407010033
+  distrBillId1: PSh0347202407010065
+  distrBillId2: PSh0347202407010065

data/b5_spd3_core_business_flow/message11

 采购计划单号高值:
-  orderNo1: PLAN2024070130743
-  orderNo2: PLAN2024070130743
+  orderNo1: PLAN2024070130803
+  orderNo2: PLAN2024070130803

data/b5_spd3_core_business_flow/message12

 采购计划单号试剂:
-  orderNo1: PLAN2024070130744
-  orderNo2: PLAN2024070130744
+  orderNo1: PLAN2024070130802
+  orderNo2: PLAN2024070130802

data/b5_spd3_core_business_flow/message13

@@ -3,27 +3,27 @@
   - &id001
     - id:
       hosId: h0347
-      branchId: h0347-3709
+      branchId: h0347-3710
       deptId:
       taskType: 1
-      sourceOrgId: p1e2e2
-      sourceOrgName: 国药集团公司fehK^
-      sourceOrderNo: PSh0347202407010033
+      sourceOrgId: p1e2e4
+      sourceOrgName: 国药集团公司l6AP(
+      sourceOrderNo: PSh0347202407010065
       billMode: '66'
       stockKind:
       purMode:
-      sourceId: PSh0347202407010033
+      sourceId: PSh0347202407010065
       sourceDetailId:
       sourceType: PSD
       sourceTypeName: 配送单
       sourceVersion: 1
-      planOrderNo: PLAN2024070130744
-      purOrderNo: CG2024070120140
-      recOrgId: e5eebc1820824b4e9e2b3f3b9da0ad4b
+      planOrderNo: PLAN2024070130802
+      purOrderNo: CG2024070120198
+      recOrgId: b4f1b6b8aa274fb981d0bf879621f7a0
       recOrgName: 二级检验科002
-      billRelationJson: '{"buyBillId":"Bh03472024070100029","planBillId":"Ph034720240701027389","planOrderNo":"PLAN2024070130744","buyOrderNo":"BUY2024070105395","purOrderNo":"CG2024070120140","purBillId":"Ch034720240701000086","purBillDate":"2024-07-01
-        09:09:11","distrBillId":"PSh0347202407010033","distrOrderNo":"PSh0347202407010033"}'
-      taskDate: '2024-07-01 09:10:01'
+      billRelationJson: '{"buyBillId":"Bh03472024070100054","planBillId":"Ph034720240701027447","planOrderNo":"PLAN2024070130802","buyOrderNo":"BUY2024070105420","purOrderNo":"CG2024070120198","purBillId":"Ch034720240701000144","purBillDate":"2024-07-01
+        10:27:48","distrBillId":"PSh0347202407010065","distrOrderNo":"PSh0347202407010065"}'
+      taskDate: '2024-07-01 10:28:45'
       taskDateStart:
       taskDateEnd:
       billModeList:

data/b5_spd3_core_business_flow/message14

@@ -3,11 +3,11 @@
   - &id001
     - purMode: 60
       unitName: 100支/100
-      hosGoodsId: h034700004333
+      hosGoodsId: h034700004338
       mdmGoodsCode:
-      spdGoodsCode: '11661286'
-      goodsCode: '00004333'
-      goodsName: 新型冠状病毒检测试剂P@whV
+      spdGoodsCode: '11661291'
+      goodsCode: '00004338'
+      goodsName: 新型冠状病毒检测试剂gi(&B
       goodsGg: G-31891
       mfrsId:
       mfrsName: 德国歌德公司 Geuder AG
@@ -24,14 +24,14 @@
       batchCode: '4444'
       expdtDate: '2025-01-07'
       productDate: '2024-07-01'
-      provName: 国药集团公司fehK^
+      provName: 国药集团公司l6AP(
       provId:
-      viewId: '03839002'
+      viewId: '03839034'
       verifyFlag: 0
       hasSterilize: 0
-      id: '03839002'
+      id: '03839034'
       detailRelationJson:
-      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004333","purMode":60,"goodsName":"新型冠状病毒检测试剂P@whV","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661286","ybDefId":""}'
+      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004338","purMode":60,"goodsName":"新型冠状病毒检测试剂gi(&B","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661291","ybDefId":""}'
       recTemperature: 20
       recHumidity: 30
       distrPrice: 99.9999

data/b5_spd3_core_business_flow/message15

 验收单号:
-  CHECK_NO1: CHECKh03472024070100023
-  CHECK_NO2: CHECKh03472024070100023
+  CHECK_NO1: CHECKh03472024070100046
+  CHECK_NO2: CHECKh03472024070100046