From 3915b26c9399e019c527c601dbfdac18ada2fde1 Mon Sep 17 00:00:00 2001 From: xiao-hesheng Date: Mon, 22 Jul 2024 12:14:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8D=81=E4=B8=80=E8=84=9A=E6=9C=AC=E7=BC=96?= =?UTF-8?q?=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...56\345\272\223\351\252\214\350\257\201.py" | 103 ++-- ...56\345\272\223\351\252\214\350\257\201.py" | 472 ++++-------------- air_case/public1/public1/public1.py | 25 +- 3 files changed, 167 insertions(+), 433 deletions(-) diff --git "a/air_case/b6_spd3_core_business_flow_database_check/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\347\233\264\351\200\201_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\347\233\264\351\200\201_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" "b/air_case/b6_spd3_core_business_flow_database_check/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\347\233\264\351\200\201_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\347\233\264\351\200\201_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" index af79292e..da3b961f 100644 --- "a/air_case/b6_spd3_core_business_flow_database_check/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\347\233\264\351\200\201_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\347\233\264\351\200\201_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" +++ "b/air_case/b6_spd3_core_business_flow_database_check/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\347\233\264\351\200\201_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\347\233\264\351\200\201_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" @@ -1414,6 +1414,7 @@ def check_hdi_distr_detail(distr_main_key, type, purchase_id): print('error') commonFuc().check_text_exist_result_text('error', 'succees') + def check_mcms_check(type=1): if type == 1: bill_mode = 16 @@ -1441,9 +1442,9 @@ def check_mcms_check(type=1): rec_org_name = get_rec_org_name(2) dept_id = rec_org_id dept_name = rec_org_name - branch_id=get_branch_id() - buyBillId = get_buyBillId(branch_id,bill_mode) - buyOrderNo = get_buyOrderNo(branch_id,bill_mode) + branch_id = get_branch_id() + buyBillId = get_buyBillId(branch_id, bill_mode) + buyOrderNo = get_buyOrderNo(branch_id, bill_mode) if type == 1: hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message2')["hosGoodsId"] elif type == 2: @@ -1452,30 +1453,32 @@ def check_mcms_check(type=1): hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message3')["hosGoodsId"] planBillId = get_planBillId(hos_goods_id) planOrderNo = get_planOrderNo(hos_goods_id) - purOrderNo = get_purOrderNo(branch_id,bill_mode) - purBillId = get_purBillId(branch_id,bill_mode) - bill_relation_json = get_purBillDate(branch_id,bill_mode) - purBillDate=reGetString(bill_relation_json, r'purBillDate":"', r'""distrBillId') - distrBillId = get_distrBillId(branch_id,bill_mode) - distrOrderNo=get_distrOrderNo(branch_id,bill_mode) - checkBillId=check_no - checkOrderNo=order_no - create_user=get_login_user_uxid() - sql="select create_time from mcms_check where id='%s';"%check_no - create_time=get_create_time(sql) - sql="select last_modified from mcms_check where id='%s';"%check_no - last_modified=get_create_time(sql) - last_modified_user=create_user - if type==1: - check_mcms_check_batch(type,check_no,order_no,hos_goods_id) + purOrderNo = get_purOrderNo(branch_id, bill_mode) + purBillId = get_purBillId(branch_id, bill_mode) + bill_relation_json = get_purBillDate(branch_id, bill_mode) + purBillDate = reGetString(bill_relation_json, r'purBillDate":"', r'""distrBillId') + distrBillId = get_distrBillId(branch_id, bill_mode) + distrOrderNo = get_distrOrderNo(branch_id, bill_mode) + checkBillId = check_no + checkOrderNo = order_no + create_user = get_login_user_uxid() + sql = "select create_time from mcms_check where id='%s';" % check_no + create_time = get_create_time(sql) + sql = "select last_modified from mcms_check where id='%s';" % check_no + last_modified = get_create_time(sql) + last_modified_user = create_user + if type == 1: + check_mcms_check_batch(type, check_no, order_no, hos_goods_id) expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'mcms_check', check_no, order_no, get_hosid(), get_branch_id(), source_id, source_no, prov_id, prov_name, rec_org_id, rec_org_name, dept_id, dept_name, buyBillId, - planBillId, planOrderNo, buyOrderNo, purOrderNo, purBillId, purBillDate, - distrBillId,distrOrderNo,checkBillId,checkOrderNo,create_user,create_time,last_modified, + planBillId, planOrderNo, buyOrderNo, purOrderNo, purBillId, + purBillDate, + distrBillId, distrOrderNo, checkBillId, checkOrderNo, create_user, + create_time, last_modified, last_modified_user) - elif type==2: - check_mcms_check_batch(type,check_no,order_no,hos_goods_id) + elif type == 2: + check_mcms_check_batch(type, check_no, order_no, hos_goods_id) expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'mcms_check1', check_no, order_no, get_hosid(), get_branch_id(), source_id, source_no, prov_id, prov_name, rec_org_id, rec_org_name, dept_id, dept_name, buyBillId, @@ -1485,7 +1488,7 @@ def check_mcms_check(type=1): create_time, last_modified, last_modified_user) else: - check_mcms_check_batch(type,check_no,order_no,hos_goods_id) + check_mcms_check_batch(type, check_no, order_no, hos_goods_id) expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'mcms_check2', check_no, order_no, get_hosid(), get_branch_id(), source_id, source_no, prov_id, prov_name, rec_org_id, rec_org_name, dept_id, dept_name, buyBillId, @@ -1513,7 +1516,9 @@ def check_mcms_check(type=1): else: print('error') commonFuc().check_text_exist_result_text('error', 'succees') -def check_mcms_check_batch(type,check_no,order_no,hos_goods_id): + + +def check_mcms_check_batch(type, check_no, order_no, hos_goods_id): print('数据库检查验收单子表') if type == 1: bill_mode = 16 @@ -1521,41 +1526,45 @@ def check_mcms_check_batch(type,check_no,order_no,hos_goods_id): bill_mode = 20 else: bill_mode = 66 - sql="select * from mcms_check_batch where pid='%s'"%check_no + sql = "select * from mcms_check_batch where pid='%s'" % check_no # 获取实际值 actual = check_mcms_pur_plan_sql(sql) print('actual', actual) - id=get_id("select id from mcms_check_batch where pid='%s'"%check_no) - pid=check_no - branch_id=get_branch_id() - distr_detail_id=get_distr_detail_id(branch_id,bill_mode) - source_detail_id=distr_detail_id - mdm_goods_code=get_mdm_goods_code1(hos_goods_id) - goods_code=get_goods_code1(hos_goods_id) - sql="select id from hdi_barcode where code_type='%s'order by create_time desc LIMIT 1;"%bill_mode - barcode_id=get_id(sql) - create_user=get_login_user_uxid() - create_time=get_create_time("select create_time from mcms_check_batch where pid='%s'"%check_no) - last_modified=get_create_time("select last_modified from mcms_check_batch where pid='%s'"%check_no) - last_modified_user=create_user - if type==1: + id = get_id("select id from mcms_check_batch where pid='%s'" % check_no) + pid = check_no + branch_id = get_branch_id() + distr_detail_id = get_distr_detail_id(branch_id, bill_mode) + source_detail_id = distr_detail_id + mdm_goods_code = get_mdm_goods_code1(hos_goods_id) + goods_code = get_goods_code1(hos_goods_id) + sql = "select id from hdi_barcode where code_type='%s'order by create_time desc LIMIT 1;" % bill_mode + barcode_id = get_id(sql) + create_user = get_login_user_uxid() + create_time = get_create_time("select create_time from mcms_check_batch where pid='%s'" % check_no) + last_modified = get_create_time("select last_modified from mcms_check_batch where pid='%s'" % check_no) + last_modified_user = create_user + if type == 1: expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'mcms_check_batch', id, - pid,order_no,source_detail_id,distr_detail_id,hos_goods_id,mdm_goods_code, - goods_code,barcode_id,create_user,create_time,last_modified,last_modified_user + pid, order_no, source_detail_id, distr_detail_id, hos_goods_id, + mdm_goods_code, + goods_code, barcode_id, create_user, create_time, last_modified, + last_modified_user ) - elif type==2: + elif type == 2: expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'mcms_check_batch1', id, pid, order_no, source_detail_id, distr_detail_id, hos_goods_id, mdm_goods_code, - goods_code, barcode_id, create_user, create_time, last_modified,last_modified_user + goods_code, barcode_id, create_user, create_time, last_modified, + last_modified_user ) else: expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'mcms_check_batch2', id, pid, order_no, source_detail_id, distr_detail_id, hos_goods_id, mdm_goods_code, - goods_code, barcode_id, create_user, create_time, last_modified,last_modified_user + goods_code, barcode_id, create_user, create_time, last_modified, + last_modified_user ) # 对比预期值和实际值是否一致 # comparison_result(actual, expected) @@ -1576,6 +1585,8 @@ def check_mcms_check_batch(type,check_no,order_no,hos_goods_id): else: print('error') commonFuc().check_text_exist_result_text('error', 'succees') + + try: pro_path = commonFuc().get_pro_path2() print('pro_path', pro_path) @@ -1632,7 +1643,7 @@ try: for i in list_data: check_mcms_purchase(int(i)) - #检查同步到外网的采购订单数据跟内网的是否一致 + # 检查同步到外网的采购订单数据跟内网的是否一致 check_mcms_purchase_out_and_in(1) print('检查同步到外网的采购订单数据跟内网的是否一致') check_mcms_purchase_out_and_in(2) diff --git "a/air_case/b6_spd3_core_business_flow_database_check/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" "b/air_case/b6_spd3_core_business_flow_database_check/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" index 80f781e9..15991891 100644 --- "a/air_case/b6_spd3_core_business_flow_database_check/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" +++ "b/air_case/b6_spd3_core_business_flow_database_check/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" @@ -5,6 +5,7 @@ import traceback from air_case.b1_herp3_login.登录内网系统.登录内网系统 import login_system from air_case.public1.public1.public1 import * from common.db.sql.sql_del_branch_info import delData +from common.db.sql.sql_tools import get_create_time, check_mcms_dept_buy_car_sql from common.fileUtls import FileUtils from common.run_cmd_script import execute_command @@ -20,390 +21,99 @@ python runner_test.py tag id2303-15 debug mdm3 """ -def SERACH_goods_id(GoodsId): - # 在请领出库渠道边仓中搜索产品 - module = 'b5_spd3_core_business_flow' - # # 登录获取用户id等信息，使用创建的用户登录===========开始 - info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3') - username = info['username1'] - password = commonFuc().get_business_data("b2_herp3_bs", "password") - print('username,password', username, password) - # # 获取token和projectCode - token, projectCode, uxid, corpId, info = login(username, password, 2) - # 登录获取用户id等信息，使用创建的用户登录============结束\ - # 获取请求头信息 - headers = commonFuc().get_business_data(module, "json_headers2", - commonFuc().get_business_data(module, "json_contentType"), token, - commonFuc().get_business_data(module, "X-APP-CODE")) - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "herpService_mcmsBranchGoodsInfo_page_url") - dept1 = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid1'] - # hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'] - # GoodsId = hosGoodsId.replace(get_hosid(), '') - request_body = commonFuc().get_business_data(module, "payload53_2", GoodsId, get_hosid(), get_branch_id(), dept1) - result = commonFuc().http_post(url, request_body, headers) - branchGoodsId = commonFuc().analysis_json('id', commonFuc().analysis_json('data', commonFuc().analysis_json('data', - result))) - return branchGoodsId - - -def second_dept_Request(hosGoodsId, type): - module = "b5_spd3_core_business_flow" - # # 登录获取用户id等信息，使用创建的用户登录===========开始 - info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3') - username = info['username1'] - password = commonFuc().get_business_data("b2_herp3_bs", "password") - print('username,password', username, password) - # # 获取token和projectCode - token, projectCode, uxid, corpId, info = login(username, password, 2) - # 登录获取用户id等信息，使用创建的用户登录============结束 - # 我要请领_手工请领_列表查询=========================== - headers = commonFuc().get_business_data(module, "json_headers2", - commonFuc().get_business_data(module, "json_contentType"), token, - commonFuc().get_business_data(module, "X-APP-CODE")) - - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "herpService_buy_queryGoodsInfoPage_url") - print('我要请领_手工请领_列表查询=================', url) - deptid2 = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'] - deptname2 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5'] - # 高值 - # hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'] - GoodsId = hosGoodsId.replace(get_hosid(), '') - areaCode = get_stockAreaId_new(deptid2, deptname2, 2) - request_body = commonFuc().get_business_data(module, "payload39", GoodsId, get_hosid(), deptid2, areaCode) - print('我要请领_手工请领_列表查询', 'request_body', request_body) - result = commonFuc().http_post(url, request_body, headers) - print('我要请领_手工请领_列表查询,result', result) - data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result)) - goodsName = commonFuc().analysis_json('goodsName', data1) - goodsSpec = commonFuc().analysis_json('goodsSpec', data1) - mdmGoodsCode = commonFuc().analysis_json('mdmGoodsCode', data1) - goodsCode = commonFuc().analysis_json('goodsCode', data1) - unit = commonFuc().analysis_json('unit', data1) - purMode = commonFuc().analysis_json('purMode', data1) - goodsMfrsName = commonFuc().analysis_json('goodsMfrsName', data1) - unitName = commonFuc().analysis_json('unitName', data1) - price = commonFuc().analysis_json('price', data1) - deptId = commonFuc().analysis_json('deptId', data1) - # areaCode=commonFuc().analysis_json('areaCode',data1) - areaName = '默认库区' - targetDeptId = commonFuc().analysis_json('targetDeptId', data1) - targetDeptName = commonFuc().analysis_json('targetDeptName', data1) - targetStockId = commonFuc().analysis_json('targetStockId', data1) - targetStockName = commonFuc().analysis_json('targetStockName', data1) - purModeText = commonFuc().analysis_json('purModeText', data1) - goodsGeneralName = commonFuc().analysis_json('goodsGeneralName', data1) - provName = commonFuc().analysis_json('provName', data1) - pkgDefId = commonFuc().analysis_json('pkgDefId', data1) - # 信息写入文件 - 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, module, '二级库向二级库请领产品信息', titlename, 'message23') - # 我要请领_手工请领_列表查询=========================== - # 添加到请领车============================================= - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "herpService_buy_createBuyCar_url") - print('添加到请领车=================', url) +def check_mcms_dept_buy_car(type=1): + hos_goods_id = 'hos_goods_id' if type == 1: - request_body = commonFuc().get_business_data(module, "payload40", hosGoodsId, goodsName, goodsSpec, - mdmGoodsCode, - goodsCode, unit, purMode, goodsMfrsName, pkgDefId, unitName, price, - deptId, - areaCode, areaName, targetDeptId, targetDeptName, targetStockId, - targetStockName, purModeText, goodsGeneralName, provName) + hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message2')["hosGoodsId"] elif type == 2: - request_body = commonFuc().get_business_data(module, "payload41", hosGoodsId, goodsName, goodsSpec, - mdmGoodsCode, - goodsCode, unit, purMode, goodsMfrsName, unitName, price, deptId, - areaCode, areaName, targetDeptId, targetDeptName, targetStockId, - targetStockName, purModeText, goodsGeneralName, provName) + hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message1')["hosGoodsId"] elif type == 3: - request_body = commonFuc().get_business_data(module, "payload42", hosGoodsId, goodsName, goodsSpec, - mdmGoodsCode, - goodsCode, unit, purMode, goodsMfrsName, pkgDefId, unitName, price, - deptId, - areaCode, areaName, targetDeptId, targetDeptName, targetStockId, - targetStockName, purModeText, goodsGeneralName, provName) - request_body = get_process_list(request_body) - print('添加到请领车', 'request_body', request_body) - result = commonFuc().http_post(url, request_body, headers) - print('添加到请领车,result', result) - # 添加到请领车============================================= - - -def BuyCarSubmit(): - module = "b5_spd3_core_business_flow" - # # 登录获取用户id等信息，使用创建的用户登录===========开始 - info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3') - username = info['username1'] - password = commonFuc().get_business_data("b2_herp3_bs", "password") - print('username,password', username, password) - # # 获取token和projectCode - token, projectCode, uxid, corpId, info = login(username, password, 2) - # 登录获取用户id等信息，使用创建的用户登录============结束 - # 我要请领_手工请领_列表查询=========================== - headers = commonFuc().get_business_data(module, "json_headers2", - commonFuc().get_business_data(module, "json_contentType"), token, - commonFuc().get_business_data(module, "X-APP-CODE")) - # 请领车查询=============================================== - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "herpService_buy_queryBuyCarPage_url") - print('请领车查询=================', url) - deptid2 = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'] - deptname2 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5'] - areaCode = get_stockAreaId_new(deptid2, deptname2, 2) - request_body = commonFuc().get_business_data(module, "payload43", areaCode, get_hosid(), deptid2) - - print('请领车查询', 'request_body', request_body) - result = commonFuc().http_post(url, request_body, headers) - print('请领车查询,result', result) - data = commonFuc().analysis_json('data', result) - list_id = [] - for i in data: - id = commonFuc().analysis_json('id', i) - list_id.append(id) - # 请领车查询=============================================== - # 请领车提交=============================================== - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "herpService_buy_validBuyCarSubmit_url") - print('请领车提交=================', url) - - billExpdtDate = timeUtils().get_time_add(30, 2) - print('billExpdtDate', billExpdtDate) - request_body = commonFuc().get_business_data(module, "payload44", billExpdtDate, get_branch_id(), list_id[0], - list_id[1], list_id[2]) - - print('请领车提交', 'request_body', request_body) - result = commonFuc().http_post(url, request_body, headers) - print('请领车提交,result', result) - # 请领车提交=============================================== - # 创建领车交易================================================= - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "herpService_buy_createBuyBill_url") - print('创建领车交易=================', url) - - billExpdtDate = timeUtils().get_time_add(30, 2) - request_body = commonFuc().get_business_data(module, "payload44", billExpdtDate, get_branch_id(), list_id[0], - list_id[1], list_id[2]) - - print('创建领车交易', 'request_body', request_body) - result = commonFuc().http_post(url, request_body, headers) - print('创建领车交易,result', result) - currentTaskList = commonFuc().analysis_json('currentTaskList', commonFuc().analysis_json('data', result)) - - -def add_dept2(): - module = 'b2_herp3_bs' - # 内网登录 - username = commonFuc().get_business_data(module, "username") - # 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() - # print( token,projectCode,uxid,corpId,info) - # c3_新增科室_特殊科室_二级库房 - branch_id = FileUtils().r_info(module, '院区新增')["branch_id"] - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "dept_insert_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")) - - # #请求体 - request_body = commonFuc().get_business_data(module, "payload15_2", get_branch_id(), get_hosid()) - print(request_body) - # # # 发送请求 - result = commonFuc().http_post(url, request_body, headers) - print('result', result) - - -def add_new_deptinfo(): - module = "b2_herp3_bs" - # 内网登录 - username = commonFuc().get_business_data(module, "username") - # 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() - # print( token,projectCode,uxid,corpId,info) - # b9_科室管理_科室登记_科室查询 - branch_id = FileUtils().r_info(module, '院区新增')["branch_id"] - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "deptPage_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")) - # #请求体 - request_body = commonFuc().get_business_data(module, "payload13", branch_id) - print(request_body) - # # # 发送请求 - result = commonFuc().http_post(url, request_body, headers) + hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message3')["hosGoodsId"] + branch_id = get_branch_id() + # 获取create_time的值 + create_time = get_create_time( + "select create_time from mcms_dept_buy_car where branch_id='%s'and hos_goods_id='%s'order by create_time desc LIMIT 1;" % ( + branch_id, hos_goods_id)) + print('create_time', create_time) + id = get_id( + "select id from mcms_dept_buy_car where branch_id='%s'and hos_goods_id='%s' order by create_time desc LIMIT 1;" % ( + branch_id, hos_goods_id)) + print('id', id) + create_user = get_id( + "select create_user from mcms_dept_buy_car where branch_id='%s'and hos_goods_id='%s' order by create_time desc LIMIT 1;;" % ( + branch_id, hos_goods_id)) + print('create_time', create_time, 'id', id) + sql = """select * from mcms_dept_buy_car where branch_id='%s' and hos_goods_id='%s' order by create_time desc LIMIT 1; + """ % (branch_id, hos_goods_id) + # 要验证的sql，取自数据库的表中 + actual_value1 = check_mcms_dept_buy_car_sql(sql) + print(actual_value1) + deptid2 = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'] + deptname2 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'] + areaCode = get_stockAreaId_new_fromDb(deptname2, 2) + areaName = '默认库区' + # 读取文件中的信息 + info = FileUtils().r_info8('b5_spd3_core_business_flow', "二级库请领产品信息", 'message21') + list_a = info['list_a'] + mdm_goods_code = commonFuc().analysis_json('mdmGoodsCode', list_a) + pur_mode = commonFuc().analysis_json('purMode', list_a) + goodsCode = commonFuc().analysis_json('goodsCode', list_a) + pkgDefId = commonFuc().analysis_json('pkgDefId', list_a) + pkgDefName = commonFuc().analysis_json('pkgDefName', list_a) + last_modified_user = create_user + last_modified = create_time + # print('actual_value1',actual_value1) + actual_value2 = get_process_list2(actual_value1) + # print('actual_value2') + # print( actual_value2) + # prov_hos_goods_id = '8d6273b7bca84dd8aace12b9422d7fd6' + expected_value2 = 'expected_value2' + if type == 1 or type == 3: + expected_value2 = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', + 'check_mcms_dept_buy_car_low_value', id, get_hosid(), branch_id, + deptid2, + deptname2, areaCode, areaName, hos_goods_id, mdm_goods_code, + goodsCode, pur_mode, pkgDefId, pkgDefName + , create_user, create_time, last_modified, last_modified_user) + elif type == 2: + expected_value2 = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', + 'check_mcms_dept_buy_car_high_value', id, get_hosid(), + branch_id, + deptid2, + deptname2, areaCode, areaName, hos_goods_id, mdm_goods_code, + goodsCode, pur_mode, + create_user, create_time, last_modified, last_modified_user) + # print('expected_value2', expected_value2) + # expected_value2=get_process_list2(expected_value2) + actual_value2 = actual_value2.replace(" ", "") + expected_value2 = expected_value2.replace(" ", "") + # print('actual_value2',actual_value2) + print('expected_value2') + print(expected_value2) + print('actual_value2') + print(actual_value2) + result = (compare_text_index(actual_value2, expected_value2)) print('result', result) - data = commonFuc().analysis_json('data', result) - total = commonFuc().analysis_json('total', data) - if total == 5: - commonFuc().check_text_exist(0, result) + if actual_value2 == expected_value2: + print('ok') + commonFuc().check_text_exist_result_text('succees', 'succees') else: - commonFuc().check_text_exist('error', result) - # 将deptid写入文件 - data1 = commonFuc().analysis_json('data', data) - print('data1', data1) - info = [] - for i in data1: - deptid = commonFuc().analysis_json('id', i) - info.append(deptid) - titlename = ['deptid1', 'deptid2', 'deptid3', 'deptid4', 'deptid5'] - - FileUtils().w_info8(info, module, '所有科室id', titlename, 'message6') - info1 = [] - for i in data1: - ename = commonFuc().analysis_json('ename', i) - info1.append(ename) - FileUtils().w_info8(info1, module, '所有科室name', titlename, 'message6') - - -def edit_goods_target(currentDeptId, targetDeptId): - module = "b2_herp3_bs" - # # 登录获取用户id等信息，使用创建的用户登录===========开始 - info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3') - username = info['username1'] - password = commonFuc().get_business_data("b2_herp3_bs", "password") - print('username,password', username, password) - # # 获取token和projectCode - token, projectCode, uxid, corpId, info = login(username, password, 2) - # 登录获取用户id等信息，使用创建的用户登录============结束 - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "basic_mcmsDeptGoodsInfo_page_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")) - - # #请求体 - request_body = commonFuc().get_business_data(module, "payload58_13_1", currentDeptId, get_hosid()) - result = commonFuc().http_post(url, request_body, headers) - print('科室产品列表查询', result) - data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result)) - for i in data1: - shelfCode = commonFuc().analysis_json('shelfCode', i) - id1 = commonFuc().analysis_json('id', i) - pkgDefId = commonFuc().analysis_json('pkgDefId', i) - purMode = commonFuc().analysis_json('purMode', i) - tbStatus = commonFuc().analysis_json('tbStatus', i) - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "herpService_basic_mcmsDeptGoodsInfo_url") - url = url + id1 - result = commonFuc().http_get(url, headers) - print('获取产品详情信息', result) - data2 = commonFuc().analysis_json('data', result) - packetQty = commonFuc().analysis_json('packetQty', data2) - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "basic_mcmsDeptGoodsInfo_updateById") - if purMode == 60 or purMode == 10: # 低值和试剂 - request_body = commonFuc().get_business_data(module, "payload58_10_1", id1, pkgDefId, targetDeptId, - shelfCode, packetQty, - tbStatus) - elif purMode == 20: # 高值 - request_body = commonFuc().get_business_data(module, "payload58_10_2", id1, targetDeptId, - shelfCode, tbStatus) - print('编辑产品请领渠道request_body', request_body) - result = commonFuc().http_post(url, request_body, headers) - print('编辑产品请领渠道result', result) - - -def pick_execute(): - module = "b5_spd3_core_business_flow" - # # 登录获取用户id等信息，使用创建的用户登录===========开始 - info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3') - username = info['username1'] - password = commonFuc().get_business_data("b2_herp3_bs", "password") - print('username,password', username, password) - # # 获取token和projectCode - token, projectCode, uxid, corpId, info = login(username, password, 2) - # 登录获取用户id等信息，使用创建的用户登录============结束 - # 生成拣货单列表查询=============================================== - headers = commonFuc().get_business_data(module, "json_headers2", - commonFuc().get_business_data(module, "json_contentType"), token, - commonFuc().get_business_data(module, "X-APP-CODE")) - url1 = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "herpService_stock_out_buyPage_url") - print('请领出库列表页面=================', url1) - request_body1 = commonFuc().get_business_data(module, "payload46_1", get_branch_id()) - - print('请领出库列表页面', 'request_body', request_body1) - result1 = commonFuc().http_post(url1, request_body1, headers) - print('请领出库列表页面,result1', result1) - data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result1)) - for i in data1: - # 获取id - BH_ID = commonFuc().analysis_json('id', i) - version = commonFuc().analysis_json('version', i) - deptBuyDetailVOList = commonFuc().analysis_json('deptBuyDetailVOList', i) - purMode = commonFuc().analysis_json('purMode', deptBuyDetailVOList) - # 生成拣货单列表查询=============================================== - # 生成拣货单列表锁定=============================================== - - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "herpService_stock_out_use_updateLock_url") - print('请领出库列表列表页面锁定=================', url) - # version=int(version)+1 - request_body = commonFuc().get_business_data(module, "payload49_1", BH_ID, version) - - print('请领出库列表列表页面锁定', 'request_body', request_body) - result = commonFuc().http_post(url, request_body, headers) - print('请领出库列表列表页面锁定,result1', result) - # 生成拣货单列表锁定=============================================== - - # 拣货============================== - if purMode == 10: - udi_code = get_udi2(1) # 获取条码 低值1 高值2 试剂3 - elif purMode == 20: - udi_code = get_udi2(2) # 获取条码 低值1 高值2 试剂3 - elif purMode == 60: - udi_code = get_udi2(3) # 获取条码 低值1 高值2 试剂3 - else: - udi_code = 'udi_code' - print('udi_code', udi_code) - if purMode == 10: - targetAreaCode,sourceId=pickScan2(BH_ID, udi_code, 1) # 低值 - elif purMode == 20: - targetAreaCode,sourceId=pickScan2(BH_ID, udi_code, 2) # 高值 - elif purMode == 60: - targetAreaCode,sourceId= pickScan2(BH_ID, udi_code, 3) # 试剂 - else: - targetAreaCode='targetAreaCode' - sourceId='sourceId' - # 提交领用出库单 - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "herpService_stock_out_use_submit_url") - print('提交拣货执行单=================', url) - if purMode == 10: - request_body = commonFuc().get_business_data(module, "payload51_1_1", targetAreaCode,sourceId) - elif purMode == 20: - request_body = commonFuc().get_business_data(module, "payload51_1_2", targetAreaCode,sourceId) - elif purMode == 60: - request_body = commonFuc().get_business_data(module, "payload51_1_3", targetAreaCode,sourceId) - - print('提交拣货执行单', 'request_body', request_body) - result = commonFuc().http_post(url, request_body, headers) - print(' 提交拣货执行单,result1', result) - - -# 复核=================================== + print('error') + commonFuc().check_text_exist_result_text('error', 'succees') try: + pro_path = commonFuc().get_pro_path2() + print('pro_path', pro_path) + sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b5流程十二请领业务流_二级库向二级库.air') + using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b5流程十二请领业务流_二级库向二级库.air') + + from a_b5流程十二请领业务流_二级库向二级库 import add_dept2 + + from a_b5流程十二请领业务流_二级库向二级库 import add_new_deptinfo,edit_goods_target,second_dept_Request + from a_b5流程十二请领业务流_二级库向二级库 import BuyCarSubmit,pick_execute + from a_b5流程十二请领业务流_二级库向二级库 import purchase_module_process + from a_b5流程十二请领业务流_二级库向二级库 import order_dp + from a_b5流程十二请领业务流_二级库向二级库 import check_accept_order add_dept2() # 新增一个二级科室 add_new_deptinfo() # 写入科室信息到文件中 grants_user_new() # 新增授权 @@ -416,7 +126,12 @@ try: set_dept_lead_new(FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid5"]) # 设置二级科室负责人 get_stockAreaId_new(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'], FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5'], 2) - set_stockShelf_Linkman()#设置库区联系人 + + # 设置库区联系人 + deptName5 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5'] + + set_stockShelf_Linkman(FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid5"], + get_stockAreaId2_new_fromDb(deptName5, 2)) #新建科室产品分配 dept_goods_distribute(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5']) #编辑产品请领目标为二级检验科002 @@ -427,6 +142,7 @@ try: updateUserLoginDefaultRange(get_listUserMgrRangePage1(5)) # 设置登录账号默认权限是新二级库 # # # 低值 second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'], 1) + check_mcms_dept_buy_car(1) # # # 高值 second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'], 2) # # # 试剂 diff --git a/air_case/public1/public1/public1.py b/air_case/public1/public1/public1.py index 134fb852..ff1c3626 100644 --- a/air_case/public1/public1/public1.py +++ b/air_case/public1/public1/public1.py @@ -2356,20 +2356,20 @@ def check_accept_order(): break # ==============================查看订单详情================== # ========设置验收全部合格 - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "check_barcode_save_url") - print('check_barcode_save_url', url) + url2 = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "check_barcode_save_url") + print('check_barcode_save_url', url2) sourceBillId = sourceId - request_body = commonFuc().get_business_data(module, "payload2", sourceBillId, viewId) + request_body2 = commonFuc().get_business_data(module, "payload2", sourceBillId, viewId) - print('设置验收全部合格request_body', request_body) + print('设置验收全部合格request_body2', request_body2) # 发送请求 time.sleep(6) while True: - result = commonFuc().http_post(url, request_body, headers) - print('result', result) - data = commonFuc().analysis_json('data', result) - code = commonFuc().analysis_json('code', result) + result2 = commonFuc().http_post(url, request_body2, headers) + print('result2', result2) + data = commonFuc().analysis_json('data', result2) + code = commonFuc().analysis_json('code', result2) print(code) if code == 0 and len(data) >= 1: break @@ -2411,7 +2411,14 @@ def check_accept_order(): code = commonFuc().analysis_json('code', result) if code == 0: break - + else: + result2 = commonFuc().http_post(url, request_body2, headers) + print('result2', result2) + data = commonFuc().analysis_json('data', result2) + code = commonFuc().analysis_json('code', result2) + print(code) + if code == 0 and len(data) >= 1: + break info = (CHECK_NO, CHECK_NO) titlename = ('CHECK_NO1', 'CHECK_NO2') FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '验收单号', titlename, 'message15') -- GitLab