Skip to content
GitLab
Commit 2c0b93a2 authored by xiao-hesheng's avatar xiao-hesheng
Browse files

修改脚本适合融合环境

parent 6dc88bfd
Hide whitespace changes
Inline Side-by-side
air_case/a5_mdm3_pdm/a1_1产品新增导入_高值.air/a1_1产品新增导入_高值.py 0 → 100644
View file @ 2c0b93a2
# -*- encoding=utf8 -*-
from common.fileUtls import FileUtils
__author__ = "xiaohesheng"
"""
case_tag:api,mdm-web,a1产品新增导入,id2251,id2251-1-1,sit,on
主数据平台:a1产品新增导入
"""
from common.common_func import commonFuc
from airtest.core.api import using
import sys
module = "a5_mdm3_pdm"
def add_goods():
# 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
# 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()
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()
# 获取医院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()
"""
场景:a1产品新增导入
用例名称：a1产品新增导入
输入：医院id
输出："rtn_msg": 0
"""
module = "a5_mdm3_pdm"
#b18供货目录申请_客户类型_医院_提交供货申请单_添加产品
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "addGoodsHandleInfos_url")
# 获取请求头信息
headers = commonFuc().get_business_data(module, "json_headers2",
commonFuc().get_business_data(module, "json_contentType"), token,
projectCode)
goodsname = commonFuc().randomString(5)
request_body = commonFuc().get_business_data(module, "payload_1", h_corpId,h_name,corpId,e_name,goodsname,e_name)
# request_body = commonFuc().get_business_data(module, "payload10_1")
# print('request_body',request_body)
# 发送请求
result = commonFuc().http_post(url, request_body, headers)
print('result', result)
#断言
code=commonFuc().analysis_json('code',result)
data=commonFuc().analysis_json('data',result)
if code==0:
commonFuc().check_text_exist(code,result)
else:
commonFuc().check_text_exist(-1, result)
add_goods()
air_case/a5_mdm3_pdm/a1_2产品新增导入_试剂.air/a1_2产品新增导入_试剂.py 0 → 100644
View file @ 2c0b93a2
# -*- encoding=utf8 -*-
from common.fileUtls import FileUtils
__author__ = "xiaohesheng"
"""
case_tag:api,mdm-web,a1产品新增导入,id2251,id2251-1-2,sit,on
主数据平台:a1产品新增导入
"""
from common.common_func import commonFuc
from airtest.core.api import using
import sys
module = "a5_mdm3_pdm"
def add_goods():
# 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
# 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()
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()
# 获取医院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()
"""
场景:a1产品新增导入
用例名称：a1产品新增导入
输入：医院id
输出："rtn_msg": 0
"""
module = "a5_mdm3_pdm"
#b18供货目录申请_客户类型_医院_提交供货申请单_添加产品
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "addGoodsHandleInfos_url")
# 获取请求头信息
headers = commonFuc().get_business_data(module, "json_headers2",
commonFuc().get_business_data(module, "json_contentType"), token,
projectCode)
goodsname = commonFuc().randomString(5)
request_body = commonFuc().get_business_data(module, "payload_2", h_corpId,h_name,corpId,e_name,goodsname,e_name)
# request_body = commonFuc().get_business_data(module, "payload10_1")
# print('request_body',request_body)
# 发送请求
result = commonFuc().http_post(url, request_body, headers)
print('result', result)
#断言
code=commonFuc().analysis_json('code',result)
data=commonFuc().analysis_json('data',result)
if code==0:
commonFuc().check_text_exist(code,result)
else:
commonFuc().check_text_exist(-1, result)
add_goods()
air_case/a5_mdm3_pdm/a1产品新增导入.air/a1产品新增导入.py
View file @ 2c0b93a2
......@@ -4,7 +4,7 @@ from common.fileUtls import FileUtils
__author__ = "xiaohesheng"
"""
case_tag:api,mdm-web,a1产品新增导入,id2251,id2251-1,sit,on
case_tag:api,mdm-web,a1产品新增导入,id2251,id2251-1-3,sit,on
主数据平台:a1产品新增导入
"""
......
air_case/a5_mdm3_pdm/a3产品信息审核_查询.air/a3产品信息审核_查询.py
View file @ 2c0b93a2
......@@ -6,7 +6,7 @@ import sys
__author__ = "xiaohesheng"
"""
case_tag:api,mdm-web,a5产品信息审核查询_无数据,id2251,id2251-5,sit,on,2023091201
case_tag:api,mdm-web,a3产品信息审核查询_有数据,id2251,id2251-3,sit,on,2023091201
主数据平台:a3产品信息审核查询
"""
from common.common_func import commonFuc, using
......@@ -60,7 +60,7 @@ def select1():
targetId=commonFuc().analysis_json('id', data)
print(id1, auditOrgId, hosGoodsId,provGoodsid,goodsAuditBillId,targetId)
info = (id1, auditOrgId,hosGoodsId,provGoodsid,goodsAuditBillId,targetId)
titlename = ('total',"MSPid", 'hosId','hosGoodsId','provGoodsid','goodsAuditBillId','targetId')
titlename = ("MSPid", 'hosId','hosGoodsId','provGoodsid','goodsAuditBillId','targetId')
# 将产品审核信息写入到文件中
FileUtils().w_info6(info, module, '产品审核信息', titlename,'message2')
else:
......
air_case/a5_mdm3_pdm/a4产品信息审核通过.air/a4产品信息审核通过.py 0 → 100644
View file @ 2c0b93a2
# -*- encoding=utf8 -*-
from common.common_func import commonFuc
from common.timeUtils import timeUtils
from common.fileUtls import FileUtils
from common.common_func import commonFuc, using
from air_case.mdm_login.登录外网系统.登录外网系统 import login_system
import sys
__author__ = "xiaohesheng"
"""
case_tag:api,mdm-web,a3产品信息审核驳回,id2251,id2251-4-1,sit,on,2023091201
主数据平台:a3产品信息审核驳回
"""
module = "a5_mdm3_pdm"
def test1():
module = "a5_mdm3_pdm"
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产品信息审核驳回
输入：CRid
输出："rtn_msg": "ok"
"""
# 登录
username = h_name
password = commonFuc().get_business_data(module, "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, "singleAudit_url")
# 获取请求头信息
headers = commonFuc().get_business_data(module, "json_headers2",
commonFuc().get_business_data(module, "json_contentType"), token,
projectCode)
info = FileUtils().r_info6(module, "产品审核信息",'message2')
print(info)
total= info['total']
if total=='0':
print('无数据可以审核')
else:
MSPid = info['MSPid']
hosId = info['hosId']
hosGoodsId = info['hosGoodsId']
provGoodsid = info['provGoodsid']
goodsAuditBillId= info['goodsAuditBillId']
targetId= info['targetId']
request_body = commonFuc().get_business_data(module, "payload3_1",MSPid,hosId,hosGoodsId,provGoodsid,goodsAuditBillId,targetId)
print('产品信息审核查询请求体', request_body)
# 发送请求
result = commonFuc().http_post(url, request_body, headers)
print("产品信息审核查询返回结果", result)
checkDict=commonFuc().get_business_data(module,'checkDict')
commonFuc().check_result(checkDict,result)
test1()
\ No newline at end of file
air_case/a5_mdm3_pdm/a4产品信息审核驳回.air/a4产品信息审核驳回.py
View file @ 2c0b93a2
......@@ -9,7 +9,7 @@ import sys
__author__ = "xiaohesheng"
"""
case_tag:api,mdm-web,a3产品信息审核驳回,id2251,id2251-4,sit,on,2023091201
case_tag:api,mdm-web,a3产品信息审核驳回,id2251,id2251-4-2,sit,on,2023091201
主数据平台:a3产品信息审核驳回
"""
module = "a5_mdm3_pdm"
......
air_case/a5_mdm3_pdm/a5产品信息审核查询_无数据.air/a5产品信息审核查询_无数据.py
View file @ 2c0b93a2
......@@ -60,7 +60,7 @@ def select1():
targetId=commonFuc().analysis_json('id', data)
print(id1, auditOrgId, hosGoodsId,provGoodsid,goodsAuditBillId,targetId)
info = (id1, auditOrgId,hosGoodsId,provGoodsid,goodsAuditBillId,targetId)
titlename = ('total',"MSPid", 'hosId','hosGoodsId','provGoodsid','goodsAuditBillId','targetId')
titlename = ("MSPid", 'hosId','hosGoodsId','provGoodsid','goodsAuditBillId','targetId')
# 将产品审核信息写入到文件中
FileUtils().w_info6(info, module, '产品审核信息', titlename,'message2')
else:
......
data/a5_mdm3_pdm/data
View file @ 2c0b93a2
......@@ -97,11 +97,178 @@ json_headers2: {
"errorFlag": "",
"userId": ""
}
"payload_1": {
"hosId": "%s",
"hosName": "%s",
"hosVersion": 3,
"collectorId": "%s",
"collectorName": "%s",
"goodsName": "一次性注射器%s",
"goodsGg": "G-31891",
"made": "德国",
"unit": "套",
"mfrsName": "德国歌德公司 Geuder AG",
"mfrsId": "mfrs-11229",
"purMode": "20",
"provGoodsJDECode": "",
"salePrice": 99.9999,
"purPrice": 99.9999,
"taxRate": 0.13,
"unitRate": 1,
"miCode": "",
"hisPrice": "0",
"sendPackage": 100,
"hitCode": "12",
"hitPrice": 99.9999,
"hosGoodsCode": "",
"xvmecCode": "123456789",
"xvmecPrice": 99.9999,
"hitId": "123456789",
"ygptPrimaryCode": "123456789",
"isDistrRel": "0",
"isOnline": "0",
"onlineKind": "dictOnlineKind:1",
"hosFactId": "",
"hosFcatKind": 0,
"remark": "无 ",
"storageConditions": "",
"hrpInfo": {
"store": "",
"trans": "",
"cla": ""
},
"ext1": "",
"ext2": "",
"cla": "",
"errorDesc": "",
"generalName": "一次性注射器",
"hosGoodsErpCode": "",
"provName": "%s",
"provId": "p1df18",
"subProvErpCode": "",
"hosLbsx": "",
"hosKindLevelCode": "",
"certificateCode": "",
"brand": "",
"hosUnit": "支",
"mfrsCode": "",
"masterCode": "",
"goodsDesc": "",
"hwDesc": "1",
"packeage": "1",
"icdCode": "",
"icd20Code": "",
"icdName": "",
"ext3": "{\"store\":\"\",\"trans\":\"\",\"cla\":\"\"}",
"ext4": "",
"ext5": "",
"ext6": "",
"tempPurchase": "0",
"charging": "1",
"isMetering": "1",
"isSubprov": "0",
"midPackageUnit": "",
"useUnit": "",
"useUnitCount": "1",
"hosUnitCount": "1",
"provUnitCount": "1",
"functional": "",
"material": "",
"keySupervision": "0",
"handleStatus": "0",
"dataSource": "2",
"errorFlag": "",
"userId": ""
}
"payload_2": {
"hosId": "%s",
"hosName": "%s",
"hosVersion": 3,
"collectorId": "%s",
"collectorName": "%s",
"goodsName": "一次性注射器%s",
"goodsGg": "G-31891",
"made": "德国",
"unit": "套",
"mfrsName": "德国歌德公司 Geuder AG",
"mfrsId": "mfrs-11229",
"purMode": "60",
"provGoodsJDECode": "",
"salePrice": 99.9999,
"purPrice": 99.9999,
"taxRate": 0.13,
"unitRate": 1,
"miCode": "",
"hisPrice": "0",
"sendPackage": 100,
"hitCode": "12",
"hitPrice": 99.9999,
"hosGoodsCode": "",
"xvmecCode": "123456789",
"xvmecPrice": 99.9999,
"hitId": "123456789",
"ygptPrimaryCode": "123456789",
"isDistrRel": "0",
"isOnline": "0",
"onlineKind": "dictOnlineKind:1",
"hosFactId": "",
"hosFcatKind": 0,
"remark": "无 ",
"storageConditions": "",
"hrpInfo": {
"store": "",
"trans": "",
"cla": ""
},
"ext1": "",
"ext2": "",
"cla": "",
"errorDesc": "",
"generalName": "一次性注射器",
"hosGoodsErpCode": "",
"provName": "%s",
"provId": "p1df18",
"subProvErpCode": "",
"hosLbsx": "",
"hosKindLevelCode": "",
"certificateCode": "",
"brand": "",
"hosUnit": "支",
"mfrsCode": "",
"masterCode": "",
"goodsDesc": "",
"hwDesc": "1",
"packeage": "1",
"icdCode": "",
"icd20Code": "",
"icdName": "",
"ext3": "{\"store\":\"\",\"trans\":\"\",\"cla\":\"\"}",
"ext4": "",
"ext5": "",
"ext6": "",
"tempPurchase": "0",
"charging": "1",
"isMetering": "1",
"isSubprov": "0",
"midPackageUnit": "",
"useUnit": "",
"useUnitCount": "1",
"hosUnitCount": "1",
"provUnitCount": "1",
"functional": "",
"material": "",
"keySupervision": "0",
"handleStatus": "0",
"dataSource": "2",
"errorFlag": "",
"userId": ""
}
"payload1": {
"queryObject":{"id":"","taskBillId":"","startDate":"","endDate":"","hosVersion":2},"pageNum":1,"pageSize":50
}
"payload2": {"orderBy":"","queryObject":{"provName":"","goodsName":"","certificateCode":"","state":10,"mfrsName":"","branchId":"","tempPurchase":"","flag":"","datePickerData":[],"certCompleteFlag":0,"hosId":"%s","provId":null,"startDate":"","endDate":"","auditor":""},"pageNum":1,"pageSize":50}
"payload3": {"id":"%s","auditOrgId":"%s","hosGoodsId":"%s","provGoodsid":"%s","goodsAuditBillId":"%s","targetId":"%s","eventType":"2","status":5,"rowRejectMemo":"审核驳回","hosVersion":3}
"payload3_1": {"id":"%s","auditOrgId":"%s","hosGoodsId":"%s","provGoodsid":"%s","goodsAuditBillId":"%s","targetId":"%s","eventType":"2","status":30,"rowRejectMemo":"审核驳回","hosVersion":3}
......
report/summary.html
View file @ 2c0b93a2
......@@ -54,10 +54,10 @@
</tr>
<tr width="600">
<td class='details-col-elapsed'>2</td>
<td class='details-col-elapsed'>1</td>
<td class='details-col-elapsed'>0分6秒</td>
<td class="details-col-elapsed">50.0%</td>
<td class='details-col-elapsed'>0</td>
<td class='details-col-elapsed'>0分5秒</td>
<td class="details-col-elapsed">0.0%</td>
</tr>
</table>
......@@ -72,16 +72,9 @@
</tr>
<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">4.523</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/a5产品信息审核查询_无数据/log.html' target='_blank'>a5产品信息审核查询_无数据</a></td>
<td class="details-col-elapsed"><a href='../log/a4产品信息审核驳回/log.html' target='_blank'>a4产品信息审核驳回</a></td>
<td class="fail">失败</td>
<td class="details-col-elapsed">2.099</td>
<td class="details-col-elapsed">5.499</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