Commit 8c790563 authored by xiao-hesheng's avatar xiao-hesheng
Browse files

优化脚本

parent d9e976f8
......@@ -8,6 +8,7 @@ case_tag:herp-web,20231010
from common.common_func import commonFuc
from common.tokenUtils import *
import os
class login_system():
......@@ -19,8 +20,15 @@ class login_system():
# 获取验证码接口
def get_token(self):
url = commonFuc().get_api_url() + commonFuc().get_business_data(self.module, "VerifyCode_url")
# print("aaaaaaaaaaaaaaaaaa" + url)
env = os.environ['ENV']
print(env)
if env == 'sit':
url = commonFuc().get_api_url() + commonFuc().get_business_data(self.module, "VerifyCode_url")
elif env=='mdm3':
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(self.module, "VerifyCode_url")
else:
url = commonFuc().get_api_url() + commonFuc().get_business_data(self.module, "VerifyCode_url")
print("aaaaaaaaaaaaaaaaaa" + url)
# 发送请求
result = commonFuc().http_get(url, headers="", params="")
......@@ -35,7 +43,12 @@ class login_system():
password = self.password
EncryptPassword = TokenUtils(username, password, uuid).get_PasswordEncrypt()
# print('加密后的密码', EncryptPassword) # 加密后的密码
login_url = commonFuc().get_api_url() + commonFuc().get_business_data(self.module, "login_url")
if env == 'sit':
login_url = commonFuc().get_api_url() + commonFuc().get_business_data(self.module, "login_url")
elif env=='mdm3':
login_url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(self.module, "login_url")
else:
login_url = commonFuc().get_api_url() + commonFuc().get_business_data(self.module, "login_url")
request_body = commonFuc().get_business_data(self.module, "payload", username, EncryptPassword, uuid)
# print(request_body)
# #获取请求头信息
......@@ -53,8 +66,15 @@ class login_system():
commonFuc().get_business_data(self.module, "json_contentType"), token,
projectCode)
# print('平台登录请求头', headers)
platform_login_url = commonFuc().get_api_url() + commonFuc().get_business_data(self.module,
"platform_login_url")
if env=='sit':
platform_login_url = commonFuc().get_api_url() + commonFuc().get_business_data(self.module,
"platform_login_url")
elif env=='mdm3':
platform_login_url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(self.module,
"platform_login_url")
else:
platform_login_url = commonFuc().get_api_url() + commonFuc().get_business_data(self.module,
"platform_login_url")
request_body = commonFuc().get_business_data(self.module, "payload2", token, uxid, projectCode)
# print(request_body)
# 发送平台登录请求
......
......@@ -7,8 +7,8 @@ from common.timeUtils import timeUtils
__author__ = "xiaohesheng"
"""
case_tag:api,mdm_core,a_a1_流程一外网企业注册审批,id2302,id2302-1,sit,on
内网:a_a1_流程一外网企业注册审批
case_tag:api,spd_core,a_a1_流程一外网企业注册审批,id2302,id2302-1,sit,on
内网:a_a1_流程一外网企业注册审批
"""
from common.common_func import commonFuc
......
......@@ -4,7 +4,7 @@ from common.fileUtls import FileUtils
__author__ = "xiaohesheng"
"""
case_tag:api,mdm_core,a_a2_流程二供货关系申请提交审批,id2302,id2302-2,sit,on
case_tag:api,spd_core,a_a2_流程二供货关系申请提交审批,id2302,id2302-2,sit,on
主数据平台:a_a2_流程二供货关系申请提交审批
"""
......
......@@ -5,7 +5,7 @@ from common.fileUtls import FileUtils
__author__ = "xiaohesheng"
"""
case_tag:api,mdm-core,a_a3_流程三_产品导入和审批,id2302,id2302-3,sit,on
case_tag:api,spd_core,a_a3_流程三_产品导入和审批,id2302,id2302-3,sit,on
主数据平台:a_a3_流程三_产品导入和审批
"""
......
......@@ -5,8 +5,10 @@ from common.run_cmd_script import execute_command
__author__ = "xiaohesheng"
"""
case_tag:api,mdm-core,a_a4_流程四_基础模块设置,id2302,id2302-4,sit,on
主数据平台:a_a4_流程四_基础模块设置
case_tag:api,spd_core,a_a4_流程四_基础模块设置,id2302,id2302-4,sit,on
主数据平台:a_a4_流程四_基础模块设置
python runner_test.py tag spd_core debug mdm3
"""
from common.common_func import commonFuc
......@@ -57,8 +59,8 @@ def test2(): # 科室添加产品信息(产品是从外网同步过来的)
token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
#
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "basic_mcmsGoodsInfo_insert")
url = commonFuc().get_api_add_port_url()+commonFuc().get_business_data(module, "basic_mcmsGoodsInfo_insert")
print('basic_mcmsGoodsInfo_insert',url)
# 获取请求头信息
headers = commonFuc().get_business_data(module, "json_headers2",
commonFuc().get_business_data(module, "json_contentType"), token,
......@@ -117,7 +119,7 @@ def dept_query_all(): # 科室查询,将科室id写入文件中
# print( token,projectCode,uxid,corpId,info)
# b9_科室管理_科室登记_科室查询
branch_id = FileUtils().r_info(module, '院区新增')["branch_id"]
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "deptPage_url")
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "deptPage_url")
# 获取请求头信息
headers = commonFuc().get_business_data(module, "json_headers2",
......@@ -169,7 +171,7 @@ def grants_user(orgName='d69a68df361a4289b2262e4ef75b55a5', mgrRangeId='feb0cc16
token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
# print( token,projectCode,uxid,corpId,info)
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "sys_user_grants_url")
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "sys_user_grants_url")
# 获取请求头信息
headers = commonFuc().get_business_data(module, "json_headers2",
commonFuc().get_business_data(module, "json_contentType"), token,
......@@ -205,5 +207,6 @@ try:
dept_query_all()
grants_user()
commonFuc().check_text_exist_result_text('succeed', 'succeed')
except:
except Exception as e:
commonFuc().check_text_exist_result_text('succeed','error')
print("发生异常:", str(e))
\ No newline at end of file
......@@ -7,7 +7,7 @@ from common.run_cmd_script import execute_command
__author__ = "xiaohesheng"
"""
case_tag:api,mdm-core,a_a5流程五_中心库入库结算_正结算,id2302,id2302-5,sit,on
case_tag:api,spd_core,a_a5流程五_中心库入库结算_正结算,id2302,id2302-5,sit,on
主数据平台:a_a5流程五_中心库入库结算_正结算
"""
......@@ -53,7 +53,7 @@ def low_vaule_purchase_plan():
token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
# 登录获取用户id等信息,使用创建的用户登录============结束
# 获取暂存的单号=======================================
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "herpService_purPlan_insert_url")
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_purPlan_insert_url")
print(url)
# 获取请求头信息
headers = commonFuc().get_business_data(module, "json_headers2",
......@@ -88,7 +88,7 @@ def low_vaule_purchase_plan():
# 获取暂存的单号==========================================================
# 获取采购计划详情中的id
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "herpService_purPlan_listVo_url")
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_purPlan_listVo_url")
print(url)
# 获取请求头信息
headers = commonFuc().get_business_data(module, "json_headers2",
......@@ -109,7 +109,7 @@ def low_vaule_purchase_plan():
FileUtils().w_info8(info,'b5_spd3_core_business_flow', '采购计划单号', titlename, 'message7')
# =====================================
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "herpService_purPlan_submitPurPlan_url")
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_purPlan_submitPurPlan_url")
print(url)
# 获取请求头信息
headers = commonFuc().get_business_data(module, "json_headers2",
......@@ -148,7 +148,7 @@ def approval_center():
# 获取token和projectCode
token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
# 登录获取用户id等信息,使用创建的用户登录============结束
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "apprCenter_url")
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "apprCenter_url")
# 获取请求头信息
headers = commonFuc().get_business_data(module, "json_headers2",
......@@ -173,7 +173,7 @@ def approval_center():
taskId = commonFuc().analysis_json('taskId', data1[0])
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "approvalBatch_url")
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "approvalBatch_url")
# 请求体
request_body = commonFuc().get_business_data(module, "payload50_7", taskId)
......@@ -207,7 +207,7 @@ def get_GoodsPkgDef(hosGoodsId):
# 获取token和projectCode
token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
# 登录获取用户id等信息,使用创建的用户登录===========结束
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "mcmsBranchGoodsInfo_url")
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "mcmsBranchGoodsInfo_url")
print(url)
# 获取请求头信息
headers = commonFuc().get_business_data(module, "json_headers2",
......@@ -235,7 +235,7 @@ def get_GoodsPkgDef(hosGoodsId):
# 获取院区产品id ===========结束
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "branchGoodsPkgDef_url")
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "branchGoodsPkgDef_url")
print(url)
# 获取请求头信息
headers = commonFuc().get_business_data(module, "json_headers2",
......@@ -274,7 +274,7 @@ def hight_vaule_purchase_plan():
token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
# 登录获取用户id等信息,使用创建的用户登录============结束
# 获取暂存的单号=======================================
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "herpService_purPlan_insert_url")
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_purPlan_insert_url")
print(url)
# 获取请求头信息
headers = commonFuc().get_business_data(module, "json_headers2",
......@@ -309,7 +309,7 @@ def hight_vaule_purchase_plan():
# 获取暂存的单号==========================================================
# 获取采购计划详情中的id
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "herpService_purPlan_listVo_url")
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_purPlan_listVo_url")
print(url)
# 获取请求头信息
headers = commonFuc().get_business_data(module, "json_headers2",
......@@ -330,7 +330,7 @@ def hight_vaule_purchase_plan():
FileUtils().w_info8(info,'b5_spd3_core_business_flow', '采购计划单号高值', titlename, 'message11')
# =====================================
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "herpService_purPlan_submitPurPlan_url")
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_purPlan_submitPurPlan_url")
print(url)
# 获取请求头信息
headers = commonFuc().get_business_data(module, "json_headers2",
......@@ -370,7 +370,7 @@ def reagent_purchase_plan():
token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
# 登录获取用户id等信息,使用创建的用户登录============结束
# 获取暂存的单号=======================================
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "herpService_purPlan_insert_url")
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_purPlan_insert_url")
print(url)
# 获取请求头信息
headers = commonFuc().get_business_data(module, "json_headers2",
......@@ -408,7 +408,7 @@ def reagent_purchase_plan():
# 获取暂存的单号==========================================================
# 获取采购计划详情中的id
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "herpService_purPlan_listVo_url")
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_purPlan_listVo_url")
print(url)
# 获取请求头信息
headers = commonFuc().get_business_data(module, "json_headers2",
......@@ -429,7 +429,7 @@ def reagent_purchase_plan():
FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '采购计划单号试剂', titlename, 'message12')
# =====================================
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "herpService_purPlan_submitPurPlan_url")
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_purPlan_submitPurPlan_url")
print(url)
# 获取请求头信息
headers = commonFuc().get_business_data(module, "json_headers2",
......
......@@ -9,7 +9,7 @@ from common.timeUtils import timeUtils
__author__ = "xiaohesheng"
"""
case_tag:api,mdm-core,a_a6流程五_中心库入库结算_正结算2_外网配送,id2302,id2302-6,sit,on
case_tag:api,spd_core,a_a6流程五_中心库入库结算_正结算2_外网配送,id2302,id2302-6,sit,on
主数据平台:a_a6流程五_中心库入库结算_正结算2_外网配送
python runner_test.py tag id2302-6 debug mdm3
"""
......@@ -23,7 +23,7 @@ module = "b5_spd3_core_business_flow"
def order_dp(type=1):
execute_command("python runner_test.py tag id2302-5 debug sit")
execute_command("python runner_test.py tag id2302-5 debug mdm3")
# # 登录获取用户id等信息,使用创建的用户登录===========开始
info = FileUtils().r_info8('b5_spd3_core_business_flow', "供货关系申请2", 'message')
# print(info)
......
......@@ -9,7 +9,7 @@ from common.timeUtils import timeUtils
__author__ = "xiaohesheng"
"""
case_tag:api,mdm-core,a_a7流程五_中心库入库结算_正结算3_内网验收入库结算,id2302,id2302-7,sit,on
case_tag:api,spd_core,a_a7流程五_中心库入库结算_正结算3_内网验收入库结算,id2302,id2302-7,sit,on
主数据平台:a_a7流程五_中心库入库结算_正结算3_内网验收入库结算
python runner_test.py tag id2302-6 debug mdm3
"""
......@@ -22,8 +22,7 @@ import time
module = "b5_spd3_core_business_flow"
def check_order(type=1):
execute_command("python runner_test.py tag id2302-5 debug sit")
def check_accept_order(type=1):
# # 登录获取用户id等信息,使用创建的用户登录===========开始
info = FileUtils().r_info8('b5_spd3_core_business_flow', "供货关系申请2", 'message')
# print(info)
......@@ -38,9 +37,9 @@ def check_order(type=1):
token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
# 登录获取用户id等信息,使用创建的用户登录============结束
# =========================查询待确认订单======================
module = "a6_mdm3_dp"
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "purchase_page_url")
# =========================查询待验收订单======================
module = "b5_spd3_core_business_flow"
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "check_wait_page_url")
# 获取请求头信息
headers = commonFuc().get_business_data(module, "json_headers2",
commonFuc().get_business_data(module, "json_contentType"), token,
......@@ -255,7 +254,7 @@ def check_order(type=1):
try:
check_order(1) # 1低值
check and accept(1) # 1低值
except Exception as e:
print('请检查脚本或者数据')
......
......@@ -74,8 +74,8 @@ class commonFuc(object):
url = 'http://spdtest.cmic.com.cn:8080'
return url
def get_api_add_port_url(self,url,port=":8080"):
url=url+port
def get_api_add_port_url(self,port=":8080"):
url=self.get_api_url()+port
return url
def get_token(self, module, enc_user_id="enc_user_id"):
......
企业信息:
e_id: CR202404230157
cname: 国药集团公司TRq#D
e_id: CR202404230258
cname: 国药集团公司2pCeJ
医院信息:
h_id: 湖南省人民医院hygU*
h_name: 湖南省人民医院hygU*
h_id: 湖南省人民医院X@n8x
h_name: 湖南省人民医院X@n8x
产品审核信息:
MSPid: MSP2404230024_1
MSPid: MSP2404230059_1
hosId: h0347
hosGoodsId: h034700003031
provGoodsid: provGood-99220140
goodsAuditBillId: MSP2404230024
targetId: MSP2404230024_1
hosGoodsId: h034700003066
provGoodsid: provGood-99220175
goodsAuditBillId: MSP2404230059
targetId: MSP2404230059_1
院区新增:
branch_id: h0347-3503
branch_name: 东土城路院区nv$Ra
branch_id: h0347-3514
branch_name: 东土城路院区Ma7zU
科室信息:
dept2_id: c4f7cc8f099a44eea00008984057b8d6
dept2_id: 9d4bd32c2cc449a4ac3dd0ab99a66b47
dept2_name: 二级检验科002
"check_wait_page_url": "/api/herpService/stock/check/wait/page"
......@@ -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分22</td>
<td class='details-col-elapsed'>1分54</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/a_a1_流程一外网企业注册审批/log.html' target='_blank'>a_a1_流程一外网企业注册审批</a></td>
<td class="details-col-elapsed"><a href='../log/a_a6流程五_中心库入库结算_正结算2_外网配送/log.html' target='_blank'>a_a6流程五_中心库入库结算_正结算2_外网配送</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">22.277</td>
<td class="details-col-elapsed">114.76</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