Skip to content
GitLab
Commit 17e0bc9b 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 915d7827
Expand all Hide whitespace changes
Inline Side-by-side
data/b5_spd3_core_business_flow/message2
View file @ 17e0bc9b
产品审核信息: 产品审核信息:
MSPid: MSP2407090008_1 MSPid: MSP2407100008_1
hosId: h0347 hosId: h0347
hosGoodsId: h034700004511 hosGoodsId: h034700004523
provGoodsid: provGood-99221707 provGoodsid: provGood-99221719
goodsAuditBillId: MSP2407090008 goodsAuditBillId: MSP2407100008
targetId: MSP2407090008_1 targetId: MSP2407100008_1
data/b5_spd3_core_business_flow/message21
View file @ 17e0bc9b
二级库请领产品信息: 二级库请领产品信息:
list_a: list_a:
- &id001 - &id001
- hosGoodsId: h034700004512 - hosGoodsId: h034700004076
purMode: 60 purMode: 60
grantRule: grantRule:
id: id:
goodsName: 新型冠状病毒检测试剂t(I8N goodsName: 新型冠状病毒检测试剂DJUhI
goodsSpec: G-31891 goodsSpec: G-31891
mdmGoodsCode: '11661465' mdmGoodsCode: '11661024'
goodsCode: '00004512' goodsCode: '00004076'
unit: 支 unit: 支
goodsMfrsName: 德国歌德公司 Geuder AG goodsMfrsName: 德国歌德公司 Geuder AG
miDjmc: '' miDjmc: ''
...@@ -16,33 +16,33 @@ ...@@ -16,33 +16,33 @@
pkgDefName: '100' pkgDefName: '100'
pkgDefQty: 100.0 pkgDefQty: 100.0
pkgQty: pkgQty:
qty: 600.0 qty: 400.0
goodsImg: [] goodsImg: []
pkgDefId: 8ce905b956f14453b958d0da398c0350 pkgDefId: 0d3db4404bcb46b9b80830502f069b4f
buyPkgQty: buyPkgQty:
unitName: 100支/100 unitName: 100支/100
price: 99.9999 price: 99.9999
hosId: hosId:
branchId: branchId:
deptId: 7b4d11aec57042e096684a46e9148fdd deptId: a463883417d44685862ebc9eb9c62990
deptName: deptName:
areaCode: areaCode:
areaName: areaName:
targetDeptId: d467187bce7f458eb5c4e1007f557353 targetDeptId: 42d415ddd37444858d61aa923d936b16
targetDeptName: 设备科001 targetDeptName: 设备科001
targetStockId: 32bc153acdb34c969f4ed39bf10d58c2 targetStockId: 61b06063d63c43848a1bac7f3a3debb4
targetStockName: 东土城路院区8SpTq中心库房 targetStockName: 东土城路院区!uON*中心库房
purchaseFlag: 1 purchaseFlag: 1
tempFlag: 0 tempFlag: 0
grantWay: 2 grantWay: 3
deptGoodsStatus: deptGoodsStatus:
codingType: 0 codingType: 0
purModeText: 检验试剂 purModeText: 检验试剂
goodsGeneralName: 检测试剂 goodsGeneralName: 检测试剂
provName: 国药集团公司L1slG provName: 国药集团公司2u7a4
noRecPkgQty: 12.0 noRecPkgQty: 1.0
noRecQty: 1200.0 noRecQty: 100.0
autoUnpack: 0 autoUnpack:
consumeQty: consumeQty:
consumePkgQty: consumePkgQty:
list_b: list_b:
......
data/b5_spd3_core_business_flow/message22
View file @ 17e0bc9b
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
list_a: list_a:
- &id001 - &id001
- id: b45a3ceccda94d5ab2f06a00d636d14f - id: b45a3ceccda94d5ab2f06a00d636d14f
lastModified: '2024-07-09 11:01:55' lastModified: '2024-07-09 05:03:32'
version: 6 version: 0
createTime: '2024-07-09 05:03:32' createTime: '2024-07-09 05:03:32'
createUser: h0347_UID-051404 createUser: UID-050151
lastModifiedUser: h0347_UID-051404 lastModifiedUser: UID-050151
stockId: 26779c8a02644b9a8089cc0909d214c0 stockId: 26779c8a02644b9a8089cc0909d214c0
shelfCode: areah03472686 shelfCode: areah03472686
shelfName: 默认库区 shelfName: 默认库区
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
parentId: parentId:
levelCode: levelCode:
tbStatus: 1 tbStatus: 1
linkman: h0347_UID-051404 linkman:
recPhone: None recPhone:
delFlag: 0 delFlag: 0
shelfNo: A01 shelfNo: A01
shelfKind: 0 shelfKind: 0
......
data/b5_spd3_core_business_flow/message3
View file @ 17e0bc9b
产品审核信息: 产品审核信息:
MSPid: MSP2407090009_1 MSPid: MSP2407100009_1
hosId: h0347 hosId: h0347
hosGoodsId: h034700004512 hosGoodsId: h034700004524
provGoodsid: provGood-99221708 provGoodsid: provGood-99221720
goodsAuditBillId: MSP2407090009 goodsAuditBillId: MSP2407100009
targetId: MSP2407090009_1 targetId: MSP2407100009_1
data/b5_spd3_core_business_flow/message4
View file @ 17e0bc9b
产品审核信息: 产品审核信息:
MSPid: MSP2407090010_1 MSPid: MSP2407100010_1
hosId: h0347 hosId: h0347
hosGoodsId: h034700004513 hosGoodsId: h034700004525
provGoodsid: provGood-99221709 provGoodsid: provGood-99221721
goodsAuditBillId: MSP2407090010 goodsAuditBillId: MSP2407100010
targetId: MSP2407090010_1 targetId: MSP2407100010_1
data/b5_spd3_core_business_flow/message5
View file @ 17e0bc9b
产品审核信息: 产品审核信息:
MSPid: MSP2407090011_1 MSPid: MSP2407100011_1
hosId: h0347 hosId: h0347
hosGoodsId: h034700004514 hosGoodsId: h034700004526
provGoodsid: provGood-99221710 provGoodsid: provGood-99221722
goodsAuditBillId: MSP2407090011 goodsAuditBillId: MSP2407100011
targetId: MSP2407090011_1 targetId: MSP2407100011_1
data/b5_spd3_core_business_flow/message6
View file @ 17e0bc9b
产品包装信息: 产品包装信息:
unitPackageid1: 8ce905b956f14453b958d0da398c0350 unitPackageid1: ebfc175df3854ee0b53e168604691235
unitPackageid2: 8ce905b956f14453b958d0da398c0350 unitPackageid2: ebfc175df3854ee0b53e168604691235
data/b5_spd3_core_business_flow/message7
View file @ 17e0bc9b
采购计划单号: 采购计划单号:
orderNo1: PLAN2024070931921 orderNo1: PLAN2024071032048
orderNo2: PLAN2024070931921 orderNo2: PLAN2024071032048
data/b5_spd3_core_business_flow/message8
View file @ 17e0bc9b
配送订单信息: 配送订单信息:
list_a: list_a:
- &id001 - &id001
- id: Ch034720240709000102 - id: Ch034720240710000054
lastModified: '2024-07-09 11:37:11' lastModified: '2024-07-10 09:18:21'
version: 0 version: 0
createTime: '2024-07-09 11:37:11' createTime: '2024-07-10 09:18:21'
createUser: h0347_UID-051404 createUser: h0347_UID-051406
lastModifiedUser: lastModifiedUser:
orderNo: CG2024070920928 orderNo: CG2024071021006
billMode: '66' billMode: '66'
recType: HDI recType: YND
hosId: h0347 hosId: h0347
branchId: h0347-3738 branchId: h0347-3740
deptId: deptId:
deptName: deptName:
recOrgId: 7b4d11aec57042e096684a46e9148fdd recOrgId: 7e43ae2e3d9b4280adf74d34961032e2
recOrgName: 二级检验科002 recOrgName: 设备科001
areaCode: areaCode:
areaName: areaName:
billExpdtDate: billExpdtDate:
sourceId: Ph034720240709028567 sourceId: Ph034720240710028695
sourceType: sourceType:
inSettlement: inSettlement:
recUser: recUser:
recPhone: recPhone:
recAddr: 自动化测试 recAddr: 自动化测试
provId: p1e332 provId: p1e336
provName: 国药集团公司L1slG provName: 国药集团公司uHVs@
subSendFlag: subSendFlag:
exeProvId: p1e332 exeProvId: p1e336
exeProvName: 国药集团公司L1slG exeProvName: 国药集团公司uHVs@
billRelationJson: billRelationJson:
extInfo: extInfo:
barcodeFlag: 1 barcodeFlag: 1
...@@ -43,11 +43,11 @@ ...@@ -43,11 +43,11 @@
hosVersion: 3 hosVersion: 3
billType: CGD billType: CGD
hosName: 邹城市人民医院(test) hosName: 邹城市人民医院(test)
branchName: 东土城路院区8SpTq branchName: 东土城路院区hEY9e
sumQty: 100.0 sumQty: 10000.0
sumPkgQty: 1.0 sumPkgQty: 100.0
sumAmount: '9999.9900' sumAmount: '999999.0000'
planOrderNo: PLAN2024070931922 planOrderNo: PLAN2024071032050
list_b: list_b:
- *id001 - *id001
list_c: list_c:
......
data/b5_spd3_core_business_flow/message9
View file @ 17e0bc9b
配送订单详细信息: 配送订单详细信息:
list_a: list_a:
- &id001 - &id001
- id: d4a7491724fe4cc999389fa90a61f8c0 - id: c8a2f99f81a84258abc800e6df5b47f7
lastModified: lastModified:
version: version:
createTime: createTime:
createUser: createUser:
lastModifiedUser: lastModifiedUser:
pid: Ch034720240709000102 pid: Ch034720240710000054
orderNo: CG2024070920928 orderNo: CG2024071021006
sourceId: 3a72d228422f4f6abf14c9129e4ea520 sourceId: 507e033879904f9296675ab3abd74c6e
hosGoodsId: h034700004512 hosGoodsId: h034700004524
mdmGoodsCode: '11661465' mdmGoodsCode: '11661477'
goodsCode: '00004512' goodsCode: '00004524'
purMode: 60 purMode: 60
price: '99.9999' price: '99.9999'
supplyId: 6e75c97bc0f84967b819e9a210592d53 supplyId: 7a69e604dfbc4216987e0535d2e889b5
pkgDefId: 8ce905b956f14453b958d0da398c0350 pkgDefId: ebfc175df3854ee0b53e168604691235
pkgDefName: '100' pkgDefName: '100'
pkgDefQty: 100.0 pkgDefQty: 100.0
pkgQty: 1.0 pkgQty: 100.0
qty: 100.0 qty: 10000.0
conPkgQty: 1.0 conPkgQty: 100.0
conQty: 100.0 conQty: 10000.0
checkPkgQty: 0.0 checkPkgQty: 0.0
checkQty: 0.0 checkQty: 0.0
distrPkgQty: 0.0 distrPkgQty: 0.0
...@@ -31,18 +31,18 @@ ...@@ -31,18 +31,18 @@
notSendPkgQty: 0.0 notSendPkgQty: 0.0
inSettlement: 1 inSettlement: 1
closeType: 1 closeType: 1
detailRelationJson: '{"planBillId":"Ph034720240709028567","buyDetailId":"Bh034720240709000810001","planDetailId":"3a72d228422f4f6abf14c9129e4ea520"}' detailRelationJson: '{"planBillId":"Ph034720240710028695","planDetailId":"507e033879904f9296675ab3abd74c6e"}'
extInfo: '{"goodsGg":"G-31891","goodsCode":"00004512","purMode":60,"goodsName":"新型冠状病毒检测试剂t(I8N"}' extInfo: '{"goodsGg":"G-31891","goodsCode":"00004524","purMode":60,"goodsName":"新型冠状病毒检测试剂6ux#Q"}'
remark: remark:
tbStatus: tbStatus:
hosVersion: hosVersion:
unit: 支 unit: 支
goodsName: 新型冠状病毒检测试剂t(I8N goodsName: 新型冠状病毒检测试剂6ux#Q
mfrsId: mfrs-11229 mfrsId: mfrs-11229
mfrsName: 德国歌德公司 Geuder AG mfrsName: 德国歌德公司 Geuder AG
goodsGg: G-31891 goodsGg: G-31891
mdmGoodsSpecCode: '11661465' mdmGoodsSpecCode: '11661477'
erpCode: '11661465' erpCode: '11661477'
made: 德国 made: 德国
goodsDi: '01123456789012' goodsDi: '01123456789012'
miDjmc: miDjmc:
...@@ -66,17 +66,17 @@ ...@@ -66,17 +66,17 @@
transCond: '' transCond: ''
storageCond: '' storageCond: ''
diType: gs1 diType: gs1
diUse: '37380000045120' diUse: '37400000045240'
multiChargeFlag: 0 multiChargeFlag: 0
useFrequency: 1 useFrequency: 1
chargeUnit: chargeUnit:
amount: '9999.9900' amount: '999999.0000'
unitName: 100支/100 unitName: 100支/100
subProvId: p1e332 subProvId: p1e336
subProvName: 国药集团公司L1slG subProvName: 国药集团公司uHVs@
subPrice: 99.9999 subPrice: 99.9999
replPkgQty: 1.0 replPkgQty: 100.0
replQty: 100.0 replQty: 10000.0
ybDefId: ybDefId:
logicId: logicId:
provGoodsId: provGoodsId:
......
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