优化调整脚本

air_case/b5_spd3_core_business_flow/a_a5流程五_中心库入库结算_正结算1_提交采购计划.air/a_a5流程五_中心库入库结算_正结算1_提交采购计划.py

 # -*- encoding=utf8 -*-
 import traceback
 
-from air_case.public1.public1.public1 import get_hosid, get_branch_id, login
+from air_case.public1.public1.public1 import get_hosid, get_branch_id, login, get_stockAreaId_new_fromDb
 from common.fileUtls import FileUtils
 from common.run_cmd_script import execute_command
 
@@ -70,13 +70,15 @@ def low_vaule_purchase_plan():
     deptid1 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid1"]
     hospital_name = commonFuc().get_business_data(module, 'hospital_name')
     areaCode = FileUtils().r_info8('b2_herp3_bs', 'shelfinfo', 'message7')["shelfCode"]
+    # deptname1 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid1']
+    # areaCode =get_stockAreaId_new_fromDb(deptname1, 1)
     areaName = FileUtils().r_info8('b2_herp3_bs', 'shelfinfo', 'message7')["areaName"]
     recUser = uxid
 
     # # 请求体
     request_body = commonFuc().get_business_data(module, "payload1_1_1", hosGoodsId, pkgDefId, hosId, branch_id,
                                                  hospital_name, deptid1, deptid1, areaCode, areaName, recUser)
-    print('request_body', request_body)
+    print('低值采购计划request_body', request_body)
     # new_request_body = request_body.replace("'", '"')
     # new_request_body = new_request_body.replace("None", 'null')
     # # print(new_request_body)

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

@@ -117,9 +117,9 @@ def check_accept_order(type=1):
 
     sourceId = sourceOrderNo
     url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "check_wait_detail_url")
-    print('url', url)
+    print('check_wait_detail_urlurl', url)
     request_body = commonFuc().get_business_data(module, "payload1", sourceId, sourceType, billMode, branch_id)
-
+    print('check_wait_detail_url,request_body', request_body)
     # print('request_body',request_body)
     # 发送请求
     while True:

data/b3_herp3_purchase/data

@@ -71,9 +71,10 @@ json_headers2: {
   "X-APP-CODE":"%s"
 }
 "payload": '{"purPlanDetail":[{"hosGoodsId":"h034700001977","pkgDefId":"22513b84dad7418fb445e5de02fa88f0","pkgDefName":"大包","pkgDefQty":20,"planPkgQty":0},{"hosGoodsId":"h034700001977","pkgDefId":"3c2b4432415e46c4aebb018969c3dcc0","pkgDefName":"小包","pkgDefQty":15,"planPkgQty":0},{"hosGoodsId":"h034700001977","pkgDefId":"56b010aba2e04f978e3038c0f53d910c","pkgDefName":" 包","pkgDefQty":33,"planPkgQty":800},{"hosGoodsId":"h034700001977","pkgDefId":"f8ad68aae4a5406ab04316e46bbf38bd","pkgDefName":"包2","pkgDefQty":66,"planPkgQty":0}],"hosId":"h0347","branchId":"h0347-2011","mgrCorpName":"邹城市人民医院(test)","deptName":"","deptId":"d69a68df361a4289b2262e4ef75b55a5","recOrgId":"d69a68df361a4289b2262e4ef75b55a5","recOrgName":"","areaCode":"areah03470414","areaName":"A库区","recUser":"UID-050151","recPhone":"xhs1009","recAddr":"A","remark":"","sourceType":"","createType":"SG","checkLcTaskQty":true}'
