流程五脚本提交

air_case/b6_spd3_core_business_flow_database_check/a_a7流程五_中心库入库结算_正结算3_内网验收入库结算_数据库验证.air/a_a7流程五_中心库入库结算_正结算3_内网验收入库结算_数据库验证.py

@@ -489,8 +489,8 @@ def check_mcms_psi_batch_in(DR_ID, type, order_no, source_id1):
     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)
+    create_time = get_create_time("select create_time from  mcms_psi_batch where id='%s';" % batch_main_key)
+    last_modified = get_create_time("select last_modified from  mcms_psi_batch where id='%s';" % batch_main_key)
     last_modified_user = create_user
     if type == 1:
         expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',

air_case/b6_spd3_core_business_flow_database_check/a_a8流程五_中心库入库结算_正结算3_外网开票_数据库验证.air/a_a8流程五_中心库入库结算_正结算3_外网开票_数据库验证.py

@@ -62,12 +62,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_0924', id,
+                                             'check_mcms_invoice_1009', 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(" ", "")
@@ -139,7 +139,7 @@ def check_mcms_invoice_detail(type=1, pid=""):
     hobd_id = get_id("select id from mcms_out_balance_detail  where prov_id='%s' order by id desc LIMIT 1 OFFSET 1;" % (
         prov_id))
     expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
-                                             'check_mcms_invoice_detail_0919_1', id,
+                                             'check_mcms_invoice_detail_1009_1', id,
                                              pid, hobd_id, branch_id, hos_goods_id, settle_month, create_user,
                                              create_time, last_modified, last_modified_user, hos_id
                                              )
@@ -274,7 +274,7 @@ def check_mcms_invoice_ext():
     pay_date = get_account_date1("select pay_date from mcms_invoice_ext where id='%s';" % id)
     pay_user = create_user
     expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
-                                             'check_mcms_invoice_ext_0924', id,
+                                             'check_mcms_invoice_ext_1009', id,
                                              hos_id, prov_id, prov_name, pay_date, create_user,
                                              create_time, last_modified, last_modified_user, pay_user
                                              )
@@ -362,6 +362,7 @@ try:
     approval_center(OBH_ID)
     from air_case.public1.public1.public1 import *
     invoice(2,OBH_ID)
+    time.sleep(6)
     # 检查发票数据
     check_mcms_invoice()
     time.sleep(3)

data/b6_spd3_core_business_flow_database_check/data

@@ -463,4 +463,15 @@
 
 "check_mcms_out_balance_detail_1009_1": '{"id": "%s", "pid": "%s", "prov_id": "%s", "prov_name": "%s", "sub_prov_id": "%s", "sub_prov_name": "%s", "out_dept_id": "%s", "out_dept_name": "%s", "account_date": %s, "pur_mode": 10, "from_table": "mcms_psi_batch", "from_id": "%s", "from_order_no": "%s", "hos_goods_id": "%s", "bar_id": "%s", "bar_code": "%s", "distr_detail_id": "%s", "hos_batch_id": "%s", "tb_status": 11, "price": Decimal("99.999900"), "settle_qty": Decimal("100.00"), "invoice_qty": Decimal("0.00"), "settle_amount": Decimal("9999.9900"), "un_settle_id": "%s", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "settle_type": 1, "contract_id": None, "normal_contract_id": None, "temp_purchase": 0, "hos_id": "%s", "fcat_id": None, "invoice_price": Decimal("99.999900"), "online_kind": "10"}'
 
