修改脚本适合融合环境

air_case/a4_mdm3_cm/b17供货关系申请列表查询.air/b17供货关系申请列表查询.py

+# -*- encoding=utf8 -*-
+from common.fileUtls import FileUtils
+
+__author__ = "xiaohesheng"
+
+"""
+case_tag:api,mdm-web,b17供货关系申请列表查询,id2255,id2255-17,sit,on
+主数据平台:b17供货关系申请列表查询 
+"""
+
+from common.common_func import commonFuc
+from air_case.mdm_login.登录外网系统.登录外网系统 import login_system
+from airtest.core.api import using
+import sys
+module = "a4_mdm3_cm"
+def test1():
+    pro_path = commonFuc().get_pro_path()
+    sys.path.append(pro_path + r'\\air_case\\a4_mdm3_cm\\a2供货关系申请_客户类型_医院_登录_企业登录.air')
+    using(pro_path + r'\\air_case\\a4_mdm3_cm\\a2供货关系申请_客户类型_医院_登录_企业登录.air')
+    from a2供货关系申请_客户类型_医院_登录_企业登录 import e_login
+    token, projectCode, uxid, corpId, username = e_login()
+    """
+     场景:b17供货关系申请列表查询
+     用例名称：b17供货关系申请列表查询
+     输入：无
+     输出："rtn_msg": ok
+    """
+    # module = "mdm3_cm"
+    # b17供货关系申请列表查询
+    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, "payload11")
+    # # 发送请求
+    result = commonFuc().http_post(url, request_body, headers)
+    print('result,aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', result)
+    # # #获取接口返回数据
+    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)
+    else:
+        commonFuc().check_text_exist('-1', result)
+test1()
+

air_case/a4_mdm3_cm/b17供货目录申请_客户类型_医院_企业账号登录.air/b17供货目录申请_客户类型_医院_企业账号登录.py

-# -*- encoding=utf8 -*-
-from common.fileUtls import FileUtils
-
-__author__ = "xiaohesheng"
-
-"""
-case_tag:api,mdm-web,b17供货目录申请_客户类型_医院_企业账号登录,id2255,id2255-17,sit,on
-主数据平台:b17供货目录申请_客户类型_医院_企业账号登录 
-"""
-
-from common.common_func import commonFuc
-from air_case.mdm_login.登录外网系统.登录外网系统 import login_system
-from airtest.core.api import using
-import sys
-module = "a4_mdm3_cm"
-def e_login():
-    module = "a4_mdm3_cm"
-    info = FileUtils().r_info("a4_mdm3_cm", "供货关系申请")
-    print(info)
-    e_corpId = info['e_corpId']
-    h_corpId = info['h_corpId']
-    e_username = info['e_username']
-    h_name = info['h_name']
-    """
-     场景:b17供货目录申请_客户类型_医院_企业账号登录
-     用例名称：b17供货目录申请_客户类型_医院_企业账号登录
-     输入：用户名，密码
-     输出："rtn_msg": token,projectCode,uxid,corpId,h_name
-    """
-    # module = "mdm3_cm"
-    #
-    username = e_username
-    # print('医院名称',username)
-    password = commonFuc().get_business_data(module, "password")
-    # print(username, password)
-    # 获取token和projectCode
-    token,projectCode,uxid,corpId,info= login_system(username, password).get_token()
-    return token,projectCode,uxid,corpId,h_name
-e_login()
-

air_case/a4_mdm3_cm/b19供货目录申请_客户类型_医院_提交供货申请单_搜索产品.air/b19供货目录申请_客户类型_医院_提交供货申请单_搜索产品.py → air_case/a4_mdm3_cm/b18供货目录查询.air/b18供货目录查询.py

@@ -4,8 +4,8 @@ from common.fileUtls import FileUtils
 __author__ = "xiaohesheng"
 
 """
-case_tag:api,mdm-web,b19供货目录申请_客户类型_医院_提交供货申请单_搜索产品,id2255,id2255-19,sit,on
-主数据平台:b19供货目录申请_客户类型_医院_提交供货申请单_搜索产品 
+case_tag:api,mdm-web,b18供货目录查询,id2255,id2255-18,sit,on
+主数据平台:b18供货目录查询 
 """
 
 from common.common_func import commonFuc
@@ -13,43 +13,40 @@ from air_case.mdm_login.登录外网系统.登录外网系统 import login_syste
 from airtest.core.api import using
 import sys
 module = "a4_mdm3_cm"
-def submitSupplyRelation_reject():
+def select1():
     module = "a4_mdm3_cm"
     pro_path = commonFuc().get_pro_path()
