Commit 23908ee7 authored by xiao-hesheng's avatar xiao-hesheng
Browse files

流程十二脚本编写

parent 20337a54
......@@ -819,7 +819,7 @@ try:
# 从下面开始,上面的暂时注释
goods_move2() # 设置产品出库渠道为直送
updateUserLoginDefaultRange(get_listUserMgrRangePage(2)) # 设置登录账号默认权限是二级库
for i in range(10):
for i in range(3):
# # 低值
second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'], 1)
# # 高值
......
......@@ -2502,6 +2502,7 @@ def pickScan2(PICK_ID, udi_code, type=1): # 二级库出库拣货扫码
result = commonFuc().http_post(url, request_body, headers)
print('result', result)
return areaCode, pickerId
def pickScan3(udi_code, type=1): # 二级库扫码发放
module = "b5_spd3_core_business_flow"
# # 登录获取用户id等信息,使用创建的用户登录===========开始
......@@ -2518,6 +2519,7 @@ def pickScan3(udi_code, type=1): # 二级库扫码发放
# ==============================获取条码信息
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_stock_pick_scan_url")
print('获取条码信息url', url)
deptid2=FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid2"]
deptName = FileUtils().r_info8('b2_herp3_bs', '所有科室name', 'message6')["deptid2"]
stockId = get_stockId(deptName + '库房', 2)
......@@ -2525,10 +2527,10 @@ def pickScan3(udi_code, type=1): # 二级库扫码发放
areaCode=get_stockAreaId_new(deptid2,deptName,2)
request_body = commonFuc().get_business_data(module, "payload60", udi_code,stockId,deptName2,areaCode)
print('获取条码信息request_body',request_body)
import pdb
pdb.set_trace()
result = commonFuc().http_post(url, request_body, headers)
print('获取条码信息result', result)
import pdb
pdb.set_trace()
# 获取必要信息
data1 = commonFuc().analysis_json('data', result)
areaCode = commonFuc().analysis_json('areaCode', data1)
......
低值配送单号:
distrBillId1: PSh0347202406040025
distrBillId2: PSh0347202406040025
distrBillId1: PSh0347202406040047
distrBillId2: PSh0347202406040047
高值配送单号:
distrBillId1: PSh0347202406040026
distrBillId2: PSh0347202406040026
distrBillId1: PSh0347202406040048
distrBillId2: PSh0347202406040048
试剂配送单号:
distrBillId1: PSh0347202406040027
distrBillId2: PSh0347202406040027
distrBillId1: PSh0347202406040049
distrBillId2: PSh0347202406040049
采购计划单号高值:
orderNo1: PLAN2024060425397
orderNo2: PLAN2024060425397
orderNo1: PLAN2024060425423
orderNo2: PLAN2024060425423
采购计划单号试剂:
orderNo1: PLAN2024060425399
orderNo2: PLAN2024060425399
orderNo1: PLAN2024060425424
orderNo2: PLAN2024060425424
......@@ -8,22 +8,22 @@
taskType: 1
sourceOrgId: p1e26b
sourceOrgName: 国药集团公司*0SeL
sourceOrderNo: PSh0347202406040027
sourceOrderNo: PSh0347202406040049
billMode: '66'
stockKind:
purMode:
sourceId: PSh0347202406040027
sourceId: PSh0347202406040049
sourceDetailId:
sourceType: PSD
sourceTypeName: 配送单
sourceVersion: 1
planOrderNo: PLAN2024060425399
purOrderNo: CG2024060417726
planOrderNo: PLAN2024060425421
purOrderNo: CG2024060417752
recOrgId: fce41341f4d441239326a6f655be8a1a
recOrgName: 二级检验科002
billRelationJson: '{"buyBillId":"Bh03472024060400019","planBillId":"Ph034720240604022044","planOrderNo":"PLAN2024060425399","buyOrderNo":"BUY2024060404611","purOrderNo":"CG2024060417726","purBillId":"Ch034720240604000080","purBillDate":"2024-06-04
08:48:54","distrBillId":"PSh0347202406040027","distrOrderNo":"PSh0347202406040027"}'
taskDate: '2024-06-04 08:49:41'
billRelationJson: '{"buyBillId":"Bh03472024060400066","planBillId":"Ph034720240604022066","planOrderNo":"PLAN2024060425421","buyOrderNo":"BUY2024060404658","purOrderNo":"CG2024060417752","purBillId":"Ch034720240604000106","purBillDate":"2024-06-04
14:43:38","distrBillId":"PSh0347202406040049","distrOrderNo":"PSh0347202406040049"}'
taskDate: '2024-06-04 14:44:24'
taskDateStart:
taskDateEnd:
billModeList:
......
......@@ -26,10 +26,10 @@
productDate: '2024-06-04'
provName: 国药集团公司*0SeL
provId:
viewId: '03838027'
viewId: '03838051'
verifyFlag: 0
hasSterilize: 0
id: '03838027'
id: '03838051'
detailRelationJson:
extInfo: '{"goodsGg":"G-31891","goodsCode":"00003976","purMode":60,"goodsName":"新型冠状病毒检测试剂KngvT","ygptCode":"","transCond":"","storageCond":"","erpCode":"11660921","ybDefId":""}'
recTemperature: 20
......
验收单号:
CHECK_NO1: CHECKh03472024060400018
CHECK_NO2: CHECKh03472024060400018
CHECK_NO1: CHECKh03472024060400045
CHECK_NO2: CHECKh03472024060400045
......@@ -16,7 +16,7 @@
pkgDefName: '100'
pkgDefQty: 100.0
pkgQty:
qty: 400.0
qty: 700.0
goodsImg: []
pkgDefId: db3a9047c8e1443cb1de3b11b72f2e98
buyPkgQty:
......
采购计划单号:
orderNo1: PLAN2024060425398
orderNo2: PLAN2024060425398
orderNo1: PLAN2024060425422
orderNo2: PLAN2024060425422
配送订单信息:
list_a:
- &id001
- id: Ch034720240604000080
lastModified: '2024-06-04 08:48:54'
- id: Ch034720240604000106
lastModified: '2024-06-04 14:43:38'
version: 0
createTime: '2024-06-04 08:48:54'
createTime: '2024-06-04 14:43:38'
createUser: h0347_UID-051312
lastModifiedUser:
orderNo: CG2024060417726
orderNo: CG2024060417752
billMode: '66'
recType: HDI
hosId: h0347
......@@ -19,7 +19,7 @@
areaCode:
areaName:
billExpdtDate:
sourceId: Ph034720240604022044
sourceId: Ph034720240604022066
sourceType:
inSettlement:
recUser:
......@@ -47,7 +47,7 @@
sumQty: 100.0
sumPkgQty: 1.0
sumAmount: '9999.9900'
planOrderNo: PLAN2024060425399
planOrderNo: PLAN2024060425421
list_b:
- *id001
list_c:
......
配送订单详细信息:
list_a:
- &id001
- id: 020ff597cf044add8d7b8229d0614c59
- id: 1f2341b0619e4ad79e088e613311b3e7
lastModified:
version:
createTime:
createUser:
lastModifiedUser:
pid: Ch034720240604000080
orderNo: CG2024060417726
sourceId: 145339c4b2724a728ebdbcd57c486f9d
pid: Ch034720240604000106
orderNo: CG2024060417752
sourceId: 9920d433cacd4e34a4fe69f4ce25056f
hosGoodsId: h034700003976
mdmGoodsCode: '11660921'
goodsCode: '00003976'
......@@ -31,7 +31,7 @@
notSendPkgQty: 0.0
inSettlement: 1
closeType: 1
detailRelationJson: '{"planBillId":"Ph034720240604022044","buyDetailId":"Bh034720240604000190001","planDetailId":"145339c4b2724a728ebdbcd57c486f9d"}'
detailRelationJson: '{"planBillId":"Ph034720240604022066","buyDetailId":"Bh034720240604000660001","planDetailId":"9920d433cacd4e34a4fe69f4ce25056f"}'
extInfo: '{"goodsGg":"G-31891","goodsCode":"00003976","purMode":60,"goodsName":"新型冠状病毒检测试剂KngvT"}'
remark:
tbStatus:
......
......@@ -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'>0分57</td>
<td class='details-col-elapsed'>4分1</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">57.633</td>
<td class="details-col-elapsed">241.637</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