From 666b2c38464a71bed8237bd68d20e0b8f9a49e22 Mon Sep 17 00:00:00 2001 From: xiao-hesheng Date: Tue, 30 Jul 2024 15:31:29 +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=89=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" | 326 ++++++++++++------ data/b5_spd3_core_business_flow/message15 | 4 +- .../data | 13 +- 3 files changed, 229 insertions(+), 114 deletions(-) diff --git "a/air_case/b6_spd3_core_business_flow_database_check/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\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_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" index bd32b143..c8a6c791 100644 --- "a/air_case/b6_spd3_core_business_flow_database_check/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\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_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" @@ -133,7 +133,108 @@ def check_mcms_psi_dept_in(type=10): else: print('error') commonFuc().check_text_exist_result_text('error', 'succees') -def check_mcms_psi_dept_batch_in(DR_ID,type): +def check_mcms_psi_dept_batch_in(DR_ID1,DR_ID,type): + branch_id = get_branch_id() + if type==67: + sql = " select * from mcms_psi_dept_batch where pid='%s' order by create_time desc LIMIT 1;" % ( + DR_ID1) + count=process_tuple(get_id("select count(*) from mcms_psi_dept_batch where pid='%s'"%DR_ID1)) + if count=='100': + print('ok') + commonFuc().check_text_exist_result_text('SUCCESS', 'SUCCESS') + else: + commonFuc().check_text_exist_result_text('error', 'SUCCESS') + else: + sql = " select * from mcms_psi_dept_batch where pid='%s';" % ( + DR_ID1) + actual = check_mcms_dept_buy_sql(sql) + print('actual', actual) + batch_main_key = get_id("select id from mcms_psi_dept_batch where pid='%s';" % DR_ID1) + pid = DR_ID1 + order_no = get_id("select order_no from mcms_psi_dept_batch where pid='%s';" % DR_ID1) + + if type == 16 or type==10: + hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message2')["hosGoodsId"] + elif type == 20: + hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message1')["hosGoodsId"] + else: + hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message3')["hosGoodsId"] + mdm_goods_code = get_mdm_goods_code1(hos_goods_id) + goods_code = get_goods_code1(hos_goods_id) + pkg_def_id = get_pkg_def_id(hos_goods_id) + picker_name = FileUtils().r_info8("b2_herp3_bs", "用户名信息", 'message3')['username1'] + picker = get_login_user_uxid_bydb(picker_name) + source_batch_id=get_id("select source_batch_id from mcms_psi_dept_batch where pid='%s';" % DR_ID1) + target_batch_id=source_batch_id + if check_batch_id(source_batch_id)==True: + print('ok') + commonFuc().check_text_exist_result_text('succees', 'succees') + else: + commonFuc().check_text_exist_result_text('error', 'succees') + barcode_id=get_id("select barcode_id from mcms_psi_dept_batch where pid='%s';" % DR_ID1) + if check_barcode_id(barcode_id)==True: + print('ok') + commonFuc().check_text_exist_result_text('succees', 'succees') + else: + commonFuc().check_text_exist_result_text('error', 'succees') + dept_name=FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'] + shelf_code= get_stockAreaId_new_fromDb(dept_name, 2) + 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_dept_batch where pid='%s';" % DR_ID1) + last_modified = get_create_time("select last_modified from mcms_psi_dept_batch where pid='%s';" % DR_ID1) + last_modified_user = create_user + if type == 16 or type==10: + # source_detail_id = get_pick_detail_id(branch_id, 16) + source_detail_id=DR_ID+"0001" + pick_detail_id=None + expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', + 'mcms_psi_dept_batch_in7', batch_main_key, pid, order_no,source_detail_id + ,pick_detail_id,hos_goods_id,mdm_goods_code,goods_code,source_batch_id, + target_batch_id,barcode_id,shelf_code,create_user,create_time,last_modified, + last_modified_user + + ) + elif type == 20: + source_detail_id = DR_ID + "0001" + pick_detail_id = None + expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', + 'mcms_psi_dept_batch_in8', batch_main_key, pid, order_no,source_detail_id + ,pick_detail_id,hos_goods_id,mdm_goods_code,goods_code,source_batch_id, + target_batch_id,barcode_id,shelf_code,create_user,create_time,last_modified, + last_modified_user + + ) + else: + source_detail_id = DR_ID + "0001" + pick_detail_id = None + expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', + 'mcms_psi_dept_batch_in9',batch_main_key, pid, order_no,source_detail_id + ,pick_detail_id,hos_goods_id,mdm_goods_code,goods_code,source_batch_id, + target_batch_id,barcode_id,shelf_code,create_user,create_time,last_modified, + last_modified_user + + ) + + print('expected', expected) + print('aaaaaaaaaaaaaaaaa') + actual_value1 = get_process_list2(actual) + expected_value1 = get_process_list2(expected) + actual_value2 = actual_value1.replace(" ", "") + expected_value2 = expected_value1.replace(" ", "") + # print('actual_value2',actual_value2) + print('expected_value2') + print(expected_value2) + print('actual_value2') + print(actual_value2) + print(compare_text_index(actual_value2, expected_value2)) + if actual_value2 == expected_value2: + print('ok') + commonFuc().check_text_exist_result_text('succees', 'succees') + else: + print('error') + commonFuc().check_text_exist_result_text('error', 'succees') + +def check_mcms_psi_dept_batch_in2(DR_ID,DR_ID1,type): branch_id = get_branch_id() sql = " select * from mcms_psi_dept_batch where pid='%s';" % ( DR_ID) @@ -223,7 +324,6 @@ def check_mcms_psi_dept_batch_in(DR_ID,type): print('error') commonFuc().check_text_exist_result_text('error', 'succees') - def check_mcms_psi_dept_batch(DR_ID,type,order_no): branch_id = get_branch_id() sql = " select * from mcms_psi_dept_batch where pid='%s';" % ( @@ -235,6 +335,7 @@ def check_mcms_psi_dept_batch(DR_ID,type,order_no): # order_no = get_id("select order_no from mcms_psi_dept_batch where pid='%s';" % DR_ID) source_detail_id = get_pick_detail_id(branch_id,type) pick_detail_id=source_detail_id + if type == 16: hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message2')["hosGoodsId"] elif type == 20: @@ -283,7 +384,7 @@ def check_mcms_psi_dept_batch(DR_ID,type,order_no): ) else: expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', - 'mcms_psi_dept_batch3',batch_main_key, pid, order_no,source_detail_id + 'mcms_psi_dept_batch3_1',batch_main_key, pid, order_no,source_detail_id ,pick_detail_id,hos_goods_id,mdm_goods_code,goods_code,source_batch_id, target_batch_id,barcode_id,shelf_code,create_user,create_time,last_modified, last_modified_user @@ -370,7 +471,7 @@ def check_mcms_psi_dept_out_and_in(type1=16,type2=10): elif type1 == 20: # 子表检查 check_mcms_psi_dept_batch(DR_ID,type1,order_no) - his_charge_no=get_id(" select his_charge_no from his_order where branch_id='%s'order by create_time desc LIMIT 1;"%branch_id) + his_charge_no=get_id(" select his_charge_no from his_order where branch_id='%s' and psi_dept_id='%s' order by create_time desc LIMIT 1;"%(branch_id,DR_ID)) expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'mcms_psi_dept5', DR_ID, order_no, target_corp_id, target_branch_id, target_dept_id, target_dept_name, target_stock_id @@ -409,108 +510,119 @@ def check_mcms_psi_dept_out_and_in(type1=16,type2=10): print('error') commonFuc().check_text_exist_result_text('error', 'succees') #检查拆包后生成的入库单============================================================ + + branch_id = get_branch_id() if type1==20: - print('高值直接出库，不存在拆包业务，也就不存在自动的入库业务') + sql = " select * from mcms_psi_dept where target_branch_id='%s' and bill_mode='%s' and stock_kind='RK_XH' order by CREATE_TIME desc LIMIT 1;" % ( + branch_id, type2) else: - - branch_id = get_branch_id() sql = " select * from mcms_psi_dept where target_branch_id='%s' and bill_mode='%s' and stock_kind='RK_CB' order by CREATE_TIME desc LIMIT 1;" % ( branch_id, type2) - actual = check_mcms_dept_buy_sql(sql) - print(actual) + actual = check_mcms_dept_buy_sql(sql) + print(actual) + if type1==20: + DR_ID1 = get_id( + " select id from mcms_psi_dept where target_branch_id='%s' and bill_mode='%s' and stock_kind='RK_XH' order by CREATE_TIME desc LIMIT 1;" % ( + branch_id, type2)) + else: DR_ID1 = get_id( " select id from mcms_psi_dept where target_branch_id='%s' and bill_mode='%s' and stock_kind='RK_CB' order by CREATE_TIME desc LIMIT 1;" % ( branch_id, type2)) - sql = "select order_no from mcms_psi_dept where id='%s';" % DR_ID1 - order_no1 = 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'] - target_stock_id = get_stockId_fromdb(target_dept_name + '库房') - target_area_code = get_stockAreaId_new_fromDb(target_dept_name, 2) - PICK_id = get_PICK_id(branch_id, type1) - source_id = DR_ID - source_corp_id = get_hosid() - source_branch_id = get_branch_id() - source_dept_id = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'] - source_dept_name = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'] - source_stock_id = get_stockId_fromdb(source_dept_name + '库房') - source_area_code = get_stockAreaId_new_fromDb(source_dept_name, 2) - buyBillId = get_buyBillId(branch_id, type1) - pickOrderNo = get_PICK_order_no(branch_id, type1) - buyOrderNo = get_buyOrderNo(branch_id, type1) - pickBillId = get_PICK_id(branch_id, type1) - psiDeptOutBillId = DR_ID - psiDeptOutOrderNo = order_no - psiDeptInBillId=DR_ID1 - psiDeptInOrderNo=order_no1 - 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_dept where id='%s';" % DR_ID1) - last_modified = get_create_time("select last_modified from mcms_psi_dept where id='%s';" % DR_ID1) - last_modified_user = create_user - accounter = create_user - source_no=order_no - last_auditor=create_user - last_audit_time= get_create_time("select last_audit_time from mcms_psi_dept where id='%s';" % DR_ID1) - account_date = process_tuple(get_create_time("select account_date from mcms_psi_dept where id='%s';" % DR_ID1)) - if type2 == 10: - # 子表检查 - check_mcms_psi_dept_batch_in(DR_ID, type2) - expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', - 'mcms_psi_dept7', DR_ID1, order_no1, target_corp_id, target_branch_id, - target_dept_id, target_dept_name, target_stock_id - , target_area_code, source_id,source_no, source_corp_id, source_branch_id, - source_dept_id, source_dept_name, source_stock_id, source_area_code, - accounter, account_date, - pickOrderNo, pickBillId, psiDeptOutBillId, psiDeptOutOrderNo - , psiDeptInBillId,psiDeptInOrderNo,create_user, create_time, last_modified, last_modified_user, - last_auditor,last_audit_time - - - ) - elif type1 == 20: - # 子表检查 - check_mcms_psi_dept_batch_in(DR_ID, type2) - expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', - 'mcms_psi_dept8', DR_ID, order_no, target_corp_id, target_branch_id, - target_dept_id, target_dept_name, target_stock_id - , target_area_code, source_id, source_corp_id, source_branch_id, - source_dept_id, source_dept_name, source_stock_id, source_area_code, - buyBillId, pickOrderNo, buyOrderNo, pickBillId, psiDeptOutBillId, - psiDeptOutOrderNo - , create_user, create_time, last_modified, last_modified_user) - else: - # 子表检查 - check_mcms_psi_dept_batch_in(DR_ID, type2) - expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', - 'mcms_psi_dept9', DR_ID1, order_no1, target_corp_id, target_branch_id, - target_dept_id, target_dept_name, target_stock_id - , target_area_code, source_id,source_no, source_corp_id, source_branch_id, - source_dept_id, source_dept_name, source_stock_id, source_area_code, - accounter, account_date, - pickOrderNo, pickBillId, psiDeptOutBillId, psiDeptOutOrderNo - , psiDeptInBillId,psiDeptInOrderNo,create_user, create_time, last_modified, last_modified_user, - last_auditor,last_audit_time) - - print('expected', expected) - print('aaaaaaaaaaaaaaaaa') - actual_value1 = get_process_list2(actual) - expected_value1 = get_process_list2(expected) - actual_value2 = actual_value1.replace(" ", "") - expected_value2 = expected_value1.replace(" ", "") - # print('actual_value2',actual_value2) - print('expected_value2') - print(expected_value2) - print('actual_value2') - print(actual_value2) - print(compare_text_index(actual_value2, expected_value2)) - if actual_value2 == expected_value2: - print('ok') - commonFuc().check_text_exist_result_text('succees', 'succees') - else: - print('error') - commonFuc().check_text_exist_result_text('error', 'succees') + sql = "select order_no from mcms_psi_dept where id='%s';" % DR_ID1 + order_no1 = 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'] + target_stock_id = get_stockId_fromdb(target_dept_name + '库房') + target_area_code = get_stockAreaId_new_fromDb(target_dept_name, 2) + PICK_id = get_PICK_id(branch_id, type1) + source_id = DR_ID + source_corp_id = get_hosid() + source_branch_id = get_branch_id() + source_dept_id = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'] + source_dept_name = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'] + source_stock_id = get_stockId_fromdb(source_dept_name + '库房') + source_area_code = get_stockAreaId_new_fromDb(source_dept_name, 2) + buyBillId = get_buyBillId(branch_id, type1) + pickOrderNo = get_PICK_order_no(branch_id, type1) + buyOrderNo = get_buyOrderNo(branch_id, type1) + pickBillId = get_PICK_id(branch_id, type1) + psiDeptOutBillId = DR_ID + psiDeptOutOrderNo = order_no + psiDeptInBillId=DR_ID1 + psiDeptInOrderNo=order_no1 + 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_dept where id='%s';" % DR_ID1) + last_modified = get_create_time("select last_modified from mcms_psi_dept where id='%s';" % DR_ID1) + last_modified_user = create_user + accounter = create_user + source_no=order_no + last_auditor=create_user + last_audit_time= get_create_time("select last_audit_time from mcms_psi_dept where id='%s';" % DR_ID1) + account_date = process_tuple(get_create_time("select account_date from mcms_psi_dept where id='%s';" % DR_ID1)) + if type2 == 10: + # 子表检查 + check_mcms_psi_dept_batch_in(DR_ID1, DR_ID,type2) + expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', + 'mcms_psi_dept7', DR_ID1, order_no1, target_corp_id, target_branch_id, + target_dept_id, target_dept_name, target_stock_id + , target_area_code, source_id,source_no, source_corp_id, source_branch_id, + source_dept_id, source_dept_name, source_stock_id, source_area_code, + accounter, account_date, + pickOrderNo, pickBillId, psiDeptOutBillId, psiDeptOutOrderNo + , psiDeptInBillId,psiDeptInOrderNo,create_user, create_time, last_modified, last_modified_user, + last_auditor,last_audit_time + + + ) + elif type2 == 20: + # 子表检查 + check_mcms_psi_dept_batch_in(DR_ID1, DR_ID, type2) + his_charge_no = get_id( + " select his_charge_no from his_order where branch_id='%s'order by create_time desc LIMIT 1;" % branch_id) + expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', + 'mcms_psi_dept8', DR_ID1, order_no1, target_corp_id, target_branch_id, + target_dept_id, target_dept_name, target_stock_id + , target_area_code, source_id,source_no, source_corp_id, source_branch_id, + source_dept_id, source_dept_name, source_stock_id, source_area_code, + his_charge_no,accounter, account_date, + pickOrderNo, pickBillId, psiDeptOutBillId, psiDeptOutOrderNo + , psiDeptInBillId,psiDeptInOrderNo,create_user, create_time, last_modified, last_modified_user, + last_auditor,last_audit_time) + else: + # 子表检查 + check_mcms_psi_dept_batch_in(DR_ID1, DR_ID, type2) + expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', + 'mcms_psi_dept9', DR_ID1, order_no1, target_corp_id, target_branch_id, + target_dept_id, target_dept_name, target_stock_id + , target_area_code, source_id,source_no, source_corp_id, source_branch_id, + source_dept_id, source_dept_name, source_stock_id, source_area_code, + accounter, account_date, + pickOrderNo, pickBillId, psiDeptOutBillId, psiDeptOutOrderNo + , psiDeptInBillId,psiDeptInOrderNo,create_user, create_time, last_modified, last_modified_user, + last_auditor,last_audit_time) + + print('expected', expected) + print('aaaaaaaaaaaaaaaaa') + actual_value1 = get_process_list2(actual) + expected_value1 = get_process_list2(expected) + actual_value2 = actual_value1.replace(" ", "") + expected_value2 = expected_value1.replace(" ", "") + # print('actual_value2',actual_value2) + print('expected_value2') + print(expected_value2) + print('actual_value2') + print(actual_value2) + print(compare_text_index(actual_value2, expected_value2)) + if actual_value2 == expected_value2: + print('ok') + commonFuc().check_text_exist_result_text('succees', 'succees') + else: + print('error') + commonFuc().check_text_exist_result_text('error', 'succees') + + #======================================================== pro_path = commonFuc().get_pro_path2() @@ -519,15 +631,15 @@ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b7流程十 using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b7流程十四退库业务_消耗退库.air') from a_b7流程十四退库业务_消耗退库 import sCan_grant,second_dept_consume_Out_Stock,second_dept_consume_in_Stock try: - # updateUserLoginDefaultRange(get_listUserMgrRangePage1(2)) # 设置登录账号默认权限是二级库 - # sCan_grant(1) # 低值扫码发放 - # check_mcms_psi_dept_out_and_in(16,10) - # sCan_grant(3) # 试剂扫码发放 - # check_mcms_psi_dept_out_and_in(66,67) - # second_dept_consume_Out_Stock(2) # 高值消耗出库 - # check_mcms_psi_dept_out_and_in(20, 67) + updateUserLoginDefaultRange(get_listUserMgrRangePage1(2)) # 设置登录账号默认权限是二级库 + sCan_grant(1) # 低值扫码发放 + check_mcms_psi_dept_out_and_in(16,10) + sCan_grant(3) # 试剂扫码发放 + check_mcms_psi_dept_out_and_in(66,67) + second_dept_consume_Out_Stock(2) # 高值消耗出库 second_dept_consume_in_Stock(2) # 高值消耗退货入库 - check_mcms_psi_dept_out_and_in(20, 67) + check_mcms_psi_dept_out_and_in(20, 20) #检查消耗出库单和消耗入库单 + second_dept_consume_Out_Stock(1) # 低值消耗出库 second_dept_consume_in_Stock(1) # 低值消耗退回入库 second_dept_consume_Out_Stock(3) # 试剂消耗出库 diff --git a/data/b5_spd3_core_business_flow/message15 b/data/b5_spd3_core_business_flow/message15 index 3d978d7a..d43e0190 100644 --- a/data/b5_spd3_core_business_flow/message15 +++ b/data/b5_spd3_core_business_flow/message15 @@ -1,3 +1,3 @@ 验收单号: - CHECK_NO1: CHECKh03472024072900037 - CHECK_NO2: CHECKh03472024072900037 + CHECK_NO1: CHECKh03472024073000037 + CHECK_NO2: CHECKh03472024073000037 diff --git a/data/b6_spd3_core_business_flow_database_check/data b/data/b6_spd3_core_business_flow_database_check/data index f4032e31..771586dd 100644 --- a/data/b6_spd3_core_business_flow_database_check/data +++ b/data/b6_spd3_core_business_flow_database_check/data @@ -88,7 +88,7 @@ "mcms_pick_detail2": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_id": "%s0001", "pur_mode": 20, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "pkg_def_type": None, "pkg_base_mirror": None, "pkg_def_id": %s, "pkg_def_name": None, "pkg_def_qty": Decimal("1.00"), "apply_qty": Decimal("1.00"), "qty": Decimal("1.00"), "picked_qty": Decimal("1.00"), "picker": "%s", "picker_name": "%s", "tb_status": 20, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 2, "plan_flag": None}' "mcms_pick_detail3": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_id": "%s0001", "pur_mode": 60, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "pkg_def_type": None, "pkg_base_mirror": None, "pkg_def_id": "%s", "pkg_def_name": "100", "pkg_def_qty": Decimal("100.00"), "apply_qty": Decimal("1.00"), "qty": Decimal("1.00"), "picked_qty": Decimal("1.00"), "picker": "%s", "picker_name": "%s", "tb_status": 20, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 2, "plan_flag": None}' -#出库单主表 +#科室出库单主表 "mcms_psi_dept1": '{"id": "%s", "order_no": "%s", "bill_mode": "16", "rec_type": "YND", "psi_flag": -1, "psi_kind": "204", "stock_kind": "CK_SL", "target_corp_id": "%s", "target_branch_id": "%s", "target_dept_id": "%s", "target_dept_name": "%s", "target_stock_id": "%s", "target_area_code": "%s", "target_area_name": "默认库区", "source_id": "%s", "source_no": None, "source_repl_id": None, "source_corp_id": "%s", "source_branch_id": "%s", "source_dept_id": "%s", "source_dept_name": "%s", "source_stock_id": "%s", "source_area_code": "%s", "source_area_name": "默认库区", "consume_type": 0, "patient_id": "", "patient_name": "", "machine_id": None, "machine_name": None, "his_charge_no": None, "remark": "", "tb_status": 20, "accounter": None, "account_date": None, "bill_relation_json": "{"buyBillId":"%s","pickOrderNo":"%s","buyOrderNo":"%s","pickBillId":"%s","psiDeptOutBillId":"%s","psiDeptOutOrderNo":"%s"}", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "last_auditor": None, "last_audit_time": None, "reject_reason": None, "reject_user": None, "reject_time": None, "initial_order": None, "source_type": "SG", "target_coding_type": None}' "mcms_psi_dept2": '{"id": "%s", "order_no": "%s", "bill_mode": "20", "rec_type": "YND", "psi_flag": -1, "psi_kind": "204", "stock_kind": "CK_SL", "target_corp_id": "%s", "target_branch_id": "%s", "target_dept_id": "%s", "target_dept_name": "%s", "target_stock_id": "%s", "target_area_code": "%s", "target_area_name": "默认库区", "source_id": "%s", "source_no": None, "source_repl_id": None, "source_corp_id": "%s", "source_branch_id": "%s", "source_dept_id": "%s", "source_dept_name": "%s", "source_stock_id": "%s", "source_area_code": "%s", "source_area_name": "默认库区", "consume_type": 0, "patient_id": "", "patient_name": "", "machine_id": None, "machine_name": None, "his_charge_no": None, "remark": "", "tb_status": 20, "accounter": None, "account_date": None, "bill_relation_json": "{"buyBillId":"%s","pickOrderNo":"%s","buyOrderNo":"%s","pickBillId":"%s","psiDeptOutBillId":"%s","psiDeptOutOrderNo":"%s"}", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "last_auditor": None, "last_audit_time": None, "reject_reason": None, "reject_user": None, "reject_time": None, "initial_order": None, "source_type": "SG", "target_coding_type": None}' "mcms_psi_dept3": '{"id": "%s", "order_no": "%s", "bill_mode": "66", "rec_type": "YND", "psi_flag": -1, "psi_kind": "204", "stock_kind": "CK_SL", "target_corp_id": "%s", "target_branch_id": "%s", "target_dept_id": "%s", "target_dept_name": "%s", "target_stock_id": "%s", "target_area_code": "%s", "target_area_name": "默认库区", "source_id": "%s", "source_no": None, "source_repl_id": None, "source_corp_id": "%s", "source_branch_id": "%s", "source_dept_id": "%s", "source_dept_name": "%s", "source_stock_id": "%s", "source_area_code": "%s", "source_area_name": "默认库区", "consume_type": 0, "patient_id": "", "patient_name": "", "machine_id": None, "machine_name": None, "his_charge_no": None, "remark": "", "tb_status": 20, "accounter": None, "account_date": None, "bill_relation_json": "{"buyBillId":"%s","pickOrderNo":"%s","buyOrderNo":"%s","pickBillId":"%s","psiDeptOutBillId":"%s","psiDeptOutOrderNo":"%s"}", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "last_auditor": None, "last_audit_time": None, "reject_reason": None, "reject_user": None, "reject_time": None, "initial_order": None, "source_type": "SG", "target_coding_type": None}' @@ -160,7 +160,10 @@ "mcms_psi_dept9": '{"id": "%s", "order_no": "%s", "bill_mode": "67", "rec_type": "YND", "psi_flag": 1, "psi_kind": "106", "stock_kind": "RK_CB", "target_corp_id": "%s", "target_branch_id": "%s", "target_dept_id": "%s", "target_dept_name": "%s", "target_stock_id": "%s", "target_area_code": "%s", "target_area_name": "默认库区", "source_id": "%s", "source_no": "%s", "source_repl_id": None, "source_corp_id": "%s", "source_branch_id": "%s", "source_dept_id": "%s", "source_dept_name": "%s", "source_stock_id": "%s", "source_area_code": "%s", "source_area_name": "默认库区", "consume_type": 0, "patient_id": None, "patient_name": None, "machine_id": None, "machine_name": None, "his_charge_no": None, "remark": None, "tb_status": 30, "accounter": "%s", "account_date": "%s", "bill_relation_json": "{"pickOrderNo":"%s","pickBillId":"%s","psiDeptOutBillId":"%s","psiDeptOutOrderNo":"%s","psiDeptInBillId":"%s","psiDeptInOrderNo":"%s"}", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "last_auditor": "%s", "last_audit_time": %s, "reject_reason": None, "reject_user": None, "reject_time": None, "initial_order": None, "source_type": "SG", "target_coding_type": None}' -#拆包人库单子表 -"mcms_psi_dept_batch_in7": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_detail_id": "%s", "pick_detail_id": "%s", "pur_mode": 10, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "source_batch_id": "%s", "target_batch_id": "%s", "settle_flag": 0, "psi_price": Decimal("99.9999"), "qty": Decimal("100.00"), "unit_name": "100支/100", "barcode_id": "%s", "sub_barcode_id": None, "shelf_code": "%s-A-01-01", "tb_status": 0, "charge_flag": 1, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0}' -"mcms_psi_dept_batch_in8": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_detail_id": "%s", "pick_detail_id": %s, "pur_mode": 20, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "source_batch_id": "%s", "target_batch_id": "%s", "settle_flag": 0, "psi_price": Decimal("99.9999"), "qty": Decimal("1.00"), "unit_name": "1支", "barcode_id": "%s", "sub_barcode_id": None, "shelf_code": "%s-A-01-01", "tb_status": 0, "charge_flag": null, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0}' -"mcms_psi_dept_batch_in9": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_detail_id": "%s", "pick_detail_id": "%s", "pur_mode": 60, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "source_batch_id": "%s", "target_batch_id": "%s", "settle_flag": 0, "psi_price": Decimal("99.9999"), "qty": Decimal("100.00"), "unit_name": "100支/100", "barcode_id": "%s", "sub_barcode_id": None, "shelf_code": "%s-A-01-01", "tb_status": 0, "charge_flag": 1, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0}' +#拆包入库单子表 +"mcms_psi_dept_batch_in7": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_detail_id": "%s", "pick_detail_id": %s, "pur_mode": 10, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "source_batch_id": "%s", "target_batch_id": "%s", "settle_flag": 0, "psi_price": Decimal("99.9999"), "qty": Decimal("100.00"), "unit_name": "1支", "barcode_id": %s, "sub_barcode_id": None, "shelf_code": "%s-A-01-01", "tb_status": 0, "charge_flag": null, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0}' +"mcms_psi_dept_batch_in8": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_detail_id": "%s", "pick_detail_id": %s, "pur_mode": 20, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "source_batch_id": "%s", "target_batch_id": "%s", "settle_flag": 0, "psi_price": Decimal("99.9999"), "qty": Decimal("1.00"), "unit_name": "1支", "barcode_id": %s, "sub_barcode_id": None, "shelf_code": "%s-A-01-01", "tb_status": 0, "charge_flag": null, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0}' +"mcms_psi_dept_batch_in9": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_detail_id": "%s", "pick_detail_id": %s, "pur_mode": 60, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "source_batch_id": "%s", "target_batch_id": "%s", "settle_flag": 0, "psi_price": Decimal("99.9999"), "qty": Decimal("1.00"), "unit_name": "1支", "barcode_id": "%s", "sub_barcode_id": None, "shelf_code": "%s-A-01-01", "tb_status": 0, "charge_flag": null, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0}' + +#拆包出库单子表试剂 +"mcms_psi_dept_batch3_1": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_detail_id": "%s", "pick_detail_id": "%s", "pur_mode": 60, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "source_batch_id": "%s", "target_batch_id": "%s", "settle_flag": 0, "psi_price": Decimal("99.9999"), "qty": Decimal("100.00"), "unit_name": "100支/100", "barcode_id": "%s", "sub_barcode_id": None, "shelf_code": "%s-A-01-01", "tb_status": 0, "charge_flag": 1, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0}' -- GitLab