-    sys.path.append(pro_path + r'\\air_case\\a4_mdm3_cm\\b17供货目录申请_客户类型_医院_企业账号登录.air')
-    using(pro_path + r'\\air_case\\a4_mdm3_cm\\b17供货目录申请_客户类型_医院_企业账号登录.air')
-    from b17供货目录申请_客户类型_医院_企业账号登录 import e_login
+    sys.path.append(pro_path + r'\\air_case\\a4_mdm3_cm\\a2供货关系申请_客户类型_医院_登录_企业登录.air')
+    using(pro_path + r'\\air_case\\a4_mdm3_cm\\a2供货关系申请_客户类型_医院_登录_企业登录.air')
+    from a2供货关系申请_客户类型_医院_登录_企业登录 import e_login
     token, projectCode, uxid, corpId, e_name = e_login()
     print(token, projectCode, uxid, corpId, e_name)
-
-    sys.path.append(pro_path + r'\\air_case\\a4_mdm3_cm\\b10供货关系审核_驳回_客户类型_医院_医院账号登录.air')
-    using(pro_path + r'\\air_case\\a4_mdm3_cm\\b10供货关系审核_驳回_客户类型_医院_医院账号登录.air')
-    from b10供货关系审核_驳回_客户类型_医院_医院账号登录 import h_login
-    h_token, h_projectCode, h_uxid, h_corpId, h_name = h_login()
-    print(h_token, h_projectCode, h_uxid, h_corpId, h_name)
     print("===================================================")
     """
-     场景:b19供货目录申请_客户类型_医院_提交供货申请单_搜索产品
-     用例名称：b19供货目录申请_客户类型_医院_提交供货申请单_搜索产品
+     场景:b18供货目录查询
+     用例名称：b18供货目录查询
      输入：医院id
      输出："rtn_msg": 0
     """
-    #b19供货目录申请_客户类型_医院_提交供货申请单_搜索产品
-    module = "mdm3_cm"
-    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "listVo_url")
+    #b18供货目录查询
+    module = "a4_mdm3_cm"
+    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "getSupplyHosList_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, "payload9", h_corpId,corpId)
+    request_body = commonFuc().get_business_data(module, "payload12")
     print('request_body',request_body)
     # 发送请求
     result = commonFuc().http_post(url, request_body, headers)
     print('result', result)
     #断言
-    checkDict=commonFuc().get_business_data(module,'checkDict4')
-    commonFuc().check_result(checkDict,result)
-submitSupplyRelation_reject()
+    code=commonFuc().analysis_json('code',result)
+
+    if code == 0:
+        commonFuc().check_text_exist(code, result)
+    else:
+        commonFuc().check_text_exist('-1', result)
+
+select1()
 

air_case/a4_mdm3_cm/b19医院客户目录维护.air/b19医院客户目录维护.py

+# -*- encoding=utf8 -*-
+from common.fileUtls import FileUtils
+
+__author__ = "xiaohesheng"
+
+"""
+case_tag:api,mdm-web,b19医院客户目录维护,id2255,id2255-19,sit,on
+主数据平台:b19医院客户目录维护 
+"""
+
+from common.common_func import commonFuc
+from air_case.mdm_login.登录外网系统.登录外网系统 import login_system
+from airtest.core.api import using
+import sys
+module = "a4_mdm3_cm"
+def select1():
+    module = "a4_mdm3_cm"
+    pro_path = commonFuc().get_pro_path()
+    sys.path.append(pro_path + r'\\air_case\\a4_mdm3_cm\\a2供货关系申请_客户类型_医院_登录_企业登录.air')
+    using(pro_path + r'\\air_case\\a4_mdm3_cm\\a2供货关系申请_客户类型_医院_登录_企业登录.air')
+    from a2供货关系申请_客户类型_医院_登录_企业登录 import e_login
+    token, projectCode, uxid, corpId, e_name = e_login()
+    print(token, projectCode, uxid, corpId, e_name)
+    print("===================================================")
+
+    """
+     场景:b19医院客户目录维护
+     用例名称：b19医院客户目录维护
+     输入：医院id
+     输出："rtn_msg": 0
+    """
+    module = "a4_mdm3_cm"
+    #b18供货目录申请_客户类型_医院_提交供货申请单_添加产品
+    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "listHosInfoVoPage_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, "payload13")
+
+    # print('request_body',request_body)
+    # 发送请求
+    result = commonFuc().http_post(url, request_body, headers)
+    print('result', result)
+    #断言
+    code=commonFuc().analysis_json('code',result)
+    if code==0:
+        commonFuc().check_text_exist(code,result)
+    else:
+        commonFuc().check_text_exist('-1', result)
+
+select1()
+

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

