脚本优化

air_case/b5_spd3_core_business_flow/a_a7流程五_中心库入库结算_正结算3_内网验收入库结算.air/a_a7流程五_中心库入库结算_正结算3_内网验收入库结算.py

@@ -184,7 +184,7 @@ def check_accept_order(type=1):
         data = commonFuc().analysis_json('data', result)
         code= commonFuc().analysis_json('code', result)
         print(code)
-        if code ==0 and data==100:
+        if code ==0 and len(data)>=100:
             break
         else:
             print('设置产品合格出现问题')

data/a2_mdm3_ea/message

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

data/a3_mdm3_hs/message

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

data/a5_mdm3_pdm/message2

 产品审核信息:
-  MSPid: MSP2407080011_1
+  MSPid: MSP2407090011_1
   hosId: h0347
-  hosGoodsId: h034700004503
-  provGoodsid: provGood-99221699
-  goodsAuditBillId: MSP2407080011
-  targetId: MSP2407080011_1
+  hosGoodsId: h034700004514
+  provGoodsid: provGood-99221710
+  goodsAuditBillId: MSP2407090011
+  targetId: MSP2407090011_1

data/b2_herp3_bs/message

 院区新增:
-  branch_id: h0347-3736
-  branch_name: 东土城路院区IjnkG
+  branch_id: h0347-3738
+  branch_name: 东土城路院区8SpTq
 科室信息:
-  dept2_id: b3e6c5f2887148389f8535862f789f0a
+  dept2_id: 7b4d11aec57042e096684a46e9148fdd
   dept2_name: 二级检验科002

data/b2_herp3_bs/message3

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

data/b2_herp3_bs/message4

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

data/b2_herp3_bs/message6

 所有科室id:
-  deptid1: a762aa0aa2df47dbac4a96173a89e85d
-  deptid2: b3e6c5f2887148389f8535862f789f0a
-  deptid3: b011a25d37e248d1aa1c94d01bb59466
-  deptid4: 096ad30186f448778c685c7d68c5bfe3
-  deptid5: b316f3f5225a45949077163a47655ad5
+  deptid1: d467187bce7f458eb5c4e1007f557353
+  deptid2: 7b4d11aec57042e096684a46e9148fdd
+  deptid3: 9a0e8ab0eb5544deafbeb2ce79eabf72
+  deptid4: 319b64576fe24cc2b24bff3e7d8815c7
 所有科室name:
   deptid1: 设备科001
   deptid2: 二级检验科002
   deptid3: 三级检测组003
   deptid4: 科室004
-  deptid5: 二级科室005

data/b2_herp3_bs/message7

 shelfinfo:
-  shelfid: 8bf86ca088f440c1874c09528445cf44
-  shelfCode: areah03472677
+  shelfid: 4227bbab7b3c4ea98553cf1c9e764bf6
+  shelfCode: areah03472689
   areaName: 自动化测试

data/b5_spd3_core_business_flow/data

