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 e52c51c9a0c77e8f04892215308d67dba84da3e7..defc53c1c1a6d94a49c34f177b4e32d7d0cd052e 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" @@ -10,7 +10,7 @@ from common.db.sql.sql_tools import get_create_time, check_mcms_dept_buy_car_sql get_expdt_date1, process_date, get_mdm_goods_code1, get_goods_code1, get_goods_name, get_goods_gg, \ get_goods_mfrs_id, get_supply_id, check_mcms_pur_sql, check_source_id, get_pkg_def_id, get_buyBillId, \ get_planBillId, get_planOrderNo, get_buyOrderNo, get_purOrderNo, get_purBillId, get_purBillDate, get_distrBillId, \ - get_distrOrderNo, get_distr_detail_id + get_distrOrderNo, get_distr_detail_id, get_ext_info from common.db.sql.sql_tools_out import check_out_check_mcms_purchase from common.fileUtls import FileUtils @@ -1162,14 +1162,16 @@ def check_hdi_distr(type=16): branch_id, FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2']))) rec_org_name = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'] last_modified = create_time - + confirmUser=distrUser + ext_info=get_ext_info(branch_id, type) + confirmTime=reGetString(ext_info, r'"confirmTime":"', r'""confirmUser') expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'hdi_distr', distr_main_key, distr_order_no, hos_id, get_hosname(), get_branch_id(), source_id, pur_bill_id, prov_id, prov_name, exe_prov_id, exe_prov_name, pur_dept_id, pur_dept_name, rec_org_id, rec_org_name, rec_user, buyBillId, planBillId, planOrderNo, buyOrderNo, purOrderNo, purBillId, purBillDate, distrBillId, distrOrderNo, - distrUser, create_user, create_user_name, create_time, last_modified, + confirmTime,confirmUser,distrUser, create_user, create_user_name, create_time, last_modified, last_modified_user ) @@ -1211,15 +1213,16 @@ def check_hdi_distr(type=16): branch_id, FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2']))) rec_org_name = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'] last_modified = create_time - # import pdb - # pdb.set_trace() + confirmUser = distrUser + ext_info = get_ext_info(branch_id, type) + confirmTime=reGetString(ext_info, r'"confirmTime":"', r'""confirmUser') expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'hdi_distr1', distr_main_key, distr_order_no, hos_id, get_hosname(), get_branch_id(), source_id, pur_bill_id, prov_id, prov_name, exe_prov_id, exe_prov_name, pur_dept_id, pur_dept_name, rec_org_id, rec_org_name, rec_user, buyBillId, planBillId, planOrderNo, buyOrderNo, purOrderNo, purBillId, purBillDate, distrBillId, distrOrderNo, - distrUser, create_user, create_user_name, create_time, last_modified, + confirmTime,confirmUser,distrUser, create_user, create_user_name, create_time, last_modified, last_modified_user ) @@ -1261,15 +1264,16 @@ def check_hdi_distr(type=16): branch_id, FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2']))) rec_org_name = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'] last_modified = create_time - # import pdb - # pdb.set_trace() + confirmUser = distrUser + ext_info = get_ext_info(branch_id, type) + confirmTime=reGetString(ext_info, r'"confirmTime":"', r'""confirmUser') expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'hdi_distr2', distr_main_key, distr_order_no, hos_id, get_hosname(), get_branch_id(), source_id, pur_bill_id, prov_id, prov_name, exe_prov_id, exe_prov_name, pur_dept_id, pur_dept_name, rec_org_id, rec_org_name, rec_user, buyBillId, planBillId, planOrderNo, buyOrderNo, purOrderNo, purBillId, purBillDate, distrBillId, distrOrderNo, - distrUser, create_user, create_user_name, create_time, last_modified, + confirmTime,confirmUser,distrUser, create_user, create_user_name, create_time, last_modified, last_modified_user ) @@ -1654,6 +1658,7 @@ try: order_dp(3) # 3试剂 time.sleep(6) time.sleep(20) + # 上面暂时注释======================================== list_data = ['16', '20', '66'] for i in list_data: time.sleep(6) @@ -1662,7 +1667,7 @@ try: time.sleep(20) check_accept_order(1) # 低值 time.sleep(6) - # 上面暂时注释======================================== + check_mcms_check(1) # 调用函数检查验收单数据库写值 check_accept_order(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 487b2af26e647933f85a907cead3454bc1fdfb08..7c81babc8f9daaec12393bda9bf271fb894d8d0c 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" @@ -846,70 +846,70 @@ try: from a_b5流程十二请领业务流_二级库向二级库 import BuyCarSubmit, pick_execute # ========下面暂时注释 - # add_dept2() # 新增一个二级科室 - # add_new_deptinfo() # 写入科室信息到文件中 - # grants_user_new() # 新增授权 - # # 同步库房信息 - # execute_command("python runner_test.py tag id2263-221 debug sit") - # # 设置部门用户 - # set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'], - # FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5'], 2) - # # 设置部门负责人 - # 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) - # - # # 设置库区联系人 - # 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 - # currentDeptId = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'] - # targetDeptId = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'] - # edit_goods_target(currentDeptId, targetDeptId) - # - # 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) - # 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() # 请领车提交 - # time.sleep(6) - # 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() - # updateUserLoginDefaultRange(get_listUserMgrRangePage1(2)) # 设置登录账号默认权限是二级库 - # # # 二级科室领用出库 - # # # 低值拣货执行 - # pick_execute() - # # 检查拣货单 - # list_data = ['16', '20', '66'] - # for i in list_data: - # check_mcms_pick(int(i)) - - # # 检查出库单 - # check_mcms_psi_dept(16) - # check_mcms_psi_dept(20) - # check_mcms_psi_dept(66) - # second_dept_one_key_in(5) - # second_dept_one_key_in(5) - # second_dept_one_key_in(5) + add_dept2() # 新增一个二级科室 + add_new_deptinfo() # 写入科室信息到文件中 + grants_user_new() # 新增授权 + # 同步库房信息 + execute_command("python runner_test.py tag id2263-221 debug sit") + # 设置部门用户 + set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'], + FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5'], 2) + # 设置部门负责人 + 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) + + # 设置库区联系人 + 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 + currentDeptId = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'] + targetDeptId = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'] + edit_goods_target(currentDeptId, targetDeptId) + + 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) + 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() # 请领车提交 + time.sleep(6) + 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() + updateUserLoginDefaultRange(get_listUserMgrRangePage1(2)) # 设置登录账号默认权限是二级库 + # # 二级科室领用出库 + # # 低值拣货执行 + pick_execute() + # 检查拣货单 + list_data = ['16', '20', '66'] + for i in list_data: + check_mcms_pick(int(i)) + + # 检查出库单 + check_mcms_psi_dept(16) + check_mcms_psi_dept(20) + check_mcms_psi_dept(66) + second_dept_one_key_in(5) + second_dept_one_key_in(5) + second_dept_one_key_in(5) # # 上面暂时注释======================== #检查入库单 - # check_mcms_psi_dept_in(16) + check_mcms_psi_dept_in(16) check_mcms_psi_dept_in(20) check_mcms_psi_dept_in(66) commonFuc().check_text_exist_result_text('succees', 'succees') diff --git a/common/db/sql/sql_tools.py b/common/db/sql/sql_tools.py index 7c5ee66b32a2c7611ddd19348e8c1788c2ba5dde..5d614252613456948ee8fa27ee7c3c22c85761c8 100644 --- a/common/db/sql/sql_tools.py +++ b/common/db/sql/sql_tools.py @@ -363,6 +363,16 @@ def get_purBillDate(branch_id,bill_mode): distr_main_key, bill_mode)) # print(bill_relation_json) return bill_relation_json +def get_ext_info(branch_id,bill_mode): + distr_main_key = get_id( + "select id from hdi_distr a where branch_id = '%s' and bill_mode='%s' order by create_time desc LIMIT 1;" % ( + branch_id, bill_mode)) + ext_info = get_id( + "select ext_info from hdi_distr a where id = '%s' and bill_mode='%s' order by create_time desc LIMIT 1;" % ( + distr_main_key, bill_mode)) + # print(bill_relation_json) + return ext_info + def get_distrBillId(branch_id,bill_mode): distr_main_key = get_id( "select id from hdi_distr a where branch_id = '%s' and bill_mode='%s' order by create_time desc LIMIT 1;" % ( diff --git a/data/b6_spd3_core_business_flow_database_check/data b/data/b6_spd3_core_business_flow_database_check/data index 6e8c454c20162d3741960ad4e3b9dc435ac4573d..1f11d25660e3b02136a58b79b7265cb48f2805fa 100644 --- a/data/b6_spd3_core_business_flow_database_check/data +++ b/data/b6_spd3_core_business_flow_database_check/data @@ -46,9 +46,9 @@ "mcms_purchase_detail2": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_id": "%s", "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "pur_mode": 60, "price": Decimal("99.999900"), "supply_id": "%s", "pkg_def_id": "%s", "pkg_def_name": "100", "pkg_def_qty": Decimal("100.00"), "pkg_qty": Decimal("1.00"), "qty": Decimal("100.00"), "con_pkg_qty": Decimal("0.00"), "con_qty": Decimal("0.00"), "up_pkg_qty": Decimal("0.00"), "up_qty": Decimal("0.00"), "check_pkg_qty": Decimal("0.00"), "check_qty": Decimal("0.00"), "distr_pkg_qty": Decimal("0.00"), "distr_qty": Decimal("0.00"), "not_send_qty": Decimal("0.00"), "not_send_pkg_qty": Decimal("0.00"), "in_settlement": 1, "close_type": 1, "detail_relation_json": "{"planBillId":"%s","buyDetailId":"%s","planDetailId":"%s"}", "ext_info": "{"goodsGg":"%s","goodsCode":"%s","purMode":60,"goodsName":"%s"}", "remark": None, "tb_status": 10, "pur_task_id": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "del_flag": 0}' -"hdi_distr": '{"id": "%s", "order_no": "%s", "bill_mode": "16", "rec_type": "HDI", "hos_id": "%s", "hos_name": "%s", "branch_id": "%s", "source_id": "%s", "source_type": "CGD", "pur_bill_id": "%s", "prov_id": "%s", "prov_name": "%s", "sub_send_flag": 10, "exe_prov_id": "%s", "exe_prov_name": "%s", "settlement": None, "pur_dept_id": "%s", "pur_dept_name": "%s", "rec_org_id": "%s", "rec_org_name": "%s", "rec_user": "%s", "rec_phone": "None", "rec_addr": "设备科001", "bill_relation_json": "{"buyBillId":"%s","planBillId":"%s","planOrderNo":"%s","buyOrderNo":"%s","purOrderNo":"%s","purBillId":"%s","purBillDate":"%s","distrBillId":"%s","distrOrderNo":"%s"}", "ext_info": "{"epidemicFlag":0,"purMode":10,"distrUser":"%s"}", "barcode_flag": 1, "pkg_flag": 1, "remark": "", "task_id": None, "convert_flag": 1, "convert_time": None, "convert_user_name": None, "reject_status": 0, "tb_status": 20, "create_user": "%s", "create_user_name": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "del_flag": 0, "last_auditor": None, "last_audit_time": None, "initial_order": None}' -"hdi_distr1": '{"id": "%s", "order_no": "%s", "bill_mode": "20", "rec_type": "HDI", "hos_id": "%s", "hos_name": "%s", "branch_id": "%s", "source_id": "%s", "source_type": "CGD", "pur_bill_id": "%s", "prov_id": "%s", "prov_name": "%s", "sub_send_flag": 10, "exe_prov_id": "%s", "exe_prov_name": "%s", "settlement": None, "pur_dept_id": "%s", "pur_dept_name": "%s", "rec_org_id": "%s", "rec_org_name": "%s", "rec_user": "%s", "rec_phone": "None", "rec_addr": "设备科001", "bill_relation_json": "{"buyBillId":"%s","planBillId":"%s","planOrderNo":"%s","buyOrderNo":"%s","purOrderNo":"%s","purBillId":"%s","purBillDate":"%s","distrBillId":"%s","distrOrderNo":"%s"}", "ext_info": "{"epidemicFlag":0,"purMode":20,"distrUser":"%s"}", "barcode_flag": 1, "pkg_flag": 0, "remark": "", "task_id": None, "convert_flag": 1, "convert_time": None, "convert_user_name": None, "reject_status": 0, "tb_status": 20, "create_user": "%s", "create_user_name": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "del_flag": 0, "last_auditor": None, "last_audit_time": None, "initial_order": None}' -"hdi_distr2": '{"id": "%s", "order_no": "%s", "bill_mode": "66", "rec_type": "HDI", "hos_id": "%s", "hos_name": "%s", "branch_id": "%s", "source_id": "%s", "source_type": "CGD", "pur_bill_id": "%s", "prov_id": "%s", "prov_name": "%s", "sub_send_flag": 10, "exe_prov_id": "%s", "exe_prov_name": "%s", "settlement": None, "pur_dept_id": "%s", "pur_dept_name": "%s", "rec_org_id": "%s", "rec_org_name": "%s", "rec_user": "%s", "rec_phone": "None", "rec_addr": "设备科001", "bill_relation_json": "{"buyBillId":"%s","planBillId":"%s","planOrderNo":"%s","buyOrderNo":"%s","purOrderNo":"%s","purBillId":"%s","purBillDate":"%s","distrBillId":"%s","distrOrderNo":"%s"}", "ext_info": "{"epidemicFlag":0,"purMode":60,"distrUser":"%s"}", "barcode_flag": 1, "pkg_flag": 1, "remark": "", "task_id": None, "convert_flag": 1, "convert_time": None, "convert_user_name": None, "reject_status": 0, "tb_status": 20, "create_user": "%s", "create_user_name": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "del_flag": 0, "last_auditor": None, "last_audit_time": None, "initial_order": None}' +"hdi_distr": '{"id": "%s", "order_no": "%s", "bill_mode": "16", "rec_type": "HDI", "hos_id": "%s", "hos_name": "%s", "branch_id": "%s", "source_id": "%s", "source_type": "CGD", "pur_bill_id": "%s", "prov_id": "%s", "prov_name": "%s", "sub_send_flag": 10, "exe_prov_id": "%s", "exe_prov_name": "%s", "settlement": None, "pur_dept_id": "%s", "pur_dept_name": "%s", "rec_org_id": "%s", "rec_org_name": "%s", "rec_user": "%s", "rec_phone": "None", "rec_addr": "设备科001", "bill_relation_json": "{"buyBillId":"%s","planBillId":"%s","planOrderNo":"%s","buyOrderNo":"%s","purOrderNo":"%s","purBillId":"%s","purBillDate":"%s","distrBillId":"%s","distrOrderNo":"%s"}", "ext_info": "{"purMode":10,"confirmTime":"%s","confirmUser":"%s","epidemicFlag":0,"distrUser":"%s"}", "barcode_flag": 1, "pkg_flag": 1, "remark": "", "task_id": None, "convert_flag": 1, "convert_time": None, "convert_user_name": None, "reject_status": 0, "tb_status": 20, "create_user": "%s", "create_user_name": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "del_flag": 0, "last_auditor": None, "last_audit_time": None, "initial_order": None}' +"hdi_distr1": '{"id": "%s", "order_no": "%s", "bill_mode": "20", "rec_type": "HDI", "hos_id": "%s", "hos_name": "%s", "branch_id": "%s", "source_id": "%s", "source_type": "CGD", "pur_bill_id": "%s", "prov_id": "%s", "prov_name": "%s", "sub_send_flag": 10, "exe_prov_id": "%s", "exe_prov_name": "%s", "settlement": None, "pur_dept_id": "%s", "pur_dept_name": "%s", "rec_org_id": "%s", "rec_org_name": "%s", "rec_user": "%s", "rec_phone": "None", "rec_addr": "设备科001", "bill_relation_json": "{"buyBillId":"%s","planBillId":"%s","planOrderNo":"%s","buyOrderNo":"%s","purOrderNo":"%s","purBillId":"%s","purBillDate":"%s","distrBillId":"%s","distrOrderNo":"%s"}", "ext_info": "{"purMode":20,"confirmTime":"%s","confirmUser":"%s","epidemicFlag":0,"distrUser":"%s"}", "barcode_flag": 1, "pkg_flag": 0, "remark": "", "task_id": None, "convert_flag": 1, "convert_time": None, "convert_user_name": None, "reject_status": 0, "tb_status": 20, "create_user": "%s", "create_user_name": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "del_flag": 0, "last_auditor": None, "last_audit_time": None, "initial_order": None}' +"hdi_distr2": '{"id": "%s", "order_no": "%s", "bill_mode": "66", "rec_type": "HDI", "hos_id": "%s", "hos_name": "%s", "branch_id": "%s", "source_id": "%s", "source_type": "CGD", "pur_bill_id": "%s", "prov_id": "%s", "prov_name": "%s", "sub_send_flag": 10, "exe_prov_id": "%s", "exe_prov_name": "%s", "settlement": None, "pur_dept_id": "%s", "pur_dept_name": "%s", "rec_org_id": "%s", "rec_org_name": "%s", "rec_user": "%s", "rec_phone": "None", "rec_addr": "设备科001", "bill_relation_json": "{"buyBillId":"%s","planBillId":"%s","planOrderNo":"%s","buyOrderNo":"%s","purOrderNo":"%s","purBillId":"%s","purBillDate":"%s","distrBillId":"%s","distrOrderNo":"%s"}", "ext_info": "{"purMode":60,"confirmTime":"%s","confirmUser":"%s","epidemicFlag":0,"distrUser":"%s"}", "barcode_flag": 1, "pkg_flag": 1, "remark": "", "task_id": None, "convert_flag": 1, "convert_time": None, "convert_user_name": None, "reject_status": 0, "tb_status": 20, "create_user": "%s", "create_user_name": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "del_flag": 0, "last_auditor": None, "last_audit_time": None, "initial_order": None}' "hdi_distr_detail": '{"id": "%s", "pid": "%s", "source_id": "%s", "source_detail_id": "%s", "pur_detail_id": "%s", "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": "支", "pur_price": Decimal("99.999900"), "batch_code": "333", "expdt_date": %s, "product_date": %s, "pkg_def_id": "%s", "pkg_def_name": "100", "pkg_def_qty": Decimal("100.00"), "supply_id": "%s", "sub_prov_id": "%s", "sub_prov_name": "%s", "sub_price": Decimal("99.9999"), "distr_price": Decimal("99.9999"), "distr_pkg_qty": Decimal("1.00"), "distr_qty": Decimal("100.00"), "settlement": 1, "certificate_code": "", "product_cert_code": None, "detail_relation_json": "{"planBillId":"%s","buyDetailId":"%s","planDetailId":"%s","purDetailId":"%s","purBillId":"%s","distrDetailId":"%s","distrBillId":"%s"}", "ext_info": "{"goodsGg":"%s","goodsCode":"%s","purMode":10,"goodsName":"%s","ygptCode":"","transCond":"","storageCond":"","erpCode":"%s","ybDefId":""}", "tb_status": 0, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "del_flag": 0}' "hdi_distr_detail2": '{"id": "%s", "pid": "%s", "source_id": "%s", "source_detail_id": "%s", "pur_detail_id": "%s", "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": "支", "pur_price": Decimal("99.999900"), "batch_code": "222", "expdt_date": %s, "product_date": %s, "pkg_def_id": %s, "pkg_def_name": null, "pkg_def_qty": Decimal("1.00"), "supply_id": "%s", "sub_prov_id": "%s", "sub_prov_name": "%s", "sub_price": Decimal("99.9999"), "distr_price": Decimal("99.9999"), "distr_pkg_qty": Decimal("1.00"), "distr_qty": Decimal("1.00"), "settlement": 1, "certificate_code": "", "product_cert_code": None, "detail_relation_json": "{"planBillId":"%s","buyDetailId":"%s","planDetailId":"%s","purDetailId":"%s","purBillId":"%s","distrDetailId":"%s","distrBillId":"%s"}", "ext_info": "{"goodsGg":"%s","goodsCode":"%s","purMode":20,"goodsName":"%s","ygptCode":"","transCond":"","storageCond":"","erpCode":"%s","ybDefId":""}", "tb_status": 0, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "del_flag": 0}'