Commit 1c21f776 authored by xiao-hesheng's avatar xiao-hesheng
Browse files

优化脚本

parent 8c790563
......@@ -246,7 +246,12 @@ def order_dp(type=1):
info = (id1, id1)
titlename = ('distrBillId1', 'distrBillId2')
# 将配送订单信息息写入到文件中
FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '低值配送单号', titlename, 'message10')
if type==1:
FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '低值配送单号', titlename, 'message10')
elif type==2:
FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '高值配送单号', titlename, 'message10')
elif type==3:
FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '试剂配送单号', titlename, 'message10')
if code == 0:
commonFuc().check_text_exist(code, result)
else:
......
# -*- encoding=utf8 -*-
import traceback
from air_case.mdm_login.登录网系统.登录网系统 import login_system
from air_case.b1_herp3_login.登录网系统.登录网系统 import login_system
from common.fileUtls import FileUtils
from common.run_cmd_script import execute_command
from common.timeUtils import timeUtils
......@@ -23,12 +23,13 @@ module = "b5_spd3_core_business_flow"
def check_accept_order(type=1):
execute_command("python runner_test.py tag id2302-6 debug mdm3")
# # 登录获取用户id等信息,使用创建的用户登录===========开始
info = FileUtils().r_info8('b5_spd3_core_business_flow', "供货关系申请2", 'message')
info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
# print(info)
username = info['e_username']
username = info['username1']
password = commonFuc().get_business_data("b2_herp3_bs", "password1")
password = commonFuc().get_business_data("b2_herp3_bs", "password")
# username = '001f90380'
# password='1qaz!QAZ'
print('username,password', username, password)
......@@ -40,27 +41,23 @@ def check_accept_order(type=1):
# =========================查询待验收订单======================
module = "b5_spd3_core_business_flow"
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "check_wait_page_url")
print('url', url)
# 获取请求头信息
headers = commonFuc().get_business_data(module, "json_headers2",
commonFuc().get_business_data(module, "json_contentType"), token,
projectCode)
branch_id = FileUtils().r_info('b2_herp3_bs', '院区新增')["branch_id"]
hos_id = branch_id[0:5]
exeProvId = FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2', 'message')["e_corpId"]
if type == 1:
orderNo1 = FileUtils().r_info8('b5_spd3_core_business_flow', '采购计划单号', 'message7')["orderNo1"]
print(orderNo1)
sourceOrderNo = FileUtils().r_info8(module, '低值配送单号', 'message10')["distrBillId1"]
elif type == 2:
orderNo1 = FileUtils().r_info8('b5_spd3_core_business_flow', '采购计划单号高值', 'message11')["orderNo1"]
print(orderNo1)
sourceOrderNo = FileUtils().r_info8(module, '高值配送单号', 'message10')["distrBillId1"]
elif type == 3:
orderNo1 = FileUtils().r_info8('b5_spd3_core_business_flow', '采购计划单号试剂', 'message12')["orderNo1"]
print(orderNo1)
sourceOrderNo = FileUtils().r_info8(module, '试剂配送单号', 'message10')["distrBillId1"]
else:
orderNo1 = 'orderNo1'
request_body = commonFuc().get_business_data(module, "payload1_1_1", orderNo1, hos_id, exeProvId)
# print('request_body',request_body)
sourceOrderNo = FileUtils().r_info8(module, '低值配送单号', 'message10')["distrBillId1"]
request_body = commonFuc().get_business_data(module, "payload", hos_id, branch_id, sourceOrderNo)
print('request_body', request_body)
# 发送请求
while True:
result = commonFuc().http_post(url, request_body, headers)
......@@ -74,10 +71,6 @@ def check_accept_order(type=1):
else:
time.sleep(6)
data1 = commonFuc().analysis_json('data', data)
id1 = commonFuc().analysis_json('id', data1[0])
print('id1', id1)
data = commonFuc().analysis_json('data', result)
data1 = commonFuc().analysis_json('data', data)
list_a = []
......@@ -89,84 +82,146 @@ def check_accept_order(type=1):
# print('list_a', len(list_a), list_a)
info = (list_a, list_b, list_c)
titlename = ('list_a', 'list_b', 'list_c')
# 将配送订单信息写入到文件中
FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '配送订单信息', titlename, 'message8')
# 从message8文件中获取信息
info = FileUtils().r_info8('b5_spd3_core_business_flow', "配送订单信息", 'message8')
# 将验收单信息写入到文件中
FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '验收单信息', titlename, 'message13')
# 从message13文件中获取信息
info = FileUtils().r_info8('b5_spd3_core_business_flow', "验收单信息", 'message13')
# print('info', info)
list_a = info['list_a']
list_a = ','.join(map(str, list_a))
import json
new_request_body = list_a.replace("'", '"')
new_request_body1 = new_request_body.replace("None", 'null')
print(new_request_body1)
list_a2 = json.loads(new_request_body1)
# print('list_a', list_a)
billMode = "billMode"
createUser = 'createUser'
hosId = 'hosId'
provId = 'provId'
for i in list_a2:
billMode = i["billMode"]
createUser = i["createUser"]
hosId = i['hosId']
provId = i['provId']
break
print('list_a', list_a)
sourceType = "sourceType"
billMode = 'billMode'
recOrgId = 'recOrgId'
recOrgName = 'recOrgName'
sourceOrgId = 'sourceOrgId'
sourceOrgName = 'sourceOrgName'
sourceVersion = 'sourceVersion'
tbStatus = 'tbStatus'
for i in list_a:
print('i', i)
for j in i:
sourceType = j["sourceType"]
billMode = j["billMode"]
recOrgId = j['recOrgId']
recOrgName = j['recOrgName']
sourceOrgId = j['sourceOrgId']
sourceOrgName = j['sourceOrgName']
sourceVersion = j['sourceVersion']
tbStatus = j['tbStatus']
break
# =========================查询待确认订单======================
# ==============================确认订单==================
module = "a6_mdm3_dp"
# =========================查询待验收订单======================
# ==============================查看订单详情==================
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "ensure_url")
sourceId = sourceOrderNo
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "check_wait_detail_url")
request_body = commonFuc().get_business_data(module, "payload2", id1, uxid)
request_body = commonFuc().get_business_data(module, "payload1", sourceId, sourceType, billMode, branch_id)
# print('request_body',request_body)
# 发送请求
time.sleep(6)
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('error', result)
# ==============================确认订单==================
# ==============================配送==================
# url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "purchase_page_url")
#
# request_body = commonFuc().get_business_data(module, "payload3_1_1",exeProvId,hos_id)
# # 发送请求
# result = commonFuc().http_post(url, request_body, headers)
# print('result', result)
# #断言
# code=commonFuc().analysis_json('code',result)
# data=commonFuc().analysis_json('data',result)
# total=commonFuc().analysis_json('total',data)
# data1 = commonFuc().analysis_json('data', data)
# id1=commonFuc().analysis_json('id', data1[0])
# print('id1',id1)
# ==================a3获取订单详细信息中的子表id_3_0医院
# a1订单配送列表数据查询_全部
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "detail_id_url")
request_body = commonFuc().get_business_data(module, "payload4", id1)
list_a = []
list_b = []
list_c = []
list_a.append(data)
list_b.append(data)
list_c.append(data)
# print('list_a', len(list_a), list_a)
info = (list_a, list_b, list_c)
titlename = ('list_a', 'list_b', 'list_c')
# 将验收单详细信息写入到文件中
FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '验收单详情信息', titlename, 'message14')
# 读取viewId
info = FileUtils().r_info8('b5_spd3_core_business_flow', "验收单详情信息", 'message14')
# print('info', info)
list_a = info['list_a']
print('list_a', list_a)
viewId = "viewId"
settlement = 'settlement'
recTemperature = 'recTemperature'
recHumidity = 'recHumidity'
for i in list_a:
for j in i:
viewId = j["viewId"]
settlement = j["settlement"]
recTemperature = j['recTemperature']
recHumidity = j['recHumidity']
break
# ==============================查看订单详情==================
# ========设置验收全部合格
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "check_barcode_save_url")
sourceBillId = sourceId
request_body = commonFuc().get_business_data(module, "payload2", sourceBillId, viewId)
# print('request_body',request_body)
# 发送请求
time.sleep(6)
result = commonFuc().http_post(url, request_body, headers)
print('resulta3获取订单详细信息中的子表id_3_0医院', result)
# 断言
code = commonFuc().analysis_json('code', result)
data = commonFuc().analysis_json('data', result)
total = commonFuc().analysis_json('total', data)
print('result', result)
# ========设置验收全部合格
# =============提交验收单========================
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "check_submit_url")
deptId = recOrgId
deptName = recOrgName
provId = sourceOrgId
provName = sourceOrgName
createUser = uxid
sourceNo = sourceId
time.sleep(6)
request_body = commonFuc().get_business_data(module, "payload3", billMode, branch_id, deptId, deptName, hos_id,
provId, provName, recOrgId, recOrgName, sourceId, sourceVersion,
sourceType, tbStatus, createUser, sourceNo, viewId, viewId, settlement,
recTemperature, recHumidity)
commonFuc().check_text_exist(code, result)
data1 = commonFuc().analysis_json('data', data)
id2 = commonFuc().analysis_json('id', data1[0])
print(id1, id2)
data1 = commonFuc().analysis_json('data', data)
print('request_body', 'c', request_body)
# 发送请求
while True:
time.sleep(3)
result = commonFuc().http_post(url, request_body, headers)
print('result', result)
CHECK_NO = commonFuc().analysis_json('data', result)
code = commonFuc().analysis_json('code', result)
if code == 0:
break
info = (CHECK_NO, CHECK_NO)
titlename = ('CHECK_NO1', 'CHECK_NO2')
FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '验收单号', titlename, 'message15')
# 入库上架
def putaway():
# # 登录获取用户id等信息,使用创建的用户登录===========开始
info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
# print(info)
username = info['username1']
password = commonFuc().get_business_data("b2_herp3_bs", "password")
# username = '001f90380'
# password='1qaz!QAZ'
print('username,password', username, password)
# # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
# # 获取token和projectCode
token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
# 登录获取用户id等信息,使用创建的用户登录============结束
#=====================上架入库列表查询==========================
headers = commonFuc().get_business_data(module, "json_headers2",
commonFuc().get_business_data(module, "json_contentType"), token,
projectCode)
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "stock_in_page_url")
branch_id = FileUtils().r_info('b2_herp3_bs', '院区新增')["branch_id"]
hosId = branch_id[0:5]
request_body = commonFuc().get_business_data(module, "payload6", branch_id, hosId)
result = commonFuc().http_post(url, request_body, headers)
print('result', result)
# 将上架入库列表数据写入文件
data = commonFuc().analysis_json('data', result)
data1= commonFuc().analysis_json('data', data)
list_a = []
list_b = []
list_c = []
......@@ -176,89 +231,95 @@ def check_accept_order(type=1):
# print('list_a', len(list_a), list_a)
info = (list_a, list_b, list_c)
titlename = ('list_a', 'list_b', 'list_c')
# 将配送订单信息息写入到文件中
FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '配送订单详细信息', titlename, 'message9')
# ==================a3获取订单详细信息中的子表id_3_0医院
# ==================订单配送========================
module = "a6_mdm3_dp"
# a1订单配送列表数据查询_全部
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "submit_url")
# 获取请求头信息
headers = commonFuc().get_business_data(module, "json_headers2",
commonFuc().get_business_data(module, "json_contentType"), token,
projectCode)
# 从message9文件中获取信息
info = FileUtils().r_info8('b5_spd3_core_business_flow', "配送订单详细信息", 'message9')
print('info从message9文件中获取信息', info)
# 将验收单详细信息写入到文件中
FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '上架入库列表数据', titlename, 'message16')
# =====================上架入库列表查询==========================
# =============查看验收单详情========================
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "stock_detail_url")
deptid1 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid1"]
areaCode = FileUtils().r_info8('b2_herp3_bs', 'shelfinfo', 'message7')["shelfCode"]
branch_id = FileUtils().r_info('b2_herp3_bs', '院区新增')["branch_id"]
hosId = branch_id[0:5]
sourceId = FileUtils().r_info8('b5_spd3_core_business_flow', '验收单号', 'message15')["CHECK_NO1"]
# 从message13文件中获取信息
info = FileUtils().r_info8('b5_spd3_core_business_flow', "验收单信息", 'message13')
# print('info', info)
list_a = info['list_a']
# print('list_a',list_a,type(list_a))
# list_a = ','.join(map(str, list_a))
# import json
# new_request_body = list_a.replace("'", '"')
# new_request_body1 = new_request_body.replace("None", 'null')
# print('new_request_body1',new_request_body1)
#
# list_a2 = json.loads(new_request_body1)
# print('list_a2', list_a2)
# print('list_a2', type(list_a2))
hosGoodsId = 'hosGoodsId'
mdmGoodsCode = 'mdmGoodsCode'
goodsCode = 'goodsCode'
pkgDefId = 'pkgDefId'
erpCode = 'erpCode'
print('list_a', list_a)
sourceType = "sourceType"
for i in list_a:
print('aaaaaaaaaaaaaaaaaaaaaaaaaaaa', i)
print('i', i)
for j in i:
print('bbbbbbbbbbbbbbbbbbb', j)
hosGoodsId = j['hosGoodsId']
mdmGoodsCode = j['mdmGoodsCode']
goodsCode = j['goodsCode']
pkgDefId = j['pkgDefId']
erpCode = j['erpCode']
sourceType = j["sourceType"]
break
# # #获取日期
productDate = timeUtils().get_time_hms(5)
expdtDate = timeUtils().get_time_add(190, 2)
if type == 1:
request_body = commonFuc().get_business_data(module, "payload9_2_1_1", id1, id1, hosId, provId, billMode,
createUser, username, createUser, id2, hosGoodsId, mdmGoodsCode,
goodsCode, pkgDefId, productDate, expdtDate, erpCode, id2)
elif type == 2:
request_body = commonFuc().get_business_data(module, "payload9_2_1_2", id1, id1, hosId, provId, billMode,
createUser, username, createUser, id2, hosGoodsId, mdmGoodsCode,
goodsCode, productDate, expdtDate, erpCode, id2)
elif type == 3:
request_body = commonFuc().get_business_data(module, "payload9_2_1_3", id1, id1, hosId, provId, billMode,
createUser, username, createUser, id2, hosGoodsId, mdmGoodsCode,
goodsCode, pkgDefId, productDate, expdtDate, erpCode, id2)
print('request_body', request_body)
# 发送请求
request_body = commonFuc().get_business_data(module, "payload4", deptid1, areaCode, hosId, sourceId, sourceType)
print('request_body', 'd', 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)
id1 = commonFuc().analysis_json('id', data)
info = (id1, id1)
titlename = ('distrBillId1', 'distrBillId2')
# 将配送订单信息息写入到文件中
FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '低值配送单号', titlename, 'message10')
if code == 0:
commonFuc().check_text_exist(code, result)
else:
commonFuc().check_text_exist('error', result)
# ==================订单配送=====================================
list_a = []
list_b = []
list_c = []
list_a.append(data)
list_b.append(data)
list_c.append(data)
# print('list_a', len(list_a), list_a)
info = (list_a, list_b, list_c)
titlename = ('list_a', 'list_b', 'list_c')
# 将验收单详细信息写入到文件中
FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '验收单库存详情信息', titlename, 'message17')
time.sleep(6)
# ============= # =============查看验收单详情================================================
# ================================入库上架===================
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "stock_detail_submit_url")
viewId = 'h03470000306444442024-10-30100支/100'
shelfCode = 'areah03471250-2-01-01'
sourceId = 'CHECKh03472024042300019'
sourceType = 'PSD'
sourceVersion = '0'
targetDeptId = deptid1
targetDeptName = '设备科001'
targetAreaCode = areaCode
targetAreaName = '自动化测试'
# 从message17文件中获取信息
info = FileUtils().r_info8('b5_spd3_core_business_flow', "验收单库存详情信息", 'message17')
# print('info', info)
list_a = info['list_a']
print('list_a', list_a)
for i in list_a:
print('i', i)
for j in i:
viewId = j["viewId"]
shelfCode=j['shelfCode']
sourceId=j['id']
break
# 从message16文件中获取信息
info = FileUtils().r_info8('b5_spd3_core_business_flow', "上架入库列表数据", 'message16')
list_a = info['list_a']
print('list_a', list_a)
for i in list_a:
for j in i:
sourceId = j['sourceId']
break
request_body = commonFuc().get_business_data(module, "payload5", viewId, shelfCode, sourceId, sourceType,
sourceVersion, targetDeptId,
targetDeptName, targetAreaCode, targetAreaName)
print('request_body',request_body)
result = commonFuc().http_post(url, request_body, headers)
print('result', result)
# ================================入库上架
try:
check and accept(1) # 1低值
# check_accept_order(1)
# check_accept_order(2)
# check_accept_order(3)
putaway()
except Exception as e:
print('请检查脚本或者数据')
print("发生异常:", str(e))
traceback.print_exc()
else:
commonFuc().check_text_exist_result_text('succeed', 'succeed')
commonFuc().check_text_exist_result_text('succees', 'succees')
"check_wait_page_url": "/api/herpService/stock/check/wait/page"
"check_wait_detail_url": "/api/herpService/stock/check/wait/detail"
"check_barcode_save_url": "/api/herpService/stock/check/barcode/batch/save"
"check_submit_url": "/api/herpService/stock/check/submit"
"stock_detail_url": "/api/herpService/stock/in/detail"
"stock_detail_submit_url": "/api/herpService/stock/in/submit"
"stock_in_page_url": "/api/herpService/stock/in/page"
"username": "xhs1009"
"password": "1qaz!QAZ"
"password1": "a123456!"
"X-APP-CODE": "herp.pc"
json_contentType: "application/json"
json_headers: {
"Content-Type": "%s"
}
json_headers2: {
"Content-Type": "%s",
"token": "%s",
"X-APP-CODE":"%s"
}
"payload": {"pageNum": 1,"pageSize":50,"queryObject":{"hosId":"%s","branchId":"%s","sourceOrderNo":"%s","sourceOrgName":"","sourceType":"","taskType":0}}
"payload1": {"sourceId":"%s","sourceType":"%s","billMode":"%s","branchId":"%s"}
"payload2": {"sourceBillId":"%s","viewIdList":["%s"],"scanStatus":1}
"payload3": {"billMode":"%s","branchId":"%s","checkAll":1,"deptId":"%s","deptName":"%s","hosId":"%s","provId":"%s","provName":"%s","recOrgId":"%s","recOrgName":"%s","resendStatus":null,"rejectReason":null,"sourceId":"%s","sourceVersion":"%s","sourceType":"%s","tbStatus":"%s","createUser":"%s","sourceNo":"%s","sterilizeList":[],"remark":"","rejectFlag":0,"detailList":[{"id":"%s","viewId":"%s","settlement":"%s","checkQty":100,"recTemperature":"%s","recHumidity":"%s"}]}
"payload4": {"targetDeptId":"%s","targetAreaCode":"%s","hosId":"%s","sourceId":"%s","sourceType":"%s","pkgTaskId":null}
"payload5": {"batchList":[{"viewId":"%s","shelfCode":"%s"}],"sourceId":"%s","sourceType":"%s","sourceVersion":"%s","targetDeptId":"%s","targetDeptName":"%s","targetAreaCode":"%s","targetAreaName":"%s","pkgTaskId":null}
"payload6": {"pageNum":1,"pageSize":50,"orderBy":"","queryObject":{"branchId":"%s","taskType":0,"stockKind":"","sourceOrgName":"","hosId":"%s"}}
\ No newline at end of file
......@@ -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'>1</td>
<td class='details-col-elapsed'>1分54秒</td>
<td class="details-col-elapsed">100.0%</td>
<td class='details-col-elapsed'>0分8秒</td>
<td class="details-col-elapsed">50.0%</td>
</tr>
</table>
......@@ -72,9 +72,16 @@
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/a_a6流程五_中心库入库结算_正结算2_外网配送/log.html' target='_blank'>a_a6流程五_中心库入库结算_正结算2_外网配送</a></td>
<td class="details-col-elapsed"><a href='../log/r_b9库房管理_库区设置_库房查询_查询全部/log.html' target='_blank'>r_b9库房管理_库区设置_库房查询_查询全部</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">114.76</td>
<td class="details-col-elapsed">2.129</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/r_c3库房管理_库区设置_新增库区/log.html' target='_blank'>r_c3库房管理_库区设置_新增库区</a></td>
<td class="fail">失败</td>
<td class="details-col-elapsed">5.917</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