From ce208e037d231b1218aa957f6c46a17832d1db50 Mon Sep 17 00:00:00 2001 From: xiao-hesheng Date: Mon, 22 Apr 2024 16:49:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...07\350\264\255\350\256\241\345\210\222.py" | 233 +++++++++++++++++- ...26\347\275\221\351\205\215\351\200\201.py" | 197 ++++++++++++--- data/a6_mdm3_dp/data | 5 +- data/b2_herp3_bs/message | 6 +- data/b3_herp3_purchase/data | 6 + report/summary.html | 4 +- 6 files changed, 400 insertions(+), 51 deletions(-) diff --git "a/air_case/b5_spd3_core_business_flow/a_a5\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222.air/a_a5\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222.py" "b/air_case/b5_spd3_core_business_flow/a_a5\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222.air/a_a5\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222.py" index eec0c1a8..7560f1e7 100644 --- "a/air_case/b5_spd3_core_business_flow/a_a5\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222.air/a_a5\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222.py" +++ "b/air_case/b5_spd3_core_business_flow/a_a5\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222.air/a_a5\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222.py" @@ -1,4 +1,6 @@ # -*- encoding=utf8 -*- +import traceback + from common.fileUtls import FileUtils from common.run_cmd_script import execute_command @@ -36,7 +38,7 @@ def login(): # 采购计划_低值 -def test1(): +def low_vaule_purchase_plan(): module = "b3_herp3_purchase" # 登录获取用户id等信息，使用创建的用户登录===========开始 info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3') @@ -256,6 +258,205 @@ def get_GoodsPkgDef(hosGoodsId): info = (unitPackageid, unitPackageid) titlename = ('unitPackageid1', 'unitPackageid2') FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '产品包装信息', titlename, 'message6') +#高值采购计划 +def hight_vaule_purchase_plan(): + module = "b3_herp3_purchase" + # 登录获取用户id等信息，使用创建的用户登录===========开始 + info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3') + print(info) + username1 = info['username1'] + + username = username1 + ## print('医院名称',username) + password = commonFuc().get_business_data(module, "password") + # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa') + # 获取token和projectCode + token, projectCode, uxid, corpId, info = login_system(username, password).get_token() + # 登录获取用户id等信息，使用创建的用户登录============结束 + # 获取暂存的单号======================================= + url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "herpService_purPlan_insert_url") + print(url) + # 获取请求头信息 + headers = commonFuc().get_business_data(module, "json_headers2", + commonFuc().get_business_data(module, "json_contentType"), token, + commonFuc().get_business_data(module, "X-APP-CODE")) + print('headers', headers) + hosGoodsId = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message1')["hosGoodsId"] + pkgDefId = None + # 获取院区id + branch_id = FileUtils().r_info('b2_herp3_bs', '院区新增')["branch_id"] + hosId = branch_id[0:5] + 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"] + areaName = FileUtils().r_info8('b2_herp3_bs', 'shelfinfo', 'message7')["areaName"] + recUser = uxid + + # # 请求体 + request_body = commonFuc().get_business_data(module, "payload1_1_2", hosGoodsId, hosId, branch_id, + hospital_name, deptid1, deptid1, areaCode, areaName, recUser) + print('request_body', request_body) + # new_request_body = request_body.replace("'", '"') + # new_request_body = new_request_body.replace("None", 'null') + # # print(new_request_body) + # import json + # request_body_json = json.loads(new_request_body) + # print('request_body_json', request_body_json) + # 发送请求 + result = commonFuc().http_post(url, request_body, headers) + print('result', result) + pid = commonFuc().analysis_json('data', result) # 采购计划号 + # 获取暂存的单号========================================================== + + # 获取采购计划详情中的id + url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "herpService_purPlan_listVo_url") + print(url) + # 获取请求头信息 + headers = commonFuc().get_business_data(module, "json_headers2", + commonFuc().get_business_data(module, "json_contentType"), token, + commonFuc().get_business_data(module, "X-APP-CODE")) + print('headers', headers) + # # 请求体 + request_body = commonFuc().get_business_data(module, "payload11", pid) + # 发送请求 + result = commonFuc().http_post(url, request_body, headers) + print('resultaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', result) + data = commonFuc().analysis_json('data', result) + id1 = commonFuc().analysis_json('id', data[0]) + orderNo = commonFuc().analysis_json('orderNo', data[0]) + print('orderNo',orderNo) + titlename=('orderNo1','orderNo2') + info=(orderNo,orderNo) + FileUtils().w_info8(info,'b5_spd3_core_business_flow', '采购计划单号高值', titlename, 'message11') + # ===================================== + + url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "herpService_purPlan_submitPurPlan_url") + print(url) + # 获取请求头信息 + headers = commonFuc().get_business_data(module, "json_headers2", + commonFuc().get_business_data(module, "json_contentType"), token, + commonFuc().get_business_data(module, "X-APP-CODE")) + print('headers', headers) + provId = FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2', 'message')["e_corpId"] + provName = FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2', 'message')["e_username"] + subProvId = FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2', 'message')["e_corpId"] + subProvName = FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2', 'message')["e_username"] + # # 请求体 + request_body = commonFuc().get_business_data(module, "payload12_1_2", pid, id1, provId, provName, subProvId, + subProvName, hosGoodsId) + # 发送请求 + result = commonFuc().http_post(url, request_body, headers) + print('resultbbbbbbbbbbbbbbbbbbbb', result) + # 断言 + code = commonFuc().analysis_json('code', result) + data = commonFuc().analysis_json('data', result) + if code == 0 and data == None: + commonFuc().check_text_exist(0, result) + else: + commonFuc().check_text_exist('error', result) +#试剂采购计划 +def reagent_purchase_plan(): + module = "b3_herp3_purchase" + # 登录获取用户id等信息，使用创建的用户登录===========开始 + info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3') + print(info) + username1 = info['username1'] + + username = username1 + ## print('医院名称',username) + password = commonFuc().get_business_data(module, "password") + # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa') + # 获取token和projectCode + token, projectCode, uxid, corpId, info = login_system(username, password).get_token() + # 登录获取用户id等信息，使用创建的用户登录============结束 + # 获取暂存的单号======================================= + url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "herpService_purPlan_insert_url") + print(url) + # 获取请求头信息 + headers = commonFuc().get_business_data(module, "json_headers2", + commonFuc().get_business_data(module, "json_contentType"), token, + commonFuc().get_business_data(module, "X-APP-CODE")) + print('headers', headers) + hosGoodsId = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message3')["hosGoodsId"] + + get_GoodsPkgDef(hosGoodsId) # 获取单元包id + pkgDefId = FileUtils().r_info8('b5_spd3_core_business_flow', '产品包装信息', 'message6')["unitPackageid1"] + + # 获取院区id + branch_id = FileUtils().r_info('b2_herp3_bs', '院区新增')["branch_id"] + hosId = branch_id[0:5] + 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"] + areaName = FileUtils().r_info8('b2_herp3_bs', 'shelfinfo', 'message7')["areaName"] + recUser = uxid + + # # 请求体 + request_body = commonFuc().get_business_data(module, "payload1_1_3", hosGoodsId,pkgDefId, hosId, branch_id, + hospital_name, deptid1, deptid1, areaCode, areaName, recUser) + print('request_body', request_body) + # new_request_body = request_body.replace("'", '"') + # new_request_body = new_request_body.replace("None", 'null') + # # print(new_request_body) + # import json + # request_body_json = json.loads(new_request_body) + # print('request_body_json', request_body_json) + # 发送请求 + result = commonFuc().http_post(url, request_body, headers) + print('result', result) + pid = commonFuc().analysis_json('data', result) # 采购计划号 + # 获取暂存的单号========================================================== + + # 获取采购计划详情中的id + url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "herpService_purPlan_listVo_url") + print(url) + # 获取请求头信息 + headers = commonFuc().get_business_data(module, "json_headers2", + commonFuc().get_business_data(module, "json_contentType"), token, + commonFuc().get_business_data(module, "X-APP-CODE")) + print('headers', headers) + # # 请求体 + request_body = commonFuc().get_business_data(module, "payload11", pid) + # 发送请求 + result = commonFuc().http_post(url, request_body, headers) + print('resultaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', result) + data = commonFuc().analysis_json('data', result) + id1 = commonFuc().analysis_json('id', data[0]) + orderNo = commonFuc().analysis_json('orderNo', data[0]) + print('orderNo', orderNo) + titlename = ('orderNo1', 'orderNo2') + info = (orderNo, orderNo) + FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '采购计划单号试剂', titlename, 'message12') + # ===================================== + + url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "herpService_purPlan_submitPurPlan_url") + print(url) + # 获取请求头信息 + headers = commonFuc().get_business_data(module, "json_headers2", + commonFuc().get_business_data(module, "json_contentType"), token, + commonFuc().get_business_data(module, "X-APP-CODE")) + print('headers', headers) + provId = FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2', 'message')["e_corpId"] + provName = FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2', 'message')["e_username"] + subProvId = FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2', 'message')["e_corpId"] + subProvName = FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2', 'message')["e_username"] + # # 请求体 + request_body = commonFuc().get_business_data(module, "payload12_1_3", pid, id1, provId, provName, subProvId, + subProvName, hosGoodsId,pkgDefId) + # 发送请求 + result = commonFuc().http_post(url, request_body, headers) + print('resultbbbbbbbbbbbbbbbbbbbb', result) + # 断言 + code = commonFuc().analysis_json('code', result) + data = commonFuc().analysis_json('data', result) + if code == 0 and data == None: + commonFuc().check_text_exist(0, result) + else: + commonFuc().check_text_exist('error', result) + + + + try: # 获取低值的hosGoodsId hosGoodsId = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message2')["hosGoodsId"] @@ -263,12 +464,34 @@ try: except: print('流程五获取hosGoodsId出现错误,请检查脚本或者数据') try: - test1() -except: - print('采购计划提交出现错误,请检查脚本或者数据') + low_vaule_purchase_plan() +except Exception as e: + print('低值采购计划提交出现错误,请检查脚本或者数据') + print("发生异常：", str(e)) + traceback.print_exc() #审批 try: approval_center() except Exception as e: print('审批采购计划出现错误,请检查脚本或者数据') - print("发生异常：", str(e)) \ No newline at end of file + print("发生异常：", str(e)) +try: + hight_vaule_purchase_plan() +except Exception as e: + print('高值采购计划出现错误,请检查脚本或者数据') + print("发生异常：", str(e)) +try: + approval_center() +except Exception as e: + print('审批采购计划出现错误,请检查脚本或者数据') + print("发生异常：", str(e)) +try: + reagent_purchase_plan() +except Exception as e: + print('试剂采购计划出现错误,请检查脚本或者数据') + print("发生异常：", str(e)) +try: + approval_center() +except Exception as e: + print('审批采购计划出现错误,请检查脚本或者数据') + print("发生异常：", str(e)) diff --git "a/air_case/b5_spd3_core_business_flow/a_a6\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2272_\345\244\226\347\275\221\351\205\215\351\200\201.air/a_a6\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2272_\345\244\226\347\275\221\351\205\215\351\200\201.py" "b/air_case/b5_spd3_core_business_flow/a_a6\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2272_\345\244\226\347\275\221\351\205\215\351\200\201.air/a_a6\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2272_\345\244\226\347\275\221\351\205\215\351\200\201.py" index 6eb69dca..418e1f7a 100644 --- "a/air_case/b5_spd3_core_business_flow/a_a6\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2272_\345\244\226\347\275\221\351\205\215\351\200\201.air/a_a6\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2272_\345\244\226\347\275\221\351\205\215\351\200\201.py" +++ "b/air_case/b5_spd3_core_business_flow/a_a6\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2272_\345\244\226\347\275\221\351\205\215\351\200\201.air/a_a6\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2272_\345\244\226\347\275\221\351\205\215\351\200\201.py" @@ -1,13 +1,17 @@ # -*- encoding=utf8 -*- +import traceback + from air_case.mdm_login.登录外网系统.登录外网系统 import login_system from common.fileUtls import FileUtils from common.run_cmd_script import execute_command +from common.timeUtils import timeUtils __author__ = "xiaohesheng" """ case_tag:api,mdm-core,a_a6流程五_中心库入库结算_正结算2_外网配送,id2302,id2302-6,sit,on -主数据平台:a_a6流程五_中心库入库结算_正结算2_外网配送 +主数据平台:a_a6流程五_中心库入库结算_正结算2_外网配送 +python runner_test.py tag id2302-6 debug mdm3 """ from common.common_func import commonFuc @@ -16,14 +20,19 @@ import sys import time module = "b5_spd3_core_business_flow" -def order_dp(): - execute_command("python runner.py tag id2302-5 debug sit") + + +def order_dp(type=1): + execute_command("python runner_test.py tag id2302-5 debug sit") # # 登录获取用户id等信息，使用创建的用户登录===========开始 info = FileUtils().r_info8('b5_spd3_core_business_flow', "供货关系申请2", 'message') # print(info) username = info['e_username'] - print('username',username) + password = commonFuc().get_business_data("b2_herp3_bs", "password1") + # username = '001f90380' + # password='1qaz!QAZ' + print('username,password', username, password) # # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa') # # 获取token和projectCode token, projectCode, uxid, corpId, info = login_system(username, password).get_token() @@ -38,10 +47,20 @@ def order_dp(): projectCode) branch_id = FileUtils().r_info('b2_herp3_bs', '院区新增')["branch_id"] hos_id = branch_id[0:5] - exeProvId= FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2','message')["e_corpId"] - orderNo1= FileUtils().r_info8('b5_spd3_core_business_flow', '采购计划单号','message7')["orderNo1"] - print(orderNo1) - request_body = commonFuc().get_business_data(module, "payload1_1_1",orderNo1,hos_id,exeProvId) + exeProvId = FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2', 'message')["e_corpId"] + + if type == 1: + orderNo1 = FileUtils().r_info8('b5_spd3_core_business_flow', '采购计划单号', 'message7')["orderNo1"] + print(orderNo1) + elif type == 2: + orderNo1 = FileUtils().r_info8('b5_spd3_core_business_flow', '采购计划单号高值', 'message11')["orderNo1"] + print(orderNo1) + elif type == 3: + orderNo1 = FileUtils().r_info8('b5_spd3_core_business_flow', '采购计划单号试剂', 'message12')["orderNo1"] + print(orderNo1) + else: + orderNo1 = 'orderNo1' + request_body = commonFuc().get_business_data(module, "payload1_1_1", orderNo1, hos_id, exeProvId) # print('request_body',request_body) # 发送请求 while True: @@ -58,14 +77,49 @@ def order_dp(): data1 = commonFuc().analysis_json('data', data) id1 = commonFuc().analysis_json('id', data1[0]) - print('id1',id1) - #=========================查询待确认订单====================== - #==============================确认订单================== + print('id1', id1) + + data = commonFuc().analysis_json('data', result) + data1 = commonFuc().analysis_json('data', data) + list_a = [] + list_b = [] + list_c = [] + list_a.append(data1) + list_b.append(data1) + list_c.append(data1) + # print('list_a', len(list_a), list_a) + info = (list_a, list_b, list_c) + titlename = ('list_a', 'list_b', 'list_c') + # 将配送订单信息息写入到文件中 + FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '配送订单信息', titlename, 'message8') + # 从message8文件中获取信息 + info = FileUtils().r_info8('b5_spd3_core_business_flow', "配送订单信息", 'message8') + # print('info', info) + list_a = info['list_a'] + list_a = ','.join(map(str, list_a)) + import json + new_request_body = list_a.replace("'", '"') + new_request_body1 = new_request_body.replace("None", 'null') + print(new_request_body1) + list_a2 = json.loads(new_request_body1) + # print('list_a', list_a) + billMode = "billMode" + createUser = 'createUser' + hosId = 'hosId' + provId = 'provId' + for i in list_a2: + billMode = i["billMode"] + createUser = i["createUser"] + hosId = i['hosId'] + provId = i['provId'] + break + + # =========================查询待确认订单====================== + # ==============================确认订单================== module = "a6_mdm3_dp" url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "ensure_url") - request_body = commonFuc().get_business_data(module, "payload2", id1, uxid) # print('request_body',request_body) @@ -79,8 +133,8 @@ def order_dp(): commonFuc().check_text_exist(code, result) else: commonFuc().check_text_exist('error', result) -#==============================确认订单================== -#==============================配送================== + # ==============================确认订单================== + # ==============================配送================== # url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "purchase_page_url") # # request_body = commonFuc().get_business_data(module, "payload3_1_1",exeProvId,hos_id) @@ -94,54 +148,117 @@ def order_dp(): # data1 = commonFuc().analysis_json('data', data) # id1=commonFuc().analysis_json('id', data1[0]) # print('id1',id1) -#==================a3获取订单详细信息中的子表id_3_0医院 - #a1订单配送列表数据查询_全部 + # ==================a3获取订单详细信息中的子表id_3_0医院 + # a1订单配送列表数据查询_全部 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "detail_id_url") - request_body = commonFuc().get_business_data(module, "payload4",id1) + request_body = commonFuc().get_business_data(module, "payload4", id1) # print('request_body',request_body) # 发送请求 result = commonFuc().http_post(url, request_body, headers) - print('result', result) - #断言 - code=commonFuc().analysis_json('code',result) - data=commonFuc().analysis_json('data',result) - total=commonFuc().analysis_json('total',data) + print('resulta3获取订单详细信息中的子表id_3_0医院', result) + # 断言 + code = commonFuc().analysis_json('code', result) + data = commonFuc().analysis_json('data', result) + total = commonFuc().analysis_json('total', data) - commonFuc().check_text_exist(code,result) + commonFuc().check_text_exist(code, result) data1 = commonFuc().analysis_json('data', data) - id2=commonFuc().analysis_json('id',data1[0]) - print(id1,id2) + id2 = commonFuc().analysis_json('id', data1[0]) + print(id1, id2) + data1 = commonFuc().analysis_json('data', data) + list_a = [] + list_b = [] + list_c = [] + list_a.append(data1) + list_b.append(data1) + list_c.append(data1) + # print('list_a', len(list_a), list_a) + info = (list_a, list_b, list_c) + titlename = ('list_a', 'list_b', 'list_c') + # 将配送订单信息息写入到文件中 + FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '配送订单详细信息', titlename, 'message9') -#==================a3获取订单详细信息中的子表id_3_0医院 -#==================订单配送 + # ==================a3获取订单详细信息中的子表id_3_0医院 + # ==================订单配送======================== module = "a6_mdm3_dp" - #a1订单配送列表数据查询_全部 + # a1订单配送列表数据查询_全部 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "submit_url") - # 获取请求头信息 + # 获取请求头信息 headers = commonFuc().get_business_data(module, "json_headers2", commonFuc().get_business_data(module, "json_contentType"), token, projectCode) - request_body = commonFuc().get_business_data(module, "payload9_2",id1,id1,id2,id2) + # 从message9文件中获取信息 + info = FileUtils().r_info8('b5_spd3_core_business_flow', "配送订单详细信息", 'message9') + print('info从message9文件中获取信息', info) + # print('info', info) + list_a = info['list_a'] + # print('list_a',list_a,type(list_a)) + # list_a = ','.join(map(str, list_a)) + # import json + # new_request_body = list_a.replace("'", '"') + # new_request_body1 = new_request_body.replace("None", 'null') + # print('new_request_body1',new_request_body1) + # + # list_a2 = json.loads(new_request_body1) + # print('list_a2', list_a2) + # print('list_a2', type(list_a2)) + hosGoodsId = 'hosGoodsId' + mdmGoodsCode = 'mdmGoodsCode' + goodsCode = 'goodsCode' + pkgDefId = 'pkgDefId' + erpCode = 'erpCode' + for i in list_a: + print('aaaaaaaaaaaaaaaaaaaaaaaaaaaa', i) + for j in i: + print('bbbbbbbbbbbbbbbbbbb', j) + hosGoodsId = j['hosGoodsId'] + mdmGoodsCode = j['mdmGoodsCode'] + goodsCode = j['goodsCode'] + pkgDefId = j['pkgDefId'] + erpCode = j['erpCode'] + break + # # #获取日期 + productDate = timeUtils().get_time_hms(5) + expdtDate = timeUtils().get_time_add(190, 2) + if type == 1: + request_body = commonFuc().get_business_data(module, "payload9_2_1_1", id1, id1, hosId, provId, billMode, + createUser, username, createUser, id2, hosGoodsId, mdmGoodsCode, + goodsCode, pkgDefId, productDate, expdtDate, erpCode, id2) + elif type == 2: + request_body = commonFuc().get_business_data(module, "payload9_2_1_2", id1, id1, hosId, provId, billMode, + createUser, username, createUser, id2, hosGoodsId, mdmGoodsCode, + goodsCode, productDate, expdtDate, erpCode, id2) + elif type == 3: + request_body = commonFuc().get_business_data(module, "payload9_2_1_3", id1, id1, hosId, provId, billMode, + createUser, username, createUser, id2, hosGoodsId, mdmGoodsCode, + goodsCode, pkgDefId, productDate, expdtDate, erpCode, id2) - print('request_body',request_body) + print('request_body', request_body) # 发送请求 result = commonFuc().http_post(url, request_body, headers) print('result', result) - #断言 - code=commonFuc().analysis_json('code',result) - data=commonFuc().analysis_json('data',result) - total=commonFuc().analysis_json('total',data) - if code==0: - commonFuc().check_text_exist(code,result) + # 断言 + code = commonFuc().analysis_json('code', result) + data = commonFuc().analysis_json('data', result) + id1 = commonFuc().analysis_json('id', data) + info = (id1, id1) + titlename = ('distrBillId1', 'distrBillId2') + # 将配送订单信息息写入到文件中 + FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '低值配送单号', titlename, 'message10') + if code == 0: + commonFuc().check_text_exist(code, result) else: commonFuc().check_text_exist('error', result) -#==================订单配送 +# ==================订单配送===================================== try: - order_dp() + # order_dp(1) # 1低值 + # order_dp(2)#2高值 + order_dp(3)#3试剂 except Exception as e: print('订单配送发生错误,请检查脚本或者数据') - print("发生异常：", str(e)) \ No newline at end of file + print("发生异常：", str(e)) + traceback.print_exc() diff --git a/data/a6_mdm3_dp/data b/data/a6_mdm3_dp/data index 98fa9277..6f161dae 100644 --- a/data/a6_mdm3_dp/data +++ b/data/a6_mdm3_dp/data @@ -41,6 +41,7 @@ json_headers2: { "payload3_2": {"pageNum":1,"pageSize":50,"orderBy":"last_modified desc, order_no desc","queryObject":{"dateValue":["",""],"exeProvId":"p10d95","pageType":1,"hosIdList":["h0028"],"tabIdx":"2","startDate":"","endDate":""}} "payload4": {"pageNum":1,"pageSize":50,"orderBy":"","queryObject":{"id":"%s","billType":"CGD","hosVersion":3,"goodsName":""}} + "payload5": {"id": "","purBillId": "%s","sourceId": "%s","sourceVersion": 1,"version": 0,"billMode": "16","hosVersion": 3,"createUser": "GYQX-SPD:user-19669","createUserName": "浙江高仰医疗","lastModifiedUser": "GYQX-SPD:user-19669","detailList": [{"sourceDetailId": "%s","hosGoodsId": "h034700001977","mdmGoodsCode": "11658092","goodsCode": "00001977","certificateCode": "械注1698145277","pkgDefId": "56b010aba2e04f978e3038c0f53d910c","provGoodsId": null,"replPkgQty": 333,"settlement": 1,"batchCode": "222","productDate": "2023-11-01","expdtDate": "2023-11-26","distrPkgQty": 1,"disabledFlag": 0,"distrQty": 10989,"ext": {"ygptCode": "","transCond": "","storageCond": "","erpCode": "11658092"},"edit": true,"barcodeList": [],"viewId": "%sROW0"}]} "payload5_1": { "id": "", @@ -97,7 +98,9 @@ json_headers2: { "payload9": {"pageNum":1,"pageSize":50,"orderBy":"last_modified desc, order_no desc","queryObject":{"dateValue":["",""],"hosId":"h0347","orderNo":"","provId":"p10d95","pageType":2,"tabIdx":"2","startDate":"","endDate":""}} "payload9_1": {"pageNum":1,"pageSize":50,"orderBy":"last_modified desc, order_no desc","queryObject":{"dateValue":["",""],"hosId":"h0028","orderNo":"","provId":"p10d95","pageType":2,"tabIdx":"2","startDate":"","endDate":""}} "payload9_2": {"id":"","purBillId":"%s","sourceId":"%s","sourceVersion":1,"version":0,"billMode":"20","hosVersion":3,"createUser":"GYQX-SPD:user-19669","createUserName":"浙江高仰医疗","lastModifiedUser":"GYQX-SPD:user-19669","detailList":[{"sourceDetailId":"%s","hosGoodsId":"h034700001984","mdmGoodsCode":"11658124","goodsCode":"00001984","certificateCode":"鄂准药监器20231044114","pkgDefId":null,"provGoodsId":null,"replPkgQty":799,"settlement":3,"batchCode":"333","productDate":"2024-04-15","expdtDate":"2035-02-25","distrPkgQty":1,"disabledFlag":0,"distrQty":1,"ext":{"ygptCode":"","transCond":"","storageCond":"2~8℃保存","erpCode":"11658124"},"edit":true,"barcodeList":[],"viewId":"%sROW0"}]} -"payload9_2_1_1": {"id":"","purBillId":"%s","sourceId":"%s","sourceVersion":1,"version":0,"billMode":"20","hosVersion":3,"createUser":"%s:%s","createUserName":"%s","lastModifiedUser":"%s:%s","detailList":[{"sourceDetailId":"%s","hosGoodsId":"%s","mdmGoodsCode":"%s","goodsCode":"%s","certificateCode":"%s","pkgDefId":"%s","provGoodsId":null,"replPkgQty":100,"settlement":1,"batchCode":"333","productDate":"%s","expdtDate":"%s","distrPkgQty":100,"disabledFlag":0,"distrQty":10000,"ext":{"ygptCode":"","transCond":"","storageCond":"","erpCode":"11659861"},"edit":true,"barcodeList":[],"viewId":"%sROW0"}]} +"payload9_2_1_1": {"id":"","purBillId":"%s","sourceId":"%s","sourceVersion":1,"version":0,"hosId":"%s","provId":"%s","billMode":"%s","hosVersion":3,"createUser":"%s","createUserName":"%s","lastModifiedUser":"%s","detailList":[{"sourceDetailId":"%s","hosGoodsId":"%s","mdmGoodsCode":"%s","goodsCode":"%s","certificateCode":"","pkgDefId":"%s","provGoodsId":null,"replPkgQty":100,"settlement":1,"batchCode":"333","productDate":"%s","expdtDate":"%s","distrPkgQty":100,"disabledFlag":0,"distrQty":10000,"ext":{"ygptCode":"","transCond":"","storageCond":"","erpCode":"%s"},"edit":true,"barcodeList":[],"viewId":"%sROW0"}]} +"payload9_2_1_2": {"id":"","purBillId":"%s","sourceId":"%s","sourceVersion":1,"version":0,"hosId":"%s","provId":"%s","billMode":"%s","hosVersion":3,"createUser":"%s","createUserName":"%s","lastModifiedUser":"%s","detailList":[{"sourceDetailId":"%s","hosGoodsId":"%s","mdmGoodsCode":"%s","goodsCode":"%s","certificateCode":"","pkgDefId":null,"provGoodsId":null,"replPkgQty":100,"settlement":1,"batchCode":"222","productDate":"%s","expdtDate":"%s","distrPkgQty":100,"disabledFlag":0,"distrQty":100,"ext":{"ygptCode":"","transCond":"","storageCond":"","erpCode":"%s"},"edit":true,"barcodeList":[],"viewId":"%sROW0"}]} +"payload9_2_1_3": {"id":"","purBillId":"%s","sourceId":"%s","sourceVersion":1,"version":0,"hosId":"%s","provId":"%s","billMode":"%s","hosVersion":3,"createUser":"%s","createUserName":"%s","lastModifiedUser":"%s","detailList":[{"sourceDetailId":"%s","hosGoodsId":"%s","mdmGoodsCode":"%s","goodsCode":"%s","certificateCode":"","pkgDefId":"%s","provGoodsId":null,"replPkgQty":100,"settlement":1,"batchCode":"4444","productDate":"%s","expdtDate":"%s","distrPkgQty":100,"disabledFlag":0,"distrQty":10000,"ext":{"ygptCode":"","transCond":"","storageCond":"","erpCode":"%s"},"edit":true,"barcodeList":[],"viewId":"%sROW0"}]} "payload9_3": {"id":"","purBillId":"%s","sourceId":"%s","sourceVersion":"%s","version":0,"billMode":"66","hosVersion":2,"createUser":"GYQX-SPD:user-19669","createUserName":"浙江高仰医疗","lastModifiedUser":"GYQX-SPD:user-19669","detailList":[{"sourceDetailId":"%s","hosGoodsId":"h0028|hosGood-880444","mdmGoodsCode":null,"goodsCode":"880444","certificateCode":"京械注准203420915218","pkgDefId":"h0028000217","provGoodsId":"provGood-1939432","replPkgQty":6,"settlement":0,"batchCode":"1","productDate":"2023-12-01","expdtDate":"2023-12-31","distrPkgQty":1,"disabledFlag":0,"distrQty":10,"ext":{"ygptCode":"","transCond":"0-15℃","storageCond":"0-30℃","erpCode":"11658060"},"edit":true,"barcodeList":[],"viewId":"%sROW0"}]} "payload9_4": {"pageNum":1,"pageSize":50,"orderBy":"last_modified desc, order_no desc","queryObject":{"dateValue":["",""],"provId":"p10d95","pageType":2,"hosIdList":["h0347","h0028"],"tabIdx":"3","startDate":"","endDate":""}} diff --git a/data/b2_herp3_bs/message b/data/b2_herp3_bs/message index 1c672abb..d63b361e 100644 --- a/data/b2_herp3_bs/message +++ b/data/b2_herp3_bs/message @@ -1,6 +1,6 @@ 院区新增: - branch_id: h0347-3502 - branch_name: 东土城路院区d5UMZ + branch_id: h0347-3503 + branch_name: 东土城路院区nv$Ra 科室信息: - dept2_id: f77d430a8dd54881a080889b4bb84873 + dept2_id: c4f7cc8f099a44eea00008984057b8d6 dept2_name: 二级检验科002 diff --git a/data/b3_herp3_purchase/data b/data/b3_herp3_purchase/data index b8c33260..7c6410d2 100644 --- a/data/b3_herp3_purchase/data +++ b/data/b3_herp3_purchase/data @@ -72,6 +72,10 @@ json_headers2: { } "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} + + "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}' "payload_2": '{"purPlanDetail":[{"hosGoodsId":"h034700001859","pkgDefId":"26d93e6fecd24b6fa4bde8aeacfbf153","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":false}' "payload_3": {"pageNum": 1,"pageSize": 50,"queryObject": {"orderNo": "","hosId": "h0347","startTime": null,"endTime": null}} @@ -91,6 +95,8 @@ json_headers2: { "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} "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} diff --git a/report/summary.html b/report/summary.html index 328c9a26..f8dab50e 100644 --- a/report/summary.html +++ b/report/summary.html @@ -56,7 +56,7 @@ 1 1 - 0分18秒 + 0分52秒 100.0% @@ -74,7 +74,7 @@ a_a6流程五_中心库入库结算_正结算2_外网配送 成功 - 18.616 + 51.897 xiaohesheng -- GitLab