修改脚本适合融合环境

air_case/a2_mdm3_ea/企业审核.air/企业审核.py

 # -*- encoding=utf8 -*-
+from common.fileUtls import FileUtils
 
 __author__ = "xiaohesheng"
 
@@ -18,6 +19,7 @@ using(pro_path+r'\\air_case\\a2_mdm3_ea\\a企业认领.air')
 from a企业认领 import *
 # print('global_var_id',global_var_id)
 id1=global_var_id
+cname=global_var_cname
 """
  场景:注册企业审核
  用例名称：企业审核
@@ -47,4 +49,8 @@ check_dict1 = commonFuc().get_business_data(module, "checkDict1")
 #断言实际结果中是否包含预期结果的内容
 commonFuc().check_result(check_dict1, result)
 #===============企业注册提交接口_审核通过_结束
-#审核通过的企业名称
+
+info=(id1,cname)
+titlename=('e_id','cname')
+#审核通过的企业名称写入文件中
+FileUtils().w_info5(info,module,'企业信息',titlename)

air_case/a4_mdm3_cm/a2供货关系申请_客户类型_医院_登录_企业登录.air/a2供货关系申请_客户类型_医院_登录_企业登录.py

@@ -19,9 +19,9 @@ def e_login():
     # using(pro_path+r'\\air_case\\mdm3_pim\\a8产品新增和审核通过.air')
     # from a8产品新增和审核通过 import Enterprise_audit
     # username=Enterprise_audit()
-    info = FileUtils().r_info("a5_mdm3_pim", "产品新增")
+    info = FileUtils().r_info("a2_mdm3_ea", "企业信息")
     print(info)
-    username = info['username']
+    username = info['cname']
     print('aaaaaaaaaaaaaaaaaaaaaaaaaaa',username)
     """
      场景:a2供货关系申请_客户类型_医院_登录_企业登录

air_case/a4_mdm3_cm/a4供货关系申请_客户类型_医院_分页查询分页查询供货申请单1.air/a4供货关系申请_客户类型_医院_分页查询分页查询供货申请单1.py

@@ -13,8 +13,8 @@ from air_case.mdm_login.登录外网系统.登录外网系统 import login_syste
 
 
 def select_upply_and_marketing():
-    module = "mdm3_cm"
-    info = FileUtils().r_info("mdm3_cm", "供货关系申请")
+    module = "a4_mdm3_cm"
+    info = FileUtils().r_info("a4_mdm3_cm", "供货关系申请")
     print(info)
     e_corpId = info['e_corpId']
     h_corpId = info['h_corpId']
@@ -40,7 +40,7 @@ def select_upply_and_marketing():
     request_body = commonFuc().get_business_data(module, "payload1",e_corpId)
     # # 发送请求
     result = commonFuc().http_post(url, request_body, headers)
-    print('result',result)
+    print('result,aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',result)
     # # #获取接口返回数据
     code=commonFuc().analysis_json('code',result)
     pageSize = commonFuc().analysis_json('pageSize',commonFuc().analysis_json('data',result))

air_case/a4_mdm3_cm/a5供货关系申请_客户类型_医院_分页查询分页查询供货申请单2.air/a5供货关系申请_客户类型_医院_分页查询分页查询供货申请单2.py

@@ -15,8 +15,8 @@ import sys
 
 
 def select_upply_and_marketing():
-    module = "mdm3_cm"
-    info = FileUtils().r_info("mdm3_cm", "供货关系申请")
+    module = "a4_mdm3_cm"
+    info = FileUtils().r_info("a4_mdm3_cm", "供货关系申请")
     print(info)
     e_corpId = info['e_corpId']
     h_corpId = info['h_corpId']

data/a2_mdm3_ea/message

+企业信息:
+  e_id: CR202312060026
+  cname: 国药集团公司*&Xer

data/a3_mdm3_hs/data

@@ -172,7 +172,7 @@ json_headers2: {
     "dataEntrance": "注册",
     "importTaskMfrsId": null,
     "createUserCorpId": null,
-    "hosSpdType": null,
+    "hosSpdType": 3,
     "companyRegistBizscopeVos": null,
     "certVOList": null,
     "upCompanyName": null,

data/a3_mdm3_hs/message

 医院信息:
-  h_id: 湖南省人民医院jtZBp
-  h_name: 湖南省人民医院jtZBp
+  h_id: 湖南省人民医院6)sJI
+  h_name: 湖南省人民医院6)sJI

data/a4_mdm3_cm/data

 "username": "test001"
 "password": "a123456!"
 
-"submitSupplyRelation_url": "/test2api/mdmService/supplyRelation/submitSupplyRelation/"
-"listVoPage_url": "/test2api/mdmService/supplyRelation/listVoPage/"
+"submitSupplyRelation_url": "/test2api/hdiFusion/supplyRelation/submitSupplyRelation"
+"listVoPage_url": "/test2api/hdiFusion/supplyRelation/listVoPage/"
 "editSupplyRelation_url": "/test2api/mdmService/supplyRelation/editSupplyRelation/"
 "auditSupplyRelation_url": "/test2api/mdmService/supplyRelation/auditSupplyRelation/"
 "listProvInfoBySubProv_url": "/test2api/mdmService/supplyRelation/listProvInfoBySubProv/"
@@ -42,6 +42,7 @@ json_headers2: {
     "orderBy": "sr.create_time desc"
 }
 
+
 "payload2": {
     "pageNum": 1,
     "pageSize": 20,

data/a4_mdm3_cm/message

 供货关系申请:
-  e_corpId: p00002e79
-  h_corpId: h24d7
-  e_username: 国药集团公司l!t)N
-  h_name: 湖南省人民医院%8!qw
+  e_corpId: p1df18
+  h_corpId: h277b
+  e_username: 国药集团公司*&Xer
+  h_name: 湖南省人民医院6)sJI

report/summary.html

@@ -56,7 +56,7 @@
         <tr width="600">
             <td class='details-col-elapsed'>1</td>
             <td class='details-col-elapsed'>1</td>
-            <td class='details-col-elapsed'>0分4秒</td>
+            <td class='details-col-elapsed'>0分40秒</td>
             <td class="details-col-elapsed">100.0%</td>
         </tr>
     </table>
@@ -72,9 +72,9 @@
         </tr>
         
         <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/注册医院审核通过/log.html' target='_blank'>注册医院审核通过</a></td>
+            <td class="details-col-elapsed"><a href='../log/a3供货关系申请_客户类型_医院_供销关系申请提交/log.html' target='_blank'>a3供货关系申请_客户类型_医院_供销关系申请提交</a></td>
             <td class="success">成功</td>
-            <td class="details-col-elapsed">4.119</td>
+            <td class="details-col-elapsed">40.018</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>