优化调整脚本

air_case/b5_spd3_core_business_flow/a_b1流程八_高值跟台业务流程.air/a_b1流程八_高值跟台业务流程.py

@@ -37,18 +37,21 @@ def operationApply():  # 高值跟台申请
                                             commonFuc().get_business_data(module, "json_contentType"), token,
                                             commonFuc().get_business_data(module, "X-APP-CODE"))
     request_body = commonFuc().get_business_data(module, "payload22", corpId, corpId)
-    print('request_body', '跟台手术申请', request_body)
+    print('request_body', '跟台手术申请列表查询url', request_body)
 
     # # # # 发送请求
     result = commonFuc().http_post(url, request_body, headers)
-    print('result', result)
+    print('跟台手术申请列表查询result', result)
     # 跟台手术申请,列表查询=============
     # 跟台手术申请提交===========================================
     url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
                                                                              "herpService_operationApply_submit_url")
-    print('url', url)
-    stockAreaId = get_stockAreaId_new(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'],
-                                      FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'], 2)
+    print('跟台手术申请提交url', url)
+    # stockAreaId = get_stockAreaId_new(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'],
+    #                                   FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'], 2)
+
+    deptname2= FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2']
+    stockAreaId = get_stockAreaId_new_fromDb(deptname2, 2)
     expireDate = timeUtils().get_time_add(1, 2)
     operDate = timeUtils().get_time_add(1, 2)
     # 从文件中获取必要信息
@@ -74,6 +77,7 @@ def operationApply():  # 高值跟台申请
                                                  provCode, provName, hosGoodsId, hosGoodsCode, provId, subProvId,
                                                  subProvName, goodsName, goodsSpec, goodsMfrsId, goodsMfrsName, unit,
                                                  price)
+    print('跟台手术申请提交request_body', request_body)
     result = commonFuc().http_post(url, request_body, headers)
     print('跟台手术申请提交result', result)
 

data/b2_herp3_bs/message

 院区新增:
-  branch_id: h0347-3757
-  branch_name: 东土城路院区1Joce
+  branch_id: h0347-3759
+  branch_name: 东土城路院区C#H1R
 科室信息:
-  dept2_id: c913da28183b4b34a3ad567a345f4df6
+  dept2_id: ea59fe790acd41719499e7278b8bb50b
   dept2_name: 二级检验科002

data/b5_spd3_core_business_flow/message

 供货关系申请2:
-  e_corpId: p1e37a
+  e_corpId: p1e37e
   h_corpId: h0347
-  e_username: 国药集团公司D1cRP
+  e_username: 国药集团公司sya!$
   h_name: test001

data/b5_spd3_core_business_flow/message1

 产品审核信息:
-  MSPid: MSP2408010015_1
+  MSPid: MSP2408020007_1
   hosId: h0347
-  hosGoodsId: h034700004744
-  provGoodsid: provGood-99221978
-  goodsAuditBillId: MSP2408010015
-  targetId: MSP2408010015_1
+  hosGoodsId: h034700004755
+  provGoodsid: provGood-99221992
+  goodsAuditBillId: MSP2408020007
+  targetId: MSP2408020007_1

data/b5_spd3_core_business_flow/message13

@@ -3,34 +3,33 @@
   - &id001
     - id:
       hosId: h0347
-      branchId: h0347-3757
+      branchId: h0347-3759
       deptId:
       taskType: 1
-      sourceOrgId: p1e37a
-      sourceOrgName: 国药集团公司D1cRP
-      sourceOrderNo: PSh0347202408010093
-      billMode: '66'
+      sourceOrgId: p1e37e
+      sourceOrgName: 国药集团公司sya!$
+      sourceOrderNo: PSh0347202408020011
+      billMode: '25'
       stockKind:
       purMode:
-      sourceId: PSh0347202408010093
+      sourceId: PSh0347202408020011
       sourceDetailId:
       sourceType: PSD
       sourceTypeName: 配送单
       sourceVersion: 1
-      planOrderNo: PLAN2024080134156
-      purOrderNo: CG2024080122414
-      recOrgId: c913da28183b4b34a3ad567a345f4df6
+      planOrderNo: SSSQ202408020369
+      purOrderNo: SSTZ202408020347
+      recOrgId: ea59fe790acd41719499e7278b8bb50b
       recOrgName: 二级检验科002
-      billRelationJson: '{"buyBillId":"Bh03472024080100038","planBillId":"Ph034720240801030801","planOrderNo":"PLAN2024080134156","buyOrderNo":"BUY2024080110209","purOrderNo":"CG2024080122414","purBillId":"Ch034720240801000132","purBillDate":"2024-08-01
-        16:50:33","distrBillId":"PSh0347202408010093","distrOrderNo":"PSh0347202408010093"}'
-      taskDate: '2024-08-01 16:51:04'
+      billRelationJson: '{"operationApplyOrderNo":"SSSQ202408020369","operationNoticeBillId":"Nh034720240802000002","distrBillId":"PSh0347202408020011","operationNoticeOrderNo":"SSTZ202408020347","distrOrderNo":"PSh0347202408020011","operationApplyBillId":"Oh034720240802000002"}'
+      taskDate: '2024-08-02 14:09:04'
       taskDateStart:
       taskDateEnd:
       billModeList:
       viewIdList:
-      supplierFlag: true
+      supplierFlag: false
       tbStatus: 20
-      remark: ''
+      remark:
       pdaFlag:
   list_b:
   - *id001

data/b5_spd3_core_business_flow/message15

 验收单号:
-  CHECK_NO1: CHECKh03472024080100084
-  CHECK_NO2: CHECKh03472024080100084
+  CHECK_NO1: CHECKh03472024080200010
+  CHECK_NO2: CHECKh03472024080200010

data/b5_spd3_core_business_flow/message2

 产品审核信息:
-  MSPid: MSP2408010016_1
+  MSPid: MSP2408020008_1
   hosId: h0347
-  hosGoodsId: h034700004745
-  provGoodsid: provGood-99221979
-  goodsAuditBillId: MSP2408010016
-  targetId: MSP2408010016_1
+  hosGoodsId: h034700004756
+  provGoodsid: provGood-99221993
+  goodsAuditBillId: MSP2408020008
+  targetId: MSP2408020008_1