+# -*- encoding=utf8 -*-
+from common.fileUtls import FileUtils
+
+__author__ = "xiaohesheng"
+
+"""
+case_tag:api,mdm-web,a3供货关系申请_客户类型_医院_供销关系申请提交,id2255,id2255-3,sit,on
+主数据平台:a3供货关系申请_客户类型_医院_供销关系申请提交 
+"""
+
+from common.common_func import commonFuc
+from air_case.mdm_login.登录外网系统.登录外网系统 import login_system
+from airtest.core.api import using
+import sys
+module = "a4_mdm3_cm"
+def supply_and_marketing_apply():
+    pro_path=commonFuc().get_pro_path()
+    sys.path.append(pro_path+r'\\air_case\\a4_mdm3_cm\\a2供货关系申请_客户类型_医院_登录_企业登录.air')
+    using(pro_path+r'\\air_case\\a4_mdm3_cm\\a2供货关系申请_客户类型_医院_登录_企业登录.air')
+    from a2供货关系申请_客户类型_医院_登录_企业登录 import e_login
+    token,projectCode,uxid,corpId,username=e_login()
+    #获取医院corpId
+    sys.path.append(pro_path + r'\\air_case\\a4_mdm3_cm\\a1供货关系申请_客户类型_医院_登录_医院登录获取医院id.air')
+    using(pro_path + r'\\air_case\\a4_mdm3_cm\\a1供货关系申请_客户类型_医院_登录_医院登录获取医院id.air')
+    from a1供货关系申请_客户类型_医院_登录_医院登录获取医院id import h_login
+    h_token,h_projectCode,h_uxid,h_corpId,h_name=h_login()
+    """
+     场景:a3供货关系申请_客户类型_医院_供销关系申请提交
+     用例名称：a3供货关系申请_客户类型_医院_供销关系申请提交
+     输入：h_corpId,contactUser,contactWay
+     输出："rtn_msg": ok
+    """
+    # 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)
+    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/a4_mdm3_cm/b18供货目录申请_客户类型_医院_提交供货申请单_添加产品.air/b18供货目录申请_客户类型_医院_提交供货申请单_添加产品.py → air_case/a5_mdm3_pdm/b18供货目录申请_客户类型_医院_提交供货申请单_添加产品.air/b18供货目录申请_客户类型_医院_提交供货申请单_添加产品.py

@@ -4,7 +4,7 @@ from common.fileUtls import FileUtils
 __author__ = "xiaohesheng"
 
 """
-case_tag:api,mdm-web,b18供货目录申请_客户类型_医院_提交供货申请单_添加产品,id2255,id2255-18,sit,on
+case_tag:api,mdm-web,b18供货目录申请_客户类型_医院_提交供货申请单_添加产品,id2255xxx,id2255-xxx,sit,on
 主数据平台:b18供货目录申请_客户类型_医院_提交供货申请单_添加产品 
 """
 

data/a4_mdm3_cm/data

@@ -8,6 +8,8 @@
 "listProvInfoBySubProv_url": "/test2api/mdmService/supplyRelation/listProvInfoBySubProv/"
 "listVo_url": "/test2api/mdmService/provGoodsInfo/listVo/"
 "addGoodsHandleInfos_url": "/test2api/hdiFusion/import/goods/addGoodsHandleInfos?flag=true"
+"getSupplyHosList_url": "/test2api/hdiFusion/supplyRelation/getSupplyHosList"
+"listHosInfoVoPage_url": "/test2api/hdiFusion/supplyRelation/listHosInfoVoPage"
 json_contentType: "application/json"
 json_headers: {
   "Content-Type": "%s"
@@ -212,6 +214,11 @@ json_headers2: {
     "errorFlag": "",
     "userId": ""
 }
+
+"payload11": {"pageNum":1,"pageSize":50,"queryObject":{"subProvName":"","clientType":"","tbStatus":"","provId":"p1df18"},"orderBy":"sr.create_time desc"}
+"payload12": {"provId":"p1df18","subProvId":"","clientType":"","hosName":"","tbStatus":20,"activeFlag":1}
+"payload13": {"pageNum":1,"pageSize":50,"queryObject":{"subProvName":"","provId":"p1df18","clientType":"","hosName":"","hosCustomerQuery":1}}
+
 checkDict: {"code": 0,'msg': None,'data':1}
 checkDict1: {"code": 400,'msg': '供销关系已存在！请勿重复添加','data':None}
 checkDict2: {"code": 400,'msg': None,'data':None}

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分2秒</td>
+            <td class='details-col-elapsed'>0分3秒</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/a1供货关系申请_客户类型_医院_登录_医院登录获取医院id/log.html' target='_blank'>a1供货关系申请_客户类型_医院_登录_医院登录获取医院id</a></td>
+            <td class="details-col-elapsed"><a href='../log/b19医院客户目录维护/log.html' target='_blank'>b19医院客户目录维护</a></td>
             <td class="success">成功</td>
-            <td class="details-col-elapsed">2.673</td>
+            <td class="details-col-elapsed">3.872</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>