脚本优化

air_case/b5_spd3_core_business_flow/a_b2流程九请领业务流_二级库向中心库.air/a_b2流程九请领业务流_二级库向中心库.py

@@ -222,12 +222,17 @@ def centeStock_pick():
         result = commonFuc().http_post(url, request_body, headers)
         remark=commonFuc().analysis_json('remark',commonFuc().analysis_json('data',result))
         time.sleep(3)
+        print('remark',remark)
         if remark==None:
             break
     #生成拣货单===============================================
     while True:
         result1 = commonFuc().http_post(url1, request_body1, headers)
+        # import pdb
+        # pdb.set_trace()
+        print('result1',result1)
         total2 = commonFuc().analysis_json('total', commonFuc().analysis_json('data', result1))
+        print('total2', total2,'total1',total1)
         if total1-total2==1:
             print('==================生成拣货单完成============================')
             break

air_case/public1/public1/public1.py

@@ -2458,8 +2458,8 @@ def pickScan2(PICK_ID, udi_code, type=1):  # 二级库出库拣货扫码
     print('获取条码信息url', url)
     request_body = commonFuc().get_business_data(module, "payload59", udi_code)
     result = commonFuc().http_post(url, request_body, headers)
-    import pdb
-    pdb.set_trace()
+    # import pdb
+    # pdb.set_trace()
     code=commonFuc().analysis_json('code',result)
     if code=='14030053':
         commonFuc().check_text_exist_result_text('error', 'SUCCESS')

data/a2_mdm3_ea/message

 企业信息:
