数据库验证流程十一脚本编写

air_case/b6_spd3_core_business_flow_database_check/a_b4流程十一请领业务流_二级库向直送_数据库验证.air/a_b4流程十一请领业务流_二级库向直送_数据库验证.py

@@ -1358,7 +1358,9 @@ def check_hdi_distr_detail(distr_main_key, type, purchase_id):
     create_time = get_create_time(
         "select create_time from hdi_distr_detail where id = '%s';" % (
             distr_detail_main_key))
-    last_modified = create_time
+    last_modified = get_create_time(
+        "select last_modified from hdi_distr_detail where id = '%s';" % (
+            distr_detail_main_key))
     last_modified_user = create_user
     if type == 16:
         expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
@@ -1393,8 +1395,24 @@ def check_hdi_distr_detail(distr_main_key, type, purchase_id):
     else:
         expected = None
 
-    comparison_result(actual, expected)
-
+    # comparison_result(actual, expected)
+    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_check(type=1):
     if type == 1:
@@ -1491,71 +1509,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:
-        #     check_hdi_distr(int(i))
-
-
-        # check_accept_order(1)  # 低值
-        # 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()
 
-        # check_accept_order(2)  # 高值
-        # check_mcms_check(2)  # 调用函数检查验收单数据库写值
-        # check_accept_order(3)  # 试剂
+        # 三个单据共审批三次
+        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:
+            check_hdi_distr(int(i))
+
+        time.sleep(20)
+        check_accept_order(1)  # 低值
+        time.sleep(6)
+        check_mcms_check(1)  # 调用函数检查验收单数据库写值
+
+        check_accept_order(2)  # 高值
+        time.sleep(6)
+        check_mcms_check(2)  # 调用函数检查验收单数据库写值
+        check_accept_order(3)  # 试剂
+        time.sleep(6)
         check_mcms_check(3)  # 调用函数检查验收单数据库写值
+     # 上面暂时注释========================================
         # 这里验收后会自动生成入库单，批次信息，需要同步验证入库单和批次信息
         # 根据验收单号到mcms_psi表查询入库单