-"check_mcms_out_balance_detail_1009_2": '{"id": "%s", "pid": "%s", "prov_id": "%s", "prov_name": "%s", "sub_prov_id": "%s", "sub_prov_name": "%s", "out_dept_id": "%s", "out_dept_name": "%s", "account_date": %s, "pur_mode": 10, "from_table": "mcms_psi_batch", "from_id": "%s", "from_order_no": "%s", "hos_goods_id": "%s", "bar_id": "%s", "bar_code": "%s", "distr_detail_id": "%s", "hos_batch_id": "%s", "tb_status": 11, "price": Decimal("99.999900"), "settle_qty": Decimal("100.00"), "invoice_qty": Decimal("0.00"), "settle_amount": Decimal("9999.9900"), "un_settle_id": "%s", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "settle_type": 1, "contract_id": None, "normal_contract_id": None, "temp_purchase": 0, "hos_id": "%s", "fcat_id": None, "invoice_price": Decimal("99.999900"), "online_kind": "10"}'
\ No newline at end of file
+"check_mcms_out_balance_detail_1009_2": '{"id": "%s", "pid": "%s", "prov_id": "%s", "prov_name": "%s", "sub_prov_id": "%s", "sub_prov_name": "%s", "out_dept_id": "%s", "out_dept_name": "%s", "account_date": %s, "pur_mode": 10, "from_table": "mcms_psi_batch", "from_id": "%s", "from_order_no": "%s", "hos_goods_id": "%s", "bar_id": "%s", "bar_code": "%s", "distr_detail_id": "%s", "hos_batch_id": "%s", "tb_status": 11, "price": Decimal("99.999900"), "settle_qty": Decimal("100.00"), "invoice_qty": Decimal("0.00"), "settle_amount": Decimal("9999.9900"), "un_settle_id": "%s", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "settle_type": 1, "contract_id": None, "normal_contract_id": None, "temp_purchase": 0, "hos_id": "%s", "fcat_id": None, "invoice_price": Decimal("99.999900"), "online_kind": "10"}'
+
+#中心库入库结算_正正结算_开票数据主表
+"check_mcms_invoice_1009": '{"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}'
+#中心库入库结算_正结算_付款单主表
+"check_mcms_invoice_ext_1009": '{"id": "%s", "hos_id": "%s", "prov_id": "%s", "prov_name": "%s", "payment_status": 20, "pay_channel": "YGPT", "pay_amount": Decimal("9999.9900"), "remain_pay_amount": Decimal("0.0000"), "remark": None, "pay_date": %s, "pay_count": 1, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "pay_user": "%s"}'
+
+#中心库入库结算_正结算_开票数据子表
+"check_mcms_invoice_detail_1009_1": '{"id": "%s", "pid": "%s", "hobd_id": "%s", "branch_id": "%s", "hos_goods_id": "%s", "invoice_qty": Decimal("100.00"), "invoice_amount": Decimal("9999.990000"), "price": Decimal("99.999900"), "invoice_price": Decimal("99.999900"), "filing_time": 1, "settle_month": "%s", "confirm_status": 0, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "hos_id": "%s", "ext_info": "{"purMode": 10, "oneFcatId": null, "onlineKind": null, "volumeFlag": null, "oneFcatName": null, "purModeText": "低值", "onlineKindText": null, "volumeFlagText": null}"}'
+"check_mcms_invoice_detail_1009_2": '{"id": "%s", "pid": "%s", "hobd_id": "%s", "branch_id": "%s", "hos_goods_id": "%s", "invoice_qty": Decimal("100.00"), "invoice_amount": Decimal("9999.990000"), "price": Decimal("99.999900"), "invoice_price": Decimal("99.999900"), "filing_time": 1, "settle_month": "%s", "confirm_status": 0, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "hos_id": "%s", "ext_info": "{"purMode": 10, "oneFcatId": null, "onlineKind": null, "volumeFlag": null, "oneFcatName": null, "purModeText": "低值", "onlineKindText": null, "volumeFlagText": null}"}'
+#中心库入库结算_正结算_付款单主表
+"check_mcms_invoice_ext_1009": '{"id": "%s", "hos_id": "%s", "prov_id": "%s", "prov_name": "%s", "payment_status": 20, "pay_channel": "YGPT", "pay_amount": Decimal("9999.9900"), "remain_pay_amount": Decimal("0.0000"), "remark": None, "pay_date": %s, "pay_count": 1, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "pay_user": "%s"}'