From a495c4b4f7081b5d3013a0694cbbb96e30d952fd Mon Sep 17 00:00:00 2001 From: xiao-hesheng Date: Mon, 29 Jul 2024 10:13:09 +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" | 369 ++++++++++++++---- data/b5_spd3_core_business_flow/message15 | 4 +- .../data | 7 +- 3 files changed, 302 insertions(+), 78 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 fd3790b4..d53bdae7 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" @@ -1676,7 +1676,7 @@ def check_mcms_psi(type=1): psiInBillId, psiInOrderNo, create_user , create_time, last_modified, last_modified_user) elif type == 2: - + check_mcms_psi_batch_in(id, type, order_no, source_id) 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, target_dept_name, target_stock_id @@ -1688,7 +1688,7 @@ def check_mcms_psi(type=1): psiInBillId, psiInOrderNo, create_user , create_time, last_modified, last_modified_user) else: - + check_mcms_psi_batch_in(id, type, order_no, source_id) 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, target_dept_name, target_stock_id @@ -1776,6 +1776,7 @@ def check_mcms_psi(type=1): source_branch_id = get_branch_id() source_area_code = get_stockAreaId_new_fromDb(source_dept_name) if type == 1: + check_mcms_psi_batch_out(id, type, order_no, source_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, @@ -1788,7 +1789,7 @@ def check_mcms_psi(type=1): psiInBillId, psiInOrderNo, psiOutBillId, psiOutOrderNo, create_user , create_time, last_modified, last_modified_user) elif type == 2: - + check_mcms_psi_batch_out(id, type, order_no, source_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, @@ -1801,7 +1802,7 @@ def check_mcms_psi(type=1): psiInBillId, psiInOrderNo, psiOutBillId, psiOutOrderNo, create_user , create_time, last_modified, last_modified_user) else: - + check_mcms_psi_batch_out(id, type, order_no, source_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, @@ -2119,23 +2120,23 @@ def check_mcms_psi_batch_in(DR_ID, type, order_no, source_id1): 'mcms_psi_batch_in1', batch_main_key, pid, order_no, source_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 + last_modified, last_modified_user ) elif type == 2: expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', - 'mcms_psi_batch_in2', batch_main_key, pid, order_no, source_detail_id + 'mcms_psi_batch_in2', batch_main_key, pid, order_no, source_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 + last_modified, last_modified_user ) else: expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', - 'mcms_psi_batch_in3', batch_main_key, pid, order_no, source_detail_id + 'mcms_psi_batch_in3', batch_main_key, pid, order_no, source_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 + last_modified, last_modified_user ) @@ -2159,6 +2160,220 @@ def check_mcms_psi_batch_in(DR_ID, type, order_no, source_id1): commonFuc().check_text_exist_result_text('error', 'succees') +def check_mcms_psi_batch_out(DR_ID, type, order_no, source_id1): + if type == 1: + bill_mode = 16 + elif type == 2: + bill_mode = 20 + else: + bill_mode = 66 + branch_id = get_branch_id() + sql = " select * from mcms_psi_batch where pid='%s';" % ( + DR_ID) + actual = check_mcms_dept_buy_sql(sql) + print('actual', actual) + batch_main_key = get_id("select id from mcms_psi_batch where pid='%s';" % DR_ID) + pid = DR_ID + # order_no = get_id("select order_no from mcms_psi_dept_batch where pid='%s';" % DR_ID) + source_detail_id = source_id1 + '0001' + pick_detail_id = None + if type == 1: + hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message2')["hosGoodsId"] + elif type == 2: + 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_batch where pid='%s';" % DR_ID) + distrBillId = get_distrBillId(branch_id, bill_mode) + target_batch_id = get_id( + "select id from mcms_hos_batch where hos_goods_id='%s' order by create_time desc LIMIT 1;" % hos_goods_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_batch where pid='%s';" % DR_ID) + 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(get_branch_name(), 1) + 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_batch where pid='%s';" % DR_ID) + last_modified = get_create_time("select last_modified from mcms_psi_batch where pid='%s';" % DR_ID) + last_modified_user = create_user + if type == 1: + expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', + 'mcms_psi_batch_in1', batch_main_key, pid, order_no, source_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 == 2: + expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', + 'mcms_psi_batch_in2', batch_main_key, pid, order_no, source_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: + expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', + 'mcms_psi_batch_in3', batch_main_key, pid, order_no, source_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_hos_batch(type=1): # 检查批次表信息 + print('中心库入库后检查批次表信息') + if type == 1: + bill_mode = 16 + pur_mode = 10 + elif type == 2: + bill_mode = 20 + pur_mode = 20 + else: + pur_mode = 60 + bill_mode = 66 + branch_id = get_branch_id() + sql = "select * from mcms_hos_batch where branch_id='%s' and pur_mode='%s' order by CREATE_TIME desc LIMIT 1;" % ( + branch_id, pur_mode) + # 获取实际值 + actual = check_mcms_pur_plan_sql(sql) + print('actual', actual) + sql = "select id from mcms_hos_batch where branch_id='%s' and pur_mode='%s' order by CREATE_TIME desc LIMIT 1;" % ( + branch_id, pur_mode) + id = get_id(sql) + hos_id = get_hosid() + branch_id = get_branch_id() + + stock_name = get_branch_name() + "中心库房" + stock_id = get_stockId_fromdb(stock_name) + src_batch_id = get_id("select src_batch_id from mcms_hos_batch where id='%s';" % id) + src_batch_id = id + if type == 1: + hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message2')["hosGoodsId"] + elif type == 2: + hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message1')["hosGoodsId"] + elif type == 3: + 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) + goods_name = get_goods_name(hos_goods_id) + goods_gg = get_goods_gg(hos_goods_id) + mfrs_id = get_goods_mfrs_id(hos_goods_id) + + + purBillId = get_purBillId(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 + # checkOrderNo = get_id(sql) + # psiInBillId = id + + 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_hos_batch where id='%s';" % id) + last_modified = get_create_time("select last_modified from mcms_hos_batch where id='%s';" % id) + last_modified_user = create_user + supply_id = get_supply_id(hos_goods_id) + prov_id = FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2', 'message')["e_corpId"] + prov_name = FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2', 'message')["e_username"] + sub_prov_id = prov_id + sub_prov_name = prov_name + expdt_date = get_create_time("select expdt_date from mcms_hos_batch where id='%s';" % id) + product_date = get_create_time("select product_date from mcms_hos_batch where id='%s';" % id) + distr_id = get_distrBillId(branch_id, bill_mode) + distr_detail_id = get_distr_detail_id(branch_id, bill_mode) + in_time = get_create_time("select in_time from mcms_hos_batch where id='%s';" % id) + goodsGg = goods_gg + goodsCode = goods_code + goodsName = goods_name + erpCode = mdm_goods_code + if type == 1: + expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'check_mcms_hos_batch1', + id, + hos_id, branch_id, stock_id, src_batch_id, hos_goods_id, + mdm_goods_code, goods_code, goods_name, goods_gg + , mfrs_id, supply_id, prov_id, prov_name, sub_prov_id, + sub_prov_name, expdt_date, product_date + , distr_id, distr_detail_id, purBillId, in_time, goodsGg, goodsCode, + goodsName, erpCode, 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_hos_batch2', + id, + hos_id, branch_id, stock_id, src_batch_id, hos_goods_id, + mdm_goods_code, goods_code, goods_name, goods_gg + , mfrs_id, supply_id, prov_id, prov_name, sub_prov_id, + sub_prov_name, expdt_date, product_date + , distr_id, distr_detail_id, purBillId, in_time, goodsGg, goodsCode, + goodsName, erpCode, create_user, create_time + , last_modified, last_modified_user) + else: + fcatId=get_id("select id from mcms_goods_kind where kind_name='财务试剂';") + expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'check_mcms_hos_batch3', + id, + hos_id, branch_id, stock_id, src_batch_id, hos_goods_id, + mdm_goods_code, goods_code, goods_name, goods_gg + , mfrs_id, supply_id, prov_id, prov_name, sub_prov_id, + sub_prov_name, expdt_date, product_date + , distr_id, distr_detail_id, purBillId, in_time, goodsGg, goodsCode, + goodsName, erpCode, fcatId,create_user, create_time + , last_modified, last_modified_user) + # 对比预期值和实际值是否一致 + 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) + result = (compare_text_index(actual_value2, expected_value2)) + print('result', result) + 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') + + try: pro_path = commonFuc().get_pro_path2() print('pro_path', pro_path) @@ -2174,74 +2389,74 @@ try: from a_b4流程十一请领业务流_二级库向直送 import check_accept_order for i in range(1): - # updateUserLoginDefaultRange(get_listUserMgrRangePage(2)) # 设置登录账号默认权限是二级库 - # goods_move2() # 设置产品出库渠道为直送 - # # # 低值 - # 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) - # check_mcms_dept_buy_car(2) - # # # 试剂 - # second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3) - # check_mcms_dept_buy_car(3) - # BuyCarSubmit() # 请领车提交 - # - # list_data = ['16', '20', '66'] - # for i in list_data: - # check_mcms_dept_buy(int(i)) - # mcms_dept_buy_detail(int(i)) - # for i in range(6): # 三个单据共审批6次 - # approval_center() - # list_data = ['16', '20', '66'] - # for i in list_data: - # check_mcms_dept_buy_approval_after(int(i)) - # mcms_dept_buy_detail_approval_after(int(i)) - # - # time.sleep(20) - # # 检查自动生成的采购计划数据 - # list_data = ['16', '20', '66'] - # for i in list_data: - # check_mcms_mcms_pur_plan(int(i)) - # # 采购模块处理 - # purchase_module_process() - # - # # 三个单据共审批三次 - # approval_center(FileUtils().r_info8('b5_spd3_core_business_flow', '采购计划单号试剂', 'message12')) - # approval_center(FileUtils().r_info8('b5_spd3_core_business_flow', '采购计划单号', 'message7')) - # approval_center(FileUtils().r_info8('b5_spd3_core_business_flow', '采购计划单号高值', 'message11')) - # time.sleep(20) - # list_data = ['16', '20', '66'] - # 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) - # order_dp(1) # 1低值 - # time.sleep(6) - # order_dp(2) # 2高值 - # time.sleep(6) - # order_dp(3) # 3试剂 - # time.sleep(6) - # time.sleep(20) - # - # list_data = ['16', '20', '66'] - # for i in list_data: - # time.sleep(6) - # check_hdi_distr(int(i)) - # - # time.sleep(20) - # #到这里就是验收和中心库自动入库以及中心库出库 - # check_accept_order(1) # 低值 验收和自动入库和出库 - # time.sleep(6) - # check_mcms_check(1) # 调用函数检查验收单数据库写值 - # # 上面暂时注释======================================== + updateUserLoginDefaultRange(get_listUserMgrRangePage(2)) # 设置登录账号默认权限是二级库 + goods_move2() # 设置产品出库渠道为直送 + # # 低值 + 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) + check_mcms_dept_buy_car(2) + # # 试剂 + second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3) + check_mcms_dept_buy_car(3) + BuyCarSubmit() # 请领车提交 + + list_data = ['16', '20', '66'] + for i in list_data: + check_mcms_dept_buy(int(i)) + mcms_dept_buy_detail(int(i)) + for i in range(6): # 三个单据共审批6次 + approval_center() + list_data = ['16', '20', '66'] + for i in list_data: + check_mcms_dept_buy_approval_after(int(i)) + mcms_dept_buy_detail_approval_after(int(i)) + + time.sleep(20) + # 检查自动生成的采购计划数据 + list_data = ['16', '20', '66'] + for i in list_data: + check_mcms_mcms_pur_plan(int(i)) + # 采购模块处理 + purchase_module_process() + + # 三个单据共审批三次 + approval_center(FileUtils().r_info8('b5_spd3_core_business_flow', '采购计划单号试剂', 'message12')) + approval_center(FileUtils().r_info8('b5_spd3_core_business_flow', '采购计划单号', 'message7')) + approval_center(FileUtils().r_info8('b5_spd3_core_business_flow', '采购计划单号高值', 'message11')) + time.sleep(20) + list_data = ['16', '20', '66'] + 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) + order_dp(1) # 1低值 + time.sleep(6) + order_dp(2) # 2高值 + time.sleep(6) + order_dp(3) # 3试剂 + time.sleep(6) + time.sleep(20) + + list_data = ['16', '20', '66'] + for i in list_data: + time.sleep(6) + check_hdi_distr(int(i)) + + time.sleep(20) + #到这里就是验收和中心库自动入库以及中心库出库 + check_accept_order(1) # 低值 验收和自动入库和出库 + time.sleep(6) + check_mcms_check(1) # 调用函数检查验收单数据库写值 check_mcms_psi(1) # 调用函数检查中心库入库单和出库单数据库写值 check_accept_order(2) # 高值 验收和自动入库和出库 time.sleep(6) - # 这里验收后会自动生成出入库单，批次信息，需要同步验证入库单和批次信息 + + # #这里验收后会自动生成出入库单，批次信息，需要同步验证入库单和批次信息 check_mcms_check(2) # 调用函数检查验收单数据库写值 check_mcms_psi(2) # 调用函数检查中心库入库单数据库写值 check_accept_order(3) # 试剂 验收和自动入库和出库 @@ -2249,7 +2464,11 @@ try: check_mcms_check(3) # 调用函数检查验收单数据库写值 check_mcms_psi(3) # 调用函数检查中心库入库单数据库写值 time.sleep(6) - + # # 上面暂时注释======================================== + # 检查批次信息 + check_mcms_hos_batch(1) + check_mcms_hos_batch(2) + check_mcms_hos_batch(3) second_dept_one_key_in() second_dept_one_key_in() second_dept_one_key_in() diff --git a/data/b5_spd3_core_business_flow/message15 b/data/b5_spd3_core_business_flow/message15 index e79fa3c7..a6664429 100644 --- a/data/b5_spd3_core_business_flow/message15 +++ b/data/b5_spd3_core_business_flow/message15 @@ -1,3 +1,3 @@ 验收单号: - CHECK_NO1: CHECKh03472024072600075 - CHECK_NO2: CHECKh03472024072600075 + CHECK_NO1: CHECKh03472024072900002 + CHECK_NO2: CHECKh03472024072900002 diff --git a/data/b6_spd3_core_business_flow_database_check/data b/data/b6_spd3_core_business_flow_database_check/data index 5d1dde07..2e5ae84a 100644 --- a/data/b6_spd3_core_business_flow_database_check/data +++ b/data/b6_spd3_core_business_flow_database_check/data @@ -117,7 +117,7 @@ #中心库入库单子表 "mcms_psi_batch_in1": '{"id":"%s","pid":"%s","order_no":"%s","source_detail_id":"%s","pick_detail_id":null,"pur_mode":10,"hos_goods_id":"%s","mdm_goods_code":"%s","goods_code":"%s","source_batch_id":"%s","target_batch_id":"%s","psi_price":Decimal("99.999900"),"qty":Decimal("100.00"),"unit_name":"100支/100","barcode_id":"%s","sub_barcode_id":null,"shelf_code":"%s-A-01-01","settle_flag":1,"tb_status":0,"pur_task_id":null,"create_user":"%s","create_time":%s,"last_modified":%s,"last_modified_user":"%s","version":1}' -"mcms_psi_batch_in2": '{"id":"%s","pid":"%s","order_no":"%s","source_detail_id":"%s","pick_detail_id":null,"pur_mode":20,"hos_goods_id":"%s","mdm_goods_code":"%s","goods_code":"%s","source_batch_id":"%s","target_batch_id":"%s","psi_price":Decimal("99.999900"),"qty":Decimal("100.00"),"unit_name":"100支/100","barcode_id":"%s","sub_barcode_id":null,"shelf_code":"%s-A-01-01","settle_flag":1,"tb_status":0,"pur_task_id":null,"create_user":"%s","create_time":%s,"last_modified":%s,"last_modified_user":"%s","version":1}' +"mcms_psi_batch_in2": '{"id":"%s","pid":"%s","order_no":"%s","source_detail_id":"%s","pick_detail_id":null,"pur_mode":20,"hos_goods_id":"%s","mdm_goods_code":"%s","goods_code":"%s","source_batch_id":"%s","target_batch_id":"%s","psi_price":Decimal("99.999900"),"qty":Decimal("1.00"),"unit_name":"1支","barcode_id":"%s","sub_barcode_id":null,"shelf_code":"%s-A-01-01","settle_flag":1,"tb_status":0,"pur_task_id":null,"create_user":"%s","create_time":%s,"last_modified":%s,"last_modified_user":"%s","version":1}' "mcms_psi_batch_in3": '{"id":"%s","pid":"%s","order_no":"%s","source_detail_id":"%s","pick_detail_id":null,"pur_mode":60,"hos_goods_id":"%s","mdm_goods_code":"%s","goods_code":"%s","source_batch_id":"%s","target_batch_id":"%s","psi_price":Decimal("99.999900"),"qty":Decimal("100.00"),"unit_name":"100支/100","barcode_id":"%s","sub_barcode_id":null,"shelf_code":"%s-A-01-01","settle_flag":1,"tb_status":0,"pur_task_id":null,"create_user":"%s","create_time":%s,"last_modified":%s,"last_modified_user":"%s","version":1}' #中心库出库单 @@ -134,3 +134,8 @@ "mcms_psi_dept_batch_in4": '{"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": null, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": null, "version": 0}' "mcms_psi_dept_batch_in5": '{"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": null, "version": 0}' "mcms_psi_dept_batch_in6": '{"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": null, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": null, "version": 0}' + +#批次信息 +"check_mcms_hos_batch1": '{"id": "%s", "hos_id": "%s", "branch_id": "%s", "stock_id": "%s", "batch_type": 40, "batch_price": Decimal("99.999900"), "src_batch_id": "%s", "src_batch_price": Decimal("99.999900"), "settlement": 1, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "goods_name": "%s", "goods_gg": "%s", "pur_mode": "10", "mfrs_id": "%s", "mfrs_name": "德国歌德公司 Geuder AG", "made": "德国", "unit": "支", "supply_id": "%s", "prov_id": "%s", "prov_name": "%s", "sub_send_flag": 10, "sub_prov_id": "%s", "sub_prov_name": "%s", "batch_code": "333", "expdt_date": %s, "product_date": %s, "bill_type": "RK_YS", "distr_id": "%s", "distr_detail_id": "%s", "distr_price": Decimal("99.999900"), "pur_bill_id": "%s", "certificate_code": "", "in_time": %s, "ext_info": "{"goodsGg":"%s","goodsCode":"%s","purMode":10,"goodsName":"%s","ygptCode":"","transCond":"","storageCond":"","erpCode":"%s","ybDefId":"","contractId":"","normalContractId":"","normalDetailId":"","fcatId":"","fcatName":"","goodsKindId":"","goodsKindName":"","miTwentysevenCode":"","focus_control":"0","focus_control_type":null}", "tb_status": 1, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "multi_charge_flag": 0, "use_frequency": 1, "charge_unit": None}' +"check_mcms_hos_batch2": '{"id": "%s", "hos_id": "%s", "branch_id": "%s", "stock_id": "%s", "batch_type": 40, "batch_price": Decimal("99.999900"), "src_batch_id": "%s", "src_batch_price": Decimal("99.999900"), "settlement": 1, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "goods_name": "%s", "goods_gg": "%s", "pur_mode": "20", "mfrs_id": "%s", "mfrs_name": "德国歌德公司 Geuder AG", "made": "德国", "unit": "支", "supply_id": "%s", "prov_id": "%s", "prov_name": "%s", "sub_send_flag": 10, "sub_prov_id": "%s", "sub_prov_name": "%s", "batch_code": "222", "expdt_date": %s, "product_date": %s, "bill_type": "RK_YS", "distr_id": "%s", "distr_detail_id": "%s", "distr_price": Decimal("99.999900"), "pur_bill_id": "%s", "certificate_code": "", "in_time": %s, "ext_info": "{"goodsGg":"%s","goodsCode":"%s","purMode":20,"goodsName":"%s","ygptCode":"","transCond":"","storageCond":"","erpCode":"%s","ybDefId":"","contractId":"","normalContractId":"","normalDetailId":"","fcatId":"","fcatName":"","goodsKindId":"","goodsKindName":"","miTwentysevenCode":"","focus_control":"0","focus_control_type":null}", "tb_status": 1, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "multi_charge_flag": 0, "use_frequency": 1, "charge_unit": None}' +"check_mcms_hos_batch3": '{"id": "%s", "hos_id": "%s", "branch_id": "%s", "stock_id": "%s", "batch_type": 40, "batch_price": Decimal("99.999900"), "src_batch_id": "%s", "src_batch_price": Decimal("99.999900"), "settlement": 1, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "goods_name": "%s", "goods_gg": "%s", "pur_mode": "60", "mfrs_id": "%s", "mfrs_name": "德国歌德公司 Geuder AG", "made": "德国", "unit": "支", "supply_id": "%s", "prov_id": "%s", "prov_name": "%s", "sub_send_flag": 10, "sub_prov_id": "%s", "sub_prov_name": "%s", "batch_code": "4444", "expdt_date": %s, "product_date": %s, "bill_type": "RK_YS", "distr_id": "%s", "distr_detail_id": "%s", "distr_price": Decimal("99.999900"), "pur_bill_id": "%s", "certificate_code": "", "in_time": %s, "ext_info": "{"goodsGg":"%s","goodsCode":"%s","purMode":60,"goodsName":"%s","ygptCode":"","transCond":"","storageCond":"","erpCode":"%s","ybDefId":"","contractId":"","normalContractId":"","normalDetailId":"","fcatId":"%s","fcatName":"财务试剂","goodsKindId":"","goodsKindName":"","miTwentysevenCode":"","focus_control":"0","focus_control_type":null}", "tb_status": 1, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "multi_charge_flag": 0, "use_frequency": 1, "charge_unit": None}' \ No newline at end of file -- GitLab