From 5a7c74380771fa7801ae50eed801269318661898 Mon Sep 17 00:00:00 2001 From: xiao-hesheng Date: Tue, 24 Sep 2024 14:37:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BA=94=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= 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" | 49 +++++++++++-------- .../data | 3 ++ 2 files changed, 32 insertions(+), 20 deletions(-) diff --git "a/air_case/b6_spd3_core_business_flow_database_check/a_a9\346\265\201\347\250\213\345\205\255_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\350\264\237\347\273\223\347\256\227_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_a9\346\265\201\347\250\213\345\205\255_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\350\264\237\347\273\223\347\256\227_\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_a9\346\265\201\347\250\213\345\205\255_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\350\264\237\347\273\223\347\256\227_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_a9\346\265\201\347\250\213\345\205\255_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\350\264\237\347\273\223\347\256\227_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" index 1349ff6a..36ec8f5b 100644 --- "a/air_case/b6_spd3_core_business_flow_database_check/a_a9\346\265\201\347\250\213\345\205\255_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\350\264\237\347\273\223\347\256\227_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_a9\346\265\201\347\250\213\345\205\255_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\350\264\237\347\273\223\347\256\227_\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_a9\346\265\201\347\250\213\345\205\255_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\350\264\237\347\273\223\347\256\227_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_a9\346\265\201\347\250\213\345\205\255_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\350\264\237\347\273\223\347\256\227_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" @@ -721,12 +721,12 @@ def check_mcms_invoice(): settle_months = year_month invoice_date = get_account_date1("select invoice_date from mcms_invoice where id='%s';" % id) expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', - 'check_mcms_invoice_0918', id, + 'check_mcms_invoice_0924', id, hos_id, prov_id, prov_name, invoice_date, settle_months, create_user, create_time, last_modified, last_modified_user ) - # 对比预期值和实际值是否一致 + # 对比预期值和实际值是否一致z actual_value1 = get_process_list2(actual) expected_value1 = get_process_list2(expected) actual_value2 = actual_value1.replace(" ", "") @@ -746,7 +746,7 @@ def check_mcms_invoice(): commonFuc().check_text_exist_result_text('error', 'succees') # 检查发票子表数据 check_mcms_invoice_detail(1, id) - check_mcms_invoice_detail2(1, id) + # check_mcms_invoice_detail2(1, id) def check_mcms_invoice_detail(type=1, pid=""): @@ -1022,24 +1022,33 @@ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_a9流程六_ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_a9流程六_中心库入库结算_负结算.air') from a_a9流程六_中心库入库结算_负结算 import center_warehouse_return try: - updateUserLoginDefaultRange(get_listUserMgrRangePage(1)) # 设置登录账号默认权限是1级库 - # test1() # 提交采购计划 # 外网配送 # 内网验收入库结算 - # 先查询所有的部门信息写入文件 - dept_query_all() - # 设置库房人员,根据传入的科室id和科室名称来设置库房 - # 中心库type=1 二级type=2三级type=3 - set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'],2) - set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3'],3) - # updateUserLoginDefaultRange(get_listUserMgrRangePage(1)) #设置登录账号默认权限是中心库 - center_warehouse_return()#中心库退货 + # updateUserLoginDefaultRange(get_listUserMgrRangePage(1)) # 设置登录账号默认权限是1级库 + # # test1() # 提交采购计划 # 外网配送 # 内网验收入库结算 + # # 先查询所有的部门信息写入文件 + # dept_query_all() + # # 设置库房人员,根据传入的科室id和科室名称来设置库房 + # # 中心库type=1 二级type=2三级type=3 + # set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'],2) + # set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3'],3) + # # updateUserLoginDefaultRange(get_listUserMgrRangePage(1)) #设置登录账号默认权限是中心库 # center_warehouse_return()#中心库退货 - OBh_ID=settle() # 生成结算单 - print(OBh_ID) - time.sleep(6) - check_mcms_out_balance(1, OBh_ID) # 结算审批前的结算数据 - # 调用审批结算单 - approval_center(OBh_ID) - invoice(2,OBh_ID)#type=2 传递结算单号,外网查询开票 + # # center_warehouse_return()#中心库退货 + # OBh_ID=settle() # 生成结算单 + # print(OBh_ID) + # time.sleep(6) + # check_mcms_out_balance(1, OBh_ID) # 结算审批前的结算数据 + # # 调用审批结算单 + # approval_center(OBh_ID) + # time.sleep(6) + # check_mcms_out_balance_approve_after(1, OBh_ID) # 结算审批后的结算数据 + # time.sleep(3) + # invoice(2,OBh_ID)#type=2 传递结算单号,外网查询开票 + # time.sleep(3) + # 检查最终的发票数据,过程数据在流程五中检查 + check_mcms_invoice() + time.sleep(3) + # 检查付款单数据 + check_mcms_invoice_ext() commonFuc().check_text_exist_result_text('succees', 'succees') except Exception as e: # 打印错误信息 diff --git a/data/b6_spd3_core_business_flow_database_check/data b/data/b6_spd3_core_business_flow_database_check/data index 1c819e84..22fe7a03 100644 --- a/data/b6_spd3_core_business_flow_database_check/data +++ b/data/b6_spd3_core_business_flow_database_check/data @@ -394,3 +394,6 @@ #中心库入库结算_正负结算_付款单子表 "check_mcms_invoice_ext_detail_0919_1": '{"id": "%s", "pid": "%s", "invoice_id": "%s", "remark": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "hos_id": "%s"}' + +#中心库入库结算_负结算_开票数据主表 +"check_mcms_invoice_0924": '{"id": "%s", "hos_id": "%s", "branch_id": None, "invoice_code": "1", "invoice_number": "test", "invoice_num": 1, "prov_id": "%s", "prov_name": "%s", "invoice_amount": Decimal("-9999.990000"), "tb_status": 50, "invoice_date": %s, "settle_months": "%s", "tax_amount": None, "payment_bill_id": None, "yxpt_order_id": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 6, "invoice_qty": Decimal("-100.0000"), "remarks": "", "invoice_tag": None, "ext_info": None}' -- GitLab