流程二脚本提交

air_case/b6_spd3_core_business_flow_database_check/a_a2_流程二供货关系申请提交审批_数据库验证.air/a_a2_流程二供货关系申请提交审批_数据库验证.py

@@ -26,17 +26,21 @@ def check_supply_relation(type=1):
     id=get_id("select id from spd_ybtest_hdi.supply_relation order by create_time desc limit 1;")
     hos_id=get_hosid()
     prov_id = get_prov_id()
-    sub_prov_id='p10d95'
+    sub_prov_id=prov_id
+    contact_way=get_id("select contact_way from spd_ybtest_hdi.supply_relation where id='%s';" % id)
+    contact_user=get_id("select contact_user from spd_ybtest_hdi.supply_relation where id='%s';" % id)
     create_time = get_create_time("select create_time from spd_ybtest_hdi.supply_relation where id='%s';" % id)
     last_modified = get_create_time("select last_modified from spd_ybtest_hdi.supply_relation where id='%s';" % id)
     # username = commonFuc().get_business_data('b2_herp3_bs', "username")
-    create_user = get_login_user_uxid_bydb(
-        FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2', 'message')["e_username"])
-    last_modified_user = create_user
-    parent_id = get_id("select parent_id from mcms_stock_shelf where id='%s';" % id)
+    auditor=get_id("select auditor from spd_ybtest_hdi.supply_relation where id='%s';" % id)
+    # create_user = get_login_user_uxid_bydb(
+    #     FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2', 'message')["e_username"])
+    # last_modified_user = create_user
+    audit_time= get_create_time("select audit_time from spd_ybtest_hdi.supply_relation where id='%s';" % id)
+    last_modified = get_id("select last_modified from spd_ybtest_hdi.supply_relation where id='%s';" % id)
     expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
-                                             'check_mcms_goods_info', id
-                                             , create_user, create_time, last_modified_user, last_modified)
+                                             'check_mcms_goods_info', id,hos_id,prov_id,sub_prov_id,contact_way
+                                             ,contact_user,auditor,audit_time, create_time, last_modified)
 
     actual_value1 = get_process_list2(actual)
     expected_value1 = get_process_list2(expected)
@@ -70,6 +74,7 @@ try:
     # 供应关系申请-客户类型医院
     FileUtils().w_info1(supply_and_marketing_apply(), module, '供货关系申请')
     submitSupplyRelation_pass()
+    check_supply_relation()
     # 供应关系申请-客户类型厂商
     FileUtils().w_info1(supply_and_marketing_apply2(), module, '供货关系申请2')
     submitSupplyRelation_pass()

data/a2_mdm3_ea/message

 企业信息:
-  e_id: CR202410310093
-  cname: 国药集团公司M@n&X
+  e_id: CR202411040038
+  cname: 国药集团公司%jH@*

data/b5_spd3_core_business_flow/message

-供货关系申请2:
-  e_corpId: p1e4bc
+供货关系申请:
+  e_corpId: p1e4d1
   h_corpId: h0347
-  e_username: 国药集团公司M@n&X
+  e_username: 国药集团公司%jH@*
   h_name: test_1

data/b6_spd3_core_business_flow_database_check/data

