Merge remote-tracking branch 'remotes/origin/master' into core_flow

air_case/b6_spd3_core_business_flow_database_check/a_b0流程七_中心库入库结算_正负结算_数据库验证.air/a_b0流程七_中心库入库结算_正负结算_数据库验证.py

@@ -867,7 +867,210 @@ def check_mcms_out_balance_detail_approve_after2(type=1, pid=""):
     else:
         print('error')
         commonFuc().check_text_exist_result_text('error', 'succees')
+def  check_mcms_invoice():
+    print('检查发票数据')
+    prov_id = get_prov_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"]
+    # else:
+    #     hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message3')["hosGoodsId"]
+
+    sql = "select * from  mcms_invoice where prov_id='%s'  order by   CREATE_TIME desc LIMIT 1;" % (
+        prov_id)
+    # 获取实际值
+    actual = check_mcms_pur_plan_sql(sql)
+    print('actual', actual)
+    sql = "select id from  mcms_invoice where prov_id='%s'  order by   CREATE_TIME desc LIMIT 1;" % (
+        prov_id)
+    id = get_id(sql)
+    hos_id = get_hosid()
+    prov_name = get_prov_name()
+
+    create_user = get_login_user_uxid_bydb(FileUtils().r_info8("b5_spd3_core_business_flow", "供货关系申请2", 'message')['e_username'])
+    # create_user = account_user_id
+    create_time = get_create_time("select create_time from  mcms_invoice where id='%s';" % id)
+    last_modified = get_create_time("select last_modified from  mcms_invoice where id='%s';" % id)
+    last_modified_user = get_login_user_uxid_bydb(FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')['username1'])
+
+
+    year, month = dateUtils().get_year_month(dateUtils().get_current_time())
+    if month < 10:
+        month = "0" + str(month)
+    year_month = str(year) + str(month)
+    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,
+                                             hos_id, prov_id, prov_name, invoice_date, settle_months, 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')
+    #检查发票子表数据
+    check_mcms_invoice_detail(1,id)
+    check_mcms_invoice_detail2(1, id)
+def check_mcms_invoice_detail(type=1,pid=""):
+    print('检查发票子表数据')
+    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"]
+    branch_id = get_branch_id()
+    sql = "select * from mcms_invoice_detail  where pid='%s' order by id LIMIT 1;" % (
+        pid)
+    # 获取实际值
+    actual = check_mcms_pur_plan_sql(sql)
+    print('actual', actual)
+    sql = "select id from  mcms_invoice_detail where pid='%s' order by id LIMIT 1;" % (
+        pid)
+    id = get_id(sql)
+    hos_id = get_hosid()
+    prov_id = get_prov_id()
+    prov_name = get_prov_name()
+    sub_prov_id = prov_id
+    settle_dept_id = None
+    distr_detail_id = get_id("select distr_detail_id from mcms_out_balance_detail where id='%s';" % id)
+    if check_distr_detail_id(distr_detail_id) == True:
+        print('ok')
+        commonFuc().check_text_exist_result_text('success', 'success')
+    else:
+        commonFuc().check_text_exist_result_text('error', 'success')
+    hos_batch_id = get_id("select hos_batch_id from mcms_out_balance_detail where id='%s';" % id)
+    if check_batch_id(hos_batch_id) == True:
+        print('ok')
+        commonFuc().check_text_exist_result_text('success', 'success')
+    else:
+        commonFuc().check_text_exist_result_text('error', 'success')
+
+
+    account_user_id = get_login_user_uxid_bydb(FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')['username1'])
+    create_user = get_login_user_uxid_bydb(FileUtils().r_info8("b5_spd3_core_business_flow", "供货关系申请2", 'message')['e_username'])
+    create_time = get_create_time("select create_time from  mcms_invoice_detail where id='%s';" % id)
+    last_modified = get_create_time("select last_modified from  mcms_invoice_detail where id='%s';" % id)
+    last_modified_user = create_user
+
+    year, month = dateUtils().get_year_month(dateUtils().get_current_time())
+    if month < 10:
+        month = "0" + str(month)
+    settle_month = str(year) + str(month)
+    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,
+                                             pid,hobd_id,branch_id, hos_goods_id,settle_month,create_user,create_time,last_modified,last_modified_user,hos_id
+                                             )
+
+    # 对比预期值和实际值是否一致
+    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')
 
+def check_mcms_invoice_detail2(type=1,pid=""):
+    print('检查发票子表数据')
+    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"]
+    branch_id = get_branch_id()
+    sql = "select * from mcms_invoice_detail  where pid='%s' order by id LIMIT 1 OFFSET 1;" % (
+        pid)
+    # 获取实际值
+    actual = check_mcms_pur_plan_sql(sql)
+    print('actual', actual)
+    sql = "select id from  mcms_invoice_detail where pid='%s' order by id LIMIT 1 OFFSET 1;" % (
+        pid)
+    id = get_id(sql)
+    hos_id = get_hosid()
+    prov_id = get_prov_id()
+    prov_name = get_prov_name()
+    sub_prov_id = prov_id
+    settle_dept_id = None
+    distr_detail_id = get_id("select distr_detail_id from mcms_out_balance_detail where id='%s';" % id)
+    if check_distr_detail_id(distr_detail_id) == True:
+        print('ok')
+        commonFuc().check_text_exist_result_text('success', 'success')
+    else:
+        commonFuc().check_text_exist_result_text('error', 'success')
+    hos_batch_id = get_id("select hos_batch_id from mcms_out_balance_detail where id='%s';" % id)
+    if check_batch_id(hos_batch_id) == True:
+        print('ok')
+        commonFuc().check_text_exist_result_text('success', 'success')
+    else:
+        commonFuc().check_text_exist_result_text('error', 'success')
+
+
+    account_user_id = get_login_user_uxid_bydb(FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')['username1'])
+    create_user = get_login_user_uxid_bydb(FileUtils().r_info8("b5_spd3_core_business_flow", "供货关系申请2", 'message')['e_username'])
+    create_time = get_create_time("select create_time from  mcms_invoice_detail where id='%s';" % id)
+    last_modified = get_create_time("select last_modified from  mcms_invoice_detail where id='%s';" % id)
+    last_modified_user = create_user
+
+    year, month = dateUtils().get_year_month(dateUtils().get_current_time())
+    if month < 10:
+        month = "0" + str(month)
+    settle_month = str(year) + str(month)
+    hobd_id=get_id("select id from mcms_out_balance_detail  where prov_id='%s' order by id desc LIMIT 1;" % (
+        prov_id))
+    expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
+                                             'check_mcms_invoice_detail_0919_2', id,
+                                             pid,hobd_id,branch_id, hos_goods_id,settle_month,create_user,create_time,last_modified,last_modified_user,hos_id
+                                             )
+
+    # 对比预期值和实际值是否一致
+    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')
 pro_path = commonFuc().get_pro_path2()
 print('pro_path', pro_path)
 sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b0流程七_中心库入库结算_正负结算.air')
@@ -895,9 +1098,13 @@ try:
     # # 调用审批结算单
     # approval_center(OBh_ID)
     # time.sleep(6)
-    check_mcms_out_balance_approve_after(1, 'OBh0347202409190004')  # 结算审批后的结算数据
-    time.sleep(3)
-    invoice(3, OBh_ID)  # type=2 传递结算单号，外网查询开票
+    # OBh_ID='OBh0347202409190004'
+    # check_mcms_out_balance_approve_after(1, 'OBh0347202409190004')  # 结算审批后的结算数据
+    # time.sleep(3)
+    # invoice(3, OBh_ID)  # type=2 传递结算单号，外网查询开票
+    # time.sleep(3)
+    #检查最终的发票数据,过程数据在流程五中检查
+    check_mcms_invoice()
     commonFuc().check_text_exist_result_text('succees', 'succees')
 except Exception as e:
     # 打印错误信息

common/Logger_Utils.py

+#
+# from common.fileUtls import FileUtils
+#
+# id2,name='1234','ddd院区'
+# oldinfo=(id2,name)
+# info=('new1234','new_ddd院区')
+# FileUtils().w_info2_new(info,'demo-ui','院区新增',oldinfo)
+
+# str=""" 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,
+#                                                  accounter, account_date,
+#                                                  pickOrderNo, pickBillId, psiDeptOutBillId, psiDeptOutOrderNo
+#                                                  , create_user, create_time, last_modified, last_modified_user
+# """
+#
+# str2=str.split(',')
+# print(len(str2))
+import sys
+
+class Logger(object):
+    def __init__(self, filename):
+        self.terminal = sys.stdout
+        self.log = open(filename, "a")
+
+    def write(self, message):
+        self.terminal.write(message)
+        self.log.write(message)
+
+    def flush(self):
+        pass
+
+# sys.stdout = Logger("output.txt")
+# sys.stderr = Logger("error.txt")
+
+# print("Hello, this is a test message.")
\ No newline at end of file

data/b6_spd3_core_business_flow_database_check/data

@@ -375,6 +375,14 @@
 "check_mcms_out_balance_0919": '{"id": "%s", "order_no": "%s", "branch_id": "%s", "hos_id": "%s", "prov_id": "%s", "prov_name": "%s", "settle_dept_id": None, "tb_status": 20, "sum_row": 2, "settle_amount": Decimal("0.000000"), "settle_way": 0, "settle_month": "%s", "settle_start_time": %s, "settle_end_time": %s, "remark": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "check_msg": "22", "settle_qty": Decimal("0.0000"), "check_user": "%s", "check_time": %s}'
 #中心库退货出库_结算数据子表_审批后
 
-"check_mcms_out_balance_detail_0919_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": 10, "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_0919_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_0919_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": 10, "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_0919_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_invoice_0918": '{"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("0.000000"), "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("0.0000"), "remarks": "", "invoice_tag": None, "ext_info": None}'
+
+
+#中心库入库结算_正负结算_开票数据字表
+"check_mcms_invoice_detail_0919_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_0919_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}"}'
\ No newline at end of file

main1/main_text.py

@@ -6,6 +6,8 @@ import os
 import traceback
 
 from air_case.public1.public1.public1 import approval_center, approval_center_all
+from common.Logger_Utils import Logger
+from common.timeUtils import timeUtils
 
 curPath = os.path.abspath(os.path.dirname(__file__))  # 获取当前文件的所在目录的绝对路径
 # print('将路径中的/换成\\', curPath)  # C:\Users\Administrator\Desktop\temp\dbshop99\main
@@ -227,6 +229,10 @@ def main_text():
             print('Cancel')
 
     def flow5_flow18():
+        date1= timeUtils().get_time_hms(1)
+        sys.stdout = Logger(date1+"output.txt")
+        sys.stderr = Logger(date1+"error.txt")
+
         # 脚本运行前清空所有待审批数据
         approval_center_all()
         approval_center_all()