Commit 2511b620 authored by 肖 和生's avatar 肖 和生
Browse files

Merge remote-tracking branch 'remotes/origin/master' into core_folw1

# Conflicts:
#	data/b5_spd3_core_business_flow/message10
#	data/b5_spd3_core_business_flow/message11
#	data/b5_spd3_core_business_flow/message12
#	data/b5_spd3_core_business_flow/message13
#	data/b5_spd3_core_business_flow/message14
#	data/b5_spd3_core_business_flow/message15
#	data/b5_spd3_core_business_flow/message21
#	data/b5_spd3_core_business_flow/message22
#	data/b5_spd3_core_business_flow/message8
#	data/b5_spd3_core_business_flow/message9
parents 51b12286 6ee2eca9
......@@ -14,7 +14,7 @@ from airtest.core.api import using
__author__ = "xiaohesheng"
"""
case_tag:api,spd_core1,a_c1流程十八中心库业务_拆包功能,id2302,id2302-21,sit,on
case_tag:api,spd_core,a_c1流程十八中心库业务_拆包功能,id2302,id2302-21,sit,on
核心业务流:a_c1流程十八中心库业务_拆包功能
python runner_test.py tag id2302-21 debug mdm3
"""
......
企业信息:
e_id: CR202407050389
cname: 国药集团公司u9Dtn
e_id: CR202407080038
cname: 国药集团公司^n1@F
医院信息:
h_id: 湖南省人民医院IMFSr
h_name: 湖南省人民医院IMFSr
h_id: 湖南省人民医院1b&Ew
h_name: 湖南省人民医院1b&Ew
产品审核信息:
MSPid: MSP2407050029_1
MSPid: MSP2407080011_1
hosId: h0347
hosGoodsId: h034700004465
provGoodsid: provGood-99221661
goodsAuditBillId: MSP2407050029
targetId: MSP2407050029_1
hosGoodsId: h034700004503
provGoodsid: provGood-99221699
goodsAuditBillId: MSP2407080011
targetId: MSP2407080011_1
......@@ -2,10 +2,10 @@
list_a:
- &id001
settleMonth: '202407'
pid: OBh0347202407050007
hosGoodsId: h034700004462
goodsCode: '00004462'
goodsName: 一次性注射器_低值C2g9i
pid: OBh0347202407080004
hosGoodsId: h034700004500
goodsCode: '00004500'
goodsName: 一次性注射器_低值wExpg
goodsGg: G-31891
mfrsName: 德国歌德公司 Geuder AG
unit: 支
......@@ -20,14 +20,14 @@
normalContractId:
normalContract: '1'
detailList:
- pid: OBh0347202407050007
- pid: OBh0347202407080004
settleMonth: '202407'
accountDate: '2024-07-05'
hosGoodsId: h034700004462
accountDate: '2024-07-08'
hosGoodsId: h034700004500
batchCode: '333'
distrDetailId: '03839280'
distrId: PSh0347202407050026
distrOrderNo: PSh0347202407050026
distrDetailId: '03839343'
distrId: PSh0347202407080002
distrOrderNo: PSh0347202407080002
settlePrice: 99.9999
maxSettleQty: -100.0
maxSettleAmount: -9999.99
......@@ -36,11 +36,11 @@
leftSettleQty: -100.0
leftSettleAmount: -9999.99
hosId: h0347
provId: p1e31d
branchId: h0347-3729
balanceDetId: OBh0347202407050007-000001
provId: p1e32e
branchId: h0347-3736
balanceDetId: OBh0347202407080004-000001
purMode: 10
barCode: 010112345678901210333112407051725011121UT240705000214
barCode: 010112345678901210333112407081725011421UT240708000002
batchId:
price:
maxQty:
......@@ -53,15 +53,15 @@
volumeFlag:
onlineKind:
invoicePrice: 99.9999
viewId: 202407OBh0347202407050007h034700004462
- pid: OBh0347202407050007
viewId: 202407OBh0347202407080004h034700004500
- pid: OBh0347202407080004
settleMonth: '202407'
accountDate: '2024-07-05'
hosGoodsId: h034700004462
accountDate: '2024-07-08'
hosGoodsId: h034700004500
batchCode: '333'
distrDetailId: '03839280'
distrId: PSh0347202407050026
distrOrderNo: PSh0347202407050026
distrDetailId: '03839343'
distrId: PSh0347202407080002
distrOrderNo: PSh0347202407080002
settlePrice: 99.9999
maxSettleQty: 100.0
maxSettleAmount: 9999.99
......@@ -70,11 +70,11 @@
leftSettleQty: 100.0
leftSettleAmount: 9999.99
hosId: h0347
provId: p1e31d
branchId: h0347-3729
balanceDetId: OBh0347202407050007-000002
provId: p1e32e
branchId: h0347-3736
balanceDetId: OBh0347202407080004-000002
purMode: 10
barCode: 010112345678901210333112407051725011121UT240705000251
barCode: 010112345678901210333112407081725011421UT240708000035
batchId:
price:
maxQty:
......@@ -87,10 +87,10 @@
volumeFlag:
onlineKind:
invoicePrice: 99.9999
viewId: 202407OBh0347202407050007h034700004462
unique: 202407OBh0347202407050007h034700004462
viewId: 202407OBh0347202407080004h034700004500
unique: 202407OBh0347202407080004h034700004500
onlineKind: '10'
viewId: 202407OBh0347202407050007h034700004462
viewId: 202407OBh0347202407080004h034700004500
list_b:
- *id001
list_c:
......
院区新增:
branch_id: h0347-3729
branch_name: 东土城路院区)Gl$!
branch_id: h0347-3736
branch_name: 东土城路院区IjnkG
科室信息:
dept2_id: 232328e5ceb44b799efba96c512618bf
dept2_id: b3e6c5f2887148389f8535862f789f0a
dept2_name: 二级检验科002
用户名信息:
username1: 自动化测试pwnfB
username2: 自动化测试pwnfB
username1: 自动化测试xgQKu
username2: 自动化测试xgQKu
一级科室信息:
dept1_id: d5e1acc8708f47a7b152e103204ee4cb
dept1_id: a762aa0aa2df47dbac4a96173a89e85d
dept1_name: 设备科001
所有科室id:
deptid1: d5e1acc8708f47a7b152e103204ee4cb
deptid2: 232328e5ceb44b799efba96c512618bf
deptid3: eefab2fb6d6e423da8e3df5e433a01a5
deptid4: 6cea679813db435099a2a3c0bcf1de0e
deptid5: feca3d1dcffb49ddba9052d401e60d8f
deptid1: a762aa0aa2df47dbac4a96173a89e85d
deptid2: b3e6c5f2887148389f8535862f789f0a
deptid3: b011a25d37e248d1aa1c94d01bb59466
deptid4: 096ad30186f448778c685c7d68c5bfe3
deptid5: b316f3f5225a45949077163a47655ad5
所有科室name:
deptid1: 设备科001
deptid2: 二级检验科002
......
shelfinfo:
shelfid: 3b42810b4b854af5a2a95f104a2d7b6b
shelfCode: areah03472634
shelfid: 8bf86ca088f440c1874c09528445cf44
shelfCode: areah03472677
areaName: 自动化测试
供货关系申请2:
e_corpId: p1e31d
e_corpId: p1e32e
h_corpId: h0347
e_username: 国药集团公司GxzLS
e_username: 国药集团公司^n1@F
h_name: test001
产品审核信息:
MSPid: MSP2407050025_1
MSPid: MSP2407080007_1
hosId: h0347
hosGoodsId: h034700004461
provGoodsid: provGood-99221657
goodsAuditBillId: MSP2407050025
targetId: MSP2407050025_1
hosGoodsId: h034700004499
provGoodsid: provGood-99221695
goodsAuditBillId: MSP2407080007
targetId: MSP2407080007_1
......@@ -5,34 +5,34 @@
lastModified:
version:
createTime:
createUser: h0347_UID-051395
createUser: h0347_UID-051402
lastModifiedUser:
billMode: '66'
billMode: '16'
recType:
stockKind:
purMode:
sourceId: DRh034720240705000171
sourceType: CK_TK
sourceVersion: 1
sourceId: CHECKh03472024070800002
sourceType: PSD
sourceVersion: 0
batchList:
billRelationJson:
hosId: h0347
deptId: d5e1acc8708f47a7b152e103204ee4cb
deptId: a762aa0aa2df47dbac4a96173a89e85d
deptName:
branchId: h0347-3729
branchId: h0347-3736
branchName:
taskType: 2
sourceOrgId: 232328e5ceb44b799efba96c512618bf
sourceOrgName: 二级检验科002
sourceOrderNo: DN20240705000171
taskSourceNo: DN20240705000171
areaCode:
areaName:
taskType: 1
sourceOrgId: p1e32e
sourceOrgName: 国药集团公司^n1@F
sourceOrderNo: YS240708002
taskSourceNo: PSh0347202407080002
areaCode: areah03472677
areaName: 自动化测试
goodsName:
goodsGg:
startDate:
endDate:
taskDate: '2024-07-05 15:48:53'
taskDate: '2024-07-08 05:07:01'
pkgTaskId:
pkgFlag:
remark: ''
......
验收单库存详情信息:
list_a:
- &id001
- id: DRh0347202407050001710001
- id: CHECKh034720240708000020001
lastModified:
version:
createTime:
createUser:
lastModifiedUser:
rowIdx:
purMode: 60
purMode: 10
unitName: 100支/100
pid: DRh034720240705000171
hosGoodsId: h034700004463
batchCode: '4444'
expdtDate: '2025-01-11'
productDate: '2024-07-05'
pid: CHECKh03472024070800002
hosGoodsId: h034700004500
batchCode: '333'
expdtDate: '2025-01-14'
productDate: '2024-07-08'
batchPrice: 99.9999
settlement: 1
batchType: 40
srcBatchId: Ph034724070500050
batchType: 20
srcBatchId: '03839343'
srcBatchPrice: 99.9999
shelfCode: areah03472634-2-01-01
shelfCode: areah03472677-2-01-01
shelfKind:
barcodeId: UT240705000418
barcodeId: UT240708000001
subBarcodeId:
qty: 100.0
pkgQty: 1
distrId: PSh0347202407050038
distrDetailId: '03839292'
pkgDefQty:
pkgDefName:
viewId: h03470000446344442025-01-11100支/100
qty: 10000.0
pkgQty: 100
distrId: PSh0347202407080002
distrDetailId: '03839343'
pkgDefQty: 100.0
pkgDefName: '100'
viewId: h0347000045003332025-01-14100支/100
codingType:
batchFlag:
hasSterilize: 0
......@@ -38,60 +38,53 @@
sterilizePassQty:
sterilizeRejectQty:
orderNo:
sourceDetailId: PICKh03472407050093660001
mdmGoodsCode: '11661416'
goodsCode: '00004463'
tbStatus:
billMode:
hosId:
branchId:
purBillId: Ch034720240705000064
provId: p1e31d
provName:
subProvId: p1e31d
purDetailId:
goodsName: 新型冠状病毒检测试剂a7oLM
sourceDetailId: '03839343'
mdmGoodsCode: '11661453'
goodsCode: '00004500'
tbStatus: 1
billMode: '16'
hosId: h0347
branchId: h0347-3736
purBillId: Ch034720240708000031
provId: p1e32e
provName: 国药集团公司^n1@F
subSendFlag: 10
exeProvId: p1e32e
exeProvName: 国药集团公司^n1@F
purDetailId: ce7f4604ecc3425fa637428e165eed27
goodsName: 一次性注射器_低值wExpg
goodsGg: G-31891
mfrsId: mfrs-11229
mfrsName: 德国歌德公司 Geuder AG
made: 德国
unit:
sourceBatchId: Ph034724070500050
targetBatchId: Ph034724070500050
pkgDefId:
purPrice: 99.9999
pkgDefId: 34b26233759a4720920cc8328dd1f8d1
supplyId: 7be89fe4c5ee4689a5e249d3197b9947
subProvId: p1e32e
subProvName: 国药集团公司^n1@F
subPrice: 99.9999
distrPrice: 99.9999
distrPkgQty: 100.0
distrQty: 10000.0
certificateCode: ''
productCertCode:
detailRelationJson:
extInfo:
psiPrice: 99.9999
ext:
goodsGg: G-31891
goodsCode: '00004463'
purMode: 60
goodsName: 新型冠状病毒检测试剂a7oLM
goodsCode: '00004500'
purMode: 10
goodsName: 一次性注射器_低值wExpg
ygptCode: ''
transCond: ''
storageCond: ''
erpCode: '11661416'
erpCode: '11661453'
ybDefId: ''
contractId: ''
normalContractId: ''
fcatId: ''
fcatName: ''
goodsKindId: ''
goodsKindName: ''
miTwentysevenCode: ''
focus_control: '0'
focus_control_type:
rtnQty:
hisChargeNo:
purTaskId:
multiChargeFlag:
trustMrfsName:
pkgCodeSee:
chargeFlag:
stockKind: CK_TK
sourceDeptId: 232328e5ceb44b799efba96c512618bf
targetDeptId: d5e1acc8708f47a7b152e103204ee4cb
ableDelFlag:
pickType: KS_TK
list_b:
- *id001
list_c:
......
条码信息:
list_a:
- &id001
id: UT240705000318
snCode: UT240705000318
ssccCode: '010839000187066823'
pkgCodeSee: 0101123456789012104444112407051725011121UT240705000318
hosGoodsId: h034700004463
hosGoodsCode: '00004463'
goodsCode: '00004463'
goodsName: 新型冠状病毒检测试剂a7oLM
goodsSpec: G-31891
goodsMfrsName: 德国歌德公司 Geuder AG
unit:
purMode: 60
batchCode: '4444'
productDate: '2024-07-05'
expdtDate: '2025-01-11'
pkgDefName: '100'
pkgDefQty: 100.0
stockId: 9b3e40528eff4ed1bf4ee12b587e00d0
stockName: 东土城路院区)Gl$!中心库房
areaName: 自动化测试
areaCode: areah03472634
lockStatus: 0
unitName: 100支/100
shelfCode: areah03472634-2-01-01
shelfNo: 自动化测试-2-01-01
pkgDefId: fdfa9805e01946bba3c5b8bd487a6dc7
extInfo: '{"pkgDefId": "fdfa9805e01946bba3c5b8bd487a6dc7", "pkgDefQty": 100, "purBillId":
"CG2024070520622", "pkgDefName": "100", "distrBillId": "PSh0347202407050028",
"inStockTime": "2024-07-05 10:20:42", "distrDetailId": "03839282", "certificateCode":
""}'
bottleId:
pkgType: '66'
miDjmc: ''
miCode: ''
transferRatio: 1.0
qty: 1
shelfKind: 0
shelfKindName: 普通货位
provName: 国药集团公司GxzLS
provId: p1e31d
inStockDate:
mfrCode:
made: 德国
price:
barName: 100支/100
purModeText: 检验试剂
codeType: 66
- id: UT240708000101
lastModified:
version:
createTime: '2024-07-08 05:06:21'
createUser:
lastModifiedUser:
snCode: UT240708000101
hosId: h0347
branchId:
stockId: 3a4ab96db19047cc9c36e92a6cc5ea06
areaCode: areah03472677
areaName: 自动化测试
shelfCode: areah03472677-2-01-01
codeType: 66
tagType: 0
hosGoodsId: h034700004501
mdmGoodsCode: '11661454'
goodsCode: '00004501'
goodsDi: '01123456789012'
barName: 100支/100
batchCode: '4444'
expdtDate: '2025-01-14'
productDate: '2024-07-08'
mfrCode:
mfrCodeSee:
pkgCode: "0101123456789012104444\x1D112407081725011421UT240708000101"
pkgCodeSee: 0101123456789012104444112407081725011421UT240708000101
ssccCode: '010839000187194625'
extInfo:
outId:
tbStatus: 20
goodsCodeDi:
barcodeId:
ext:
pkgDefId: 2d4d3bd0ebe745efa73bb7123cf21f6a
pkgDefQty: 100
purBillId: CG2024070820770
pkgDefName: '100'
distrBillId: PSh0347202407080004
inStockTime: '2024-07-08 05:08:08'
distrDetailId: '03839345'
certificateCode: ''
sourceDetailId:
purMode: 60
purModes:
price:
pid:
goodsMfrsName: 德国歌德公司 Geuder AG
mfrsName:
goodsSpec: G-31891
unit:
goodsName: 新型冠状病毒检测试剂hO3Tu
pkgDefId: 2d4d3bd0ebe745efa73bb7123cf21f6a
pkgDefQty: 100
defaultPkgDefQty:
defaultQty:
defaultSurplusQty:
defaultPkgDefId:
purDetailId:
pkgDefName: '100'
printNum: 0
deptId:
deptName:
billId:
taskId:
made: 德国
provId: p1e32e
provName: 国药集团公司^n1@F
subProvId: p1e32e
subProvName: 国药集团公司^n1@F
provHosGoodsId:
sourceType:
taskDate:
sourceOrderNo:
taskType:
detailId:
branchGoodsPkgDefList:
unitName:
areaCodeList:
diType:
mdmGoodsSpecCode:
hosGoodsCode: '00004501'
supplyId:
inSettlement:
spdGoodsCode:
codeKind:
brand:
miCode:
transferRatio: 1.0
miDjmc:
tbStatusList:
purModeText:
stockName:
tbStatusText:
pkgType:
bottleId:
pkgStatus:
qty:
packUnit:
minSaleQty:
rfidFlag:
mfrCodeFlag:
scanStatus:
scanId:
multiChargeFlag:
useFrequency:
chargeUnit:
lockStatus:
remark:
hosBatchId:
settleFlag:
inStockTime:
verifyFlag:
subSendFlag: 10
list_b:
- *id001
list_c:
......
产品信息:
list_a:
- &id001
- hosGoodsId: h034700004461
hosGoodsCode: '00004461'
provId: p1e31d
subProvId: p1e31d
subProvName: 国药集团公司GxzLS
goodsName: 高值牙钻机rY4w$
- hosGoodsId: h034700004499
hosGoodsCode: '00004499'
provId: p1e32e
subProvId: p1e32e
subProvName: 国药集团公司^n1@F
goodsName: 高值牙钻机PFKHm
goodsSpec: G-31891
goodsGeneralName:
goodsMfrsId: mfrs-11229
......
产品审核信息:
MSPid: MSP2407050026_1
MSPid: MSP2407080008_1
hosId: h0347
hosGoodsId: h034700004462
provGoodsid: provGood-99221658
goodsAuditBillId: MSP2407050026
targetId: MSP2407050026_1
hosGoodsId: h034700004500
provGoodsid: provGood-99221696
goodsAuditBillId: MSP2407080008
targetId: MSP2407080008_1
二级库条码信息:
list_a:
- &id001
id: '8800000001075736'
snCode: '8800000001075736'
ssccCode: '010839000187076327'
pkgCodeSee: '01000000000044611022221124070517250111218800000001075736'
hosGoodsId: h034700004461
hosGoodsCode: '00004461'
goodsCode: '00004461'
goodsName: 高值牙钻机rY4w$
id: E800000001076172
snCode: E800000001076172
ssccCode: '010839000187204621'
pkgCodeSee: '0100000000004499102222112407081725011421E800000001076172'
hosGoodsId: h034700004499
hosGoodsCode: '00004499'
goodsCode: '00004499'
goodsName: 高值牙钻机PFKHm
goodsSpec: G-31891
goodsMfrsName: 德国歌德公司 Geuder AG
unit:
purMode: 20
batchCode: '2222'
productDate: '2024-07-05'
expdtDate: '2025-01-11'
productDate: '2024-07-08'
expdtDate: '2025-01-14'
pkgDefName:
pkgDefQty: 1.0
stockId: 6898e3a36c3c4b36bf1ea0648b26cba4
stockId: dbabf6ef2a274e5dbab2b6c1426dbf56
stockName: 二级检验科002库房
areaName: 默认库区
areaCode: areah03472631
areaCode: areah03472676
lockStatus: 0
unitName: 1支
shelfCode: areah03472631-A-01-01
shelfCode: areah03472676-A-01-01
shelfNo: A01-A-01-01
pkgDefId:
extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202407050029", "inStockTime":
"2024-07-05 10:39:28", "useFrequency": 1, "distrDetailId": "03839283", "multiChargeFlag":
extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202407080005", "inStockTime":
"2024-07-08 05:15:06", "useFrequency": 1, "distrDetailId": "03839346", "multiChargeFlag":
0}'
bottleId:
pkgType: '25'
......@@ -38,9 +38,9 @@
qty: 1
shelfKind: 0
shelfKindName: 普通货位
provName: 国药集团公司GxzLS
provId: p1e31d
inStockDate: '2024-07-05 10:39:28'
provName: 国药集团公司^n1@F
provId: p1e32e
inStockDate: '2024-07-08 05:15:05'
mfrCode:
made: 德国
price:
......
产品审核信息:
MSPid: MSP2407050027_1
MSPid: MSP2407080009_1
hosId: h0347
hosGoodsId: h034700004463
provGoodsid: provGood-99221659
goodsAuditBillId: MSP2407050027
targetId: MSP2407050027_1
hosGoodsId: h034700004501
provGoodsid: provGood-99221697
goodsAuditBillId: MSP2407080009
targetId: MSP2407080009_1
产品审核信息:
MSPid: MSP2407050028_1
MSPid: MSP2407080010_1
hosId: h0347
hosGoodsId: h034700004464
provGoodsid: provGood-99221660
goodsAuditBillId: MSP2407050028
targetId: MSP2407050028_1
hosGoodsId: h034700004502
provGoodsid: provGood-99221698
goodsAuditBillId: MSP2407080010
targetId: MSP2407080010_1
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