-  e_id: CR202407010057
-  cname: 国药集团公司l6AP(
+  e_id: CR202407020038
+  cname: 国药集团公司kGTpV

data/a3_mdm3_hs/message

 医院信息:
-  h_id: 湖南省人民医院zX6ld
-  h_name: 湖南省人民医院zX6ld
+  h_id: 湖南省人民医院W1A@i
+  h_name: 湖南省人民医院W1A@i

data/a5_mdm3_pdm/message2

 产品审核信息:
-  MSPid: MSP2407010016_1
+  MSPid: MSP2407020011_1
   hosId: h0347
-  hosGoodsId: h034700004340
-  provGoodsid: provGood-99221533
-  goodsAuditBillId: MSP2407010016
-  targetId: MSP2407010016_1
+  hosGoodsId: h034700004356
+  provGoodsid: provGood-99221551
+  goodsAuditBillId: MSP2407020011
+  targetId: MSP2407020011_1

data/a6_mdm3_si/message

@@ -2,10 +2,10 @@
   list_a:
   - &id001
     settleMonth: '202407'
-    pid: OBh0347202407010008
-    hosGoodsId: h034700004337
-    goodsCode: '00004337'
-    goodsName: 一次性注射器_低值xh*Uq
+    pid: OBh0347202407020004
+    hosGoodsId: h034700004353
+    goodsCode: '00004353'
+    goodsName: 一次性注射器_低值NaZMe
     goodsGg: G-31891
     mfrsName: 德国歌德公司 Geuder AG
     unit: 支
@@ -20,14 +20,14 @@
     normalContractId:
     normalContract: '1'
     detailList:
-    - pid: OBh0347202407010008
+    - pid: OBh0347202407020004
       settleMonth: '202407'
-      accountDate: '2024-07-01'
-      hosGoodsId: h034700004337
+      accountDate: '2024-07-02'
+      hosGoodsId: h034700004353
       batchCode: '333'
-      distrDetailId: '03839007'
-      distrId: PSh0347202407010038
-      distrOrderNo: PSh0347202407010038
+      distrDetailId: '03839046'
+      distrId: PSh0347202407020009
+      distrOrderNo: PSh0347202407020009
       settlePrice: 99.9999
       maxSettleQty: -100.0
       maxSettleAmount: -9999.99
@@ -36,11 +36,11 @@
       leftSettleQty: -100.0
       leftSettleAmount: -9999.99
       hosId: h0347
-      provId: p1e2e4
-      branchId: h0347-3710
-      balanceDetId: OBh0347202407010008-000001
+      provId: p1e2e8
+      branchId: h0347-3712
+      balanceDetId: OBh0347202407020004-000001
       purMode: 10
-      barCode: 013710000004337010333112407011725010721UT240701001016
+      barCode: 013712000004353010333112407021725010821UT240702000204
       batchId:
       price:
       maxQty:
@@ -53,15 +53,15 @@
       volumeFlag:
       onlineKind:
       invoicePrice: 99.9999
-      viewId: 202407OBh0347202407010008h034700004337
-    - pid: OBh0347202407010008
+      viewId: 202407OBh0347202407020004h034700004353
+    - pid: OBh0347202407020004
       settleMonth: '202407'
-      accountDate: '2024-07-01'
-      hosGoodsId: h034700004337
+      accountDate: '2024-07-02'
+      hosGoodsId: h034700004353
       batchCode: '333'
-      distrDetailId: '03839007'
-      distrId: PSh0347202407010038
-      distrOrderNo: PSh0347202407010038
+      distrDetailId: '03839046'
+      distrId: PSh0347202407020009
+      distrOrderNo: PSh0347202407020009
       settlePrice: 99.9999
       maxSettleQty: 100.0
       maxSettleAmount: 9999.99
@@ -70,11 +70,11 @@
       leftSettleQty: 100.0
       leftSettleAmount: 9999.99
       hosId: h0347
-      provId: p1e2e4
-      branchId: h0347-3710
-      balanceDetId: OBh0347202407010008-000002
+      provId: p1e2e8
+      branchId: h0347-3712
+      balanceDetId: OBh0347202407020004-000002
       purMode: 10
-      barCode: 013710000004337010333112407011725010721UT240701001016
+      barCode: 013712000004353010333112407021725010821UT240702000240
       batchId:
       price:
       maxQty:
@@ -87,10 +87,10 @@
       volumeFlag:
       onlineKind:
       invoicePrice: 99.9999
-      viewId: 202407OBh0347202407010008h034700004337
-    unique: 202407OBh0347202407010008h034700004337
+      viewId: 202407OBh0347202407020004h034700004353
+    unique: 202407OBh0347202407020004h034700004353
     onlineKind: '10'
-    viewId: 202407OBh0347202407010008h034700004337
+    viewId: 202407OBh0347202407020004h034700004353
   list_b:
   - *id001
   list_c:

data/b2_herp3_bs/message

 院区新增:
-  branch_id: h0347-3710
-  branch_name: 东土城路院区zmS@y
+  branch_id: h0347-3712
+  branch_name: 东土城路院区$!ZNd
 科室信息:
-  dept2_id: b4f1b6b8aa274fb981d0bf879621f7a0
+  dept2_id: 08398b8842854e85b738846cbcbb97f7
   dept2_name: 二级检验科002

data/b2_herp3_bs/message3

 用户名信息:
-  username1: 自动化测试m93jP
-  username2: 自动化测试m93jP
+  username1: 自动化测试0oUY#
+  username2: 自动化测试0oUY#

data/b2_herp3_bs/message4

 一级科室信息:
-  dept1_id: b0e510cc2a7a4122bf7f1a626884d075
+  dept1_id: 533beea90bd8402fa62377a5a84befd6
   dept1_name: 设备科001

data/b2_herp3_bs/message6

 所有科室id:
-  deptid1: b0e510cc2a7a4122bf7f1a626884d075
-  deptid2: b4f1b6b8aa274fb981d0bf879621f7a0
-  deptid3: 6cc782eb3fdf4ee6b234bd0402ee198b
-  deptid4: 586dd2dcd2b3489e94ac66ea70107b03
-  deptid5: 5527f27b88ec4e1aaa2aecdbfab5908c
+  deptid1: 533beea90bd8402fa62377a5a84befd6
+  deptid2: 08398b8842854e85b738846cbcbb97f7
+  deptid3: 90ffdd89a239466983c18d20c1730a3d
+  deptid4: 271b96c808c94c4092c0d0c8f55aa397
+  deptid5: 5e2a2dfd8379430e8d7c76ad095c74da
 所有科室name:
   deptid1: 设备科001
   deptid2: 二级检验科002

data/b2_herp3_bs/message7

 shelfinfo:
-  shelfid: fc0d04aa11a647f98a1f27b5bf00de8c
-  shelfCode: areah03472541
+  shelfid: 59aebd42a2f7415aa83296b106026ae6
+  shelfCode: areah03472553
   areaName: 自动化测试

data/b5_spd3_core_business_flow/data

@@ -147,7 +147,7 @@ json_headers2: {
 "payload46": {"pageNum":1,"pageSize":50,"queryObject":{"deptId":"","auditStartTime":null,"auditEndTime":null,"startBillExpectDate":null,"endBillExpectDate":null,"priorityList":[],"orderNo":"","keyword":"","goodsSpec":"","shelfName":"","address":""}}
 "payload46_1": {"pageNum":1,"pageSize":50,"queryObject":{"orderNo":"","priorityList":[],"branchId":"%s"}}
 
-"payload47": {"generateAll":false,"ids":["%s"]}
+"payload47": {"generateAll":false,"ids":["%s"],"allBillFlag":0}
 "payload48": {"pageNum":1,"pageSize":50,"queryObject":{"pickType":"KS","id":"","pickerName":"","targetDeptName":"","priorityList":[],"areaCode":"","keyword":"%s","goodsSpec":""}}
 "payload49": {"lockStatus":1,"pickId":"%s","version":"%s"}
 "payload49_1": {"lockStatus":1,"buyId":"%s","version":"%s"}

data/b5_spd3_core_business_flow/message

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

data/b5_spd3_core_business_flow/message1

 产品审核信息:
-  MSPid: MSP2407010012_1
+  MSPid: MSP2407020007_1
   hosId: h0347
-  hosGoodsId: h034700004336
-  provGoodsid: provGood-99221529
-  goodsAuditBillId: MSP2407010012
-  targetId: MSP2407010012_1
+  hosGoodsId: h034700004352
+  provGoodsid: provGood-99221547
+  goodsAuditBillId: MSP2407020007
+  targetId: MSP2407020007_1

data/b5_spd3_core_business_flow/message10

 低值配送单号:
-  distrBillId1: PSh0347202407010063
-  distrBillId2: PSh0347202407010063
+  distrBillId1: PSh0347202407020015
+  distrBillId2: PSh0347202407020015
 高值配送单号:
-  distrBillId1: PSh0347202407010064
-  distrBillId2: PSh0347202407010064
+  distrBillId1: PSh0347202407020016
+  distrBillId2: PSh0347202407020016
 试剂配送单号:
-  distrBillId1: PSh0347202407010065
-  distrBillId2: PSh0347202407010065
+  distrBillId1: PSh0347202407020017
+  distrBillId2: PSh0347202407020017
+高值跟台配送单号:
+  distrBillId1: PSh0347202407020018
+  distrBillId2: PSh0347202407020018

data/b5_spd3_core_business_flow/message11

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

data/b5_spd3_core_business_flow/message12

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

data/b5_spd3_core_business_flow/message13

@@ -3,34 +3,33 @@
   - &id001
     - id:
       hosId: h0347
-      branchId: h0347-3710
+      branchId: h0347-3712
       deptId:
       taskType: 1
-      sourceOrgId: p1e2e4
-      sourceOrgName: 国药集团公司l6AP(
-      sourceOrderNo: PSh0347202407010065
-      billMode: '66'
+      sourceOrgId: p1e2e8
+      sourceOrgName: 国药集团公司kGTpV
+      sourceOrderNo: PSh0347202407020018
+      billMode: '25'
       stockKind:
       purMode:
-      sourceId: PSh0347202407010065
+      sourceId: PSh0347202407020018
       sourceDetailId:
       sourceType: PSD
       sourceTypeName: 配送单
       sourceVersion: 1
-      planOrderNo: PLAN2024070130802
-      purOrderNo: CG2024070120198
-      recOrgId: b4f1b6b8aa274fb981d0bf879621f7a0
+      planOrderNo: SSSQ202407020317
+      purOrderNo: SSTZ202407020293
+      recOrgId: 08398b8842854e85b738846cbcbb97f7
       recOrgName: 二级检验科002
-      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'
+      billRelationJson: '{"operationApplyOrderNo":"SSSQ202407020317","operationNoticeBillId":"Nh034720240702000001","distrBillId":"PSh0347202407020018","operationNoticeOrderNo":"SSTZ202407020293","distrOrderNo":"PSh0347202407020018","operationApplyBillId":"Oh034720240702000001"}'
+      taskDate: '2024-07-02 11:19:23'
       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: h034700004338
+    - purMode: 20
+      unitName: 1支
+      hosGoodsId: h034700004352
       mdmGoodsCode:
-      spdGoodsCode: '11661291'
-      goodsCode: '00004338'
-      goodsName: 新型冠状病毒检测试剂gi(&B
+      spdGoodsCode: '11661305'
+      goodsCode: '00004352'
+      goodsName: 高值牙钻机q*iy$
       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-07'
-      productDate: '2024-07-01'
-      provName: 国药集团公司l6AP(
+      pkgDefName:
+      pkgDefQty: 1.0
+      batchCode: '2222'
+      expdtDate: '2025-01-08'
+      productDate: '2024-07-02'
+      provName: 国药集团公司kGTpV
       provId:
-      viewId: '03839034'
+      viewId: '03839055'
       verifyFlag: 0
       hasSterilize: 0
-      id: '03839034'
+      id: '03839055'
       detailRelationJson:
-      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004338","purMode":60,"goodsName":"新型冠状病毒检测试剂gi(&B","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661291","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:
@@ -57,6 +57,7 @@
       useFrequency: 1
       codingType: 0
       limitMessage:
+      autoUnpack: 0
   list_b:
   - *id001
   list_c:

data/b5_spd3_core_business_flow/message15

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