@@ -449,4 +449,4 @@ json_headers2: {
 "payload69": {"stockId": "%s","stockName": "%s","areaCode": "%s","areaName": "%s","barCodeList": [{"id": "%s","lastModified": null,"version": null,"createTime": "%s","createUser": null,"lastModifiedUser": null,"snCode": "%s","hosId": "%s","branchId": null,"stockId": "%s","areaCode": "%s","areaName": "%s","shelfCode": "%s","codeType": "%s","tagType": 0,"hosGoodsId": "%s","mdmGoodsCode": "%s","goodsCode": "%s","goodsDi": "%s","barName": "%s","batchCode": "%s","expdtDate": "%s","productDate": "%s","mfrCode": null,"mfrCodeSee": null,"pkgCode": "%s","pkgCodeSee": "%s","ssccCode": "%s","extInfo": null,"outId": null,"tbStatus": "%s","goodsCodeDi": null,"barcodeId": null,"ext": {"pkgDefId": "%s","pkgDefQty": "%s","purBillId": "%s","pkgDefName": "%s","distrBillId": "%s","inStockTime": "%s","distrDetailId": "%s","certificateCode": ""},"sourceDetailId": null,"purMode": "%s","purModes": null,"price":"%s","pid": null,"goodsMfrsName": "%s","mfrsName": null,"goodsSpec": "%s","unit": "%s","goodsName": "%s","pkgDefId": "%s","pkgDefQty": "%s","defaultPkgDefQty": null,"defaultQty": null,"defaultSurplusQty": null,"defaultPkgDefId": null,"purDetailId": null,"pkgDefName": "%s","printNum": "%s","deptId": null,"deptName": null,"billId": null,"taskId": null,"made": "%s","provId": null,"provName": null,"subProvId": null,"subProvName": null,"provHosGoodsId": null,"sourceType": null,"taskDate": null,"sourceOrderNo": null,"taskType": null,"detailId": null,"branchGoodsPkgDefList": null,"unitName": "%s","areaCodeList": null,"diType": null,"mdmGoodsSpecCode": null,"hosGoodsCode": "%s","supplyId": null,"inSettlement": null,"spdGoodsCode": null,"codeKind": null,"brand": null,"miCode": "","transferRatio": 1,"miDjmc": "","tbStatusList": null,"purModeText": "%s","stockName": null,"tbStatusText": null,"pkgType": null,"bottleId": null,"pkgStatus": null,"qty": 1,"packUnit": null,"minSaleQty": null,"rfidFlag": null,"mfrCodeFlag": null,"scanStatus": null,"scanId": null,"multiChargeFlag": null,"useFrequency": null,"chargeUnit": null,"lockStatus": null,"remark": null,"hosBatchId": null,"settleFlag": null,"inStockTime": null,"verifyFlag":null}],"pickType": "CB","tbStatus": "%s"}
 
 "expected_value": "('00004260', 'h0347', 'p1e2ca', '177df1fadf39415ea5ce40e64edf449d', None, '11661208', '11661208', '11661208', '一次性注射器_低值hMY2F','一次性注射器', 'mfrs-11229', '德国歌德公司 Geuder AG', '', None, '', 'ycxzsq_dzhMY2F', None, '支', 'G-31891', Decimal('1.000000'), 2, '3', 10, None, None, '', None, Decimal('99.9999'), None, '德国', None, None, '', 1, None, 0, None, 0, '', '', None, None, 1, 0, 1, 'p1e2ca:UID-051951', datetime.datetime(2024, 6, 26, 7, 1, 39), 'p1e2ca:UID-051951', 0, 0, 1, None)"
-"expected_value2": '{"hos_goods_code": "00004500", "hos_id": "h0347", "prov_id": "p1e32e", "prov_hos_goods_id": "%s", "srv_id": None, "mdm_goods_code": "11661453", "mdm_goods_spec_code": "11661453", "spd_goods_code": "11661453", "goods_name": "一次性注射器_低值wExpg", "goods_general_name": "一次性注射器", "goods_mfrs_id": "mfrs-11229", "goods_mfrs_name": "德国歌德公司 Geuder AG", "goods_reg_cert": "", "goods_agent_mfrs_id": None, "brand": "", "short_pinyin": "ycxzsq_dzwExpg", "kind_sixtyeight_code": None, "unit": "支", "goods_spec": "G-31891", "goods_package": Decimal("1.000000"), "bar_code_mng": 2, "unique_code_strategy": "3", "pur_mode": 10, "sub_pur_mode": None, "erp_code": None, "herp_code": "", "hrp": None, "price": Decimal("99.9999"), "abroad_flag": None, "made": "德国", "property": None, "mgr_level": None, "goods_desc": "", "charge_flag": 1, "focus_control_type": None, "temp_flag": 0, "official_status": None, "focus_control": 0, "storage_conditions": "", "transport_conditions": "", "into_cost_flag": None, "rfid_flag": None, "purchase_flag": 1, "tb_status": 0, "version": 1, "create_user": "p1e32e:UID-052100", "create_time": datetime.datetime(2024, 7, 8, 5, 1, 27), "last_modified_user": "p1e32e:UID-052100", "sterilize_flag": 0, "multi_charge_flag": 0, "use_frequency": 1, "charge_unit": None}'
+"expected_value2": '{"hos_goods_code": "00004249","hos_id": "h0347","prov_id": "p1e2c6","prov_hos_goods_id": "%s","srv_id": null,"mdm_goods_code": "11661197","mdm_goods_spec_code": "11661197","spd_goods_code": "11661197","goods_name": "一次性注射器_低值qPW6a","goods_general_name": "一次性注射器","goods_mfrs_id": "mfrs-11229","goods_mfrs_name": "德国歌德公司 Geuder AG","goods_reg_cert": "","goods_agent_mfrs_id": null,"brand": "","short_pinyin": "ycxzsq_dzqPW6a","kind_sixtyeight_code": null,"unit": "支","goods_spec": "G-31891","goods_package": Decimal("1.000000"),"bar_code_mng": 2,"unique_code_strategy": "3","pur_mode": 10,"sub_pur_mode": null,"erp_code": null,"herp_code": "","hrp": null,"price": Decimal("99.9999"),"abroad_flag": null,"made": "德国","property": null,"mgr_level": null,"goods_desc": "","charge_flag": 1,"focus_control_type": null,"temp_flag": 0,"official_status": null,"focus_control": 0,"storage_conditions": "","transport_conditions": "","into_cost_flag": null,"rfid_flag": null,"purchase_flag": 1,"tb_status": 0,"version": 1,"create_user": "p1e2c6:UID-051946","create_time": datetime.datetime(2024,6,25,7,1,34),"last_modified_user": "p1e2c6:UID-051946","sterilize_flag": 0,"multi_charge_flag": 0,"use_frequency": 1,"charge_unit": null}'
\ No newline at end of file

data/b5_spd3_core_business_flow/message

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

data/b5_spd3_core_business_flow/message1

 产品审核信息:
-  MSPid: MSP2407080007_1
+  MSPid: MSP2407090007_1
   hosId: h0347
-  hosGoodsId: h034700004499
-  provGoodsid: provGood-99221695
-  goodsAuditBillId: MSP2407080007
-  targetId: MSP2407080007_1
+  hosGoodsId: h034700004510
+  provGoodsid: provGood-99221706
+  goodsAuditBillId: MSP2407090007
+  targetId: MSP2407090007_1

data/b5_spd3_core_business_flow/message10

 低值配送单号:
-  distrBillId1: PSh0347202407080035
-  distrBillId2: PSh0347202407080035
+  distrBillId1: PSh0347202407090008
+  distrBillId2: PSh0347202407090008
 高值配送单号:
-  distrBillId1: PSh0347202407080036
-  distrBillId2: PSh0347202407080036
+  distrBillId1: PSh0347202407090009
+  distrBillId2: PSh0347202407090009
 试剂配送单号:
-  distrBillId1: PSh0347202407080037
-  distrBillId2: PSh0347202407080037
+  distrBillId1: PSh0347202407090010
+  distrBillId2: PSh0347202407090010

data/b5_spd3_core_business_flow/message11

 采购计划单号高值:
-  orderNo1: PLAN2024070831738
-  orderNo2: PLAN2024070831738
+  orderNo1: PLAN2024070931844
+  orderNo2: PLAN2024070931844

data/b5_spd3_core_business_flow/message12

 采购计划单号试剂:
-  orderNo1: PLAN2024070831737
-  orderNo2: PLAN2024070831737
+  orderNo1: PLAN2024070931845
+  orderNo2: PLAN2024070931845

data/b5_spd3_core_business_flow/message13

@@ -3,32 +3,32 @@
   - &id001
     - id:
       hosId: h0347
-      branchId: h0347-3736
+      branchId: h0347-3738
       deptId:
       taskType: 1
-      sourceOrgId: p1e32e
-      sourceOrgName: 国药集团公司^n1@F
-      sourceOrderNo: PSh0347202407080037
+      sourceOrgId: p1e332
+      sourceOrgName: 国药集团公司L1slG
+      sourceOrderNo: PSh0347202407090010
       billMode: '66'
       stockKind:
       purMode:
-      sourceId: PSh0347202407080037
+      sourceId: PSh0347202407090010
       sourceDetailId:
       sourceType: PSD
       sourceTypeName: 配送单
       sourceVersion: 1
-      planOrderNo: PLAN2024070831737
-      purOrderNo: CG2024070820812
-      recOrgId: b3e6c5f2887148389f8535862f789f0a
-      recOrgName: 二级检验科002
-      billRelationJson: '{"buyBillId":"Bh03472024070800072","planBillId":"Ph034720240708028382","planOrderNo":"PLAN2024070831737","buyOrderNo":"BUY2024070806023","purOrderNo":"CG2024070820812","purBillId":"Ch034720240708000075","purBillDate":"2024-07-08
-        10:50:17","distrBillId":"PSh0347202407080037","distrOrderNo":"PSh0347202407080037"}'
-      taskDate: '2024-07-08 10:51:04'
+      planOrderNo: PLAN2024070931845
+      purOrderNo: CG2024070920865
+      recOrgId: d467187bce7f458eb5c4e1007f557353
+      recOrgName: 设备科001
+      billRelationJson: '{"planBillId":"Ph034720240709028490","planOrderNo":"PLAN2024070931845","purOrderNo":"CG2024070920865","purBillId":"Ch034720240709000039","purBillDate":"2024-07-09
+        08:41:20","distrBillId":"PSh0347202407090010","distrOrderNo":"PSh0347202407090010"}'
+      taskDate: '2024-07-09 08:42:05'
       taskDateStart:
       taskDateEnd:
       billModeList:
       viewIdList:
-      supplierFlag: true
+      supplierFlag: false
       tbStatus: 20
       remark: ''
       pdaFlag:

data/b5_spd3_core_business_flow/message14

 验收单详情信息:
   list_a:
   - &id001
-    - purMode: 60
-      unitName: 100支/100
-      hosGoodsId: h034700004501
+    - purMode: 20
+      unitName: 1支
+      hosGoodsId: h034700004510
       mdmGoodsCode:
-      spdGoodsCode: '11661454'
-      goodsCode: '00004501'
-      goodsName: 新型冠状病毒检测试剂hO3Tu
+      spdGoodsCode: '11661463'
+      goodsCode: '00004510'
+      goodsName: 高值牙钻机Mm)84
       goodsGg: G-31891
       mfrsId:
       mfrsName: 德国歌德公司 Geuder AG
