优化脚本

air_case/mdm3_cm/a1供货关系申请_客户类型_医院_登录_医院登录获取医院id.air/a1供货关系申请_客户类型_医院_登录_医院登录获取医院id.py

@@ -31,6 +31,6 @@ def h_login():
     # print(username, password)
     # 获取token和projectCode
     token,projectCode,uxid,corpId,info= login_system(username, password).get_token()
-    return token,projectCode,uxid,corpId
+    return token,projectCode,uxid,corpId,h_name
 
 h_login()
\ No newline at end of file

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

@@ -31,6 +31,6 @@ def e_login():
     # print(username, password)
     # 获取token和projectCode
     token,projectCode,uxid,corpId,info= login_system(username, password).get_token()
-    return token,projectCode,uxid,corpId
+    return token,projectCode,uxid,corpId,username
 
 e_login()
\ No newline at end of file

air_case/mdm3_cm/a3供货关系申请_客户类型_医院_供销关系申请提交.air/a3供货关系申请_客户类型_医院_供销关系申请提交.py

@@ -12,18 +12,18 @@ from common.common_func import commonFuc
 from air_case.mdm_login.登录外网系统.登录外网系统 import login_system
 from airtest.core.api import using
 import sys
+module = "mdm3_cm"
 def supply_and_marketing_apply():
-    module = "mdm3_cm"
     pro_path=commonFuc().get_pro_path()
     sys.path.append(pro_path+r'\\air_case\\mdm3_cm\\a2供货关系申请_客户类型_医院_登录_企业登录.air')
     using(pro_path+r'\\air_case\\mdm3_cm\\a2供货关系申请_客户类型_医院_登录_企业登录.air')
     from a2供货关系申请_客户类型_医院_登录_企业登录 import e_login
-    token,projectCode,uxid,corpId=e_login()
+    token,projectCode,uxid,corpId,username=e_login()
     #获取医院corpId
     sys.path.append(pro_path + r'\\air_case\\mdm3_cm\\a1供货关系申请_客户类型_医院_登录_医院登录获取医院id.air')
     using(pro_path + r'\\air_case\\mdm3_cm\\a1供货关系申请_客户类型_医院_登录_医院登录获取医院id.air')
     from a1供货关系申请_客户类型_医院_登录_医院登录获取医院id import h_login
