Skip to content
GitLab
Commit 8981da14 authored by xiao-hesheng's avatar xiao-hesheng
Browse files

脚本优化

parent 02fe7ddb
Hide whitespace changes
Inline Side-by-side
air_case/b5_spd3_core_business_flow/a_b8流程十五退库业务_三级库向二级库退库.air/a_b8流程十五退库业务_三级库向二级库退库.py
View file @ 8981da14
......@@ -36,7 +36,7 @@ def second_dept_return_Out_Stock(type): # 三级库退库出库
commonFuc().get_business_data(module, "X-APP-CODE"))
if type == 2:
udi_code = get_udi2(2) # 获取条码 低值1 高值2 试剂3
udi_code = get_udi3(2) # 获取条码 低值1 高值2 试剂3
# 高值退库出库
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
......@@ -168,7 +168,7 @@ def second_dept_return_Out_Stock(type): # 三级库退库出库
print('result', result)
elif type == 1:
print('低值耗材或者试剂退库出库')
udi_code = get_udi2(1) # 获取条码 低值1 高值2 试剂3
udi_code = get_udi3(1) # 获取条码 低值1 高值2 试剂3
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
"herpService_stock_pick_scan_url")
# 从message18文件中获取信息
......@@ -295,7 +295,7 @@ def second_dept_return_Out_Stock(type): # 三级库退库出库
print('低值产品退库出库，result', result)
elif type == 3:
print('试剂产品退库出库')
udi_code = get_udi2(3) # 获取条码 低值1 高值2 试剂3
udi_code = get_udi3(3) # 获取条码 低值1 高值2 试剂3
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
"herpService_stock_pick_scan_url")
# 从message18文件中获取信息
......
air_case/public1/public1/public1.py
View file @ 8981da14
......@@ -681,6 +681,72 @@ def get_udi2(type=1): # 二级科室库存明细查询获取条码
break
return pkgCodeSee
def get_udi3(type=1): # 三级科室库存明细查询获取条码
# type=1低值 2高值 3试剂
module = "b5_spd3_core_business_flow"
token, projectCode1, uxid1, corpId1, info1 = call_login()
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
"herpService_stock_barcode_page_url")
print('get_udi', 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"))
# # 请求体
request_body = 'request_body'
deptName3 = FileUtils().r_info8('b2_herp3_bs', '所有科室name', 'message6')["deptid3"]
stockId3 = get_stockId(deptName3 + '库房', 3)
deptid3 = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3']
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(), deptid3,stockId3)
elif type == 2:
hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId']
GoodsId = hosGoodsId.replace(get_hosid(), '')
request_body = commonFuc().get_business_data(module, "payload17_2_1", GoodsId, get_branch_id(), deptid3,stockId3)
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(), deptid3,stockId3)
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(), deptid3,stockId3)
print('getudi_request_body', request_body)
# # # # 发送请求
result = commonFuc().http_post(url, request_body, headers)
# import pdb
# pdb.set_trace()
print('aaaaaaaaaaaaaaaaresult', result)
data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))
print('条码库存result', result)
pkgCodeSee = 'pkgCodeSee'
for i in data1:
lockStatus = commonFuc().analysis_json('lockStatus', i)
if lockStatus == 0:
print('lockStatus', lockStatus)
pkgCodeSee = commonFuc().analysis_json('pkgCodeSee', i)
pkgcode = commonFuc().analysis_json('pkgCodeSee', i)
# # 将条码信息写入文件
list_a = []
list_b = []
list_c = []
list_a.append(i)
list_b.append(i)
list_c.append(i)
# 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, module, '条码信息', titlename, 'message18')
break
return pkgCodeSee
def get_udi(type=1): # 退货出库扫条码
# type=1低值 2高值 3试剂
......
data/a2_mdm3_ea/message
View file @ 8981da14
企业信息:
e_id: CR202407020038
cname: 国药集团公司kGTpV
e_id: CR202407030038
cname: 国药集团公司MPah7
data/a3_mdm3_hs/message
View file @ 8981da14
医院信息:
h_id: 湖南省人民医院W1A@i
h_name: 湖南省人民医院W1A@i
h_id: 湖南省人民医院!^KoE
h_name: 湖南省人民医院!^KoE
data/a5_mdm3_pdm/message2
View file @ 8981da14
产品审核信息:
MSPid: MSP2407020011_1
MSPid: MSP2407030011_1
hosId: h0347
hosGoodsId: h034700004356
provGoodsid: provGood-99221551
goodsAuditBillId: MSP2407020011
targetId: MSP2407020011_1
hosGoodsId: h034700004382
provGoodsid: provGood-99221577
goodsAuditBillId: MSP2407030011
targetId: MSP2407030011_1
data/a6_mdm3_si/message
View file @ 8981da14
......@@ -2,10 +2,10 @@
list_a:
- &id001
settleMonth: '202407'
pid: OBh0347202407020009
hosGoodsId: h034700004353
goodsCode: '00004353'
goodsName: 一次性注射器_低值NaZMe
pid: OBh0347202407030004
hosGoodsId: h034700004379
goodsCode: '00004379'
goodsName: 一次性注射器_低值KBYLs
goodsGg: G-31891
mfrsName: 德国歌德公司 Geuder AG
unit: 支
......@@ -20,14 +20,14 @@
normalContractId:
normalContract: '1'
detailList:
- pid: OBh0347202407020009
- pid: OBh0347202407030004
settleMonth: '202407'
accountDate: '2024-07-02'
hosGoodsId: h034700004353
accountDate: '2024-07-03'
hosGoodsId: h034700004379
batchCode: '333'
distrDetailId: '03839046'
distrId: PSh0347202407020009
distrOrderNo: PSh0347202407020009
distrDetailId: '03839114'
distrId: PSh0347202407030002
distrOrderNo: PSh0347202407030002
settlePrice: 99.9999
maxSettleQty: -100.0
maxSettleAmount: -9999.99
......@@ -36,11 +36,11 @@
leftSettleQty: -100.0
leftSettleAmount: -9999.99
hosId: h0347
provId: p1e2e8
branchId: h0347-3712
balanceDetId: OBh0347202407020009-000001
provId: p1e2ec
branchId: h0347-3714
balanceDetId: OBh0347202407030004-000001
purMode: 10
barCode: 013712000004353010333112407021725010821UT240702000208
barCode: 013714000004379010333112407031725010921UT240703000002
batchId:
price:
maxQty:
......@@ -53,15 +53,15 @@
volumeFlag:
onlineKind:
invoicePrice: 99.9999
viewId: 202407OBh0347202407020009h034700004353
- pid: OBh0347202407020009
viewId: 202407OBh0347202407030004h034700004379
- pid: OBh0347202407030004
settleMonth: '202407'
accountDate: '2024-07-02'
hosGoodsId: h034700004353
accountDate: '2024-07-03'
hosGoodsId: h034700004379
batchCode: '333'
distrDetailId: '03839086'
distrId: PSh0347202407020049
distrOrderNo: PSh0347202407020049
distrDetailId: '03839114'
distrId: PSh0347202407030002
distrOrderNo: PSh0347202407030002
settlePrice: 99.9999
maxSettleQty: 100.0
maxSettleAmount: 9999.99
......@@ -70,11 +70,11 @@
leftSettleQty: 100.0
leftSettleAmount: 9999.99
hosId: h0347
provId: p1e2e8
branchId: h0347-3712
balanceDetId: OBh0347202407020009-000002
provId: p1e2ec
branchId: h0347-3714
balanceDetId: OBh0347202407030004-000002
purMode: 10
barCode: 013712000004353010333112407021725010821UT240702001613
barCode: 013714000004379010333112407031725010921UT240703000025
batchId:
price:
maxQty:
......@@ -87,10 +87,10 @@
volumeFlag:
onlineKind:
invoicePrice: 99.9999
viewId: 202407OBh0347202407020009h034700004353
unique: 202407OBh0347202407020009h034700004353
viewId: 202407OBh0347202407030004h034700004379
unique: 202407OBh0347202407030004h034700004379
onlineKind: '10'
viewId: 202407OBh0347202407020009h034700004353
viewId: 202407OBh0347202407030004h034700004379
list_b:
- *id001
list_c:
......
data/b2_herp3_bs/message
View file @ 8981da14
院区新增:
branch_id: h0347-3712
branch_name: 东土城路院区$!ZNd
branch_id: h0347-3714
branch_name: 东土城路院区QJH)#
科室信息:
dept2_id: 08398b8842854e85b738846cbcbb97f7
dept2_id: b8cbdc0117e8499cb1ccac00cb6166ca
dept2_name: 二级检验科002
data/b2_herp3_bs/message3
View file @ 8981da14
用户名信息:
username1: 自动化测试0oUY#
username2: 自动化测试0oUY#
username1: 自动化测试lPIo0
username2: 自动化测试lPIo0
data/b2_herp3_bs/message4
View file @ 8981da14
一级科室信息:
dept1_id: 533beea90bd8402fa62377a5a84befd6
dept1_id: 0b61ab7ea9b746a3844426111c5ec6db
dept1_name: 设备科001
data/b2_herp3_bs/message6
View file @ 8981da14
所有科室id:
deptid1: 533beea90bd8402fa62377a5a84befd6
deptid2: 08398b8842854e85b738846cbcbb97f7
deptid3: 90ffdd89a239466983c18d20c1730a3d
deptid4: 271b96c808c94c4092c0d0c8f55aa397
deptid5: 5e2a2dfd8379430e8d7c76ad095c74da
deptid1: 0b61ab7ea9b746a3844426111c5ec6db
deptid2: b8cbdc0117e8499cb1ccac00cb6166ca
deptid3: f10f9bac7ca3421093f6f20e4f71d1ca
deptid4: 3e5f25d08e33424288d9d0f223eb3b00
deptid5: fe6d1b6f141d4f0490bbaae4fd23de77
所有科室name:
deptid1: 设备科001
deptid2: 二级检验科002
......
data/b2_herp3_bs/message7
View file @ 8981da14
shelfinfo:
shelfid: 59aebd42a2f7415aa83296b106026ae6
shelfCode: areah03472553
shelfid: 8125a0cfb1d74982abbd67e19f2547e8
shelfCode: areah03472565
areaName: 自动化测试
data/b5_spd3_core_business_flow/message
View file @ 8981da14
供货关系申请2:
e_corpId: p1e2e8
e_corpId: p1e2ec
h_corpId: h0347
e_username: 国药集团公司kGTpV
e_username: 国药集团公司MPah7
h_name: test001
data/b5_spd3_core_business_flow/message1
View file @ 8981da14
产品审核信息:
MSPid: MSP2407020007_1
MSPid: MSP2407030007_1
hosId: h0347
hosGoodsId: h034700004352
provGoodsid: provGood-99221547
goodsAuditBillId: MSP2407020007
targetId: MSP2407020007_1
hosGoodsId: h034700004378
provGoodsid: provGood-99221573
goodsAuditBillId: MSP2407030007
targetId: MSP2407030007_1
data/b5_spd3_core_business_flow/message10
View file @ 8981da14
低值配送单号:
distrBillId1: PSh0347202407020072
distrBillId2: PSh0347202407020072
distrBillId1: PSh0347202407030021
distrBillId2: PSh0347202407030021
高值配送单号:
distrBillId1: PSh0347202407020073
distrBillId2: PSh0347202407020073
distrBillId1: PSh0347202407030022
distrBillId2: PSh0347202407030022
试剂配送单号:
distrBillId1: PSh0347202407020074
distrBillId2: PSh0347202407020074
distrBillId1: PSh0347202407030023
distrBillId2: PSh0347202407030023
data/b5_spd3_core_business_flow/message11
View file @ 8981da14
采购计划单号高值:
orderNo1: PLAN2024070231020
orderNo2: PLAN2024070231020
orderNo1: PLAN2024070331116
orderNo2: PLAN2024070331116
data/b5_spd3_core_business_flow/message12
View file @ 8981da14
采购计划单号试剂:
orderNo1: PLAN2024070231021
orderNo2: PLAN2024070231021
orderNo1: PLAN2024070331114
orderNo2: PLAN2024070331114
data/b5_spd3_core_business_flow/message13
View file @ 8981da14
......@@ -3,27 +3,27 @@
- &id001
- id:
hosId: h0347
branchId: h0347-3712
branchId: h0347-3714
deptId:
taskType: 1
sourceOrgId: p1e2e8
sourceOrgName: 国药集团公司kGTpV
sourceOrderNo: PSh0347202407020074
sourceOrgId: p1e2ec
sourceOrgName: 国药集团公司MPah7
sourceOrderNo: PSh0347202407030023
billMode: '66'
stockKind:
purMode:
sourceId: PSh0347202407020074
sourceId: PSh0347202407030023
sourceDetailId:
sourceType: PSD
sourceTypeName: 配送单
sourceVersion: 1
planOrderNo: PLAN2024070231021
purOrderNo: CG2024070220362
recOrgId: 08398b8842854e85b738846cbcbb97f7
planOrderNo: PLAN2024070331114
purOrderNo: CG2024070320422
recOrgId: b8cbdc0117e8499cb1ccac00cb6166ca
recOrgName: 二级检验科002
billRelationJson: '{"buyBillId":"Bh03472024070200115","planBillId":"Ph034720240702027666","planOrderNo":"PLAN2024070231021","buyOrderNo":"BUY2024070205552","purOrderNo":"CG2024070220362","purBillId":"Ch034720240702000158","purBillDate":"2024-07-02
16:49:14","distrBillId":"PSh0347202407020074","distrOrderNo":"PSh0347202407020074"}'
taskDate: '2024-07-02 16:50:11'
billRelationJson: '{"buyBillId":"Bh03472024070300022","planBillId":"Ph034720240703027759","planOrderNo":"PLAN2024070331114","buyOrderNo":"BUY2024070305586","purOrderNo":"CG2024070320422","purBillId":"Ch034720240703000051","purBillDate":"2024-07-03
07:42:40","distrBillId":"PSh0347202407030023","distrOrderNo":"PSh0347202407030023"}'
taskDate: '2024-07-03 07:42:58'
taskDateStart:
taskDateEnd:
billModeList:
......
data/b5_spd3_core_business_flow/message14
View file @ 8981da14
......@@ -3,11 +3,11 @@
- &id001
- purMode: 60
unitName: 100支/100
hosGoodsId: h034700004354
hosGoodsId: h034700004380
mdmGoodsCode:
spdGoodsCode: '11661307'
goodsCode: '00004354'
goodsName: 新型冠状病毒检测试剂j(r&Q
spdGoodsCode: '11661333'
goodsCode: '00004380'
goodsName: 新型冠状病毒检测试剂Gg(sT
goodsGg: G-31891
mfrsId:
mfrsName: 德国歌德公司 Geuder AG
......@@ -22,16 +22,16 @@
pkgDefName: '100'
pkgDefQty: 100.0
batchCode: '4444'
expdtDate: '2025-01-08'
productDate: '2024-07-02'
provName: 国药集团公司kGTpV
expdtDate: '2025-01-09'
productDate: '2024-07-03'
provName: 国药集团公司MPah7
provId:
viewId: '03839111'
viewId: '03839135'
verifyFlag: 0
hasSterilize: 0
id: '03839111'
id: '03839135'
detailRelationJson:
extInfo: '{"goodsGg":"G-31891","goodsCode":"00004354","purMode":60,"goodsName":"新型冠状病毒检测试剂j(r&Q","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661307","ybDefId":""}'
extInfo: '{"goodsGg":"G-31891","goodsCode":"00004380","purMode":60,"goodsName":"新型冠状病毒检测试剂Gg(sT","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661333","ybDefId":""}'
recTemperature: 20
recHumidity: 30
distrPrice: 99.9999
......
data/b5_spd3_core_business_flow/message15
View file @ 8981da14
验收单号:
CHECK_NO1: CHECKh03472024070200055
CHECK_NO2: CHECKh03472024070200055
CHECK_NO1: CHECKh03472024070300023
CHECK_NO2: CHECKh03472024070300023
data/b5_spd3_core_business_flow/message16
View file @ 8981da14
......@@ -5,144 +5,34 @@
lastModified:
version:
createTime:
createUser: h0347_UID-051378
createUser: h0347_UID-051380
lastModifiedUser:
billMode: '16'
billMode: '66'
recType:
stockKind:
purMode:
sourceId: CHECKh03472024070200030
sourceType: PSD
sourceVersion: 0
sourceId: DRh034720240703000050
sourceType: CK_TK
sourceVersion: 1
batchList:
billRelationJson:
hosId: h0347
deptId: 533beea90bd8402fa62377a5a84befd6
deptId: 0b61ab7ea9b746a3844426111c5ec6db
deptName:
branchId: h0347-3712
branchId: h0347-3714
branchName:
taskType: 1
sourceOrgId: p1e2e8
sourceOrgName: 国药集团公司kGTpV
sourceOrderNo: YS240702030
taskSourceNo: PSh0347202407020049
areaCode: areah03472553
areaName: 自动化测试
taskType: 2
sourceOrgId: b8cbdc0117e8499cb1ccac00cb6166ca
sourceOrgName: 二级检验科002
sourceOrderNo: DN20240703000050
taskSourceNo: DN20240703000050
areaCode:
areaName:
goodsName:
goodsGg:
startDate:
endDate:
taskDate: '2024-07-02 15:10:10'
pkgTaskId:
pkgFlag:
remark: ''
goodsSpec:
areaList:
areaDefaultFlag:
excludeDeptIds:
deptIds:
sourceReplId:
defaultAreaCode:
defaultAreaName:
sourceNo:
distrOrderNo:
deptBuyer:
stockName:
dataDeptIds:
oldDeptName:
oldOrderNo:
allowRejectFlag:
targetCodingType: 0
pdaFlag:
createUserName:
createUserIds:
- id:
lastModified:
version:
createTime:
createUser: h0347_UID-051378
lastModifiedUser:
billMode: '20'
recType:
stockKind:
purMode:
sourceId: CHECKh03472024070200010
sourceType: PSD
sourceVersion: 0
batchList:
billRelationJson:
hosId: h0347
deptId: 533beea90bd8402fa62377a5a84befd6
deptName:
branchId: h0347-3712
branchName:
taskType: 1
sourceOrgId: p1e2e8
sourceOrgName: 国药集团公司kGTpV
sourceOrderNo: YS240702010
taskSourceNo: PSh0347202407020026
areaCode: areah03472553
areaName: 自动化测试
goodsName:
goodsGg:
startDate:
endDate:
taskDate: '2024-07-02 14:20:29'
pkgTaskId:
pkgFlag:
remark: ''
goodsSpec:
areaList:
areaDefaultFlag:
excludeDeptIds:
deptIds:
sourceReplId:
defaultAreaCode:
defaultAreaName:
sourceNo:
distrOrderNo:
deptBuyer:
stockName:
dataDeptIds:
oldDeptName:
oldOrderNo:
allowRejectFlag:
targetCodingType: 0
pdaFlag:
createUserName:
createUserIds:
- id:
lastModified:
version:
createTime:
createUser: h0347_UID-051378
lastModifiedUser:
billMode: '16'
recType:
stockKind:
purMode:
sourceId: CHECKh03472024070200009
sourceType: PSD
sourceVersion: 0
batchList:
billRelationJson:
hosId: h0347
deptId: 533beea90bd8402fa62377a5a84befd6
deptName:
branchId: h0347-3712
branchName:
taskType: 1
sourceOrgId: p1e2e8
sourceOrgName: 国药集团公司kGTpV
sourceOrderNo: YS240702009
taskSourceNo: PSh0347202407020022
areaCode: areah03472553
areaName: 自动化测试
goodsName:
goodsGg:
startDate:
endDate:
taskDate: '2024-07-02 14:17:51'
taskDate: '2024-07-03 07:55:08'
pkgTaskId:
pkgFlag:
remark: ''
......
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