@@ -19,23 +19,23 @@
       certificateCode: ''
       rfidFlag: 0
       pkgDefId:
-      pkgDefName: '100'
-      pkgDefQty: 100.0
-      batchCode: '4444'
-      expdtDate: '2025-01-14'
-      productDate: '2024-07-08'
-      provName: 国药集团公司^n1@F
+      pkgDefName:
+      pkgDefQty: 1.0
+      batchCode: '222'
+      expdtDate: '2025-01-15'
+      productDate: '2024-07-09'
+      provName: 国药集团公司L1slG
       provId:
-      viewId: '03839378'
+      viewId: '03839415'
       verifyFlag: 0
       hasSterilize: 0
-      id: '03839378'
+      id: '03839415'
       detailRelationJson:
-      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004501","purMode":60,"goodsName":"新型冠状病毒检测试剂hO3Tu","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661454","ybDefId":""}'
+      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004510","purMode":20,"goodsName":"高值牙钻机Mm)84","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661463","ybDefId":""}'
       recTemperature: 20
       recHumidity: 30
       distrPrice: 99.9999
-      distrPkgQty: 1.0
+      distrPkgQty: 100.0
       distrQty: 100.0
       price: 99.9999
       checkQty: 0.0
@@ -55,9 +55,9 @@
       trustMrfsName:
       multiChargeFlag: 0
       useFrequency: 1
