Commit 7dbe912b authored by xiao-hesheng's avatar xiao-hesheng
Browse files

脚本优化

parent 4dd0acce
......@@ -96,7 +96,7 @@ def center_Stock_unpack(type): # 扫码发放(高值不能扫码发放)
areaName = 'areaName'
shelfCode = 'shelfCode'
codeType = 'codeType'
tagType = 'tagType'
# tagType = 'tagType'
hosGoodsId = 'hosGoodsId'
mdmGoodsCode = 'mdmGoodsCode'
goodsCode = 'goodsCode'
......@@ -168,7 +168,7 @@ def center_Stock_unpack(type): # 扫码发放(高值不能扫码发放)
request_body = commonFuc().get_business_data(module, "payload68", stockId, stockName, areaCode, areaName, UTid,
createTime, UTid, hosId,
stockId,
areaCode, areaName, shelfCode, codeType, tagType, hosGoodsId,
areaCode, areaName, shelfCode, codeType, hosGoodsId,
mdmGoodsCode, goodsCode, goodsDi, barName, batchCode, expdtDate,
productDate, pkgCode, pkgCodeSee, ssccCode, tbStatus, pkgDefId,
pkgDefQty,
......@@ -177,66 +177,10 @@ def center_Stock_unpack(type): # 扫码发放(高值不能扫码发放)
goodsMfrsName, goodsSpec, unit, goodsName, pkgDefId, pkgDefQty,
pkgDefName, printNum, made, unitName, hosGoodsCode, purModeText)
print('request_body', 'ccccccc', request_body)
import pdb
pdb.set_trace()
# # # # 发送请求
result = commonFuc().http_post(url, request_body, headers)
print('result', result)
PICK_ID = commonFuc().analysis_json('data', result)
# =====================出库复核列表查询获取pickid===============
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
"herpService_pick_return_page_url")
print('url', url)
request_body = commonFuc().get_business_data(module, "payload20", get_branch_id(), get_hosid(), deptid1)
# # # # 发送请求
result = commonFuc().http_post(url, request_body, headers)
print('result', result)
# =====================出库复核列表查询获取pickid===============
# =======================查看出库单详细信息===============
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
"herpService_pick_checkReview_url")
url = url + ' '.join(PICK_ID) + '?pickedFlag=true'
print('url', url)
# # # # 发送请求
result = commonFuc().http_get(url, headers)
print('查看出库单详细信息result', result)
# =======================查看出库单详细信息===============
# ========================扫码复核
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
"herpService_stock_hdiBarcode_scan_url")
url = url + pkgCode
print('url', url)
# # # # 发送请求
result = commonFuc().http_get(url, headers)
print('扫码复核result', result)
data = commonFuc().analysis_json('data', result)
UT_id = commonFuc().analysis_json('id', data)
createTime = commonFuc().analysis_json('createTime', data)
snCode = commonFuc().analysis_json('snCode', data)
tbStatus = commonFuc().analysis_json('tbStatus', data)
print(UT_id)
# ========================扫码复核
# ========出库复核提交==========
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
"herpService_stock_review_pass_submit_url")
print('url', url)
sourceId = ' '.join(PICK_ID)
# 请求体
request_body = commonFuc().get_business_data(module, "payload21", UT_id, createTime, snCode, hosId, stockId,
areaCode, areaName, shelfCode, codeType, hosGoodsId,
mdmGoodsCode, goodsCode, goodsDi, barName, batchCode, expdtDate,
productDate, pkgCode, pkgCodeSee, ssccCode, tbStatus,
distrDetailId,
distrBillId, purBillId, pkgDefQty, pkgDefId, pkgDefName, purMode,
goodsMfrsName, goodsSpec, unit, goodsName, pkgDefId, pkgDefQty,
pkgDefName, made, hosGoodsCode, sourceId)
print('request_body', request_body)
# # # # 发送请求
result = commonFuc().http_post(url, request_body, headers)
print('herpService_stock_review_pass_submit_urlresult', result)
# ========出库复核提交
elif type == 3:
print('试剂产品扫码发放')
module = "b5_spd3_core_business_flow"
......@@ -249,71 +193,98 @@ def center_Stock_unpack(type): # 扫码发放(高值不能扫码发放)
token, projectCode, uxid, corpId, info = login(username, password, 2)
# 登录获取用户id等信息,使用创建的用户登录============结束
# 到库房明细查询,查询产品的udi码
get_udi(3)
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_pick_submit_url")
udi_code = get_udi1(3)
# 扫码====================
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
"herpService_stock_pick_scan_url")
# 从message18文件中获取信息
info = FileUtils().r_info8(module, "条码信息", 'message18')
# print('info', info)
list_a = info['list_a']
stockId = commonFuc().analysis_json('stockId', list_a)
stockName = commonFuc().analysis_json('stockName', list_a)
areaCode = commonFuc().analysis_json('areaCode', list_a)
areaName = commonFuc().analysis_json('areaName', list_a)
deptId2 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid2"]
targetDeptId = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid1"]
deptName = get_branch_name()
targetStockId = get_stockId(deptName + '中心库房', 1)
request_body = commonFuc().get_business_data(module, "payload67", udi_code, stockId, stockName, areaCode,
areaName
)
print('request_body', request_body)
result = commonFuc().http_post(url, request_body, headers)
print('扫码发放result', result)
price = commonFuc().analysis_json('price', commonFuc().analysis_json('data', result))
createTime = commonFuc().analysis_json('createTime', commonFuc().analysis_json('data', result))
hosId = commonFuc().analysis_json('hosId', commonFuc().analysis_json('data', result))
tbStatus = commonFuc().analysis_json('tbStatus', commonFuc().analysis_json('data', result))
printNum = commonFuc().analysis_json('printNum', commonFuc().analysis_json('data', result))
# 扫码=======================
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_centCbSubmit_url")
print('url', url)
headers = commonFuc().get_business_data(module, "json_headers2",
commonFuc().get_business_data(module, "json_contentType"), token,
commonFuc().get_business_data(module, "X-APP-CODE"))
# 从文件中获取必要信息
info = FileUtils().r_info8(module, "条码信息", 'message18')
# print('info', info)
list_a = info['list_a']
# print('list_a', list_a[0], type(list_a), len(list_a))
UTid = 'UT'
areaCode = 'areaCode';
createTime = 'createTime';
hosId = 'hosId';
stockId = 'stockId';
areaCode = 'areaCode';
areaName = 'areaName';
areaCode = 'areaCode'
# createTime = 'createTime'
hosId = 'hosId'
stockId = 'stockId'
areaCode = 'areaCode'
areaName = 'areaName'
shelfCode = 'shelfCode'
codeType = 'codeType';
tagType = 'tagType';
hosGoodsId = 'hosGoodsId';
mdmGoodsCode = 'mdmGoodsCode';
goodsCode = 'goodsCode';
goodsDi = 'goodsDi';
barName = 'barName';
codeType = 'codeType'
# tagType = 'tagType'
hosGoodsId = 'hosGoodsId'
mdmGoodsCode = 'mdmGoodsCode'
goodsCode = 'goodsCode'
goodsDi = 'goodsDi'
barName = 'barName'
batchCode = 'batchCode'
expdtDate = 'expdtDate';
expdtDate = 'expdtDate'
productDate = 'productDate'
pkgCode = 'pkgCode'
print('aaaaaaaaaaaaaaaaaaaaaaaaa', list_a[0])
list_b = list_a[0]
for i in list_b:
for i in list_a:
print(i)
UTid = i['id']
areaCode = i['areaCode']
createTime = i['createTime']
hosId = i['hosId']
stockId = i['stockId'];
areaCode = i['areaCode'];
areaName = i['areaName'];
# createTime = i['createTime']
# hosId = i['hosId']
stockId = i['stockId']
areaCode = i['areaCode']
areaName = i['areaName']
shelfCode = i['shelfCode']
codeType = i['codeType'];
tagType = i['tagType'];
hosGoodsId = i['hosGoodsId'];
mdmGoodsCode = i['mdmGoodsCode']
goodsCode = i['goodsCode'];
goodsDi = i['goodsDi'];
barName = i['barName'];
codeType = i['codeType']
# tagType = i['tagType']
hosGoodsId = i['hosGoodsId']
# mdmGoodsCode = i['mdmGoodsCode']
goodsCode = i['goodsCode']
# goodsDi = i['goodsDi']
barName = i['barName']
batchCode = i['batchCode']
expdtDate = i['expdtDate'];
expdtDate = i['expdtDate']
productDate = i['productDate']
pkgCode = i['pkgCode']
# pkgCode = i['pkgCode']
pkgCodeSee = i['pkgCodeSee']
ssccCode = i['ssccCode']
tbStatus = i['tbStatus']
# tbStatus = i['tbStatus']
onlyKey = i['hosGoodsId']
ext = i['ext']
ext = i['extInfo']
print('ext', ext)
distrDetailId = ext['distrDetailId']
distrBillId = ext['distrBillId']
purBillId = ext['purBillId']
pkgDefQty = ext['pkgDefQty']
pkgDefId = ext['pkgDefId']
pkgDefName = ext['pkgDefName']
distrDetailId = reGetString(ext, r'distrDetailId": "', r'", ')
distrBillId = reGetString(ext, r'distrBillId": "', r'", ')
purBillId = reGetString(ext, r'purBillId": "', r'", ')
pkgDefQty = reGetString(ext, r'pkgDefQty": "', r'", ')
pkgDefId = reGetString(ext, r'pkgDefId": "', r'", ')
pkgDefName = reGetString(ext, r'pkgDefName": "', r'", ')
purMode = i['purMode']
goodsMfrsName = i['goodsMfrsName']
goodsSpec = i['goodsSpec']
......@@ -324,97 +295,43 @@ def center_Stock_unpack(type): # 扫码发放(高值不能扫码发放)
pkgDefName = i['pkgDefName']
# printNum = i['printNum']
made = i['made']
provId = i['provId']
provName = i['provName']
subProvId = i['subProvId']
subProvName = i['subProvName']
# provId = i['provId']
# provName = i['provName']
# subProvId = i['subProvId']
# subProvName = i['subProvName']
hosGoodsCode = i['hosGoodsCode']
subSendFlag = i['subSendFlag']
# subSendFlag = i['subSendFlag']
areaName = i['areaName']
hosId = i['hosId']
# hosId = i['hosId']
unitName = i['unitName']
purModeText = i['purModeText']
extInfo = i['extInfo']
inStockTime = reGetString(extInfo, r'inStockTime": "', r'",')
break
deptid1 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid1"]
deptName = FileUtils().r_info8('b2_herp3_bs', '所有科室name', 'message6')["deptid1"]
# # 请求体
request_body = commonFuc().get_business_data(module, "payload19", areaCode, UTid, createTime, UTid, hosId,
request_body = commonFuc().get_business_data(module, "payload69", stockId, stockName, areaCode, areaName, UTid,
createTime, UTid, hosId,
stockId,
areaCode, areaName, shelfCode, codeType, tagType, hosGoodsId,
areaCode, areaName, shelfCode, codeType, hosGoodsId,
mdmGoodsCode, goodsCode, goodsDi, barName, batchCode, expdtDate,
productDate, pkgCode, pkgCodeSee, ssccCode, tbStatus,
distrDetailId,
distrBillId, purBillId, pkgDefQty, pkgDefId, pkgDefName, purMode,
productDate, pkgCode, pkgCodeSee, ssccCode, tbStatus, pkgDefId,
pkgDefQty,
purBillId, pkgDefName, distrBillId, inStockTime, distrDetailId,
purMode, price,
goodsMfrsName, goodsSpec, unit, goodsName, pkgDefId, pkgDefQty,
pkgDefName, printNum, made, provId, provName, subProvId,
subProvName,
hosGoodsCode, subSendFlag, onlyKey, areaName, hosId,
get_branch_id(),
deptid1, deptName, stockId)
pkgDefName, printNum, made, unitName, hosGoodsCode, purModeText)
print('request_body', 'ccccccc', request_body)
# # # # 发送请求
result = commonFuc().http_post(url, request_body, headers)
print('result', result)
PICK_ID = commonFuc().analysis_json('data', result)
# =====================出库复核列表查询获取pickid===============
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
"herpService_pick_return_page_url")
print('url', url)
request_body = commonFuc().get_business_data(module, "payload20", get_branch_id(), get_hosid(), deptid1)
# # # # 发送请求
result = commonFuc().http_post(url, request_body, headers)
print('result', result)
# =====================出库复核列表查询获取pickid===============
# =======================查看出库单详细信息===============
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
"herpService_pick_checkReview_url")
url = url + ' '.join(PICK_ID) + '?pickedFlag=true'
print('url', url)
# # # # 发送请求
result = commonFuc().http_get(url, headers)
print('查看出库单详细信息result', result)
# =======================查看出库单详细信息===============
# ========================扫码复核
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
"herpService_stock_hdiBarcode_scan_url")
url = url + pkgCode
print('url', url)
# # # # 发送请求
result = commonFuc().http_get(url, headers)
print('扫码复核result', result)
data = commonFuc().analysis_json('data', result)
UT_id = commonFuc().analysis_json('id', data)
createTime = commonFuc().analysis_json('createTime', data)
snCode = commonFuc().analysis_json('snCode', data)
tbStatus = commonFuc().analysis_json('tbStatus', data)
print(UT_id)
# ========================扫码复核
# ========出库复核提交==========
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
"herpService_stock_review_pass_submit_url")
print('url', url)
sourceId = ' '.join(PICK_ID)
# 请求体
request_body = commonFuc().get_business_data(module, "payload21", UT_id, createTime, snCode, hosId, stockId,
areaCode, areaName, shelfCode, codeType, tagType, hosGoodsId,
mdmGoodsCode, goodsCode, goodsDi, barName, batchCode, expdtDate,
productDate, pkgCode, pkgCodeSee, ssccCode, tbStatus,
distrDetailId,
distrBillId, purBillId, pkgDefQty, pkgDefId, pkgDefName, purMode,
goodsMfrsName, goodsSpec, unit, goodsName, pkgDefId, pkgDefQty,
pkgDefName, made, hosGoodsCode, sourceId)
print('request_body', request_body)
# # # # 发送请求
result = commonFuc().http_post(url, request_body, headers)
print('herpService_stock_review_pass_submit_urlresult', result)
# ========出库复核提交
try:
updateUserLoginDefaultRange(get_listUserMgrRangePage1(1)) # 设置登录账号默认权限是二级库
center_Stock_unpack(1) # 低值耗材退货出库
center_Stock_unpack(2) # 试剂耗材退货出库
# center_Stock_unpack(1) # 低值耗材退货出库
center_Stock_unpack(3) # 试剂耗材退货出库
commonFuc().check_text_exist_result_text('succees', 'succees')
except:
commonFuc().check_text_exist_result_text('error', '1')
......@@ -524,5 +524,130 @@ json_headers2: {
"pickType": "CB",
"tbStatus": 20
}
"payload69": {
"stockId": "%s",
"stockName": "%s",
"areaCode": "%s",
"areaName": "%s",
"barCodeList": [
{
"id": "%s",
"lastModified": null,
"version": null,
"createTime": "%s",
"createUser": null,
"lastModifiedUser": null,
"snCode": "%s",
"hosId": "%s",
"branchId": null,
"stockId": "%s",
"areaCode": "%s",
"areaName": "%s",
"shelfCode": "%s",
"codeType": "%s",
"tagType": 0,
"hosGoodsId": "%s",
"mdmGoodsCode": "%s",
"goodsCode": "%s",
"goodsDi": "%s",
"barName": "%s",
"batchCode": "%s",
"expdtDate": "%s",
"productDate": "%s",
"mfrCode": null,
"mfrCodeSee": null,
"pkgCode": "%s",
"pkgCodeSee": "%s",
"ssccCode": "%s",
"extInfo": null,
"outId": null,
"tbStatus": "%s",
"goodsCodeDi": null,
"barcodeId": null,
"ext": {
"pkgDefId": "%s",
"pkgDefQty": "%s",
"purBillId": "%s",
"pkgDefName": "%s",
"distrBillId": "%s",
"inStockTime": "%s",
"distrDetailId": "%s",
"certificateCode": ""
},
"sourceDetailId": null,
"purMode": "%s",
"purModes": null,
"price":"%s",
"pid": null,
"goodsMfrsName": "%s",
"mfrsName": null,
"goodsSpec": "%s",
"unit": "%s",
"goodsName": "%s",
"pkgDefId": "%s",
"pkgDefQty": "%s",
"defaultPkgDefQty": null,
"defaultQty": null,
"defaultSurplusQty": null,
"defaultPkgDefId": null,
"purDetailId": null,
"pkgDefName": "%s",
"printNum": "%s",
"deptId": null,
"deptName": null,
"billId": null,
"taskId": null,
"made": "%s",
"provId": null,
"provName": null,
"subProvId": null,
"subProvName": null,
"provHosGoodsId": null,
"sourceType": null,
"taskDate": null,
"sourceOrderNo": null,
"taskType": null,
"detailId": null,
"branchGoodsPkgDefList": null,
"unitName": "%s",
"areaCodeList": null,
"diType": null,
"mdmGoodsSpecCode": null,
"hosGoodsCode": "%s",
"supplyId": null,
"inSettlement": null,
"spdGoodsCode": null,
"codeKind": null,
"brand": null,
"miCode": "",
"transferRatio": 1,
"miDjmc": "",
"tbStatusList": null,
"purModeText": "%s",
"stockName": null,
"tbStatusText": null,
"pkgType": null,
"bottleId": null,
"pkgStatus": null,
"qty": 1,
"packUnit": null,
"minSaleQty": null,
"rfidFlag": null,
"mfrCodeFlag": null,
"scanStatus": null,
"scanId": null,
"multiChargeFlag": null,
"useFrequency": null,
"chargeUnit": null,
"lockStatus": null,
"remark": null,
"hosBatchId": null,
"settleFlag": null,
"inStockTime": null
}
],
"pickType": "CB",
"tbStatus": 20
}
"expected_value": "('00004260', 'h0347', 'p1e2ca', '177df1fadf39415ea5ce40e64edf449d', None, '11661208', '11661208', '11661208', '一次性注射器_低值hMY2F','一次性注射器', 'mfrs-11229', '德国歌德公司 Geuder AG', '', None, '', 'ycxzsq_dzhMY2F', None, '支', 'G-31891', Decimal('1.000000'), 2, '3', 10, None, None, '', None, Decimal('99.9999'), None, '德国', None, None, '', 1, None, 0, None, 0, '', '', None, None, 1, 0, 1, 'p1e2ca:UID-051951', datetime.datetime(2024, 6, 26, 7, 1, 39), 'p1e2ca:UID-051951', 0, 0, 1, None)"
"expected_value2": '{"hos_goods_code": "00004249","hos_id": "h0347","prov_id": "p1e2c6","prov_hos_goods_id": "%s","srv_id": null,"mdm_goods_code": "11661197","mdm_goods_spec_code": "11661197","spd_goods_code": "11661197","goods_name": "一次性注射器_低值qPW6a","goods_general_name": "一次性注射器","goods_mfrs_id": "mfrs-11229","goods_mfrs_name": "德国歌德公司 Geuder AG","goods_reg_cert": "","goods_agent_mfrs_id": null,"brand": "","short_pinyin": "ycxzsq_dzqPW6a","kind_sixtyeight_code": null,"unit": "支","goods_spec": "G-31891","goods_package": Decimal("1.000000"),"bar_code_mng": 2,"unique_code_strategy": "3","pur_mode": 10,"sub_pur_mode": null,"erp_code": null,"herp_code": "","hrp": null,"price": Decimal("99.9999"),"abroad_flag": null,"made": "德国","property": null,"mgr_level": null,"goods_desc": "","charge_flag": 1,"focus_control_type": null,"temp_flag": 0,"official_status": null,"focus_control": 0,"storage_conditions": "","transport_conditions": "","into_cost_flag": null,"rfid_flag": null,"purchase_flag": 1,"tb_status": 0,"version": 1,"create_user": "p1e2c6:UID-051946","create_time": datetime.datetime(2024,6,25,7,1,34),"last_modified_user": "p1e2c6:UID-051946","sterilize_flag": 0,"multi_charge_flag": 0,"use_frequency": 1,"charge_unit": null}'
条码信息:
list_a:
- &id001
id: UT240628000602
snCode: UT240628000602
ssccCode: '010839000185971624'
pkgCodeSee: 013703000004299010333112406281725010421UT240628000602
hosGoodsId: h034700004299
hosGoodsCode: '00004299'
goodsCode: '00004299'
goodsName: 一次性注射器_低值aK%^J
id: UT240628001103
snCode: UT240628001103
ssccCode: '010839000186051721'
pkgCodeSee: 0137030000043000104444112406281725010421UT240628001103
hosGoodsId: h034700004300
hosGoodsCode: '00004300'
goodsCode: '00004300'
goodsName: 新型冠状病毒检测试剂NB9uU
goodsSpec: G-31891
goodsMfrsName: 德国歌德公司 Geuder AG
unit:
purMode: 10
batchCode: '333'
purMode: 60
batchCode: '4444'
productDate: '2024-06-28'
expdtDate: '2025-01-04'
pkgDefName: '100'
......@@ -26,13 +26,13 @@
unitName: 100支/100
shelfCode: areah03472500-2-01-01
shelfNo: 自动化测试-2-01-01
pkgDefId: 86c1768645fd4eb298f14e2c9cbdbb91
extInfo: '{"pkgDefId": "86c1768645fd4eb298f14e2c9cbdbb91", "pkgDefQty": 100, "purBillId":
"CG2024062819872", "pkgDefName": "100", "distrBillId": "PSh0347202406280012",
"inStockTime": "2024-06-28 09:02:41", "distrDetailId": "03838916", "certificateCode":
pkgDefId: e7f685371a90478481b0942098c2597b
extInfo: '{"pkgDefId": "e7f685371a90478481b0942098c2597b", "pkgDefQty": 100, "purBillId":
"CG2024062819898", "pkgDefName": "100", "distrBillId": "PSh0347202406280020",
"inStockTime": "2024-06-28 09:02:16", "distrDetailId": "03838924", "certificateCode":
""}'
bottleId:
pkgType: '16'
pkgType: '66'
miDjmc: ''
miCode: ''
transferRatio: 1.0
......@@ -46,8 +46,8 @@
made: 德国
price:
barName: 100支/100
purModeText: 低值耗材
codeType: 16
purModeText: 检验试剂
codeType: 66
list_b:
- *id001
list_c:
......
......@@ -76,9 +76,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
<tr width="600">
<td class='details-col-elapsed'>1</td>
<td class='details-col-elapsed'>0</td>
<td class='details-col-elapsed'>6分0</td>
<td class="details-col-elapsed">0.0%</td>
<td class='details-col-elapsed'>1</td>
<td class='details-col-elapsed'>0分11</td>
<td class="details-col-elapsed">100.0%</td>
</tr>
</table>
......@@ -94,8 +94,8 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
<tr width="600">
<td class="details-col-elapsed"><a href='../log/a_c1流程十八中心库业务_拆包功能/log.html' target='_blank'>a_c1流程十八中心库业务_拆包功能</a></td>
<td class="fail">失败</td>
<td class="details-col-elapsed">360.493</td>
<td class="success">成功</td>
<td class="details-col-elapsed">11.145</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