@@ -529,3 +529,6 @@
 "check_mcms_goods_info_after_approval3": '{"id": "%s", "hos_goods_code": "%s", "hos_id": "%s", "prov_id": "%s", "prov_hos_goods_id": "%s", "srv_id": None, "mdm_goods_code": "%s", "mdm_goods_spec_code": "%s", "spd_goods_code": "%s", "goods_name": "%s", "goods_general_name": "检测试剂", "goods_mfrs_id": "mfrs-11229", "goods_mfrs_name": "德国歌德公司 Geuder AG", "goods_reg_cert": "", "goods_agent_mfrs_id": None, "brand": "", "short_pinyin": "%s", "kind_sixtyeight_code": None, "unit": "支", "goods_spec": "G-31891", "goods_package": Decimal("1.000000"), "bar_code_mng": 2, "unique_code_strategy": "0", "pur_mode": 60, "sub_pur_mode": None, "erp_code": None, "herp_code": "", "price": Decimal("99.9999"), "abroad_flag": None, "made": "德国", "property": None, "mgr_level": None, "goods_desc": "", "charge_flag": 1, "focus_control_type": None, "temp_flag": 0, "official_status": None, "focus_control": 0, "storage_conditions": "", "transport_conditions": "", "into_cost_flag": None, "rfid_flag": None, "purchase_flag": 1, "tb_status": 0, "version": 1, "create_user": "%s", "create_time": %s, "last_modified_user": "%s", "last_modified": %s, "sterilize_flag": 0, "multi_charge_flag": 0, "use_frequency": 1, "charge_unit": None, "remark": "无 "}'
 "check_mcms_goods_info_after_approval4": '{"id": "%s", "hos_goods_code": "%s", "hos_id": "%s", "prov_id": "%s", "prov_hos_goods_id": "%s", "srv_id": None, "mdm_goods_code": "%s", "mdm_goods_spec_code": "%s", "spd_goods_code": "%s", "goods_name": "%s", "goods_general_name": "一次性注射器", "goods_mfrs_id": "mfrs-11229", "goods_mfrs_name": "德国歌德公司 Geuder AG", "goods_reg_cert": "", "goods_agent_mfrs_id": None, "brand": "", "short_pinyin": "%s", "kind_sixtyeight_code": None, "unit": "支", "goods_spec": "G-31891", "goods_package": Decimal("1.000000"), "bar_code_mng": 2, "unique_code_strategy": "3", "pur_mode": 10, "sub_pur_mode": None, "erp_code": None, "herp_code": "", "price": Decimal("99.9999"), "abroad_flag": None, "made": "德国", "property": None, "mgr_level": None, "goods_desc": "", "charge_flag": 1, "focus_control_type": None, "temp_flag": 0, "official_status": None, "focus_control": 0, "storage_conditions": "", "transport_conditions": "", "into_cost_flag": None, "rfid_flag": None, "purchase_flag": 1, "tb_status": 0, "version": 1, "create_user": "%s", "create_time": %s, "last_modified_user": "%s", "last_modified": %s, "sterilize_flag": 0, "multi_charge_flag": 0, "use_frequency": 1, "charge_unit": None, "remark": "无 "}'
 "check_mcms_goods_info_after_approval5": '{"id": "%s", "hos_goods_code": "%s", "hos_id": "%s", "prov_id": "%s", "prov_hos_goods_id": "%s", "srv_id": None, "mdm_goods_code": "%s", "mdm_goods_spec_code": "%s", "spd_goods_code": "%s", "goods_name": "%s", "goods_general_name": "一次性注射器", "goods_mfrs_id": "mfrs-11229", "goods_mfrs_name": "德国歌德公司 Geuder AG", "goods_reg_cert": "", "goods_agent_mfrs_id": None, "brand": "", "short_pinyin": "%s", "kind_sixtyeight_code": None, "unit": "支", "goods_spec": "G-31891", "goods_package": Decimal("1.000000"), "bar_code_mng": 2, "unique_code_strategy": "3", "pur_mode": 10, "sub_pur_mode": None, "erp_code": None, "herp_code": "", "price": Decimal("99.9999"), "abroad_flag": None, "made": "德国", "property": None, "mgr_level": None, "goods_desc": "", "charge_flag": 1, "focus_control_type": None, "temp_flag": 0, "official_status": None, "focus_control": 0, "storage_conditions": "", "transport_conditions": "", "into_cost_flag": None, "rfid_flag": None, "purchase_flag": 1, "tb_status": 0, "version": 1, "create_user": "%s", "create_time": %s, "last_modified_user": "%s", "last_modified": %s, "sterilize_flag": 0, "multi_charge_flag": 0, "use_frequency": 1, "charge_unit": None, "remark": "无 "}'
+
+#检查功应关系表
+"check_supply_relation": '{"id": "%s", "hos_id": "%s", "prov_id": "%s", "sub_prov_id": "%s", "client_type": "1", "invitation_code": None, "contact_way": "%s", "contact_user": "%s", "tb_status": 20, "active_flag": "1", "auditor": "%s", "audit_time": %s, "audit_comment": None, "version": 1, "create_user": "GYQX-SPD:user-19669", "create_time": %s, "last_modified_user": "h0347:UID-042066", "last_modified": %s}'
\ No newline at end of file