-"payload1_1_1": {"purPlanDetail":[{"hosGoodsId":"%s","pkgDefId":"%s","pkgDefName":"100","pkgDefQty":100,"planPkgQty":100}],"hosId":"%s","branchId":"%s","mgrCorpName":"%s","deptName":"","deptId":"%s","recOrgId":"%s","recOrgName":"","areaCode":"%s","areaName":"%s","recUser":"%s","recPhone":"xhs","recAddr":"自动化测试","remark":"","sourceType":"","createType":"SG","checkLcTaskQty":true}
-"payload1_1_2": {"purPlanDetail":[{"hosGoodsId":"%s","pkgDefId":null,"pkgDefName":"包","pkgDefQty":1,"planPkgQty":100}],"hosId":"%s","branchId":"%s","mgrCorpName":"%s","deptName":"","deptId":"%s","recOrgId":"%s","recOrgName":"","areaCode":"%s","areaName":"%s","recUser":"%s","recPhone":"xhs","recAddr":"自动化测试","remark":"","sourceType":"","createType":"SG","checkLcTaskQty":true}
-"payload1_1_3": {"purPlanDetail":[{"hosGoodsId":"%s","pkgDefId":"%s","pkgDefName":"100","pkgDefQty":100,"planPkgQty":100}],"hosId":"%s","branchId":"%s","mgrCorpName":"%s","deptName":"","deptId":"%s","recOrgId":"%s","recOrgName":"","areaCode":"%s","areaName":"%s","recUser":"%s","recPhone":"xhs","recAddr":"自动化测试","remark":"","sourceType":"","createType":"SG","checkLcTaskQty":true}
+#"payload1_1_1": {"purPlanDetail":[{"hosGoodsId":"%s","pkgDefId":"%s","pkgDefName":"100","pkgDefQty":100,"planPkgQty":100}],"hosId":"%s","branchId":"%s","mgrCorpName":"%s","deptName":"","deptId":"%s","recOrgId":"%s","recOrgName":"","areaCode":"%s","areaName":"%s","recUser":"%s","recPhone":"xhs","recAddr":"自动化测试","remark":"","sourceType":"","createType":"SG","checkLcTaskQty":true}
+"payload1_1_1": {"purPlanDetail":[{"hosGoodsId":"%s","pkgDefId":"%s","pkgDefName":"100","pkgDefQty":100,"planPkgQty":100,"codingType":0}],"hosId":"%s","branchId":"%s","mgrCorpName":"%s","deptName":"","deptId":"%s","recOrgId":"%s","recOrgName":"","areaCode":"%s","areaName":"%s","recUser":"%s","recPhone":"xhs","recAddr":"设备科001","remark":"","sourceType":"","createType":"SG","checkLcTaskQty":true}
+"payload1_1_2": {"purPlanDetail":[{"hosGoodsId":"%s","pkgDefId":null,"pkgDefName":"包","pkgDefQty":1,"planPkgQty":100,"codingType":0}],"hosId":"%s","branchId":"%s","mgrCorpName":"%s","deptName":"","deptId":"%s","recOrgId":"%s","recOrgName":"","areaCode":"%s","areaName":"%s","recUser":"%s","recPhone":"xhs","recAddr":"自动化测试","remark":"","sourceType":"","createType":"SG","checkLcTaskQty":true}
+"payload1_1_3": {"purPlanDetail":[{"hosGoodsId":"%s","pkgDefId":"%s","pkgDefName":"100","pkgDefQty":100,"planPkgQty":100,"codingType":0}],"hosId":"%s","branchId":"%s","mgrCorpName":"%s","deptName":"","deptId":"%s","recOrgId":"%s","recOrgName":"","areaCode":"%s","areaName":"%s","recUser":"%s","recPhone":"xhs","recAddr":"自动化测试","remark":"","sourceType":"","createType":"SG","checkLcTaskQty":true}
 
 
 "payload_1": '{"purPlanDetail":[{"hosGoodsId":"h034700001947","pkgDefId":null,"pkgDefName":"包","pkgDefQty":1,"planPkgQty":888}],"hosId":"h0347","branchId":"h0347-2011","mgrCorpName":"邹城市人民医院(test)","deptName":"","deptId":"d69a68df361a4289b2262e4ef75b55a5","recOrgId":"d69a68df361a4289b2262e4ef75b55a5","recOrgName":"","areaCode":"areah03470414","areaName":"A库区","recUser":"UID-050151","recPhone":"xhs1009","recAddr":"A","remark":"","sourceType":"","createType":"SG","checkLcTaskQty":true}'
