Skip to content
GitLab
Commit c9f4691d authored by liguangyu06's avatar liguangyu06
Browse files

Merge remote-tracking branch 'origin/master'

parents ad460bff 34f00d94
Hide whitespace changes
Inline Side-by-side
air_case/mdm3_psm/a认领锁定产品规格.air/a认领锁定产品规格.py 0 → 100644
View file @ c9f4691d
# -*- encoding=utf8 -*-
import sys
from air_case.mdm_login.登录外网系统.登录外网系统 import login_system
from common.timeUtils import timeUtils
from airtest.core.api import using
from common.common_func import commonFuc
from common.fileUtls import *
__author__ = "xiaohesheng"
"""
case_tag:api,mdm-web,认领锁定产品规格信息,id2253,id2253-3,sit,on,20230915
主数据平台:web产品规格查询
"""
pro_path=commonFuc().get_pro_path()
sys.path.append(pro_path+r'\\air_case\\mdm3_psm\\a查询产品规格数据.air')
using(pro_path+r'\\air_case\\mdm3_psm\\a查询产品规格数据.air')
from a查询产品规格数据 import *
print('GRBID',global_GRBID)
GRBID=global_GRBID
module = "mdm3_psm"
# 登录
info = FileUtils().r_info('mdm3_pim','产品新增')
username=info['username']
goodsname=info['goodsname']
password = commonFuc().get_business_data('mdm3_pim', "password")
# print(username, password)
# 获取token和projectCode
token, projectCode, uxid, corpId,info = login_system(username, password).get_token()
# 锁定产品规格信息
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "updateById_url2")
# 获取请求头信息
headers = commonFuc().get_business_data(module, "json_headers2",
commonFuc().get_business_data(module, "json_contentType"), token,
projectCode)
now = timeUtils().get_time_hms()
request_body = commonFuc().get_business_data(module, "payload3", GRBID, uxid, now)
# 发送请求
result = commonFuc().http_post(url, request_body, headers)
print('result',result)
# print('实际值',result)
code = commonFuc().analysis_json('code', result)
# print(code)
# 断言实际结果中是否包含预期结果的内容
commonFuc().check_text_exist(code,result)
if code==0:
commonFuc().check_text_exist(code,result)
elif code==400:
commonFuc().check_text_exist(code, result)
else:
commonFuc().check_text_exist(500, result)
air_case/mdm3_psm/b产品规格审核通过.air/b产品规格审核通过.py 0 → 100644
View file @ c9f4691d
# -*- encoding=utf8 -*-
import sys
from air_case.mdm_login.登录外网系统.登录外网系统 import login_system
from common.timeUtils import timeUtils
from airtest.core.api import using
from common.common_func import commonFuc
from common.fileUtls import *
__author__ = "xiaohesheng"
"""
case_tag:api,mdm-web,审核通过产品规格信息,id2253,id2253-4,sit,on,20230915
主数据平台:web产品规格查询
"""
pro_path = commonFuc().get_pro_path()
sys.path.append(pro_path + r'\\air_case\\mdm3_psm\\a查询产品规格数据.air')
using(pro_path + r'\\air_case\\mdm3_psm\\a查询产品规格数据.air')
from a查询产品规格数据 import *
print('GRBID', global_GRBID, 'global_goodsId', global_goodsId)
GRBID = global_GRBID
goodsId = global_goodsId
module = "mdm3_psm"
# 登录
info = FileUtils().r_info('mdm3_pim', '产品新增')
username = info['username']
goodsname = info['goodsname']
password = commonFuc().get_business_data('mdm3_pim', "password")
# print(username, password)
# 获取token和projectCode
token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
# 审核产品规格信息
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "handleAuditSpecRegist_url")
# 获取请求头信息
headers = commonFuc().get_business_data(module, "json_headers2",
commonFuc().get_business_data(module, "json_contentType"), token,
projectCode)
now = timeUtils().get_time_hms()
request_body = commonFuc().get_business_data(module, "payload4", GRBID, now, now, uxid, uxid, GRBID, goodsId, goodsname,
goodsname)
# 发送请求
result = commonFuc().http_post(url, request_body, headers)
print('result', result)
code = commonFuc().analysis_json('code', result)
# print(code)
# 断言实际结果中是否包含预期结果的内容
commonFuc().check_text_exist(code, result)
if code == 0:
commonFuc().check_text_exist(code, result)
elif code == 400:
commonFuc().check_text_exist(code, result)
else:
commonFuc().check_text_exist(-500, result)
air_case/mdm_login/登录外网系统.air/登录外网系统.py
View file @ c9f4691d
......@@ -2,7 +2,7 @@
__author__ = "xiaohesheng"
"""
case_tag:mdm-web,10086登录,用例集id2226
case_tag:mdm-web1,10086登录,用例集id2226
主数据平台:统一登录接口，第一步获取验证码，第二步登录系统，第三步平台登录验证token
"""
......
air_case/mdm_login/登录外网系统/登录外网系统.py
View file @ c9f4691d
......@@ -2,7 +2,7 @@
__author__ = "xiaohesheng"
"""
case_tag:mdm-web,10086登录,用例集id2226
case_tag:mdm-web1,10086登录,用例集id2226
主数据平台:统一登录接口，第一步获取验证码，第二步登录系统，第三步平台登录验证token
"""
......
data/mdm3_pim/data
View file @ c9f4691d
......@@ -9,6 +9,7 @@
"getGoodsRegistBillDetail_url": "/test2api/mdmService/goodsRegistBill/getGoodsRegistBillDetail/"
"handleAuditGoodsRegist_url": "/test2api/mdmService/goodsRegistBill/handleAuditGoodsRegist/"
"submitGoodsSpecsRegist_url": "/test2api/mdmService/goodsRegistBill/submitGoodsSpecsRegist/"
"username": "1679886114521"
"password": "a123456!"
......@@ -337,6 +338,20 @@ json_headers2: {
}
]
}
"payload12": {
"pageNum": 1,
"pageSize": 20,
"queryObject": {
"pid": "",
"provId": "%s",
"goodsName": "%s",
"goodsMfrsName": "",
"isAbroad": "",
"purpose": "",
"mgrLevel": "",
"status": 0
}
}
"name1": "一次性注射器"
checkDict: {"code": 0, "msg":None,"data": {"pageNum": 1, "pageSize": 20, "total": 0, "data": [], "totalInfo": None}}
checkDict1: {"code": -2,"msg": "医院已被注册，请耐心等待审核通知!", "data": None}
......
data/mdm3_pim/message
View file @ c9f4691d
产品新增:
username: 国药集团公司T)^Qj
goodsname: 一次性注射器uP^fo
username: 国药集团公司ITzkH
goodsname: 一次性注射器DdvmT
data/mdm3_psm/data 0 → 100644
View file @ c9f4691d
"listVoPage_url": "/test2api/mdmService/provGoodsInfo/listVoPage"
"queryListPage_url": "/test2api/mdmService/companyRegistBill/listPage"
"updateById_url": "/test2api/mdmService/companyRegistBill/updateById"
"checkHosRegistInfo_url": "/test2api/mdmService/companyRegistBill/checkHosRegistInfo"
"submitGoodsRegist_url": "/test2api/mdmService/goodsRegistBill/submitGoodsRegist"
"listAuditBillByPage_url": "/test2api/mdmService/goodsRegistBill/listAuditBillByPage"
"updateById_url2": "/test2api/mdmService/goodsRegistBill/updateById"
"getGoodsRegistBillDetail_url": "/test2api/mdmService/goodsRegistBill/getGoodsRegistBillDetail/"
"handleAuditGoodsRegist_url": "/test2api/mdmService/goodsRegistBill/handleAuditGoodsRegist/"
"submitGoodsSpecsRegist_url": "/test2api/mdmService/goodsRegistBill/submitGoodsSpecsRegist/"
"listAuditSpecsBillByPage_url": "/test2api/mdmService/goodsRegistBill/listAuditSpecsBillByPage/"
"handleAuditSpecRegist_url": "/test2api/mdmService/goodsRegistBill/handleAuditSpecRegist/"
"username": "1679886114521"
"password": "a123456!"
json_contentType: "application/json"
json_headers: {
"Content-Type": "%s"
}
json_headers2: {
"Content-Type": "%s",
"token": "%s",
"X-APP-CODE":"%s"
}
"payload1": {
"registSourceProject": "h0347",
"goodsRegistVO": {
"id": "%s",
"goodsMfrsId": "p56a4",
"goodsName": "%s"
},
"goodsSpecsRegistVOList": [
{
"goodsGg": "20ml",
"miGoodsGg": "20ml",
"miGoodsXh": "20ml",
"goodsUseUnit": "支",
"mi27code": "123456789012243454",
"udiCode": "12345678901234",
"diType":"0",
"rowNum": 1
}
]
}
"payload2": {
"pageNum": 1,
"pageSize": 10,
"queryObject": {
"auditStatus": 10,
"billType": 20,
"goodsName": "%s",
"goodsMfrsName": ""
}
}
"payload3": {
"id": "%s",
"isLocked": 1,
"version": 0,
"auditor": "%s",
"auditStartTime": "%s"
}
"payload4": {
"id": "%s",
"version": 1,
"auditStatus": 20,
"auditComment": "",
"goodsSpecsRegistVOList": [
{
"id": "e0f0a26e3a4f4087b63f2af3ea6a4be2",
"lastModified": "%s",
"version": 0,
"createTime": "%s",
"createUser": "%s",
"lastModifiedUser": "%s",
"billId": "%s",
"goodsRegistId": "%s",
"mdmGoodsSpecCode": null,
"provGoodsSpecsId": null,
"goodsMfrsId": "p56a4",
"goodsName": "%s",
"shortPinyin": "%s",
"goodsGg": "20ml",
"miGoodsGg": "20ml",
"miGoodsXh": "20ml",
"mi27code": "20ml",
"udiCode": "20ml",
"goodsUseUnit": "支",
"auditStatus": 10,
"auditComment": null,
"specAuditStatus": true
}
]
}
"payload10": {
"pageNum": 1,
"pageSize": 20,
"queryObject": {
"pid": "",
"provId": "%s",
"goodsName": "%s",
"goodsMfrsName": "",
"isAbroad": "",
"purpose": "",
"mgrLevel": "",
"status": 0
}
}
"name1": "一次性注射器"
checkDict: {"code": 0, "msg":None,"data": {"pageNum": 1, "pageSize": 20, "total": 0, "data": [], "totalInfo": None}}
checkDict1: {"code": -2,"msg": "医院已被注册，请耐心等待审核通知!", "data": None}
checkDict2: {'code': 0, 'msg': None, 'data': 'success'}
report/summary.html
View file @ c9f4691d
......@@ -54,9 +54,9 @@
</tr>
<tr width="600">
<td class='details-col-elapsed'>7</td>
<td class='details-col-elapsed'>7</td>
<td class='details-col-elapsed'>0分4秒</td>
<td class='details-col-elapsed'>4</td>
<td class='details-col-elapsed'>4</td>
<td class='details-col-elapsed'>0分2秒</td>
<td class="details-col-elapsed">100.0%</td>
</tr>
</table>
......@@ -72,51 +72,30 @@
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/a企业认领/log.html' target='_blank'>a企业认领</a></td>
<td class="details-col-elapsed"><a href='../log/a产品规格申报/log.html' target='_blank'>a产品规格申报</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">1.082</td>
<td class="details-col-elapsed">0.829</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/a企业锁定/log.html' target='_blank'>a企业锁定</a></td>
<td class="details-col-elapsed"><a href='../log/a查询产品规格数据/log.html' target='_blank'>a查询产品规格数据</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">1.088</td>
<td class="details-col-elapsed">0.415</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="details-col-elapsed"><a href='../log/a认领锁定产品规格/log.html' target='_blank'>a认领锁定产品规格</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">0.651</td>
<td class="details-col-elapsed">0.835</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="details-col-elapsed"><a href='../log/b产品规格审核通过/log.html' target='_blank'>b产品规格审核通过</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">0.4</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/企业查询2/log.html' target='_blank'>企业查询2</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">0.435</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.001</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.806</td>
<td class="details-col-elapsed">0.398</td>
<td class="details-col-elapsed">xiaohesheng</td>
</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