优化脚本

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

@@ -10,41 +10,43 @@ case_tag:api,mdm-web,a4供货关系申请_客户类型_医院_分页查询分页
 
 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():
+
+
+def select_upply_and_marketing():
     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()
+    info = FileUtils().r_info("mdm3_cm", "供货关系申请")
+    print(info)
+    e_corpId = info['e_corpId']
+    h_corpId = info['h_corpId']
+    e_username = info['e_username']
+    h_name = info['h_name']
+    token, projectCode, uxid, corpId, info = login_system(e_username,
+                                                          commonFuc().get_business_data(module, 'password')).get_token()
+    print(token, projectCode, uxid, corpId, info )
     """
      场景: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")
+
+    #a4供货关系申请_客户类型_医院_分页查询分页查询供货申请单1
+    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "listVoPage_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)
-    # 发送请求
+
+    request_body = commonFuc().get_business_data(module, "payload1",e_corpId)
+    # # 发送请求
     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()
+    # # #获取接口返回数据
+    code=commonFuc().analysis_json('code',result)
+    pageSize = commonFuc().analysis_json('pageSize',commonFuc().analysis_json('data',result))
+    if code==0 and pageSize==10:
+        commonFuc().check_text_exist(code,result)
\ No newline at end of file
+    else:
+        commonFuc().check_text_exist('-1', result)
+
+select_upply_and_marketing()

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

+# -*- encoding=utf8 -*-
+from common.fileUtls import FileUtils
+
+__author__ = "xiaohesheng"
+
+"""
+case_tag:api,mdm-web,a5供货关系申请_客户类型_医院_分页查询分页查询供货申请单2,id2255,id2255-5,sit,on
+主数据平台:a5供货关系申请_客户类型_医院_分页查询分页查询供货申请单2 
+"""
+
+from common.common_func import commonFuc
+from air_case.mdm_login.登录外网系统.登录外网系统 import login_system
+from airtest.core.api import using
+import sys
+
+
+def select_upply_and_marketing():
+    module = "mdm3_cm"
+    info = FileUtils().r_info("mdm3_cm", "供货关系申请")
+    print(info)
+    e_corpId = info['e_corpId']
+    h_corpId = info['h_corpId']
+    e_username = info['e_username']
+    h_name = info['h_name']
+    token, projectCode, uxid, corpId, info = login_system(e_username,
+                                                          commonFuc().get_business_data(module, 'password')).get_token()
+    print(token, projectCode, uxid, corpId, info )
+    """
+     场景:a5供货关系申请_客户类型_医院_分页查询分页查询供货申请单2
+     用例名称：a5供货关系申请_客户类型_医院_分页查询分页查询供货申请单2
+     输入：e_corpId
+     输出："rtn_msg": data
+    """
+
+    #a4供货关系申请_客户类型_医院_分页查询分页查询供货申请单1
+    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "listVoPage_url")
+    # 获取请求头信息
+    headers = commonFuc().get_business_data(module, "json_headers2",
+                                            commonFuc().get_business_data(module, "json_contentType"), token,
+                                            projectCode)
+
+    request_body = commonFuc().get_business_data(module, "payload2",e_corpId)
+    # # 发送请求
+    result = commonFuc().http_post(url, request_body, headers)
+    print('result',result)
+    # # #获取接口返回数据
+    code=commonFuc().analysis_json('code',result)
+    pageSize = commonFuc().analysis_json('pageSize',commonFuc().analysis_json('data',result))
+    if code==0 and pageSize==20:
+        commonFuc().check_text_exist(code,result)
+    else:
+        commonFuc().check_text_exist(-1, result)
+
+select_upply_and_marketing()

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

+# -*- encoding=utf8 -*-
+from common.fileUtls import FileUtils
+
+__author__ = "xiaohesheng"
+
+"""
+case_tag:api,mdm-web,a6供货关系申请_客户类型_医院_分页查询分页查询供货申请单3,id2255,id2255-6,sit,on
+主数据平台:a6供货关系申请_客户类型_医院_分页查询分页查询供货申请单3 
+"""
+
+from common.common_func import commonFuc
+from air_case.mdm_login.登录外网系统.登录外网系统 import login_system
+from airtest.core.api import using
+import sys
+
+
+def select_upply_and_marketing():
+    module = "mdm3_cm"
+    info = FileUtils().r_info("mdm3_cm", "供货关系申请")
+    print(info)
+    e_corpId = info['e_corpId']
+    h_corpId = info['h_corpId']
+    e_username = info['e_username']
+    h_name = info['h_name']
+    token, projectCode, uxid, corpId, info = login_system(e_username,
+                                                          commonFuc().get_business_data(module, 'password')).get_token()
+    # print(token, projectCode, uxid, corpId, info )
+    """
+     场景:a6供货关系申请_客户类型_医院_分页查询分页查询供货申请单3
+     用例名称：a6供货关系申请_客户类型_医院_分页查询分页查询供货申请单3
+     输入：e_corpId
+     输出："rtn_msg": data
+    """
+
+    #a4供货关系申请_客户类型_医院_分页查询分页查询供货申请单1
+    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "listVoPage_url")
+    # 获取请求头信息
+    headers = commonFuc().get_business_data(module, "json_headers2",
+                                            commonFuc().get_business_data(module, "json_contentType"), token,
+                                            projectCode)
+
+    request_body = commonFuc().get_business_data(module, "payload3",e_corpId)
+    # # 发送请求
+    result = commonFuc().http_post(url, request_body, headers)
+    print('result',result)
+    # # #获取接口返回数据
+    code=commonFuc().analysis_json('code',result)
+    pageSize = commonFuc().analysis_json('pageSize',commonFuc().analysis_json('data',result))
+    if code==0 and pageSize==50:
+        commonFuc().check_text_exist(code,result)
+    else:
+        commonFuc().check_text_exist(-1, result)
+
+select_upply_and_marketing()

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

+# -*- encoding=utf8 -*-
+from common.fileUtls import FileUtils
+
+__author__ = "xiaohesheng"
+
+"""
+case_tag:api,mdm-web,a7供货关系申请_客户类型_医院_分页查询分页查询供货申请单4,id2255,id2255-7,sit,on
+主数据平台:a7供货关系申请_客户类型_医院_分页查询分页查询供货申请单4 
+"""
+
+from common.common_func import commonFuc
+from air_case.mdm_login.登录外网系统.登录外网系统 import login_system
+from airtest.core.api import using
+import sys
+
+
+def select_upply_and_marketing():
+    module = "mdm3_cm"
+    info = FileUtils().r_info("mdm3_cm", "供货关系申请")
+    print(info)
+    e_corpId = info['e_corpId']
+    h_corpId = info['h_corpId']
+    e_username = info['e_username']
+    h_name = info['h_name']
+    token, projectCode, uxid, corpId, info = login_system(e_username,
+                                                          commonFuc().get_business_data(module, 'password')).get_token()
+    # print(token, projectCode, uxid, corpId, info )
+    """
+     场景:a7供货关系申请_客户类型_医院_分页查询分页查询供货申请单4
+     用例名称：a7供货关系申请_客户类型_医院_分页查询分页查询供货申请单4
+     输入：e_corpId
+     输出："rtn_msg": data
+    """
+
+    #a4供货关系申请_客户类型_医院_分页查询分页查询供货申请单1
+    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "listVoPage_url")
+    # 获取请求头信息
+    headers = commonFuc().get_business_data(module, "json_headers2",
+                                            commonFuc().get_business_data(module, "json_contentType"), token,
+                                            projectCode)
+
+    request_body = commonFuc().get_business_data(module, "payload4",e_corpId)
+    # # 发送请求
+    result = commonFuc().http_post(url, request_body, headers)
+    print('result',result)
+    # # #获取接口返回数据
+    code=commonFuc().analysis_json('code',result)
+    pageSize = commonFuc().analysis_json('pageSize',commonFuc().analysis_json('data',result))
+    if code==0 and pageSize==100:
+        commonFuc().check_text_exist(code,result)
+    else:
+        commonFuc().check_text_exist(-1, result)
+
+select_upply_and_marketing()

common/fileUtls.py

@@ -52,6 +52,8 @@ class FileUtils(object):
         # 写入到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_cm/data

@@ -2,7 +2,7 @@
 "password": "a123456!"
 
 "submitSupplyRelation_url": "/test2api/mdmService/supplyRelation/submitSupplyRelation/"
-
+"listVoPage_url": "/test2api/mdmService/supplyRelation/listVoPage/"
 json_contentType: "application/json"
 json_headers: {
   "Content-Type": "%s"
@@ -26,4 +26,49 @@ json_headers2: {
     "version": ""
 }
 
+"payload1": {
+    "pageNum": 1,
+    "pageSize": 10,
+    "queryObject": {
+        "provName": "",
+        "clientType": "",
+        "tbStatus": "",
+        "subProvId": "%s"
+    },
+    "orderBy": "sr.create_time desc"
+}
+
+"payload2": {
+    "pageNum": 1,
+    "pageSize": 20,
+    "queryObject": {
+        "provName": "",
+        "clientType": "",
+        "tbStatus": "",
+        "subProvId": "%s"
+    },
+    "orderBy": "sr.create_time desc"
+}
+"payload3": {
+    "pageNum": 1,
+    "pageSize": 50,
+    "queryObject": {
+        "provName": "",
+        "clientType": "",
+        "tbStatus": "",
+        "subProvId": "%s"
+    },
+    "orderBy": "sr.create_time desc"
+}
+"payload4": {
+    "pageNum": 1,
+    "pageSize": 100,
+    "queryObject": {
+        "provName": "",
+        "clientType": "",
+        "tbStatus": "",
+        "subProvId": "%s"
+    },
+    "orderBy": "sr.create_time desc"
+}
 checkDict: {"code": 0,'msg': None,'data':1}
\ No newline at end of file

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分11秒</td>
+            <td class='details-col-elapsed'>0分0秒</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/a3供货关系申请_客户类型_医院_供销关系申请提交/log.html' target='_blank'>a3供货关系申请_客户类型_医院_供销关系申请提交</a></td>
+            <td class="details-col-elapsed"><a href='../log/a7供货关系申请_客户类型_医院_分页查询分页查询供货申请单4/log.html' target='_blank'>a7供货关系申请_客户类型_医院_分页查询分页查询供货申请单4</a></td>
             <td class="success">成功</td>
-            <td class="details-col-elapsed">11.581</td>
+            <td class="details-col-elapsed">0.691</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>