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
产品信息: 产品信息:
list_a: list_a:
- &id001 - &id001
- hosGoodsId: h034700004510 - hosGoodsId: h034700004546
hosGoodsCode: '00004510' hosGoodsCode: '00004546'
provId: p1e332 provId: p1e34a
subProvId: p1e332 subProvId: p1e34a
subProvName: 国药集团公司L1slG subProvName: 国药集团公司BCJj3
goodsName: 高值牙钻机Mm)84 goodsName: 高值牙钻机yg5eu
goodsSpec: G-31891 goodsSpec: G-31891
goodsGeneralName: goodsGeneralName:
goodsMfrsId: mfrs-11229 goodsMfrsId: mfrs-11229
......
产品审核信息: 产品审核信息:
MSPid: MSP2407100008_1 MSPid: MSP2407120008_1
hosId: h0347 hosId: h0347
hosGoodsId: h034700004523 hosGoodsId: h034700004547
provGoodsid: provGood-99221719 provGoodsid: provGood-99221748
goodsAuditBillId: MSP2407100008 goodsAuditBillId: MSP2407120008
targetId: MSP2407100008_1 targetId: MSP2407120008_1
二级库条码信息: 二级库条码信息:
list_a: list_a:
- &id001 - &id001
id: '100000142024070900001202' id: '100000142024071200000301'
snCode: '100000142024070900001202' snCode: '100000142024071200000301'
ssccCode: '010839000188953221' ssccCode: '010839000189421927'
pkgCodeSee: '01000000000045101022221124070917250115241100000142024070900001202' pkgCodeSee: '01000000000045461022221124071217250118241100000142024071200000301'
hosGoodsId: h034700004510 hosGoodsId: h034700004546
hosGoodsCode: '00004510' hosGoodsCode: '00004546'
goodsCode: '00004510' goodsCode: '00004546'
goodsName: 高值牙钻机Mm)84 goodsName: 高值牙钻机yg5eu
goodsSpec: G-31891 goodsSpec: G-31891
goodsMfrsName: 德国歌德公司 Geuder AG goodsMfrsName: 德国歌德公司 Geuder AG
unit: unit:
purMode: 20 purMode: 20
batchCode: '2222' batchCode: '2222'
productDate: '2024-07-09' productDate: '2024-07-12'
expdtDate: '2025-01-15' expdtDate: '2025-01-18'
pkgDefName: pkgDefName:
pkgDefQty: 1.0 pkgDefQty: 1.0
stockId: 26779c8a02644b9a8089cc0909d214c0 stockId: 43295b7afb7f436683e89076a51232e5
stockName: 二级检验科002库房 stockName: 二级检验科002库房
areaName: 默认库区 areaName: 默认库区
areaCode: areah03472686 areaCode: areah03472726
lockStatus: 0 lockStatus: 0
unitName: 1支 unitName: 1支
shelfCode: areah03472686-A-01-01 shelfCode: areah03472726-A-01-01
shelfNo: A01-A-01-01 shelfNo: A01-A-01-01
pkgDefId: pkgDefId:
extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202407090015", "inStockTime": extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202407120005", "inStockTime":
"2024-07-09 09:02:14", "useFrequency": 1, "distrDetailId": "03839421", "multiChargeFlag": "2024-07-12 08:15:52", "useFrequency": 1, "distrDetailId": "03839612", "multiChargeFlag":
0}' 0}'
bottleId: bottleId:
pkgType: '25' pkgType: '25'
...@@ -38,9 +38,9 @@ ...@@ -38,9 +38,9 @@
qty: 1 qty: 1
shelfKind: 0 shelfKind: 0
shelfKindName: 普通货位 shelfKindName: 普通货位
provName: 国药集团公司L1slG provName: 国药集团公司BCJj3
provId: p1e332 provId: p1e34a
inStockDate: '2024-07-09 09:02:13' inStockDate: '2024-07-12 08:15:52'
mfrCode: mfrCode:
made: 德国 made: 德国
price: price:
......
二级库请领产品信息: 二级库请领产品信息:
list_a: list_a:
- &id001 - &id001
- hosGoodsId: h034700004076 - hosGoodsId: h034700004548
purMode: 60 purMode: 60
grantRule: grantRule:
id: id:
goodsName: 新型冠状病毒检测试剂DJUhI goodsName: 新型冠状病毒检测试剂#JL$M
goodsSpec: G-31891 goodsSpec: G-31891
mdmGoodsCode: '11661024' mdmGoodsCode: '11661507'
goodsCode: '00004076' goodsCode: '00004548'
unit: unit:
goodsMfrsName: 德国歌德公司 Geuder AG goodsMfrsName: 德国歌德公司 Geuder AG
miDjmc: '' miDjmc: ''
...@@ -16,22 +16,22 @@ ...@@ -16,22 +16,22 @@
pkgDefName: '100' pkgDefName: '100'
pkgDefQty: 100.0 pkgDefQty: 100.0
pkgQty: pkgQty:
qty: 400.0 qty: 1600.0
goodsImg: [] goodsImg: []
pkgDefId: 0d3db4404bcb46b9b80830502f069b4f pkgDefId: ad7ebe1c0b0d42869c1bff9468f0d727
buyPkgQty: buyPkgQty:
unitName: 100支/100 unitName: 100支/100
price: 99.9999 price: 99.9999
hosId: hosId:
branchId: branchId:
deptId: a463883417d44685862ebc9eb9c62990 deptId: e6a7862c7b3d49a69ab93979a8f32710
deptName: deptName:
areaCode: areaCode:
areaName: areaName:
targetDeptId: 42d415ddd37444858d61aa923d936b16 targetDeptId: b82f526b0c4c438c95ccafd8a07d3af6
targetDeptName: 设备科001 targetDeptName: 设备科001
targetStockId: 61b06063d63c43848a1bac7f3a3debb4 targetStockId: 49c401cc82704c7f8c9d110ff39e9106
targetStockName: 东土城路院区!uON*中心库房 targetStockName: 东土城路院区&BvGU中心库房
purchaseFlag: 1 purchaseFlag: 1
tempFlag: 0 tempFlag: 0
grantWay: 3 grantWay: 3
...@@ -39,10 +39,10 @@ ...@@ -39,10 +39,10 @@
codingType: 0 codingType: 0
purModeText: 检验试剂 purModeText: 检验试剂
goodsGeneralName: 检测试剂 goodsGeneralName: 检测试剂
provName: 国药集团公司2u7a4 provName: 国药集团公司BCJj3
noRecPkgQty: 1.0 noRecPkgQty: 2.0
noRecQty: 100.0 noRecQty: 200.0
autoUnpack: autoUnpack: 0
consumeQty: consumeQty:
consumePkgQty: consumePkgQty:
list_b: list_b:
......
库区信息: 库区信息:
list_a: list_a:
- &id001 - &id001
- id: b45a3ceccda94d5ab2f06a00d636d14f - id: 529a05a8036748ca8c3c7c5e310ef149
lastModified: '2024-07-09 05:03:32' lastModified: '2024-07-12 08:16:19'
version: 0 version: 1
createTime: '2024-07-09 05:03:32' createTime: '2024-07-12 08:02:32'
createUser: UID-050151 createUser: h0347_UID-051410
lastModifiedUser: UID-050151 lastModifiedUser: h0347_UID-051410
stockId: 26779c8a02644b9a8089cc0909d214c0 stockId: 43295b7afb7f436683e89076a51232e5
shelfCode: areah03472686 shelfCode: areah03472726
shelfName: 默认库区 shelfName: 默认库区
address: 二级检验科002 address: 二级检验科002
shelfType: shelfType:
...@@ -18,13 +18,13 @@ ...@@ -18,13 +18,13 @@
parentId: parentId:
levelCode: levelCode:
tbStatus: 1 tbStatus: 1
linkman: linkman: h0347_UID-051410
recPhone: recPhone: None
delFlag: 0 delFlag: 0
shelfNo: A01 shelfNo: A01
shelfKind: 0 shelfKind: 0
hosId: hosId:
deptId: 7b4d11aec57042e096684a46e9148fdd deptId: e6a7862c7b3d49a69ab93979a8f32710
areaCode: areaCode:
areaName: areaName:
stockName: stockName:
......
产品审核信息: 产品审核信息:
MSPid: MSP2407100009_1 MSPid: MSP2407120009_1
hosId: h0347 hosId: h0347
hosGoodsId: h034700004524 hosGoodsId: h034700004548
provGoodsid: provGood-99221720 provGoodsid: provGood-99221749
goodsAuditBillId: MSP2407100009 goodsAuditBillId: MSP2407120009
targetId: MSP2407100009_1 targetId: MSP2407120009_1
产品审核信息: 产品审核信息:
MSPid: MSP2407100010_1 MSPid: MSP2407120010_1
hosId: h0347 hosId: h0347
hosGoodsId: h034700004525 hosGoodsId: h034700004549
provGoodsid: provGood-99221721 provGoodsid: provGood-99221750
goodsAuditBillId: MSP2407100010 goodsAuditBillId: MSP2407120010
targetId: MSP2407100010_1 targetId: MSP2407120010_1
产品审核信息: 产品审核信息:
MSPid: MSP2407100011_1 MSPid: MSP2407120011_1
hosId: h0347 hosId: h0347
hosGoodsId: h034700004526 hosGoodsId: h034700004550
provGoodsid: provGood-99221722 provGoodsid: provGood-99221751
goodsAuditBillId: MSP2407100011 goodsAuditBillId: MSP2407120011
targetId: MSP2407100011_1 targetId: MSP2407120011_1
产品包装信息: 产品包装信息:
unitPackageid1: ebfc175df3854ee0b53e168604691235 unitPackageid1: ad7ebe1c0b0d42869c1bff9468f0d727
unitPackageid2: ebfc175df3854ee0b53e168604691235 unitPackageid2: ad7ebe1c0b0d42869c1bff9468f0d727
采购计划单号: 采购计划单号:
orderNo1: PLAN2024071032048 orderNo1: PLAN2024071232520
orderNo2: PLAN2024071032048 orderNo2: PLAN2024071232520
配送订单信息: 配送订单信息:
list_a: list_a:
- &id001 - &id001
- id: Ch034720240710000054 - id: Ch034720240712000091
lastModified: '2024-07-10 09:18:21' lastModified: '2024-07-12 11:17:11'
version: 0 version: 0
createTime: '2024-07-10 09:18:21' createTime: '2024-07-12 11:17:11'
createUser: h0347_UID-051406 createUser: h0347_UID-051410
lastModifiedUser: lastModifiedUser:
orderNo: CG2024071021006 orderNo: CG2024071221204
billMode: '66' billMode: '66'
recType: YND recType: YND
hosId: h0347 hosId: h0347
branchId: h0347-3740 branchId: h0347-3745
deptId: deptId:
deptName: deptName:
recOrgId: 7e43ae2e3d9b4280adf74d34961032e2 recOrgId: b82f526b0c4c438c95ccafd8a07d3af6
recOrgName: 设备科001 recOrgName: 设备科001
areaCode: areaCode:
areaName: areaName:
billExpdtDate: billExpdtDate:
sourceId: Ph034720240710028695 sourceId: Ph034720240712029167
sourceType: sourceType:
inSettlement: inSettlement:
recUser: recUser:
recPhone: recPhone:
recAddr: 自动化测试 recAddr: 自动化测试
provId: p1e336 provId: p1e34a
provName: 国药集团公司uHVs@ provName: 国药集团公司BCJj3
subSendFlag: subSendFlag:
exeProvId: p1e336 exeProvId: p1e34a
exeProvName: 国药集团公司uHVs@ exeProvName: 国药集团公司BCJj3
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: 东土城路院区hEY9e branchName: 东土城路院区&BvGU
sumQty: 10000.0 sumQty: 10000.0
sumPkgQty: 100.0 sumPkgQty: 100.0
sumAmount: '999999.0000' sumAmount: '999999.0000'
planOrderNo: PLAN2024071032050 planOrderNo: PLAN2024071232522
list_b: list_b:
- *id001 - *id001
list_c: list_c:
......
配送订单详细信息: 配送订单详细信息:
list_a: list_a:
- &id001 - &id001
- id: c8a2f99f81a84258abc800e6df5b47f7 - id: 8a4737aac84b410bb203b4c050b31e58
lastModified: lastModified:
version: version:
createTime: createTime:
createUser: createUser:
lastModifiedUser: lastModifiedUser:
pid: Ch034720240710000054 pid: Ch034720240712000091
orderNo: CG2024071021006 orderNo: CG2024071221204
sourceId: 507e033879904f9296675ab3abd74c6e sourceId: d4a297506e0b426faf4505f215dc9a68
hosGoodsId: h034700004524 hosGoodsId: h034700004548
mdmGoodsCode: '11661477' mdmGoodsCode: '11661507'
goodsCode: '00004524' goodsCode: '00004548'
purMode: 60 purMode: 60
price: '99.9999' price: '99.9999'
supplyId: 7a69e604dfbc4216987e0535d2e889b5 supplyId: 658f164522e44b3fb2e17fba17a95da1
pkgDefId: ebfc175df3854ee0b53e168604691235 pkgDefId: ad7ebe1c0b0d42869c1bff9468f0d727
pkgDefName: '100' pkgDefName: '100'
pkgDefQty: 100.0 pkgDefQty: 100.0
pkgQty: 100.0 pkgQty: 100.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":"Ph034720240710028695","planDetailId":"507e033879904f9296675ab3abd74c6e"}' detailRelationJson: '{"planBillId":"Ph034720240712029167","planDetailId":"d4a297506e0b426faf4505f215dc9a68"}'
extInfo: '{"goodsGg":"G-31891","goodsCode":"00004524","purMode":60,"goodsName":"新型冠状病毒检测试剂6ux#Q"}' extInfo: '{"goodsGg":"G-31891","goodsCode":"00004548","purMode":60,"goodsName":"新型冠状病毒检测试剂#JL$M"}'
remark: remark:
tbStatus: tbStatus:
hosVersion: hosVersion:
unit: unit:
goodsName: 新型冠状病毒检测试剂6ux#Q goodsName: 新型冠状病毒检测试剂#JL$M
mfrsId: mfrs-11229 mfrsId: mfrs-11229
mfrsName: 德国歌德公司 Geuder AG mfrsName: 德国歌德公司 Geuder AG
goodsGg: G-31891 goodsGg: G-31891
mdmGoodsSpecCode: '11661477' mdmGoodsSpecCode: '11661507'
erpCode: '11661477' erpCode: '11661507'
made: 德国 made: 德国
goodsDi: '01123456789012' goodsDi: '01123456789012'
miDjmc: miDjmc:
...@@ -65,15 +65,15 @@ ...@@ -65,15 +65,15 @@
goodsRegCert: '' goodsRegCert: ''
transCond: '' transCond: ''
storageCond: '' storageCond: ''
diType: gs1 diType:
diUse: '37400000045240' diUse: '01123456789012'
multiChargeFlag: 0 multiChargeFlag: 0
useFrequency: 1 useFrequency: 1
chargeUnit: chargeUnit:
amount: '999999.0000' amount: '999999.0000'
unitName: 100支/100 unitName: 100支/100
subProvId: p1e336 subProvId: p1e34a
subProvName: 国药集团公司uHVs@ subProvName: 国药集团公司BCJj3
subPrice: 99.9999 subPrice: 99.9999
replPkgQty: 100.0 replPkgQty: 100.0
replQty: 10000.0 replQty: 10000.0
......
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