Skip to content
GitLab
Commit d520a49e authored by 肖 和生's avatar 肖 和生
Browse files

Merge remote-tracking branch 'remotes/origin/core_folw' 

# 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/message8
#	data/b5_spd3_core_business_flow/message9
parent c98b7846
Hide whitespace changes
Inline Side-by-side
data/a2_mdm3_ea/message
View file @ d520a49e
企业信息:
e_id: CR202407100038
cname: 国药集团公司uHVs@
e_id: CR202407120038
cname: 国药集团公司BCJj3
data/a3_mdm3_hs/message
View file @ d520a49e
医院信息:
h_id: 湖南省人民医院bru7H
h_name: 湖南省人民医院bru7H
h_id: 湖南省人民医院wIjec
h_name: 湖南省人民医院wIjec
data/a5_mdm3_pdm/message2
View file @ d520a49e
产品审核信息:
MSPid: MSP2407100011_1
MSPid: MSP2407120011_1
hosId: h0347
hosGoodsId: h034700004526
provGoodsid: provGood-99221722
goodsAuditBillId: MSP2407100011
targetId: MSP2407100011_1
hosGoodsId: h034700004550
provGoodsid: provGood-99221751
goodsAuditBillId: MSP2407120011
targetId: MSP2407120011_1
data/a6_mdm3_si/message
View file @ d520a49e
......@@ -2,10 +2,10 @@
list_a:
- &id001
settleMonth: '202407'
pid: OBh0347202407100004
hosGoodsId: h034700004523
goodsCode: '00004523'
goodsName: 一次性注射器_低值3^n61
pid: OBh0347202407120006
hosGoodsId: h034700004547
goodsCode: '00004547'
goodsName: 一次性注射器_低值gV9^n
goodsGg: G-31891
mfrsName: 德国歌德公司 Geuder AG
unit: 支
......@@ -20,14 +20,14 @@
normalContractId:
normalContract: '1'
detailList:
- pid: OBh0347202407100004
- pid: OBh0347202407120006
settleMonth: '202407'
accountDate: '2024-07-10'
hosGoodsId: h034700004523
accountDate: '2024-07-12'
hosGoodsId: h034700004547
batchCode: '333'
distrDetailId: '03839511'
distrId: PSh0347202407100014
distrOrderNo: PSh0347202407100014
distrDetailId: '03839656'
distrId: PSh0347202407120049
distrOrderNo: PSh0347202407120049
settlePrice: 99.9999
maxSettleQty: 100.0
maxSettleAmount: 9999.99
......@@ -36,11 +36,11 @@
leftSettleQty: 100.0
leftSettleAmount: 9999.99
hosId: h0347
provId: p1e336
branchId: h0347-3740
balanceDetId: OBh0347202407100004-000001
provId: p1e34a
branchId: h0347-3745
balanceDetId: OBh0347202407120006-000001
purMode: 10
barCode: '0137400000045230103331124071017250116241100000142024071000001243'
barCode: '0101123456789012103331124071217250118241100000142024071200002344'
batchId:
price:
maxQty:
......@@ -53,15 +53,15 @@
volumeFlag:
onlineKind:
invoicePrice: 99.9999
viewId: 202407OBh0347202407100004h034700004523
- pid: OBh0347202407100004
viewId: 202407OBh0347202407120006h034700004547
- pid: OBh0347202407120006
settleMonth: '202407'
accountDate: '2024-07-10'
hosGoodsId: h034700004523
accountDate: '2024-07-12'
hosGoodsId: h034700004547
batchCode: '333'
distrDetailId: '03839511'
distrId: PSh0347202407100014
distrOrderNo: PSh0347202407100014
distrDetailId: '03839653'
distrId: PSh0347202407120046
distrOrderNo: PSh0347202407120046
settlePrice: 99.9999
maxSettleQty: 100.0
maxSettleAmount: 9999.99
......@@ -70,11 +70,11 @@
leftSettleQty: 100.0
leftSettleAmount: 9999.99
hosId: h0347
provId: p1e336
branchId: h0347-3740
balanceDetId: OBh0347202407100004-000002
provId: p1e34a
branchId: h0347-3745
balanceDetId: OBh0347202407120006-000002
purMode: 10
barCode: '0137400000045230103331124071017250116241100000142024071000001274'
barCode: '0101123456789012103331124071217250118241100000142024071200002341'
batchId:
price:
maxQty:
......@@ -87,10 +87,10 @@
volumeFlag:
onlineKind:
invoicePrice: 99.9999
viewId: 202407OBh0347202407100004h034700004523
unique: 202407OBh0347202407100004h034700004523
viewId: 202407OBh0347202407120006h034700004547
unique: 202407OBh0347202407120006h034700004547
onlineKind: '10'
viewId: 202407OBh0347202407100004h034700004523
viewId: 202407OBh0347202407120006h034700004547
list_b:
- *id001
list_c:
......
data/b2_herp3_bs/message
View file @ d520a49e
院区新增:
branch_id: h0347-3740
branch_name: 东土城路院区hEY9e
branch_id: h0347-3745
branch_name: 东土城路院区&BvGU
科室信息:
dept2_id: 14a28df13e5c44cf8ce300f44aaf0e88
dept2_id: e6a7862c7b3d49a69ab93979a8f32710
dept2_name: 二级检验科002
data/b2_herp3_bs/message3
View file @ d520a49e
用户名信息:
username1: 自动化测试Kaqme
username2: 自动化测试Kaqme
username1: 自动化测试S1C9r
username2: 自动化测试S1C9r
data/b2_herp3_bs/message4
View file @ d520a49e
一级科室信息:
dept1_id: 7e43ae2e3d9b4280adf74d34961032e2
dept1_id: b82f526b0c4c438c95ccafd8a07d3af6
dept1_name: 设备科001
data/b2_herp3_bs/message6
View file @ d520a49e
所有科室id:
deptid1: 7e43ae2e3d9b4280adf74d34961032e2
deptid2: 14a28df13e5c44cf8ce300f44aaf0e88
deptid3: 71c292a398e94084b3e6731d08667277
deptid4: df22c6280f8f4c43b5e4e1e34db3ca26
deptid1: b82f526b0c4c438c95ccafd8a07d3af6
deptid2: e6a7862c7b3d49a69ab93979a8f32710
deptid3: 432fefd558364c1d99239e204b3db33c
deptid4: af7a08388a7e4aae94b58626f1e320cf
所有科室name:
deptid1: 设备科001
deptid2: 二级检验科002
......
data/b2_herp3_bs/message7
View file @ d520a49e
shelfinfo:
shelfid: 60e63d729cf94ce2aeabed0d317ff396
shelfCode: areah03472702
shelfid: 33173d5531d045499cf59d97b2b8af83
shelfCode: areah03472727
areaName: 自动化测试
data/b5_spd3_core_business_flow/message
View file @ d520a49e
供货关系申请2:
e_corpId: p1e336
e_corpId: p1e34a
h_corpId: h0347
e_username: 国药集团公司uHVs@
e_username: 国药集团公司BCJj3
h_name: test001
data/b5_spd3_core_business_flow/message1
View file @ d520a49e
产品审核信息:
MSPid: MSP2407100007_1
MSPid: MSP2407120007_1
hosId: h0347
hosGoodsId: h034700004522
provGoodsid: provGood-99221718
goodsAuditBillId: MSP2407100007
targetId: MSP2407100007_1
hosGoodsId: h034700004546
provGoodsid: provGood-99221747
goodsAuditBillId: MSP2407120007
targetId: MSP2407120007_1
data/b5_spd3_core_business_flow/message10
View file @ d520a49e
低值配送单号:
distrBillId1: PSh0347202407100017
distrBillId2: PSh0347202407100017
distrBillId1: PSh0347202407120061
distrBillId2: PSh0347202407120061
高值配送单号:
distrBillId1: PSh0347202407100018
distrBillId2: PSh0347202407100018
distrBillId1: PSh0347202407120062
distrBillId2: PSh0347202407120062
试剂配送单号:
distrBillId1: PSh0347202407100019
distrBillId2: PSh0347202407100019
distrBillId1: PSh0347202407120063
distrBillId2: PSh0347202407120063
data/b5_spd3_core_business_flow/message11
View file @ d520a49e
采购计划单号高值:
orderNo1: PLAN2024071032049
orderNo2: PLAN2024071032049
orderNo1: PLAN2024071232521
orderNo2: PLAN2024071232521
data/b5_spd3_core_business_flow/message12
View file @ d520a49e
采购计划单号试剂:
orderNo1: PLAN2024071032050
orderNo2: PLAN2024071032050
orderNo1: PLAN2024071232522
orderNo2: PLAN2024071232522
data/b5_spd3_core_business_flow/message13
View file @ d520a49e
......@@ -3,27 +3,27 @@
- &id001
- id:
hosId: h0347
branchId: h0347-3740
branchId: h0347-3745
deptId:
taskType: 1
sourceOrgId: p1e336
sourceOrgName: 国药集团公司uHVs@
sourceOrderNo: PSh0347202407100016
sourceOrgId: p1e34a
sourceOrgName: 国药集团公司BCJj3
sourceOrderNo: PSh0347202407120063
billMode: '66'
stockKind:
purMode:
sourceId: PSh0347202407100016
sourceId: PSh0347202407120063
sourceDetailId:
sourceType: PSD
sourceTypeName: 配送单
sourceVersion: 1
planOrderNo: PLAN2024071032044
purOrderNo: CG2024071021003
recOrgId: 7e43ae2e3d9b4280adf74d34961032e2
planOrderNo: PLAN2024071232522
purOrderNo: CG2024071221204
recOrgId: b82f526b0c4c438c95ccafd8a07d3af6
recOrgName: 设备科001
billRelationJson: '{"planBillId":"Ph034720240710028689","planOrderNo":"PLAN2024071032044","purOrderNo":"CG2024071021003","purBillId":"Ch034720240710000051","purBillDate":"2024-07-10
08:34:57","distrBillId":"PSh0347202407100016","distrOrderNo":"PSh0347202407100016"}'
taskDate: '2024-07-10 08:35:30'
billRelationJson: '{"planBillId":"Ph034720240712029167","planOrderNo":"PLAN2024071232522","purOrderNo":"CG2024071221204","purBillId":"Ch034720240712000091","purBillDate":"2024-07-12
11:17:11","distrBillId":"PSh0347202407120063","distrOrderNo":"PSh0347202407120063"}'
taskDate: '2024-07-12 11:17:51'
taskDateStart:
taskDateEnd:
billModeList:
......
data/b5_spd3_core_business_flow/message14
View file @ d520a49e
......@@ -3,11 +3,11 @@
- &id001
- purMode: 60
unitName: 100支/100
hosGoodsId: h034700004524
hosGoodsId: h034700004548
mdmGoodsCode:
spdGoodsCode: '11661477'
goodsCode: '00004524'
goodsName: 新型冠状病毒检测试剂6ux#Q
spdGoodsCode: '11661507'
goodsCode: '00004548'
goodsName: 新型冠状病毒检测试剂#JL$M
goodsGg: G-31891
mfrsId:
mfrsName: 德国歌德公司 Geuder AG
......@@ -22,16 +22,16 @@
pkgDefName: '100'
pkgDefQty: 100.0
batchCode: '4444'
expdtDate: '2025-01-16'
productDate: '2024-07-10'
provName: 国药集团公司uHVs@
expdtDate: '2025-01-18'
productDate: '2024-07-12'
provName: 国药集团公司BCJj3
provId:
viewId: '03839513'
viewId: '03839671'
verifyFlag: 0
hasSterilize: 0
id: '03839513'
id: '03839671'
detailRelationJson:
extInfo: '{"goodsGg":"G-31891","goodsCode":"00004524","purMode":60,"goodsName":"新型冠状病毒检测试剂6ux#Q","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661477","ybDefId":""}'
extInfo: '{"goodsGg":"G-31891","goodsCode":"00004548","purMode":60,"goodsName":"新型冠状病毒检测试剂#JL$M","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661507","ybDefId":""}'
recTemperature: 20
recHumidity: 30
distrPrice: 99.9999
......
data/b5_spd3_core_business_flow/message15
View file @ d520a49e
验收单号:
CHECK_NO1: CHECKh03472024071000008
CHECK_NO2: CHECKh03472024071000008
CHECK_NO1: CHECKh03472024071200056
CHECK_NO2: CHECKh03472024071200056
data/b5_spd3_core_business_flow/message16
View file @ d520a49e
......@@ -5,89 +5,34 @@
lastModified:
version:
createTime:
createUser: h0347_UID-051406
createUser: h0347_UID-051410
lastModifiedUser:
billMode: '16'
recType:
stockKind:
purMode:
sourceId: CHECKh03472024071000006
sourceId: CHECKh03472024071200002
sourceType: PSD
sourceVersion: 0
batchList:
billRelationJson:
hosId: h0347
deptId: 7e43ae2e3d9b4280adf74d34961032e2
deptId: b82f526b0c4c438c95ccafd8a07d3af6
deptName:
branchId: h0347-3740
branchId: h0347-3745
branchName:
taskType: 1
sourceOrgId: p1e336
sourceOrgName: 国药集团公司uHVs@
sourceOrderNo: YS240710006
taskSourceNo: PSh0347202407100014
areaCode: areah03472702
sourceOrgId: p1e34a
sourceOrgName: 国药集团公司BCJj3
sourceOrderNo: YS240712002
taskSourceNo: PSh0347202407120002
areaCode: areah03472727
areaName: 自动化测试
goodsName:
goodsGg:
startDate:
endDate:
taskDate: '2024-07-10 08:36:31'
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-051406
lastModifiedUser:
billMode: '66'
recType:
stockKind:
purMode:
sourceId: CHECKh03472024071000002
sourceType: PSD
sourceVersion: 0
batchList:
billRelationJson:
hosId: h0347
deptId: 7e43ae2e3d9b4280adf74d34961032e2
deptName:
branchId: h0347-3740
branchName:
taskType: 1
sourceOrgId: p1e336
sourceOrgName: 国药集团公司uHVs@
sourceOrderNo: YS240710002
taskSourceNo: PSh0347202407100004
areaCode: areah03472702
areaName: 自动化测试
goodsName:
goodsGg:
startDate:
endDate:
taskDate: '2024-07-10 07:53:30'
taskDate: '2024-07-12 08:06:19'
pkgTaskId:
pkgFlag:
remark: ''
......
data/b5_spd3_core_business_flow/message17
View file @ d520a49e
验收单库存详情信息:
list_a:
- &id001
- id: CHECKh034720240710000060001
- id: CHECKh034720240712000020001
lastModified:
version:
createTime:
......@@ -10,27 +10,27 @@
rowIdx:
purMode: 10
unitName: 100支/100
pid: CHECKh03472024071000006
hosGoodsId: h034700004523
pid: CHECKh03472024071200002
hosGoodsId: h034700004547
batchCode: '333'
expdtDate: '2025-01-16'
productDate: '2024-07-10'
expdtDate: '2025-01-18'
productDate: '2024-07-12'
batchPrice: 99.9999
settlement: 1
batchType: 20
srcBatchId: '03839511'
srcBatchId: '03839609'
srcBatchPrice: 99.9999
shelfCode: areah03472702-2-01-01
shelfCode: areah03472727-2-01-01
shelfKind:
barcodeId: '100000142024071000001201'
barcodeId: '100000142024071200000001'
subBarcodeId:
qty: 10000.0
pkgQty: 100
distrId: PSh0347202407100014
distrDetailId: '03839511'
distrId: PSh0347202407120002
distrDetailId: '03839609'
pkgDefQty: 100.0
pkgDefName: '100'
viewId: h0347000045233332025-01-16100支/100
viewId: h0347000045473332025-01-18100支/100
codingType:
batchFlag:
hasSterilize: 0
......@@ -38,31 +38,31 @@
sterilizePassQty:
sterilizeRejectQty:
orderNo:
sourceDetailId: '03839511'
mdmGoodsCode: '11661476'
goodsCode: '00004523'
sourceDetailId: '03839609'
mdmGoodsCode: '11661506'
goodsCode: '00004547'
tbStatus: 1
billMode: '16'
hosId: h0347
branchId: h0347-3740
purBillId: Ch034720240710000049
provId: p1e336
provName: 国药集团公司uHVs@
branchId: h0347-3745
purBillId: Ch034720240712000031
provId: p1e34a
provName: 国药集团公司BCJj3
subSendFlag: 10
exeProvId: p1e336
exeProvName: 国药集团公司uHVs@
purDetailId: 1aea365e77a446f7a7c99e6434cb42e8
goodsName: 一次性注射器_低值3^n61
exeProvId: p1e34a
exeProvName: 国药集团公司BCJj3
purDetailId: 0442c7d1b66d4ea6a9093602094b235e
goodsName: 一次性注射器_低值gV9^n
goodsGg: G-31891
mfrsId: mfrs-11229
mfrsName: 德国歌德公司 Geuder AG
made: 德国
unit: 支
purPrice: 99.9999
pkgDefId: 0ad202620eb54335b560f4a41883a342
supplyId: 90e02d6476fd49f8892fada69854027b
subProvId: p1e336
subProvName: 国药集团公司uHVs@
pkgDefId: 78dc0eecc5f64150b0d98f3a2c367734
supplyId: 65a74baa3ba543699d85dbd3fa4b2bd0
subProvId: p1e34a
subProvName: 国药集团公司BCJj3
subPrice: 99.9999
distrPrice: 99.9999
distrPkgQty: 100.0
......@@ -74,13 +74,13 @@
psiPrice: 99.9999
ext:
goodsGg: G-31891
goodsCode: '00004523'
goodsCode: '00004547'
purMode: 10
goodsName: 一次性注射器_低值3^n61
goodsName: 一次性注射器_低值gV9^n
ygptCode: ''
transCond: ''
storageCond: ''
erpCode: '11661476'
erpCode: '11661506'
ybDefId: ''
purTaskId:
multiChargeFlag:
......
data/b5_spd3_core_business_flow/message18
View file @ d520a49e
条码信息:
list_a:
- &id001
- id: '100000142024070900000602'
- id: '100000142024071200000004'
lastModified:
version:
createTime: '2024-07-09 08:41:23'
createTime: '2024-07-12 08:05:09'
createUser:
lastModifiedUser:
snCode: '100000142024070900000602'
snCode: '100000142024071200000004'
hosId: h0347
branchId:
stockId: 32bc153acdb34c969f4ed39bf10d58c2
areaCode: areah03472689
stockId: 49c401cc82704c7f8c9d110ff39e9106
areaCode: areah03472727
areaName: 自动化测试
shelfCode: areah03472689-2-01-01
shelfCode: areah03472727-2-01-01
codeType: 16
tagType: 0
hosGoodsId: h034700004511
mdmGoodsCode: '11661464'
goodsCode: '00004511'
goodsDi: '37380000045110'
hosGoodsId: h034700004547
mdmGoodsCode: '11661506'
goodsCode: '00004547'
goodsDi: '01123456789012'
barName: 100支/100
batchCode: '333'
expdtDate: '2025-01-15'
productDate: '2024-07-09'
expdtDate: '2025-01-18'
productDate: '2024-07-12'
mfrCode:
mfrCodeSee:
pkgCode: "013738000004511010333\x1D1124070917250115241100000142024070900000602"
pkgCodeSee: '0137380000045110103331124070917250115241100000142024070900000602'
ssccCode: '010839000188893220'
pkgCode: "010112345678901210333\x1D1124071217250118241100000142024071200000004"
pkgCodeSee: '0101123456789012103331124071217250118241100000142024071200000004'
ssccCode: '010839000189392227'
extInfo:
outId:
tbStatus: 20
goodsCodeDi:
barcodeId:
ext:
pkgDefId: 012d0a2b966a4e84b58793c6855af34d
pkgDefId: 78dc0eecc5f64150b0d98f3a2c367734
pkgDefQty: 100
purBillId: CG2024070920863
purBillId: CG2024071221144
pkgDefName: '100'
distrBillId: PSh0347202407090008
inStockTime: '2024-07-09 08:43:58'
distrDetailId: '03839414'
distrBillId: PSh0347202407120002
inStockTime: '2024-07-12 08:07:55'
distrDetailId: '03839609'
certificateCode: ''
sourceDetailId:
purMode: 10
......@@ -52,8 +52,8 @@
mfrsName:
goodsSpec: G-31891
unit: 支
goodsName: 一次性注射器_低值5^*N%
pkgDefId: 012d0a2b966a4e84b58793c6855af34d
goodsName: 一次性注射器_低值gV9^n
pkgDefId: 78dc0eecc5f64150b0d98f3a2c367734
pkgDefQty: 100
defaultPkgDefQty:
defaultQty:
......@@ -67,10 +67,10 @@
billId:
taskId:
made: 德国
provId: p1e332
provName: 国药集团公司L1slG
subProvId: p1e332
subProvName: 国药集团公司L1slG
provId: p1e34a
provName: 国药集团公司BCJj3
subProvId: p1e34a
subProvName: 国药集团公司BCJj3
provHosGoodsId:
sourceType:
taskDate:
......@@ -82,7 +82,7 @@
areaCodeList:
diType:
mdmGoodsSpecCode:
hosGoodsCode: '00004511'
hosGoodsCode: '00004547'
supplyId:
inSettlement:
spdGoodsCode:
......@@ -114,6 +114,7 @@
settleFlag:
inStockTime:
verifyFlag:
scanType:
subSendFlag: 10
list_b:
- *id001
......
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