@@ -94,9 +95,9 @@ json_headers2: {
 "payload10": '{"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":999,"pkgDefQty":1,"provId":"p00001603","provName":"北京中杉金桥生物技术有限公司(test)","subProvId":"p56a4","subProvName":"国药集团浙江医疗器材有限公司","hosGoodsId":"h034700001757","purMode":20,"version":0,"pkgDefId":null,"purTaskId":null,"sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":true}'
 "payload11": {"pid":"%s","hosGoodsName":"","hosGoodsSpec":"","provName":"","purModes":[],"subProvName":""}
 "payload12": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":800,"pkgDefQty":33,"provId":"p10d95","provName":"浙江高仰医疗科技有限公司","subProvId":"p10d95","subProvName":"浙江高仰医疗科技有限公司","hosGoodsId":"h034700001977","purMode":10,"version":0,"pkgDefId":"56b010aba2e04f978e3038c0f53d910c","purTaskId":null,"sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
-"payload12_1_1": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":100,"pkgDefQty":100,"provId":"%s","provName":"%s","subProvId":"%s","subProvName":"%s","hosGoodsId":"%s","purMode":10,"version":0,"pkgDefId":"%s","purTaskId":null,"sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
-"payload12_1_2": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":100,"pkgDefQty":1,"provId":"%s","provName":"%s","subProvId":"%s","subProvName":"%s","hosGoodsId":"%s","purMode":20,"version":0,"pkgDefId":null,"purTaskId":null,"sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
-"payload12_1_3": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":100,"pkgDefQty":100,"provId":"%s","provName":"%s","subProvId":"%s","subProvName":"%s","hosGoodsId":"%s","purMode":60,"version":0,"pkgDefId":"%s","purTaskId":null,"sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
+"payload12_1_1": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":100,"pkgDefQty":100,"provId":"%s","provName":"%s","subProvId":"%s","subProvName":"%s","hosGoodsId":"%s","purMode":10,"version":0,"pkgDefId":"%s","purTaskId":null,"sourceId":null,"codingType":0}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
+"payload12_1_2": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":100,"pkgDefQty":1,"provId":"%s","provName":"%s","subProvId":"%s","subProvName":"%s","hosGoodsId":"%s","purMode":20,"version":0,"pkgDefId":null,"purTaskId":null,"sourceId":null,"codingType":0}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
+"payload12_1_3": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":100,"pkgDefQty":100,"provId":"%s","provName":"%s","subProvId":"%s","subProvName":"%s","hosGoodsId":"%s","purMode":60,"version":0,"pkgDefId":"%s","purTaskId":null,"sourceId":null,"codingType":0}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
 
 "payload13": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":3,"planPkgQty":888,"pkgDefQty":1,"provId":"p10d95","provName":"浙江高仰医疗科技有限公司","subProvId":"p10d95","subProvName":"浙江高仰医疗科技有限公司","hosGoodsId":"h034700001947","purMode":20,"version":0,"pkgDefId":null,"purTaskId":null,"sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
 "payload14": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":888,"pkgDefQty":1,"provId":"p000029d8","provName":"国药集团湖南分公司mkcQNd","subProvId":"p000029d7","subProvName":"国药集团湖北分公司mQDwR7","hosGoodsId":"h034700001859","purMode":60,"version":0,"pkgDefId":"26d93e6fecd24b6fa4bde8aeacfbf153","purTaskId":"5c85573c049141ff8df808dabc30d2b1","sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":false}

data/b5_spd3_core_business_flow/message13

@@ -6,24 +6,24 @@
       branchId: h0347-3738
       deptId:
       taskType: 1
-      sourceOrgId: p1e332
-      sourceOrgName: 国药集团公司L1slG
-      sourceOrderNo: PSh0347202407090062
+      sourceOrgId: p1e35e
+      sourceOrgName: 国药集团公司S57ui
+      sourceOrderNo: PSh0347202408010065
       billMode: '66'
       stockKind:
       purMode:
-      sourceId: PSh0347202407090062
+      sourceId: PSh0347202408010065
       sourceDetailId:
       sourceType: PSD
       sourceTypeName: 配送单
       sourceVersion: 1
-      planOrderNo: PLAN2024070931922
-      purOrderNo: CG2024070920928
-      recOrgId: 7b4d11aec57042e096684a46e9148fdd
-      recOrgName: 二级检验科002
-      billRelationJson: '{"buyBillId":"Bh03472024070900081","planBillId":"Ph034720240709028567","planOrderNo":"PLAN2024070931922","buyOrderNo":"BUY2024070906129","purOrderNo":"CG2024070920928","purBillId":"Ch034720240709000102","purBillDate":"2024-07-09
-        11:37:11","distrBillId":"PSh0347202407090062","distrOrderNo":"PSh0347202407090062"}'
-      taskDate: '2024-07-09 11:38:26'
+      planOrderNo: PLAN2024080134122
+      purOrderNo: CG2024080122381
+      recOrgId: 63c734f07fcc422ea80f49ca8e5bbd95
+      recOrgName: 设备科001
+      billRelationJson: '{"planBillId":"Ph034720240801030767","planOrderNo":"PLAN2024080134122","purOrderNo":"CG2024080122381","purBillId":"Ch034720240801000099","purBillDate":"2024-08-01
+        15:14:28","distrBillId":"PSh0347202408010065","distrOrderNo":"PSh0347202408010065"}'
+      taskDate: '2024-08-01 15:15:04'
       taskDateStart:
       taskDateEnd:
       billModeList:

data/b5_spd3_core_business_flow/message15

 验收单号:
-  CHECK_NO1: CHECKh03472024080100018
-  CHECK_NO2: CHECKh03472024080100018
+  CHECK_NO1: CHECKh03472024080100056
+  CHECK_NO2: CHECKh03472024080100056