Commit 5fc7698b authored by xiao-hesheng's avatar xiao-hesheng
Browse files

脚本调整

parent 256db2a5
...@@ -50,5 +50,5 @@ def supply_and_marketing_apply(): ...@@ -50,5 +50,5 @@ def supply_and_marketing_apply():
e_corpId=corpId e_corpId=corpId
e_username=username e_username=username
return e_corpId,h_corpId,e_username,h_name 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,'供货关系申请') FileUtils().w_info1(supply_and_marketing_apply(),module,'供货关系申请')
\ No newline at end of file
...@@ -13,7 +13,7 @@ from air_case.mdm_login.登录外网系统.登录外网系统 import login_syste ...@@ -13,7 +13,7 @@ from air_case.mdm_login.登录外网系统.登录外网系统 import login_syste
from airtest.core.api import using from airtest.core.api import using
import sys import sys
module = "mdm3_cm" module = "mdm3_cm"
def submitSupplyRelation_reject(): def submitSupplyRelation_pass():
module = "mdm3_cm" module = "mdm3_cm"
pro_path = commonFuc().get_pro_path() pro_path = commonFuc().get_pro_path()
sys.path.append(pro_path + r'\\air_case\\mdm3_cm\\b10供货关系审核_驳回_客户类型_医院_医院账号登录.air') sys.path.append(pro_path + r'\\air_case\\mdm3_cm\\b10供货关系审核_驳回_客户类型_医院_医院账号登录.air')
...@@ -32,7 +32,7 @@ def submitSupplyRelation_reject(): ...@@ -32,7 +32,7 @@ def submitSupplyRelation_reject():
输入:医院id 输入:医院id
输出:"rtn_msg": 0 输出:"rtn_msg": 0
""" """
#a12供货关系审核_驳回_客户类型_医院_供销关系审核_驳回 #b15供货关系审核_通过_客户类型_医院
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "auditSupplyRelation_url") url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "auditSupplyRelation_url")
# 获取请求头信息 # 获取请求头信息
headers = commonFuc().get_business_data(module, "json_headers2", headers = commonFuc().get_business_data(module, "json_headers2",
...@@ -40,12 +40,12 @@ def submitSupplyRelation_reject(): ...@@ -40,12 +40,12 @@ def submitSupplyRelation_reject():
projectCode) projectCode)
contactUser=commonFuc().randomString(5) contactUser=commonFuc().randomString(5)
contactWay=contactUser contactWay=contactUser
request_body = commonFuc().get_business_data(module, "payload7", id1,contactUser,contactWay) request_body = commonFuc().get_business_data(module, "payload7_2", id1,contactUser,contactWay)
# 发送请求 # 发送请求
result = commonFuc().http_post(url, request_body, headers) result = commonFuc().http_post(url, request_body, headers)
print('result', result) print('result', result)
#断言 #断言
checkDict=commonFuc().get_business_data(module,'checkDict') checkDict=commonFuc().get_business_data(module,'checkDict')
commonFuc().check_result(checkDict,result) commonFuc().check_result(checkDict,result)
submitSupplyRelation_reject() submitSupplyRelation_pass()
...@@ -22,8 +22,8 @@ def e_login(): ...@@ -22,8 +22,8 @@ def e_login():
e_username = info['e_username'] e_username = info['e_username']
h_name = info['h_name'] h_name = info['h_name']
""" """
场景:a10供货关系审核_驳回_客户类型_医院_医院账号登录 场景:b17供货目录申请_客户类型_医院_企业账号登录
用例名称:a10供货关系审核_驳回_客户类型_医院_医院账号登录 用例名称:b17供货目录申请_客户类型_医院_企业账号登录
输入:用户名,密码 输入:用户名,密码
输出:"rtn_msg": token,projectCode,uxid,corpId,h_name 输出:"rtn_msg": token,projectCode,uxid,corpId,h_name
""" """
......
...@@ -32,6 +32,7 @@ def submitSupplyRelation_reject(): ...@@ -32,6 +32,7 @@ def submitSupplyRelation_reject():
输入:医院id 输入:医院id
输出:"rtn_msg": 0 输出:"rtn_msg": 0
""" """
module = "mdm3_cm"
#b18供货目录申请_客户类型_医院_提交供货申请单_添加产品 #b18供货目录申请_客户类型_医院_提交供货申请单_添加产品
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "listProvInfoBySubProv_url") url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "listProvInfoBySubProv_url")
# 获取请求头信息 # 获取请求头信息
...@@ -45,7 +46,10 @@ def submitSupplyRelation_reject(): ...@@ -45,7 +46,10 @@ def submitSupplyRelation_reject():
result = commonFuc().http_post(url, request_body, headers) result = commonFuc().http_post(url, request_body, headers)
print('result', result) print('result', result)
#断言 #断言
checkDict=commonFuc().get_business_data(module,'checkDict4') code=commonFuc().analysis_json('code',result)
commonFuc().check_result(checkDict,result) data=commonFuc().analysis_json('data',result)
if code==0:
commonFuc().check_text_exist(corpId,result)
submitSupplyRelation_reject() submitSupplyRelation_reject()
# -*- 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 = "mdm3_cm"
def submitSupplyRelation_reject():
module = "mdm3_cm"
pro_path = commonFuc().get_pro_path()
sys.path.append(pro_path + r'\\air_case\\mdm3_cm\\b17供货目录申请_客户类型_医院_企业账号登录.air')
using(pro_path + r'\\air_case\\mdm3_cm\\b17供货目录申请_客户类型_医院_企业账号登录.air')
from b17供货目录申请_客户类型_医院_企业账号登录 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\\mdm3_cm\\b10供货关系审核_驳回_客户类型_医院_医院账号登录.air')
using(pro_path + r'\\air_case\\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供货目录申请_客户类型_医院_提交供货申请单_搜索产品
输入:医院id
输出:"rtn_msg": 0
"""
#b19供货目录申请_客户类型_医院_提交供货申请单_搜索产品
module = "mdm3_cm"
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "listVo_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)
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()
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
"editSupplyRelation_url": "/test2api/mdmService/supplyRelation/editSupplyRelation/" "editSupplyRelation_url": "/test2api/mdmService/supplyRelation/editSupplyRelation/"
"auditSupplyRelation_url": "/test2api/mdmService/supplyRelation/auditSupplyRelation/" "auditSupplyRelation_url": "/test2api/mdmService/supplyRelation/auditSupplyRelation/"
"listProvInfoBySubProv_url": "/test2api/mdmService/supplyRelation/listProvInfoBySubProv/" "listProvInfoBySubProv_url": "/test2api/mdmService/supplyRelation/listProvInfoBySubProv/"
"listVo_url": "/test2api/mdmService/provGoodsInfo/listVo/"
json_contentType: "application/json" json_contentType: "application/json"
json_headers: { json_headers: {
"Content-Type": "%s" "Content-Type": "%s"
...@@ -106,12 +107,25 @@ json_headers2: { ...@@ -106,12 +107,25 @@ json_headers2: {
"activeFlag": "", "activeFlag": "",
"version": 0 "version": 0
} }
"payload7_2": {
"id": "%s",
"contactUser": "%s",
"contactWay": "%s",
"tbStatus": 20,
"activeFlag": "1",
"version": 0
}
"payload8": { "payload8": {
"provId": "%s", "provId": "%s",
"hosId": "%s", "hosId": "%s",
"tbStatus": 20, "tbStatus": 20,
"activeFlag": 1 "activeFlag": 1
} }
"payload9": {
"searchMdmGoodsCode": "MG",
"hosId": "%s",
"provId": "%s"
}
checkDict: {"code": 0,'msg': None,'data':1} checkDict: {"code": 0,'msg': None,'data':1}
checkDict1: {"code": 400,'msg': '供销关系已存在!请勿重复添加','data':None} checkDict1: {"code": 400,'msg': '供销关系已存在!请勿重复添加','data':None}
checkDict2: {"code": 400,'msg': None,'data':None} checkDict2: {"code": 400,'msg': None,'data':None}
......
产品新增: 产品新增:
username: 国药集团公司1O4Qy username: 国药集团公司(LAep
goodsname: 一次性注射器uHVxG goodsname: 一次性注射器aLzgd
...@@ -54,9 +54,9 @@ ...@@ -54,9 +54,9 @@
</tr> </tr>
<tr width="600"> <tr width="600">
<td class='details-col-elapsed'>5</td> <td class='details-col-elapsed'>1</td>
<td class='details-col-elapsed'>5</td> <td class='details-col-elapsed'>1</td>
<td class='details-col-elapsed'>0分3</td> <td class='details-col-elapsed'>0分2</td>
<td class="details-col-elapsed">100.0%</td> <td class="details-col-elapsed">100.0%</td>
</tr> </tr>
</table> </table>
...@@ -72,37 +72,9 @@ ...@@ -72,37 +72,9 @@
</tr> </tr>
<tr width="600"> <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/b19供货目录申请_客户类型_医院_提交供货申请单_搜索产品/log.html' target='_blank'>b19供货目录申请_客户类型_医院_提交供货申请单_搜索产品</a></td>
<td class="success">成功</td> <td class="success">成功</td>
<td class="details-col-elapsed">0.289</td> <td class="details-col-elapsed">2.036</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/医院注册_注册时医院已存在/log.html' target='_blank'>医院注册_注册时医院已存在</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">0.227</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/医院注册正常注册公立医院/log.html' target='_blank'>医院注册正常注册公立医院</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">0.164</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/注册医院审核通过/log.html' target='_blank'>注册医院审核通过</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">1.856</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/注册医院审核驳回/log.html' target='_blank'>注册医院审核驳回</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">0.961</td>
<td class="details-col-elapsed">xiaohesheng</td> <td class="details-col-elapsed">xiaohesheng</td>
</tr> </tr>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment