From 21471af102a38a329a29375955655d0423a68acf Mon Sep 17 00:00:00 2001 From: xiao-hesheng Date: Fri, 28 Jun 2024 08:05:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=84=9A=E6=9C=AC=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/a2_mdm3_ea/message | 4 +- data/a3_mdm3_hs/message | 4 +- data/a5_mdm3_pdm/message2 | 10 ++--- data/b2_herp3_bs/message | 6 +-- data/b2_herp3_bs/message3 | 4 +- data/b2_herp3_bs/message4 | 2 +- data/b2_herp3_bs/message6 | 10 ++--- data/b2_herp3_bs/message7 | 4 +- data/b5_spd3_core_business_flow/message | 4 +- data/b5_spd3_core_business_flow/message1 | 10 ++--- data/b5_spd3_core_business_flow/message10 | 12 +++--- data/b5_spd3_core_business_flow/message11 | 4 +- data/b5_spd3_core_business_flow/message12 | 4 +- data/b5_spd3_core_business_flow/message2 | 10 ++--- data/b5_spd3_core_business_flow/message22 | 24 ++++++------ data/b5_spd3_core_business_flow/message3 | 10 ++--- data/b5_spd3_core_business_flow/message4 | 10 ++--- data/b5_spd3_core_business_flow/message5 | 10 ++--- data/b5_spd3_core_business_flow/message6 | 4 +- data/b5_spd3_core_business_flow/message7 | 4 +- data/b5_spd3_core_business_flow/message8 | 38 +++++++++--------- data/b5_spd3_core_business_flow/message9 | 48 +++++++++++------------ 22 files changed, 118 insertions(+), 118 deletions(-) diff --git a/data/a2_mdm3_ea/message b/data/a2_mdm3_ea/message index 9f0405f5..7f2337cc 100644 --- a/data/a2_mdm3_ea/message +++ b/data/a2_mdm3_ea/message @@ -1,3 +1,3 @@ 企业信息: - e_id: CR202406260095 - cname: 国药集团公司EJey4 + e_id: CR202406280038 + cname: 国药集团公司HcKed diff --git a/data/a3_mdm3_hs/message b/data/a3_mdm3_hs/message index c8c0be6d..35d964c0 100644 --- a/data/a3_mdm3_hs/message +++ b/data/a3_mdm3_hs/message @@ -1,3 +1,3 @@ 医院信息: - h_id: 湖南省人民医院Z5&dX - h_name: 湖南省人民医院Z5&dX + h_id: 湖南省人民医院wlTDM + h_name: 湖南省人民医院wlTDM diff --git a/data/a5_mdm3_pdm/message2 b/data/a5_mdm3_pdm/message2 index e396894d..cf1f0689 100644 --- a/data/a5_mdm3_pdm/message2 +++ b/data/a5_mdm3_pdm/message2 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406260031_1 + MSPid: MSP2406280011_1 hosId: h0347 - hosGoodsId: h034700004283 - provGoodsid: provGood-99221471 - goodsAuditBillId: MSP2406260031 - targetId: MSP2406260031_1 + hosGoodsId: h034700004302 + provGoodsid: provGood-99221495 + goodsAuditBillId: MSP2406280011 + targetId: MSP2406280011_1 diff --git a/data/b2_herp3_bs/message b/data/b2_herp3_bs/message index d2a59b45..1bfbe542 100644 --- a/data/b2_herp3_bs/message +++ b/data/b2_herp3_bs/message @@ -1,6 +1,6 @@ 院区新增: - branch_id: h0347-3701 - branch_name: 东土城路院区!(BYi + branch_id: h0347-3703 + branch_name: 东土城路院区O!1FP 科室信息: - dept2_id: a164fd08a56b448d978c2e48dabc64f6 + dept2_id: af321aaaec034d90aa1aef29b752bd3f dept2_name: 二级检验科002 diff --git a/data/b2_herp3_bs/message3 b/data/b2_herp3_bs/message3 index 1654713d..306e4985 100644 --- a/data/b2_herp3_bs/message3 +++ b/data/b2_herp3_bs/message3 @@ -1,3 +1,3 @@ 用户名信息: - username1: 自动化测试tnS^4 - username2: 自动化测试tnS^4 + username1: 自动化测试jFbwJ + username2: 自动化测试jFbwJ diff --git a/data/b2_herp3_bs/message4 b/data/b2_herp3_bs/message4 index 39257cc4..b06e0a0f 100644 --- a/data/b2_herp3_bs/message4 +++ b/data/b2_herp3_bs/message4 @@ -1,3 +1,3 @@ 一级科室信息: - dept1_id: f94c7beab2524e1eb14aa161d1feac8a + dept1_id: f72c2b5cf1e74269bbea7fb380eb229c dept1_name: 设备科001 diff --git a/data/b2_herp3_bs/message6 b/data/b2_herp3_bs/message6 index 91af16db..d05978b4 100644 --- a/data/b2_herp3_bs/message6 +++ b/data/b2_herp3_bs/message6 @@ -1,9 +1,9 @@ 所有科室id: - deptid1: f94c7beab2524e1eb14aa161d1feac8a - deptid2: a164fd08a56b448d978c2e48dabc64f6 - deptid3: 8aa972b9fcb14c3ebdb27d6b027600e8 - deptid4: 67edba6ed3ee4e7eb44ccfec38c74df7 - deptid5: a73183483031453c9c4a26b71d04ea05 + deptid1: f72c2b5cf1e74269bbea7fb380eb229c + deptid2: af321aaaec034d90aa1aef29b752bd3f + deptid3: e46e777be6424aa999f8167984c192cf + deptid4: 6ab8feb3db4d4fb990d94ea190b7e861 + deptid5: 11f9d75d2dde4699b459ebe03dd4229b 所有科室name: deptid1: 设备科001 deptid2: 二级检验科002 diff --git a/data/b2_herp3_bs/message7 b/data/b2_herp3_bs/message7 index fb8ae58b..b767ba6b 100644 --- a/data/b2_herp3_bs/message7 +++ b/data/b2_herp3_bs/message7 @@ -1,4 +1,4 @@ shelfinfo: - shelfid: 15e6a96ff5374ed19335cabfccd454dd - shelfCode: areah03472488 + shelfid: 3ed05211f813494bbec61c704fe227bf + shelfCode: areah03472500 areaName: 自动化测试 diff --git a/data/b5_spd3_core_business_flow/message b/data/b5_spd3_core_business_flow/message index 4f689add..1fefbede 100644 --- a/data/b5_spd3_core_business_flow/message +++ b/data/b5_spd3_core_business_flow/message @@ -1,5 +1,5 @@ 供货关系申请2: - e_corpId: p1e2d0 + e_corpId: p1e2d6 h_corpId: h0347 - e_username: 国药集团公司EJey4 + e_username: 国药集团公司HcKed h_name: test001 diff --git a/data/b5_spd3_core_business_flow/message1 b/data/b5_spd3_core_business_flow/message1 index 46e4a3cc..33a073d2 100644 --- a/data/b5_spd3_core_business_flow/message1 +++ b/data/b5_spd3_core_business_flow/message1 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406260027_1 + MSPid: MSP2406280007_1 hosId: h0347 - hosGoodsId: h034700004279 - provGoodsid: provGood-99221467 - goodsAuditBillId: MSP2406260027 - targetId: MSP2406260027_1 + hosGoodsId: h034700004298 + provGoodsid: provGood-99221491 + goodsAuditBillId: MSP2406280007 + targetId: MSP2406280007_1 diff --git a/data/b5_spd3_core_business_flow/message10 b/data/b5_spd3_core_business_flow/message10 index ab6cc76c..28fcdabd 100644 --- a/data/b5_spd3_core_business_flow/message10 +++ b/data/b5_spd3_core_business_flow/message10 @@ -1,9 +1,9 @@ 低值配送单号: - distrBillId1: PSh0347202406260035 - distrBillId2: PSh0347202406260035 + distrBillId1: PSh0347202406280006 + distrBillId2: PSh0347202406280006 高值配送单号: - distrBillId1: PSh0347202406260036 - distrBillId2: PSh0347202406260036 + distrBillId1: PSh0347202406280007 + distrBillId2: PSh0347202406280007 试剂配送单号: - distrBillId1: PSh0347202406260037 - distrBillId2: PSh0347202406260037 + distrBillId1: PSh0347202406280008 + distrBillId2: PSh0347202406280008 diff --git a/data/b5_spd3_core_business_flow/message11 b/data/b5_spd3_core_business_flow/message11 index d2343c45..22415bef 100644 --- a/data/b5_spd3_core_business_flow/message11 +++ b/data/b5_spd3_core_business_flow/message11 @@ -1,3 +1,3 @@ 采购计划单号高值: - orderNo1: PLAN2024062630184 - orderNo2: PLAN2024062630184 + orderNo1: PLAN2024062830339 + orderNo2: PLAN2024062830339 diff --git a/data/b5_spd3_core_business_flow/message12 b/data/b5_spd3_core_business_flow/message12 index 05010485..59f9c9e6 100644 --- a/data/b5_spd3_core_business_flow/message12 +++ b/data/b5_spd3_core_business_flow/message12 @@ -1,3 +1,3 @@ 采购计划单号试剂: - orderNo1: PLAN2024062630186 - orderNo2: PLAN2024062630186 + orderNo1: PLAN2024062830340 + orderNo2: PLAN2024062830340 diff --git a/data/b5_spd3_core_business_flow/message2 b/data/b5_spd3_core_business_flow/message2 index b3409143..8d297206 100644 --- a/data/b5_spd3_core_business_flow/message2 +++ b/data/b5_spd3_core_business_flow/message2 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406260028_1 + MSPid: MSP2406280008_1 hosId: h0347 - hosGoodsId: h034700004280 - provGoodsid: provGood-99221468 - goodsAuditBillId: MSP2406260028 - targetId: MSP2406260028_1 + hosGoodsId: h034700004299 + provGoodsid: provGood-99221492 + goodsAuditBillId: MSP2406280008 + targetId: MSP2406280008_1 diff --git a/data/b5_spd3_core_business_flow/message22 b/data/b5_spd3_core_business_flow/message22 index 0854bd8c..67ed795e 100644 --- a/data/b5_spd3_core_business_flow/message22 +++ b/data/b5_spd3_core_business_flow/message22 @@ -1,16 +1,16 @@ 库区信息: list_a: - &id001 - - id: 99968abd895e4985bc5f46cb68d49221 - lastModified: '2024-06-26 14:04:20' - version: 1 - createTime: '2024-06-26 13:41:53' - createUser: h0347_UID-051365 - lastModifiedUser: h0347_UID-051365 - stockId: a304d698ea7b43ac80964d338825012b - shelfCode: areah03472486 + - id: 6490097382b2445e990d72f419ffdfb2 + lastModified: '2024-06-28 07:03:35' + version: 0 + createTime: '2024-06-28 07:03:35' + createUser: UID-050151 + lastModifiedUser: UID-050151 + stockId: 4ffa7170c7e24e90b33555e549b79a69 + shelfCode: areah03472498 shelfName: 默认库区 - address: 二级检验科002 + address: 三级检测组003 shelfType: stockType: 0 defaultFlag: 1 @@ -18,13 +18,13 @@ parentId: levelCode: tbStatus: 1 - linkman: h0347_UID-051365 - recPhone: None + linkman: + recPhone: delFlag: 0 shelfNo: A01 shelfKind: 0 hosId: - deptId: a164fd08a56b448d978c2e48dabc64f6 + deptId: e46e777be6424aa999f8167984c192cf areaCode: areaName: stockName: diff --git a/data/b5_spd3_core_business_flow/message3 b/data/b5_spd3_core_business_flow/message3 index ecac6235..ceba63f0 100644 --- a/data/b5_spd3_core_business_flow/message3 +++ b/data/b5_spd3_core_business_flow/message3 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406260029_1 + MSPid: MSP2406280009_1 hosId: h0347 - hosGoodsId: h034700004281 - provGoodsid: provGood-99221469 - goodsAuditBillId: MSP2406260029 - targetId: MSP2406260029_1 + hosGoodsId: h034700004300 + provGoodsid: provGood-99221493 + goodsAuditBillId: MSP2406280009 + targetId: MSP2406280009_1 diff --git a/data/b5_spd3_core_business_flow/message4 b/data/b5_spd3_core_business_flow/message4 index 2e213fd0..1ed95a19 100644 --- a/data/b5_spd3_core_business_flow/message4 +++ b/data/b5_spd3_core_business_flow/message4 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406260030_1 + MSPid: MSP2406280010_1 hosId: h0347 - hosGoodsId: h034700004282 - provGoodsid: provGood-99221470 - goodsAuditBillId: MSP2406260030 - targetId: MSP2406260030_1 + hosGoodsId: h034700004301 + provGoodsid: provGood-99221494 + goodsAuditBillId: MSP2406280010 + targetId: MSP2406280010_1 diff --git a/data/b5_spd3_core_business_flow/message5 b/data/b5_spd3_core_business_flow/message5 index e396894d..cf1f0689 100644 --- a/data/b5_spd3_core_business_flow/message5 +++ b/data/b5_spd3_core_business_flow/message5 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406260031_1 + MSPid: MSP2406280011_1 hosId: h0347 - hosGoodsId: h034700004283 - provGoodsid: provGood-99221471 - goodsAuditBillId: MSP2406260031 - targetId: MSP2406260031_1 + hosGoodsId: h034700004302 + provGoodsid: provGood-99221495 + goodsAuditBillId: MSP2406280011 + targetId: MSP2406280011_1 diff --git a/data/b5_spd3_core_business_flow/message6 b/data/b5_spd3_core_business_flow/message6 index 31cd2781..9f9d388f 100644 --- a/data/b5_spd3_core_business_flow/message6 +++ b/data/b5_spd3_core_business_flow/message6 @@ -1,3 +1,3 @@ 产品包装信息: - unitPackageid1: d2e7b571331e43368ffe9bd7f4d2e772 - unitPackageid2: d2e7b571331e43368ffe9bd7f4d2e772 + unitPackageid1: e7f685371a90478481b0942098c2597b + unitPackageid2: e7f685371a90478481b0942098c2597b diff --git a/data/b5_spd3_core_business_flow/message7 b/data/b5_spd3_core_business_flow/message7 index e7a93cc7..5fe91abd 100644 --- a/data/b5_spd3_core_business_flow/message7 +++ b/data/b5_spd3_core_business_flow/message7 @@ -1,3 +1,3 @@ 采购计划单号: - orderNo1: PLAN2024062630185 - orderNo2: PLAN2024062630185 + orderNo1: PLAN2024062830338 + orderNo2: PLAN2024062830338 diff --git a/data/b5_spd3_core_business_flow/message8 b/data/b5_spd3_core_business_flow/message8 index 2cbb9cd3..89e6705a 100644 --- a/data/b5_spd3_core_business_flow/message8 +++ b/data/b5_spd3_core_business_flow/message8 @@ -1,35 +1,35 @@ 配送订单信息: list_a: - &id001 - - id: Ch034720240626000087 - lastModified: '2024-06-26 14:18:26' + - id: Ch034720240628000052 + lastModified: '2024-06-28 07:09:33' version: 0 - createTime: '2024-06-26 14:18:26' - createUser: h0347_UID-051365 + createTime: '2024-06-28 07:09:33' + createUser: h0347_UID-051368 lastModifiedUser: - orderNo: CG2024062619774 + orderNo: CG2024062819859 billMode: '66' - recType: HDI + recType: YND hosId: h0347 - branchId: h0347-3701 + branchId: h0347-3703 deptId: deptName: - recOrgId: a164fd08a56b448d978c2e48dabc64f6 - recOrgName: 二级检验科002 + recOrgId: f72c2b5cf1e74269bbea7fb380eb229c + recOrgName: 设备科001 areaCode: areaName: billExpdtDate: - sourceId: Ph034720240626026831 + sourceId: Ph034720240628026985 sourceType: inSettlement: recUser: recPhone: recAddr: 自动化测试 - provId: p1e2d0 - provName: 国药集团公司EJey4 + provId: p1e2d6 + provName: 国药集团公司HcKed subSendFlag: - exeProvId: p1e2d0 - exeProvName: 国药集团公司EJey4 + exeProvId: p1e2d6 + exeProvName: 国药集团公司HcKed billRelationJson: extInfo: barcodeFlag: 1 @@ -43,11 +43,11 @@ hosVersion: 3 billType: CGD hosName: 邹城市人民医院(test) - branchName: 东土城路院区!(BYi - sumQty: 100.0 - sumPkgQty: 1.0 - sumAmount: '9999.9900' - planOrderNo: PLAN2024062630186 + branchName: 东土城路院区O!1FP + sumQty: 10000.0 + sumPkgQty: 100.0 + sumAmount: '999999.0000' + planOrderNo: PLAN2024062830340 list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message9 b/data/b5_spd3_core_business_flow/message9 index 4dde37b2..35891e99 100644 --- a/data/b5_spd3_core_business_flow/message9 +++ b/data/b5_spd3_core_business_flow/message9 @@ -1,28 +1,28 @@ 配送订单详细信息: list_a: - &id001 - - id: 555d2316885b414f99a0683b594b8384 + - id: ba664a9f0c3a4cb197b1bf39e11c67fe lastModified: version: createTime: createUser: lastModifiedUser: - pid: Ch034720240626000087 - orderNo: CG2024062619774 - sourceId: 3af3399cfd2f49e69784fdf09795a7bf - hosGoodsId: h034700004281 - mdmGoodsCode: '11661229' - goodsCode: '00004281' + pid: Ch034720240628000052 + orderNo: CG2024062819859 + sourceId: 11e8e725a92a43299eec2c501a9aab68 + hosGoodsId: h034700004300 + mdmGoodsCode: '11661253' + goodsCode: '00004300' purMode: 60 price: '99.9999' - supplyId: a43b723dd03d43ed899f3878615417c9 - pkgDefId: d2e7b571331e43368ffe9bd7f4d2e772 + supplyId: 5ea17d71f5ab43c9af41a6755bf67c6d + pkgDefId: e7f685371a90478481b0942098c2597b pkgDefName: '100' pkgDefQty: 100.0 - pkgQty: 1.0 - qty: 100.0 - conPkgQty: 1.0 - conQty: 100.0 + pkgQty: 100.0 + qty: 10000.0 + conPkgQty: 100.0 + conQty: 10000.0 checkPkgQty: 0.0 checkQty: 0.0 distrPkgQty: 0.0 @@ -31,18 +31,18 @@ notSendPkgQty: 0.0 inSettlement: 1 closeType: 1 - detailRelationJson: '{"planBillId":"Ph034720240626026831","buyDetailId":"Bh034720240626000150001","planDetailId":"3af3399cfd2f49e69784fdf09795a7bf"}' - extInfo: '{"goodsGg":"G-31891","goodsCode":"00004281","purMode":60,"goodsName":"新型冠状病毒检测试剂4GWk!"}' + detailRelationJson: '{"planBillId":"Ph034720240628026985","planDetailId":"11e8e725a92a43299eec2c501a9aab68"}' + extInfo: '{"goodsGg":"G-31891","goodsCode":"00004300","purMode":60,"goodsName":"新型冠状病毒检测试剂NB9uU"}' remark: tbStatus: hosVersion: unit: 支 - goodsName: 新型冠状病毒检测试剂4GWk! + goodsName: 新型冠状病毒检测试剂NB9uU mfrsId: mfrs-11229 mfrsName: 德国歌德公司 Geuder AG goodsGg: G-31891 - mdmGoodsSpecCode: '11661229' - erpCode: '11661229' + mdmGoodsSpecCode: '11661253' + erpCode: '11661253' made: 德国 goodsDi: '01123456789012' miDjmc: @@ -66,17 +66,17 @@ transCond: '' storageCond: '' diType: gs1 - diUse: '37010000042810' + diUse: '37030000043000' multiChargeFlag: 0 useFrequency: 1 chargeUnit: - amount: '9999.9900' + amount: '999999.0000' unitName: 100支/100 - subProvId: p1e2d0 - subProvName: 国药集团公司EJey4 + subProvId: p1e2d6 + subProvName: 国药集团公司HcKed subPrice: 99.9999 - replPkgQty: 1.0 - replQty: 100.0 + replPkgQty: 100.0 + replQty: 10000.0 ybDefId: logicId: provGoodsId: -- GitLab