流程八脚本提交

air_case/b6_spd3_core_business_flow_database_check/a_b1流程八_高值跟台业务流程_数据库验证.air/a_b1流程八_高值跟台业务流程_数据库验证.py

@@ -4,7 +4,8 @@ import traceback
 
 from air_case.b1_herp3_login.登录内网系统.登录内网系统 import login_system
 from air_case.public1.public1.public1 import *
-from common.db.sql.sql_tools import check_mcms_dept_buy_sql, get_login_user_uxid_bydb, get_create_time
+from common.db.sql.sql_tools import check_mcms_dept_buy_sql, get_login_user_uxid_bydb, get_create_time, get_goods_code1, \
+    get_goods_name
 
 from common.fileUtls import FileUtils
 from common.run_cmd_script import execute_command
@@ -325,18 +326,21 @@ def check_mcms_operation_notice_list(pid,p_order_no):
     source_bill_detail_id=get_id("select id from mcms_operation_apply_list order by create_time desc  LIMIT 1;")
     pkg_code=p_order_no
     hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message1')["hosGoodsId"]
-    prov_id=get_prov_id()
-    sub_prov_id=get_prov_id()
+    goodsCode=get_goods_code1(hos_goods_id)
+    goodsName=get_goods_name(hos_goods_id)
 
+    sub_prov_id=get_prov_id()
+    sub_prov_name=get_prov_name()
+    create_user_name=FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')['username1']
 
-    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_operation_apply_list where id='%s';" % ID)
-    last_modified = get_create_time("select last_modified from  mcms_operation_apply_list where id='%s';" % ID)
+    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_operation_notice_list where id='%s';" % ID)
+    last_modified = get_create_time("select last_modified from  mcms_operation_notice_list where id='%s';" % ID)
     last_modified_user = create_user
 
     expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
-                                             'check_mcms_operation_notice_list', ID, pid, hos_goods_id, prov_id, sub_prov_id,
-                                           create_user, create_time, last_modified, last_modified_user
+                                             'check_mcms_operation_notice_list', ID, pid, source_bill_detail_id,pkg_code,hos_goods_id, sub_prov_id, sub_prov_name,
+                                           goodsCode,goodsName,create_user, create_user_name,create_time, last_modified, last_modified_user
 
                                              )