-      codingType: 0
+      codingType:
       limitMessage:
-      autoUnpack: 0
+      autoUnpack:
   list_b:
   - *id001
   list_c:

data/b5_spd3_core_business_flow/message15

 验收单号:
-  CHECK_NO1: CHECKh03472024070800034
-  CHECK_NO2: CHECKh03472024070800034
+  CHECK_NO1: CHECKh03472024070900006
+  CHECK_NO2: CHECKh03472024070900006

data/b5_spd3_core_business_flow/message2

 产品审核信息:
-  MSPid: MSP2407080008_1
+  MSPid: MSP2407090008_1
   hosId: h0347
-  hosGoodsId: h034700004500
-  provGoodsid: provGood-99221696
-  goodsAuditBillId: MSP2407080008
-  targetId: MSP2407080008_1
+  hosGoodsId: h034700004511
+  provGoodsid: provGood-99221707
+  goodsAuditBillId: MSP2407090008
+  targetId: MSP2407090008_1

data/b5_spd3_core_business_flow/message21

 二级库请领产品信息:
   list_a:
   - &id001
-    - hosGoodsId: h034700004501
+    - hosGoodsId: h034700004076
       purMode: 60
       grantRule:
       id:
-      goodsName: 新型冠状病毒检测试剂hO3Tu
+      goodsName: 新型冠状病毒检测试剂DJUhI
       goodsSpec: G-31891
