From 5e9203d087838b94b87d1e031f9d95ffa50fd607 Mon Sep 17 00:00:00 2001 From: xiao-hesheng Date: Fri, 26 Jul 2024 10:08:18 +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=BA=8C=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" | 94 ++++++++++--------- 1 file changed, 49 insertions(+), 45 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 953e7206..22f426c4 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" @@ -1048,7 +1048,7 @@ def check_mcms_purchase_out_and_in(type=1): create_user = get_login_user_uxid2() if type == 1: sql = "select * from mcms_purchase where branch_id='%s' and create_user='%s' order by create_time desc LIMIT 3;" % ( - branch_id, create_user) + branch_id, create_user) else: sql = "select * from mcms_purchase_detail where create_user='%s' order by create_time desc LIMIT 3;" % create_user result_in = check_in_check_mcms_purchase(sql) @@ -1548,7 +1548,8 @@ def check_mcms_check_batch(type, check_no, order_no, hos_goods_id): 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' and branch_id='%s' order by create_time desc LIMIT 1;" % (bill_mode,branch_id) + sql = "select id from hdi_barcode where code_type='%s' and branch_id='%s' order by create_time desc LIMIT 1;" % ( + bill_mode, branch_id) 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) @@ -1608,12 +1609,12 @@ def check_mcms_psi(type=1): bill_mode = 66 branch_id = get_branch_id() sql = "select * from mcms_psi where target_branch_id='%s' and bill_mode='%s' and stock_kind='RK_YS' order by CREATE_TIME desc LIMIT 1;" % ( - branch_id, bill_mode) + branch_id, bill_mode) # 获取实际值 actual = check_mcms_pur_plan_sql(sql) print('actual', actual) sql = "select id from mcms_psi where target_branch_id='%s' and bill_mode='%s' and stock_kind='RK_YS' order by CREATE_TIME desc LIMIT 1;" % ( - branch_id, bill_mode) + branch_id, bill_mode) id = get_id(sql) sql = "select order_no from mcms_psi where target_branch_id='%s' and bill_mode='%s' and stock_kind='RK_YS' order by CREATE_TIME desc LIMIT 1;" % ( branch_id, bill_mode) @@ -1626,7 +1627,7 @@ def check_mcms_psi(type=1): target_stock_id = get_stockId_fromdb(stock_name) target_area_code = get_stockAreaId_new_fromDb(target_dept_name, 1) source_id = FileUtils().r_info8('b5_spd3_core_business_flow', '验收单号', 'message15')['CHECK_NO1'] - source_no = get_distrBillId(branch_id,bill_mode) + source_no = get_distrBillId(branch_id, bill_mode) source_repl_id = source_no source_corp_id = FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2', 'message')["e_corpId"] source_dept_id = source_corp_id @@ -1647,12 +1648,12 @@ def check_mcms_psi(type=1): buyOrderNo = get_buyOrderNo(branch_id, bill_mode) purOrderNo = get_purOrderNo(branch_id, bill_mode) purBillId = get_purBillId(branch_id, bill_mode) - bill_relation_json= get_purBillDate2(branch_id, bill_mode) + bill_relation_json = get_purBillDate2(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 = source_id - sql="select order_no from mcms_check where id='%s';"%checkBillId + sql = "select order_no from mcms_check where id='%s';" % checkBillId checkOrderNo = get_id(sql) psiInBillId = id psiInOrderNo = order_no @@ -1713,34 +1714,34 @@ def check_mcms_psi(type=1): else: print('error') commonFuc().check_text_exist_result_text('error', 'succees') - #检查中心库出库单==================================================================== + # 检查中心库出库单==================================================================== sql = "select * from mcms_psi where target_branch_id='%s' and bill_mode='%s' and stock_kind='CK_QL' order by CREATE_TIME desc LIMIT 1;" % ( - branch_id, bill_mode) + branch_id, bill_mode) # 获取实际值 actual = check_mcms_pur_plan_sql(sql) print('actual', actual) sql = "select id from mcms_psi where target_branch_id='%s' and bill_mode='%s' and stock_kind='CK_QL' order by CREATE_TIME desc LIMIT 1;" % ( - branch_id, bill_mode) - id = get_id(sql) + branch_id, bill_mode) + id_out = get_id(sql) sql = "select order_no from mcms_psi where target_branch_id='%s' and bill_mode='%s' and stock_kind='CK_QL' order by CREATE_TIME desc LIMIT 1;" % ( branch_id, bill_mode) - order_no = get_id(sql) + order_no_out = get_id(sql) target_corp_id = get_hosid() target_branch_id = get_branch_id() target_dept_id = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'] target_dept_name = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'] - stock_name = get_branch_name() + "库房" + stock_name = target_dept_name + "库房" target_stock_id = get_stockId_fromdb(stock_name) target_area_code = get_stockAreaId_new_fromDb(target_dept_name, 2) - source_id = FileUtils().r_info8('b5_spd3_core_business_flow', '验收单号', 'message15')['CHECK_NO1'] - source_no = get_distrBillId(branch_id,bill_mode) + source_id_out = id + source_no_out = order_no source_repl_id = source_no - source_corp_id = FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2', 'message')["e_corpId"] - source_dept_id = source_corp_id - source_dept_name = FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2', 'message')["e_username"] + source_corp_id = get_hosid() + source_dept_id = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid1'] + source_dept_name =FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid1'] source_stock_id = source_corp_id accounter = get_login_user_uxid_bydb(FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')['username1']) - account_date = get_create_time("select account_date from mcms_psi where id='%s';" % id) + account_date = get_create_time("select account_date from mcms_psi where id='%s';" % id_out) buyBillId = get_buyBillId(branch_id, bill_mode) if type == 1: @@ -1754,53 +1755,58 @@ def check_mcms_psi(type=1): buyOrderNo = get_buyOrderNo(branch_id, bill_mode) purOrderNo = get_purOrderNo(branch_id, bill_mode) purBillId = get_purBillId(branch_id, bill_mode) - bill_relation_json= get_purBillDate2(branch_id, bill_mode) + bill_relation_json = get_purBillDate2(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 = source_id - sql="select order_no from mcms_check where id='%s';"%checkBillId + sql = "select order_no from mcms_check where id='%s';" % checkBillId checkOrderNo = get_id(sql) psiInBillId = id psiInOrderNo = order_no + psiOutBillId = id_out + psiOutOrderNo = order_no_out create_user = get_login_user_uxid_bydb(FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')['username1']) - create_time = get_create_time("select create_time from mcms_psi where id='%s';" % id) - last_modified = get_create_time("select last_modified from mcms_psi where id='%s';" % id) + create_time = get_create_time("select create_time from mcms_psi where id='%s';" % id_out) + last_modified = get_create_time("select last_modified from mcms_psi where id='%s';" % id_out) last_modified_user = create_user + source_branch_id = get_branch_id() + source_area_code=get_stockAreaId2_new_fromDb(source_dept_name) if type == 1: - expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'check_mcms_psi_out1', id, - order_no, target_corp_id, target_branch_id, target_dept_id, + expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'check_mcms_psi_out1', + id_out, + order_no_out, target_corp_id, target_branch_id, target_dept_id, target_dept_name, target_stock_id - , target_area_code, source_id, source_no, source_repl_id, - source_corp_id, source_dept_id, source_dept_name - , source_stock_id, accounter, account_date, buyBillId, planBillId, + , target_area_code, source_id_out, source_no_out, source_repl_id, + source_corp_id, source_branch_id, source_dept_id, source_dept_name + , source_stock_id, source_area_code, buyBillId, planBillId, planOrderNo, buyOrderNo, purOrderNo, purBillId , purBillDate, distrBillId, distrOrderNo, checkBillId, checkOrderNo, - psiInBillId, psiInOrderNo, create_user + psiInBillId, psiInOrderNo, psiOutBillId, psiOutOrderNo, create_user , create_time, last_modified, last_modified_user) elif type == 2: - expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'check_mcms_psi2', id, - order_no, target_corp_id, target_branch_id, target_dept_id, + expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'check_mcms_psi_out2', id_out, + order_no_out, target_corp_id, target_branch_id, target_dept_id, target_dept_name, target_stock_id - , target_area_code, source_id, source_no, source_repl_id, - source_corp_id, source_dept_id, source_dept_name - , source_stock_id, accounter, account_date, buyBillId, planBillId, + , target_area_code, source_id_out, source_no_out, source_repl_id, + source_corp_id, source_branch_id, source_dept_id, source_dept_name + , source_stock_id, source_area_code, buyBillId, planBillId, planOrderNo, buyOrderNo, purOrderNo, purBillId , purBillDate, distrBillId, distrOrderNo, checkBillId, checkOrderNo, - psiInBillId, psiInOrderNo, create_user + psiInBillId, psiInOrderNo, psiOutBillId, psiOutOrderNo, create_user , create_time, last_modified, last_modified_user) else: - expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'check_mcms_psi3', id, - order_no, target_corp_id, target_branch_id, target_dept_id, + expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'check_mcms_psi_out3',id_out, + order_no_out, target_corp_id, target_branch_id, target_dept_id, target_dept_name, target_stock_id - , target_area_code, source_id, source_no, source_repl_id, - source_corp_id, source_dept_id, source_dept_name - , source_stock_id, accounter, account_date, buyBillId, planBillId, + , target_area_code, source_id_out, source_no_out, source_repl_id, + source_corp_id, source_branch_id, source_dept_id, source_dept_name + , source_stock_id, source_area_code, buyBillId, planBillId, planOrderNo, buyOrderNo, purOrderNo, purBillId , purBillDate, distrBillId, distrOrderNo, checkBillId, checkOrderNo, - psiInBillId, psiInOrderNo, create_user + psiInBillId, psiInOrderNo, psiOutBillId, psiOutOrderNo, create_user , create_time, last_modified, last_modified_user) # 对比预期值和实际值是否一致 actual_value1 = get_process_list2(actual) @@ -1821,6 +1827,7 @@ def check_mcms_psi(type=1): print('error') commonFuc().check_text_exist_result_text('error', 'succees') + try: pro_path = commonFuc().get_pro_path2() print('pro_path', pro_path) @@ -1900,7 +1907,7 @@ try: # # 上面暂时注释======================================== # check_mcms_check(1) # 调用函数检查验收单数据库写值 - check_mcms_psi(1) # 调用函数检查中心库入库单数据库写值 + check_mcms_psi(1) # 调用函数检查中心库入库单和出库单数据库写值 check_accept_order(2) # 高值 time.sleep(6) # 这里验收后会自动生成出入库单，批次信息，需要同步验证入库单和批次信息 @@ -1911,9 +1918,6 @@ try: check_mcms_check(3) # 调用函数检查验收单数据库写值 check_mcms_psi(3) # 调用函数检查中心库入库单数据库写值 - - - # second_dept_one_key_in() # second_dept_one_key_in() # second_dept_one_key_in() -- GitLab