-    h_token,h_projectCode,h_uxid,h_corpId=h_login()
+    h_token,h_projectCode,h_uxid,h_corpId,h_name=h_login()
     """
      场景:a3供货关系申请_客户类型_医院_供销关系申请提交
      用例名称：a3供货关系申请_客户类型_医院_供销关系申请提交
@@ -47,4 +47,8 @@ def supply_and_marketing_apply():
     #
     check_dict= commonFuc().get_business_data(module, "checkDict")
     commonFuc().check_result(check_dict,result)
-supply_and_marketing_apply()
\ No newline at end of file
+    e_corpId=corpId
+    e_username=username
+    return e_corpId,h_corpId,e_username,h_name
+# supply_and_marketing_apply()
+FileUtils().w_info1(supply_and_marketing_apply(),module,'供货关系申请')
\ No newline at end of file

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

+# -*- encoding=utf8 -*-
+from common.fileUtls import FileUtils
+
+__author__ = "xiaohesheng"
+
+"""
+case_tag:api,mdm-web,a4供货关系申请_客户类型_医院_分页查询分页查询供货申请单1,id2255,id2255-4,sit,on
+主数据平台:a4供货关系申请_客户类型_医院_分页查询分页查询供货申请单1 
+"""
+
+from common.common_func import commonFuc
+from air_case.mdm_login.登录外网系统.登录外网系统 import login_system
+from airtest.core.api import using
+import sys
+def supply_and_marketing_apply():
+    module = "mdm3_cm"
+    pro_path=commonFuc().get_pro_path()
+    sys.path.append(pro_path+r'\\air_case\\mdm3_cm\\a2供货关系申请_客户类型_医院_登录_企业登录.air')
+    using(pro_path+r'\\air_case\\mdm3_cm\\a2供货关系申请_客户类型_医院_登录_企业登录.air')
+    from a2供货关系申请_客户类型_医院_登录_企业登录 import e_login
+    token,projectCode,uxid,corpId=e_login()
+    #获取医院corpId
+    sys.path.append(pro_path + r'\\air_case\\mdm3_cm\\a1供货关系申请_客户类型_医院_登录_医院登录获取医院id.air')
+    using(pro_path + r'\\air_case\\mdm3_cm\\a1供货关系申请_客户类型_医院_登录_医院登录获取医院id.air')
+    from a1供货关系申请_客户类型_医院_登录_医院登录获取医院id import h_login
+    h_token,h_projectCode,h_uxid,h_corpId=h_login()
+    """
+     场景:a4供货关系申请_客户类型_医院_分页查询分页查询供货申请单1
+     用例名称：a4供货关系申请_客户类型_医院_分页查询分页查询供货申请单1
+     输入：e_corpId
+     输出："rtn_msg": data
+    """
+    # module = "mdm3_cm"
+    #a3供货关系申请_客户类型_医院_供销关系申请提交
+    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "submitSupplyRelation_url")
+    # 获取请求头信息
+    headers = commonFuc().get_business_data(module, "json_headers2",
+                                            commonFuc().get_business_data(module, "json_contentType"), token,
+                                            projectCode)
+    contactUser=commonFuc().randomString(5)
+    contactWay=contactUser
+    request_body = commonFuc().get_business_data(module, "payload",h_corpId,contactUser,contactWay)
+    # 发送请求
+    result = commonFuc().http_post(url, request_body, headers)
+    print('result',result)
+    # #获取接口返回数据
+    #
+    check_dict= commonFuc().get_business_data(module, "checkDict")
+    commonFuc().check_result(check_dict,result)
+supply_and_marketing_apply()
\ No newline at end of file

common/fileUtls.py

@@ -22,7 +22,6 @@ class FileUtils(object):
         # 写入到yaml文件
         with open(yamlpath, "w", encoding="utf-8") as f:
             yaml.dump(dict, f, Dumper=yaml.RoundTripDumper,allow_unicode=True)
-
     def r_info(self, module,keyname):
         w_path = rootPath + os.sep + 'data' + os.sep + module
         yamlpath = os.path.join(w_path, "message")
@@ -36,6 +35,23 @@ class FileUtils(object):
                 return None
         else:
             return None
+     #供货关系信息写入文件
+    def w_info1(self, info,module,keyname):
+        module=module
+        dict = {}
+        value = {}
+        value['e_corpId'] = info[0]
+        value['h_corpId'] = info[1]
+        value['e_username'] = info[2]
+        value['h_name'] = info[3]
+        key=keyname
+        dict[key] = value
+        w_path=rootPath+os.sep+'data'+os.sep+module
+        # print(w_path)
+        yamlpath = os.path.join(w_path, "message")
+        # 写入到yaml文件
+        with open(yamlpath, "w", encoding="utf-8") as f:
+            yaml.dump(dict, f, Dumper=yaml.RoundTripDumper,allow_unicode=True)
 if __name__ == '__main__':
     # info=("aaaa","bbbbbb","mdm3-pim")
     # FileUtils().w_info(info,"产品新增")

data/mdm3_pim/message

 产品新增:
-  username: 国药集团公司bK0sq
-  goodsname: 一次性注射器Wftdo
+  username: 国药集团公司!*Ras
+  goodsname: 一次性注射器0FlwJ

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分10秒</td>
+            <td class='details-col-elapsed'>0分11秒</td>
             <td class="details-col-elapsed">100.0%</td>
         </tr>
     </table>
@@ -74,7 +74,7 @@
         <tr width="600">
             <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">10.489</td>
+            <td class="details-col-elapsed">11.581</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>