流程五脚本提交

air_case/b6_spd3_core_business_flow_database_check/a_a4_流程四_基础模块设置_数据库验证.air/a_a4_流程四_基础模块设置_数据库验证.py

@@ -463,49 +463,50 @@ def check_dept_leader():
         commonFuc().check_text_exist_result_text('error', 'succees')
 
 def check_StockArea():
-    print('检查库区数据')
+    print('检查新增的库区数据')
     branch_id = get_branch_id()
-    sql1 = "select * from sys_org where branch_id='%s' order by create_time desc LIMIT 1 OFFSET 3;" % (
-        branch_id)
-    actual = check_mcms_pur_sql(sql1)
-    print('actual', actual)
-    id = get_id(
-        "select id from sys_org where branch_id='%s' order by create_time desc LIMIT 1 OFFSET 3;" % (branch_id))
-    pid = get_id("select pid from sys_org where branch_id='%s' order by create_time desc LIMIT 1 OFFSET 3;" % (
-        branch_id))
-    code = get_id("select code from sys_org where branch_id='%s' and id='%s';" % (branch_id, id))
-    corp_id = get_hosid()
-    last_update_datetime = get_create_time("select last_update_datetime from sys_org where id='%s';" % id)
-    create_time = get_create_time("select create_time from sys_org where id='%s';" % id)
-    last_modified = get_create_time("select last_modified from sys_org where id='%s';" % id)
-    username = commonFuc().get_business_data('b2_herp3_bs', "username")
-    create_user = get_login_user_uxid_bydb(username)
-    last_modified_user = create_user
-    user_leader_id = get_login_user_uxid_bydb(
-        FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')['username1'])
-    expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
-                                             'check_dept_leader', id, pid, code, corp_id, branch_id,
-                                             last_update_datetime
-                                             , create_time, create_user, last_modified_user, last_modified,
-                                             user_leader_id)
+    for i in range(4):
+        sql1 = "select * from mcms_stock_shelf order by shelf_code desc LIMIT 1 OFFSET %s;" % (
+            i)
+        actual = check_mcms_pur_sql(sql1)
+        print('actual', actual)
+        id = get_id(
+            "select id from sys_org where branch_id='%s' order by create_time desc LIMIT 1 OFFSET 3;" % (branch_id))
+        pid = get_id("select pid from sys_org where branch_id='%s' order by create_time desc LIMIT 1 OFFSET 3;" % (
+            branch_id))
+        code = get_id("select code from sys_org where branch_id='%s' and id='%s';" % (branch_id, id))
+        corp_id = get_hosid()
+        last_update_datetime = get_create_time("select last_update_datetime from sys_org where id='%s';" % id)
+        create_time = get_create_time("select create_time from sys_org where id='%s';" % id)
+        last_modified = get_create_time("select last_modified from sys_org where id='%s';" % id)
+        username = commonFuc().get_business_data('b2_herp3_bs', "username")
+        create_user = get_login_user_uxid_bydb(username)
+        last_modified_user = create_user
+        user_leader_id = get_login_user_uxid_bydb(
+            FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')['username1'])
+        expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
+                                                 'check_dept_leader', id, pid, code, corp_id, branch_id,
+                                                 last_update_datetime
+                                                 , create_time, create_user, last_modified_user, last_modified,
+                                                 user_leader_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')
+        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_a4_流程四_基础模块设置.air')

data/b6_spd3_core_business_flow_database_check/data

@@ -508,3 +508,9 @@
 
 #检查部门负责人数据
 "check_dept_leader": '{"id": "%s", "pid": "%s", "code": "%s", "self_code": None, "corp_id": "%s", "branch_id": "%s", "corp_kind": "1", "ename": "设备科001", "cname": "设备科001", "dept_level": 1, "dept_type": "1", "ext1": None, "ext2": None, "ext3": None, "ext4": None, "ext5": None, "dept_cate": 1, "dept_kind": 1, "ordinal": None, "short_pinyin": "sbk001", "address": "设备科001", "contact_way": "13401003250", "scm_code": None, "erp_code": "001", "remark": None, "node_kind": None, "flag": "1", "last_update_datetime": %s, "version": 3, "create_time": %s, "create_user": "%s", "last_modified_user": "%s", "last_modified": %s, "user_leader_id": "%s"}'
+
+#检查库区数据
+"check_mcms_stock_shelf0": '{"id": "%s", "stock_id": "%s", "shelf_code": "%s-2-02-02", "shelf_no": "%s-2-02-02", "shelf_name": None, "shelf_type": None, "stock_type": 1, "default_flag": 0, "special_flag": None, "parent_id": "%s", "linkman": None, "rec_phone": None, "level_code": None, "tb_status": 1, "shelf_kind": 0, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "del_flag": 0, "address": None}'
+"check_mcms_stock_shelf1": '{"id": "%s", "stock_id": "%s", "shelf_code": "%s-2-02-02", "shelf_no": "%s-2-02-02", "shelf_name": None, "shelf_type": None, "stock_type": 1, "default_flag": 0, "special_flag": None, "parent_id": "%s", "linkman": None, "rec_phone": None, "level_code": None, "tb_status": 1, "shelf_kind": 0, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "del_flag": 0, "address": None}'
+"check_mcms_stock_shelf2": '{"id": "%s", "stock_id": "%s", "shelf_code": "%s-2-02-02", "shelf_no": "%s-2-02-02", "shelf_name": None, "shelf_type": None, "stock_type": 1, "default_flag": 0, "special_flag": None, "parent_id": "%s", "linkman": None, "rec_phone": None, "level_code": None, "tb_status": 1, "shelf_kind": 0, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "del_flag": 0, "address": None}'
+"check_mcms_stock_shelf3": '{"id": "%s", "stock_id": "%s", "shelf_code": "%s-2-02-02", "shelf_no": "%s-2-02-02", "shelf_name": None, "shelf_type": None, "stock_type": 1, "default_flag": 0, "special_flag": None, "parent_id": "%s", "linkman": None, "rec_phone": None, "level_code": None, "tb_status": 1, "shelf_kind": 0, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "del_flag": 0, "address": None}'
\ No newline at end of file