修改脚本适合融合环境

air_case/a4_mdm3_cm/b14供货关系审核_客户类型_医院_供销关系申请提交.air/b14供货关系审核_客户类型_医院_供销关系申请提交.py

@@ -30,7 +30,7 @@ def supply_and_marketing_apply():
      输入：h_corpId,contactUser,contactWay
      输出："rtn_msg": ok
     """
-    # module = "mdm3_cm"
+    # module = "a4_mdm3_cm"
     #b14供货关系审核_客户类型_医院_供销关系申请提交
     url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "submitSupplyRelation_url")
     # 获取请求头信息
@@ -39,7 +39,7 @@ def supply_and_marketing_apply():
                                             projectCode)
     contactUser=commonFuc().randomString(5)
     contactWay=contactUser
-    request_body = commonFuc().get_business_data(module, "payload",h_corpId,contactUser,contactWay)
+    request_body = commonFuc().get_business_data(module, "payload_1",h_corpId,contactUser,contactWay)
     # 发送请求
     result = commonFuc().http_post(url, request_body, headers)
     print('result',result)
@@ -50,5 +50,5 @@ def supply_and_marketing_apply():
     e_corpId=corpId
     e_username=username
     return e_corpId,h_corpId,e_username,h_name
-supply_and_marketing_apply()
+# supply_and_marketing_apply()
 FileUtils().w_info1(supply_and_marketing_apply(),module,'供货关系申请')
\ No newline at end of file

air_case/a4_mdm3_cm/c0供货关系申请_客户类型_厂商_供货关系申请提交.air/c0供货关系申请_客户类型_厂商_供货关系申请提交.py

@@ -4,8 +4,8 @@ from common.fileUtls import FileUtils
 __author__ = "xiaohesheng"
 
 """
-case_tag:api,mdm-web,a3供货关系申请_客户类型_医院_供销关系申请提交,id2255,id2255-3,sit,on
-主数据平台:a3供货关系申请_客户类型_医院_供销关系申请提交 
+case_tag:api,mdm-web,c0供货关系申请_客户类型_厂商_供货关系申请提交,id2255,id2255-20,sit,on
+主数据平台:c0供货关系申请_客户类型_厂商_供货关系申请提交 
 """
 
 from common.common_func import commonFuc

data/a2_mdm3_ea/message

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

data/a3_mdm3_hs/message

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

data/a4_mdm3_cm/data

@@ -20,6 +20,12 @@ json_headers2: {
   "token": "%s",
   "X-APP-CODE":"%s"
 }
+json_headers2_2: {
+  "Content-Type": "%s",
+  "token": "%s",
+  "X-APP-CODE":"%s",
+  "X-SESSION-ID":"%s"
+}
 "payload": {
     "id": "",
     "provName": "",
@@ -32,6 +38,7 @@ json_headers2: {
     "contactWay": "%s",
     "version": ""
 }
+"payload_1": {"id":"","subProvName":"","hosName":"","invitationCode":"","hosId":"%s","clientType":"1","provId":"","contactUser":"%s","contactWay":"%s","version":""}
 
 "payload1": {
     "pageNum": 1,

data/a4_mdm3_cm/message

 供货关系申请:
-  e_corpId: p1df18
-  h_corpId: h277b
-  e_username: 国药集团公司*&Xer
-  h_name: 湖南省人民医院6)sJI
+  e_corpId: p1df21
+  h_corpId: h2780
+  e_username: 国药集团公司3zPqg
+  h_name: 湖南省人民医院^RZEN

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分3秒</td>
+            <td class='details-col-elapsed'>0分5秒</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/b19医院客户目录维护/log.html' target='_blank'>b19医院客户目录维护</a></td>
+            <td class="details-col-elapsed"><a href='../log/b14供货关系审核_客户类型_医院_供销关系申请提交/log.html' target='_blank'>b14供货关系审核_客户类型_医院_供销关系申请提交</a></td>
             <td class="success">成功</td>
-            <td class="details-col-elapsed">3.872</td>
+            <td class="details-col-elapsed">4.986</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>