Skip to content
GitLab
Commit 4b1e60e9 authored by xiao-hesheng's avatar xiao-hesheng
Browse files

脚本优化

parent ed7e4669
Hide whitespace changes
Inline Side-by-side
air_case/public1/public1/public1.py
View file @ 4b1e60e9
......@@ -634,7 +634,7 @@ def get_udi2(type=1): # 二级科室库存明细查询获取条码
if type == 1:
hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId']
GoodsId = hosGoodsId.replace(get_hosid(), '')
request_body = commonFuc().get_business_data(module, "payload17_2", GoodsId, get_branch_id(), deptid2)
request_body = commonFuc().get_business_data(module, "payload17_2", GoodsId, get_branch_id(), deptid2,stockId2)
elif type == 2:
hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId']
GoodsId = hosGoodsId.replace(get_hosid(), '')
......@@ -643,12 +643,12 @@ def get_udi2(type=1): # 二级科室库存明细查询获取条码
elif type == 3:
hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId']
GoodsId = hosGoodsId.replace(get_hosid(), '')
request_body = commonFuc().get_business_data(module, "payload17_2_2", GoodsId, get_branch_id(), deptid2)
request_body = commonFuc().get_business_data(module, "payload17_2_2", GoodsId, get_branch_id(), deptid2,stockId2)
elif type == 4: # 试剂单瓶条码
hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId']
GoodsId = hosGoodsId.replace(get_hosid(), '')
request_body = commonFuc().get_business_data(module, "payload17_3", GoodsId, get_branch_id(), deptid2)
request_body = commonFuc().get_business_data(module, "payload17_3", GoodsId, get_branch_id(), deptid2,stockId2)
print('getudi_request_body', request_body)
# # # # 发送请求
......
data/b5_spd3_core_business_flow/data
View file @ 4b1e60e9
......@@ -110,10 +110,10 @@ json_headers2: {
"payload16": {"invoiceBillIdList":["%s"],"payChannelEnum":"YGPT","hosId":"%s"}
"payload17": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["","","","","",""],"goodsName":"%s","branchId":"%s","purModes":[],"ssccCode":"","deptId":"","deptQuery":false,"bottleId":"","billModes":null,"provId":"","goodsSpec":"","batchCode":"","mfrCode":""}}
"payload17_1": {"pageNum":1,"pageSize":50,"queryObject":{"goodsName":"%s","branchId":"%s","purModes":[""],"ssccCode":"","deptId":"","deptQuery":false,"stockId":"","bottleId":"","billModes":null,"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}}
"payload17_2": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["",""],"goodsName":"%s","branchId":"%s","purModes":["10"],"ssccCode":"","deptId":"%s","deptQuery":true,"bottleId":"","billModes":null,"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}}
"payload17_2": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["",""],"goodsName":"%s","branchId":"%s","purModes":["10"],"ssccCode":"","deptId":"%s","deptQuery":true,"stockId":"%s","bottleId":"","billModes":null,"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}}
"payload17_2_1": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["",""],"goodsName":"%s","branchId":"%s","purModes":["20"],"ssccCode":"","deptId":"%s","deptQuery":true,"stockId":"%s","bottleId":"","billModes":["20"],"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}}
"payload17_2_2": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["",""],"goodsName":"%s","branchId":"%s","purModes":["60"],"ssccCode":"","deptId":"%s","deptQuery":true,"bottleId":"","billModes":["66"],"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}}
"payload17_3": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["",""],"goodsName":"%s","branchId":"%s","purModes":["60"],"ssccCode":"","deptId":"%s","deptQuery":true,"bottleId":"","billModes":["67"],"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}}
"payload17_2_2": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["",""],"goodsName":"%s","branchId":"%s","purModes":["60"],"ssccCode":"","deptId":"%s","deptQuery":true,"stockId":"%s","bottleId":"","billModes":["66"],"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}}
"payload17_3": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["",""],"goodsName":"%s","branchId":"%s","purModes":["60"],"ssccCode":"","deptId":"%s","deptQuery":true,"stockId":"%s","bottleId":"","billModes":["67"],"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}}
"payload18": {"areaCode":"%s","code":"%s","pickType":"TH","stockId":"%s"}
"payload19": {"areaCode":"%s","reasonKind":"1","remark":"","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":"%s","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","ext":{"distrDetailId":"%s","distrBillId":"%s","certificateCode":"","purBillId":"%s","pkgDefQty":"%s","pkgDefId":"%s","pkgDefName":"%s"},"sourceDetailId":null,"purMode":"%s","purModes":null,"price":null,"pid":null,"goodsMfrsName":"%s","mfrsName":null,"goodsSpec":"%s","unit":"%s","goodsName":"%s","pkgDefId":"%s","pkgDefQty":"%s","purDetailId":null,"pkgDefName":"%s","printNum":"%s","deptId":null,"deptName":null,"billId":null,"taskId":null,"made":"%s","provId":"%s","provName":"%s","subProvId":"%s","subProvName":"%s","provHosGoodsId":null,"sourceType":null,"taskDate":null,"sourceOrderNo":null,"taskType":null,"detailId":null,"branchGoodsPkgDefList":null,"unitName":null,"areaCodeList":null,"diType":null,"mdmGoodsSpecCode":null,"hosGoodsCode":"%s","supplyId":null,"inSettlement":null,"spdGoodsCode":null,"codeKind":null,"brand":null,"miCode":null,"transferRatio":1,"miDjmc":null,"tbStatusList":null,"purModeText":null,"stockName":null,"tbStatusText":null,"pkgType":null,"bottleId":null,"pkgStatus":null,"qty":null,"packUnit":null,"minSaleQty":null,"rfidFlag":null,"mfrCodeFlag":null,"scanStatus":null,"scanId":null,"multiChargeFlag":null,"useFrequency":null,"chargeUnit":null,"lockStatus":null,"subSendFlag":"%s","onlyKey":"%s2fa9d44bf3b443f184ea457066259ee13332024-11-02100p1e171p1e171"}],"areaName":"%s","hosId":"%s","branchId":"%s","deptId":"%s","deptName":"%s","stockId":"%s","pickType":"TH"}
......
data/b5_spd3_core_business_flow/message18
View file @ 4b1e60e9
条码信息:
list_a:
- &id001
id: '8800000001073938'
snCode: '8800000001073938'
ssccCode: '010839000186546425'
pkgCodeSee: '0101123456789012102221124070117250107218800000001073938'
hosGoodsId: h034700004336
hosGoodsCode: '00004336'
goodsCode: '00004336'
goodsName: 高值牙钻机coh6B
id: UT240701001619
snCode: UT240701001619
ssccCode: '010839000186546326'
pkgCodeSee: 013710000004337010333112407011725010721UT240701001619
hosGoodsId: h034700004337
hosGoodsCode: '00004337'
goodsCode: '00004337'
goodsName: 一次性注射器_低值xh*Uq
goodsSpec: G-31891
goodsMfrsName: 德国歌德公司 Geuder AG
unit: 支
purMode: 20
batchCode: '222'
purMode: 10
batchCode: '333'
productDate: '2024-07-01'
expdtDate: '2025-01-07'
pkgDefName:
pkgDefQty: 1.0
stockId: bd4c0744cee04b208483483dded13ff8
stockName: 二级检验科002库房
pkgDefName: '100'
pkgDefQty: 100.0
stockId: 699dd747426940b282b69d7acc27d51d
stockName: 三级检测组003库房
areaName: 默认库区
areaCode: areah03472540
areaCode: areah03472538
lockStatus: 0
unitName: 1支
shelfCode: areah03472540-A-01-01
unitName: 100支/100
shelfCode: areah03472538-A-01-01
shelfNo: A01-A-01-01
pkgDefId:
extInfo: '{"pkgDefQty": 1, "purBillId": "CG2024070120188", "distrBillId": "PSh0347202407010055",
"inStockTime": "2024-07-01 10:16:53", "useFrequency": 1, "distrDetailId": "03839024",
"certificateCode": "", "multiChargeFlag": 0}'
pkgDefId: d7b778b300694f3c8351912c561a69a5
extInfo: '{"pkgDefId": "d7b778b300694f3c8351912c561a69a5", "pkgDefQty": 100, "purBillId":
"CG2024070120190", "pkgDefName": "100", "distrBillId": "PSh0347202407010054",
"inStockTime": "2024-07-01 11:15:02", "distrDetailId": "03839023", "certificateCode":
""}'
bottleId:
pkgType: '20'
pkgType: '16'
miDjmc: ''
miCode: ''
transferRatio: 1.0
......@@ -40,13 +41,13 @@
shelfKindName: 普通货位
provName: 国药集团公司l6AP(
provId: p1e2e4
inStockDate: '2024-07-01 10:16:52'
inStockDate: '2024-07-01 11:15:01'
mfrCode:
made: 德国
price:
barName: 1支
purModeText: 高值耗材
codeType: 20
barName: 100支/100
purModeText: 低值耗材
codeType: 16
list_b:
- *id001
list_c:
......
report/summary.html
View file @ 4b1e60e9
......@@ -77,7 +77,7 @@ 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'>1分3秒</td>
<td class='details-col-elapsed'>0分55秒</td>
<td class="details-col-elapsed">0.0%</td>
</tr>
</table>
......@@ -95,7 +95,7 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
<tr width="600">
<td class="details-col-elapsed"><a href='../log/a_b7流程十四退库业务_消耗退库/log.html' target='_blank'>a_b7流程十四退库业务_消耗退库</a></td>
<td class="fail">失败</td>
<td class="details-col-elapsed">63.097</td>
<td class="details-col-elapsed">54.907</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