-      mdmGoodsCode: '11661454'
-      goodsCode: '00004501'
+      mdmGoodsCode: '11661024'
+      goodsCode: '00004076'
       unit: 支
       goodsMfrsName: 德国歌德公司 Geuder AG
       miDjmc: ''
@@ -16,33 +16,33 @@
       pkgDefName: '100'
       pkgDefQty: 100.0
       pkgQty:
-      qty: 500.0
+      qty: 400.0
       goodsImg: []
-      pkgDefId: 2d4d3bd0ebe745efa73bb7123cf21f6a
+      pkgDefId: 0d3db4404bcb46b9b80830502f069b4f
       buyPkgQty:
       unitName: 100支/100
       price: 99.9999
       hosId:
       branchId:
-      deptId: b3e6c5f2887148389f8535862f789f0a
+      deptId: a463883417d44685862ebc9eb9c62990
       deptName:
       areaCode:
       areaName:
-      targetDeptId: a762aa0aa2df47dbac4a96173a89e85d
+      targetDeptId: 42d415ddd37444858d61aa923d936b16
       targetDeptName: 设备科001
-      targetStockId: 3a4ab96db19047cc9c36e92a6cc5ea06
-      targetStockName: 东土城路院区IjnkG中心库房
+      targetStockId: 61b06063d63c43848a1bac7f3a3debb4
+      targetStockName: 东土城路院区!uON*中心库房
       purchaseFlag: 1
       tempFlag: 0
-      grantWay: 2
+      grantWay: 3
       deptGoodsStatus:
       codingType: 0
       purModeText: 检验试剂
       goodsGeneralName: 检测试剂
-      provName: 国药集团公司^n1@F
-      noRecPkgQty: 15.0
-      noRecQty: 1500.0
-      autoUnpack: 0
+      provName: 国药集团公司2u7a4
+      noRecPkgQty: 1.0
+      noRecQty: 100.0
+      autoUnpack:
       consumeQty:
       consumePkgQty:
   list_b: