From be6d087730545d86f5d798c1e50d8aef0d9b9b5d Mon Sep 17 00:00:00 2001 From: xiao-hesheng Date: Wed, 25 Sep 2024 08:14:13 +0800 Subject: [PATCH] another_Changelist --- data/a2_mdm3_ea/message | 4 +- data/a3_mdm3_hs/message | 4 +- data/a5_mdm3_pdm/message2 | 10 +- data/a6_mdm3_si/message | 65 ++++---- data/b2_herp3_bs/message | 6 +- data/b2_herp3_bs/message3 | 4 +- data/b2_herp3_bs/message4 | 2 +- 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/message13 | 28 ++-- data/b5_spd3_core_business_flow/message14 | 21 +-- data/b5_spd3_core_business_flow/message15 | 4 +- data/b5_spd3_core_business_flow/message16 | 188 +++++++++++++++++----- data/b5_spd3_core_business_flow/message17 | 55 ++++--- data/b5_spd3_core_business_flow/message18 | 166 +++++++++++++------ data/b5_spd3_core_business_flow/message19 | 12 +- data/b5_spd3_core_business_flow/message2 | 10 +- data/b5_spd3_core_business_flow/message20 | 37 ++--- data/b5_spd3_core_business_flow/message21 | 8 +- data/b5_spd3_core_business_flow/message22 | 20 +-- 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 | 30 ++-- report/summary.html | 12 +- 31 files changed, 477 insertions(+), 285 deletions(-) diff --git a/data/a2_mdm3_ea/message b/data/a2_mdm3_ea/message index 3d79a8fa..9f6150f4 100644 --- a/data/a2_mdm3_ea/message +++ b/data/a2_mdm3_ea/message @@ -1,3 +1,3 @@ 企业信息: - e_id: CR202407090038 - cname: 国药集团公司L1slG + e_id: CR202409120038 + cname: 国药集团公司Dk&FX diff --git a/data/a3_mdm3_hs/message b/data/a3_mdm3_hs/message index 4f1a4119..55af8fa8 100644 --- a/data/a3_mdm3_hs/message +++ b/data/a3_mdm3_hs/message @@ -1,3 +1,3 @@ 医院信息: - h_id: 湖南省人民医院@mRoD - h_name: 湖南省人民医院@mRoD + h_id: 湖南省人民医院bIoAC + h_name: 湖南省人民医院bIoAC diff --git a/data/a5_mdm3_pdm/message2 b/data/a5_mdm3_pdm/message2 index b8886bca..7fae1da5 100644 --- a/data/a5_mdm3_pdm/message2 +++ b/data/a5_mdm3_pdm/message2 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2407090011_1 + MSPid: MSP2409120010_1 hosId: h0347 - hosGoodsId: h034700004514 - provGoodsid: provGood-99221710 - goodsAuditBillId: MSP2407090011 - targetId: MSP2407090011_1 + hosGoodsId: h034700005072 + provGoodsid: provGood-99222344 + goodsAuditBillId: MSP2409120010 + targetId: MSP2409120010_1 diff --git a/data/a6_mdm3_si/message b/data/a6_mdm3_si/message index ef47129c..7e59c97f 100644 --- a/data/a6_mdm3_si/message +++ b/data/a6_mdm3_si/message @@ -1,11 +1,11 @@ 结算开票信息: list_a: - &id001 - settleMonth: '202407' - pid: OBh0347202407090006 - hosGoodsId: h034700004511 - goodsCode: '00004511' - goodsName: 一次性注射器_低值5^*N% + settleMonth: '202409' + pid: OBh0347202409240006 + hosGoodsId: h034700005069 + goodsCode: '00005069' + goodsName: 一次性注射器_低值Lr^E0 goodsGg: G-31891 mfrsName: 德国歌德公司 Geuder AG unit: 支 @@ -16,18 +16,18 @@ cacheleftAmount: 19999.98 purMode: 10 waitInvoicingNum: 0.0 - invoicingPrice: + invoicingPrice: 99.9999 normalContractId: normalContract: '1' detailList: - - pid: OBh0347202407090006 - settleMonth: '202407' - accountDate: '2024-07-09' - hosGoodsId: h034700004511 + - pid: OBh0347202409240006 + settleMonth: '202409' + accountDate: '2024-09-24' + hosGoodsId: h034700005069 batchCode: '333' - distrDetailId: '03839414' - distrId: PSh0347202407090008 - distrOrderNo: PSh0347202407090008 + distrDetailId: '03841377' + distrId: PSh0347202409120007 + distrOrderNo: PSh0347202409120007 settlePrice: 99.9999 maxSettleQty: -100.0 maxSettleAmount: -9999.99 @@ -36,11 +36,11 @@ leftSettleQty: -100.0 leftSettleAmount: -9999.99 hosId: h0347 - provId: p1e332 - branchId: h0347-3738 - balanceDetId: OBh0347202407090006-000001 + provId: p1e3cd + branchId: h0347-3641 + balanceDetId: OBh0347202409240006-000001 purMode: 10 - barCode: '0137380000045110103331124070917250115241100000142024070900000602' + barCode: '01364100000506901124091217250321103332103472024091200000382' batchId: price: maxQty: @@ -53,15 +53,15 @@ volumeFlag: onlineKind: invoicePrice: 99.9999 - viewId: 202407OBh0347202407090006h034700004511 - - pid: OBh0347202407090006 - settleMonth: '202407' - accountDate: '2024-07-09' - hosGoodsId: h034700004511 + viewId: 202409OBh0347202409240006h034700005069 + - pid: OBh0347202409240006 + settleMonth: '202409' + accountDate: '2024-09-24' + hosGoodsId: h034700005069 batchCode: '333' - distrDetailId: '03839417' - distrId: PSh0347202407090011 - distrOrderNo: PSh0347202407090011 + distrDetailId: '03841610' + distrId: PSh0347202409240007 + distrOrderNo: PSh0347202409240007 settlePrice: 99.9999 maxSettleQty: 100.0 maxSettleAmount: 9999.99 @@ -70,11 +70,11 @@ leftSettleQty: 100.0 leftSettleAmount: 9999.99 hosId: h0347 - provId: p1e332 - branchId: h0347-3738 - balanceDetId: OBh0347202407090006-000002 + provId: p1e3cd + branchId: h0347-3641 + balanceDetId: OBh0347202409240006-000002 purMode: 10 - barCode: '0137380000045110103331124070917250115241100000142024070900000993' + barCode: 013641000005069011240924172504021033321UT240924000008 batchId: price: maxQty: @@ -87,10 +87,11 @@ volumeFlag: onlineKind: invoicePrice: 99.9999 - viewId: 202407OBh0347202407090006h034700004511 - unique: 202407OBh0347202407090006h034700004511 + viewId: 202409OBh0347202409240006h034700005069 + unique: 202409OBh0347202409240006h034700005069 + invoicePrice: onlineKind: '10' - viewId: 202407OBh0347202407090006h034700004511 + viewId: 202409OBh0347202409240006h034700005069 list_b: - *id001 list_c: diff --git a/data/b2_herp3_bs/message b/data/b2_herp3_bs/message index 844819a0..c6e7048c 100644 --- a/data/b2_herp3_bs/message +++ b/data/b2_herp3_bs/message @@ -1,6 +1,6 @@ 院区新增: - branch_id: h0347-3761 - branch_name: 东土城路院区l7B8J + branch_id: h0347-3641 + branch_name: 东土城路院区E3YVe 科室信息: - dept2_id: 924c2c4187334c01a846e1fa2323c5cf + dept2_id: 327ed981d695457880bc5622fa90d641 dept2_name: 二级检验科002 diff --git a/data/b2_herp3_bs/message3 b/data/b2_herp3_bs/message3 index 952711ac..2da34cf7 100644 --- a/data/b2_herp3_bs/message3 +++ b/data/b2_herp3_bs/message3 @@ -1,3 +1,3 @@ 用户名信息: - username1: 自动化测试D5M9c - username2: 自动化测试D5M9c + username1: 自动化测试gief4 + username2: 自动化测试gief4 diff --git a/data/b2_herp3_bs/message4 b/data/b2_herp3_bs/message4 index 8759067f..064afd38 100644 --- a/data/b2_herp3_bs/message4 +++ b/data/b2_herp3_bs/message4 @@ -1,3 +1,3 @@ 一级科室信息: - dept1_id: d467187bce7f458eb5c4e1007f557353 + dept1_id: 2c2069ed30084987b25592be25b1c1fa dept1_name: 设备科001 diff --git a/data/b2_herp3_bs/message7 b/data/b2_herp3_bs/message7 index 0ecd9441..befd9865 100644 --- a/data/b2_herp3_bs/message7 +++ b/data/b2_herp3_bs/message7 @@ -1,4 +1,4 @@ shelfinfo: - shelfid: 4227bbab7b3c4ea98553cf1c9e764bf6 - shelfCode: areah03472689 + shelfid: 0908ff9f96b74524a56bb8dab2182aa3 + shelfCode: areah03472121 areaName: 自动化测试 diff --git a/data/b5_spd3_core_business_flow/message b/data/b5_spd3_core_business_flow/message index 141b9273..1613698a 100644 --- a/data/b5_spd3_core_business_flow/message +++ b/data/b5_spd3_core_business_flow/message @@ -1,5 +1,5 @@ 供货关系申请2: - e_corpId: p1e3ae + e_corpId: p1e3cd h_corpId: h0347 - e_username: 国药集团公司lSTdZ + e_username: 国药集团公司Dk&FX h_name: test_1 diff --git a/data/b5_spd3_core_business_flow/message1 b/data/b5_spd3_core_business_flow/message1 index 9350425f..ef348b6b 100644 --- a/data/b5_spd3_core_business_flow/message1 +++ b/data/b5_spd3_core_business_flow/message1 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2408220013_1 + MSPid: MSP2409120006_1 hosId: h0347 - hosGoodsId: h034700004905 - provGoodsid: provGood-99222157 - goodsAuditBillId: MSP2408220013 - targetId: MSP2408220013_1 + hosGoodsId: h034700005068 + provGoodsid: provGood-99222340 + goodsAuditBillId: MSP2409120006 + targetId: MSP2409120006_1 diff --git a/data/b5_spd3_core_business_flow/message10 b/data/b5_spd3_core_business_flow/message10 index 882d911f..a9dac506 100644 --- a/data/b5_spd3_core_business_flow/message10 +++ b/data/b5_spd3_core_business_flow/message10 @@ -1,9 +1,9 @@ 低值配送单号: - distrBillId1: PSh0347202407090060 - distrBillId2: PSh0347202407090060 + distrBillId1: PSh0347202409240026 + distrBillId2: PSh0347202409240026 高值配送单号: - distrBillId1: PSh0347202407090061 - distrBillId2: PSh0347202407090061 + distrBillId1: PSh0347202409240027 + distrBillId2: PSh0347202409240027 试剂配送单号: - distrBillId1: PSh0347202407090062 - distrBillId2: PSh0347202407090062 + distrBillId1: PSh0347202409240028 + distrBillId2: PSh0347202409240028 diff --git a/data/b5_spd3_core_business_flow/message11 b/data/b5_spd3_core_business_flow/message11 index 139e0f6b..6ebb1a52 100644 --- a/data/b5_spd3_core_business_flow/message11 +++ b/data/b5_spd3_core_business_flow/message11 @@ -1,3 +1,3 @@ 采购计划单号高值: - orderNo1: PLAN2024070931920 - orderNo2: PLAN2024070931920 + orderNo1: PLAN2024092424668 + orderNo2: PLAN2024092424668 diff --git a/data/b5_spd3_core_business_flow/message12 b/data/b5_spd3_core_business_flow/message12 index 1a4e5394..9ea812a9 100644 --- a/data/b5_spd3_core_business_flow/message12 +++ b/data/b5_spd3_core_business_flow/message12 @@ -1,3 +1,3 @@ 采购计划单号试剂: - orderNo1: PLAN2024070931922 - orderNo2: PLAN2024070931922 + orderNo1: PLAN2024092424669 + orderNo2: PLAN2024092424669 diff --git a/data/b5_spd3_core_business_flow/message13 b/data/b5_spd3_core_business_flow/message13 index 6b4344b2..9295791d 100644 --- a/data/b5_spd3_core_business_flow/message13 +++ b/data/b5_spd3_core_business_flow/message13 @@ -3,35 +3,37 @@ - &id001 - id: hosId: h0347 - branchId: h0347-3764 + branchId: h0347-3641 deptId: taskType: 1 - sourceOrgId: p1e3ae - sourceOrgName: 国药集团公司lSTdZ - sourceOrderNo: PSh0347202408280004 - billMode: '25' + sourceOrgId: p1e3cd + sourceOrgName: 国药集团公司Dk&FX + sourceOrderNo: PSh0347202409240028 + billMode: '66' stockKind: purMode: - sourceId: PSh0347202408280004 + sourceId: PSh0347202409240028 sourceDetailId: sourceType: PSD sourceTypeName: 配送单 sourceVersion: 1 - planOrderNo: SSSQ202408280385 - purOrderNo: SSTZ202408280363 - recOrgId: 9e693185220a45c5a9fb8328f4d45b5d + planOrderNo: PLAN2024092424669 + purOrderNo: CG2024092417256 + recOrgId: 327ed981d695457880bc5622fa90d641 recOrgName: 二级检验科002 - billRelationJson: '{"operationApplyOrderNo":"SSSQ202408280385","operationNoticeBillId":"Nh034720240828000001","distrBillId":"PSh0347202408280004","operationNoticeOrderNo":"SSTZ202408280363","distrOrderNo":"PSh0347202408280004","operationApplyBillId":"Oh034720240828000001"}' - taskDate: '2024-08-28 16:05:13' + billRelationJson: '{"buyBillId":"Bh03472024092400048","planBillId":"Ph034720240924021314","planOrderNo":"PLAN2024092424669","buyOrderNo":"BUY2024092404650","purOrderNo":"CG2024092417256","purBillId":"Ch034720240924000056","purBillDate":"2024-09-24 + 12:42:26","distrBillId":"PSh0347202409240028","distrOrderNo":"PSh0347202409240028"}' + taskDate: '2024-09-24 12:43:14' taskDateStart: taskDateEnd: billModeList: viewIdList: - supplierFlag: false + supplierFlag: true tbStatus: 20 - remark: + remark: '' pdaFlag: areaCode: + areaCodeName: list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message14 b/data/b5_spd3_core_business_flow/message14 index 4c28f1bd..077a8ed7 100644 --- a/data/b5_spd3_core_business_flow/message14 +++ b/data/b5_spd3_core_business_flow/message14 @@ -3,11 +3,11 @@ - &id001 - purMode: 60 unitName: 100支/100 - hosGoodsId: h034700004512 + hosGoodsId: h034700005070 mdmGoodsCode: - spdGoodsCode: '11661465' - goodsCode: '00004512' - goodsName: 新型冠状病毒检测试剂t(I8N + spdGoodsCode: '11662098' + goodsCode: '00005070' + goodsName: 新型冠状病毒检测试剂jGRMV goodsGg: G-31891 mfrsId: mfrsName: 德国歌德公司 Geuder AG @@ -22,16 +22,16 @@ pkgDefName: '100' pkgDefQty: 100.0 batchCode: '4444' - expdtDate: '2025-01-15' - productDate: '2024-07-09' - provName: 国药集团公司L1slG + expdtDate: '2025-04-02' + productDate: '2024-09-24' + provName: 国药集团公司Dk&FX provId: - viewId: '03839469' + viewId: '03841631' verifyFlag: 0 hasSterilize: 0 - id: '03839469' + id: '03841631' detailRelationJson: - extInfo: '{"goodsGg":"G-31891","goodsCode":"00004512","purMode":60,"goodsName":"新型冠状病毒检测试剂t(I8N","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661465","ybDefId":""}' + extInfo: '{"goodsGg":"G-31891","goodsCode":"00005070","purMode":60,"goodsName":"新型冠状病毒检测试剂jGRMV","ygptCode":"","transCond":"","storageCond":"","erpCode":"11662098","ybDefId":""}' recTemperature: 20 recHumidity: 30 distrPrice: 99.9999 @@ -58,6 +58,7 @@ codingType: 0 limitMessage: autoUnpack: 0 + orderNo: list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message15 b/data/b5_spd3_core_business_flow/message15 index 858ccacd..5f360c3b 100644 --- a/data/b5_spd3_core_business_flow/message15 +++ b/data/b5_spd3_core_business_flow/message15 @@ -1,3 +1,3 @@ 验收单号: - CHECK_NO1: CHECKh03472024082800004 - CHECK_NO2: CHECKh03472024082800004 + CHECK_NO1: CHECKh03472024092400031 + CHECK_NO2: CHECKh03472024092400031 diff --git a/data/b5_spd3_core_business_flow/message16 b/data/b5_spd3_core_business_flow/message16 index 6309c3a3..459e6ef7 100644 --- a/data/b5_spd3_core_business_flow/message16 +++ b/data/b5_spd3_core_business_flow/message16 @@ -5,34 +5,34 @@ lastModified: version: createTime: - createUser: h0347_UID-051404 + createUser: h0347_UID-051303 lastModifiedUser: billMode: '66' recType: stockKind: purMode: - sourceId: DRh034720240709000126 + sourceId: DRh034720240924000086 sourceType: CK_TK sourceVersion: 1 batchList: billRelationJson: hosId: h0347 - deptId: d467187bce7f458eb5c4e1007f557353 + deptId: 2c2069ed30084987b25592be25b1c1fa deptName: - branchId: h0347-3738 + branchId: h0347-3641 branchName: taskType: 2 - sourceOrgId: 7b4d11aec57042e096684a46e9148fdd + sourceOrgId: 327ed981d695457880bc5622fa90d641 sourceOrgName: 二级检验科002 - sourceOrderNo: DN20240709000126 - taskSourceNo: DN20240709000126 + sourceOrderNo: DN20240924000086 + taskSourceNo: DN20240924000086 areaCode: areaName: goodsName: goodsGg: startDate: endDate: - taskDate: '2024-07-09 12:16:02' + taskDate: '2024-09-24 12:51:06' pkgTaskId: pkgFlag: remark: '' @@ -60,34 +60,144 @@ lastModified: version: createTime: - createUser: h0347_UID-051404 + createUser: h0347_UID-051303 + lastModifiedUser: + billMode: '20' + recType: + stockKind: + purMode: + sourceId: CHECKh03472024091400014 + sourceType: PSD + sourceVersion: 0 + batchList: + billRelationJson: + hosId: h0347 + deptId: 2c2069ed30084987b25592be25b1c1fa + deptName: + branchId: h0347-3641 + branchName: + taskType: 1 + sourceOrgId: p1e3cd + sourceOrgName: 国药集团公司Dk&FX + sourceOrderNo: YS240914014 + taskSourceNo: PSh0347202409140006 + areaCode: areah03472121 + areaName: 自动化测试 + goodsName: + goodsGg: + startDate: + endDate: + taskDate: '2024-09-14 13:12:17' + 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-051303 lastModifiedUser: billMode: '16' recType: stockKind: purMode: - sourceId: CHECKh03472024070900027 + sourceId: CHECKh03472024091400013 + sourceType: PSD + sourceVersion: 0 + batchList: + billRelationJson: + hosId: h0347 + deptId: 2c2069ed30084987b25592be25b1c1fa + deptName: + branchId: h0347-3641 + branchName: + taskType: 1 + sourceOrgId: p1e3cd + sourceOrgName: 国药集团公司Dk&FX + sourceOrderNo: YS240914013 + taskSourceNo: PSh0347202409140005 + areaCode: areah03472121 + areaName: 自动化测试 + goodsName: + goodsGg: + startDate: + endDate: + taskDate: '2024-09-14 13:11:52' + 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-051303 + lastModifiedUser: + billMode: '66' + recType: + stockKind: + purMode: + sourceId: CHECKh03472024091200023 sourceType: PSD sourceVersion: 0 batchList: billRelationJson: hosId: h0347 - deptId: d467187bce7f458eb5c4e1007f557353 + deptId: 2c2069ed30084987b25592be25b1c1fa deptName: - branchId: h0347-3738 + branchId: h0347-3641 branchName: taskType: 1 - sourceOrgId: p1e332 - sourceOrgName: 国药集团公司L1slG - sourceOrderNo: YS240709027 - taskSourceNo: PSh0347202407090032 - areaCode: areah03472689 + sourceOrgId: p1e3cd + sourceOrgName: 国药集团公司Dk&FX + sourceOrderNo: YS240912023 + taskSourceNo: PSh0347202409120018 + areaCode: areah03472121 areaName: 自动化测试 goodsName: goodsGg: startDate: endDate: - taskDate: '2024-07-09 10:30:56' + taskDate: '2024-09-12 13:31:43' pkgTaskId: pkgFlag: remark: '' @@ -115,34 +225,34 @@ lastModified: version: createTime: - createUser: h0347_UID-051404 + createUser: h0347_UID-051303 lastModifiedUser: billMode: '20' recType: stockKind: purMode: - sourceId: CHECKh03472024070900003 + sourceId: CHECKh03472024091200022 sourceType: PSD sourceVersion: 0 batchList: billRelationJson: hosId: h0347 - deptId: d467187bce7f458eb5c4e1007f557353 + deptId: 2c2069ed30084987b25592be25b1c1fa deptName: - branchId: h0347-3738 + branchId: h0347-3641 branchName: taskType: 1 - sourceOrgId: p1e332 - sourceOrgName: 国药集团公司L1slG - sourceOrderNo: YS240709003 - taskSourceNo: PSh0347202407090006 - areaCode: areah03472689 + sourceOrgId: p1e3cd + sourceOrgName: 国药集团公司Dk&FX + sourceOrderNo: YS240912022 + taskSourceNo: PSh0347202409120017 + areaCode: areah03472121 areaName: 自动化测试 goodsName: goodsGg: startDate: endDate: - taskDate: '2024-07-09 08:39:47' + taskDate: '2024-09-12 13:31:18' pkgTaskId: pkgFlag: remark: '' @@ -170,34 +280,34 @@ lastModified: version: createTime: - createUser: h0347_UID-051404 + createUser: h0347_UID-051303 lastModifiedUser: - billMode: '66' + billMode: '16' recType: stockKind: purMode: - sourceId: CHECKh03472024070900002 + sourceId: CHECKh03472024091200021 sourceType: PSD sourceVersion: 0 batchList: billRelationJson: hosId: h0347 - deptId: d467187bce7f458eb5c4e1007f557353 + deptId: 2c2069ed30084987b25592be25b1c1fa deptName: - branchId: h0347-3738 + branchId: h0347-3641 branchName: taskType: 1 - sourceOrgId: p1e332 - sourceOrgName: 国药集团公司L1slG - sourceOrderNo: YS240709002 - taskSourceNo: PSh0347202407090007 - areaCode: areah03472689 + sourceOrgId: p1e3cd + sourceOrgName: 国药集团公司Dk&FX + sourceOrderNo: YS240912021 + taskSourceNo: PSh0347202409120016 + areaCode: areah03472121 areaName: 自动化测试 goodsName: goodsGg: startDate: endDate: - taskDate: '2024-07-09 08:38:32' + taskDate: '2024-09-12 13:30:47' pkgTaskId: pkgFlag: remark: '' diff --git a/data/b5_spd3_core_business_flow/message17 b/data/b5_spd3_core_business_flow/message17 index 63e27e85..7366d618 100644 --- a/data/b5_spd3_core_business_flow/message17 +++ b/data/b5_spd3_core_business_flow/message17 @@ -1,7 +1,7 @@ 验收单库存详情信息: list_a: - &id001 - - id: DRh0347202407090001260001 + - id: DRh0347202409240000860001 lastModified: version: createTime: @@ -10,27 +10,27 @@ rowIdx: purMode: 60 unitName: 100支/100 - pid: DRh034720240709000126 - hosGoodsId: h034700004512 + pid: DRh034720240924000086 + hosGoodsId: h034700005070 batchCode: '4444' - expdtDate: '2025-01-15' - productDate: '2024-07-09' + expdtDate: '2025-03-21' + productDate: '2024-09-12' batchPrice: 99.9999 settlement: 1 batchType: 40 - srcBatchId: Ph034724070900003 + srcBatchId: Ph034724091200012 srcBatchPrice: 99.9999 - shelfCode: areah03472689-2-01-01 + shelfCode: areah03472121-2-01-01 shelfKind: - barcodeId: '100000142024070900000805' + barcodeId: '03472024091200000525' subBarcodeId: qty: 100.0 pkgQty: 1 - distrId: PSh0347202407090010 - distrDetailId: '03839416' + distrId: PSh0347202409120009 + distrDetailId: '03841379' pkgDefQty: pkgDefName: - viewId: h03470000451244442025-01-15100支/100 + viewId: h03470000507044442025-03-21100支/100 codingType: batchFlag: hasSterilize: 0 @@ -38,26 +38,26 @@ sterilizePassQty: sterilizeRejectQty: orderNo: - sourceDetailId: PICKh03472407090091660001 - mdmGoodsCode: '11661465' - goodsCode: '00004512' + sourceDetailId: PICKh03472409240064660001 + mdmGoodsCode: '11662098' + goodsCode: '00005070' tbStatus: billMode: hosId: branchId: - purBillId: Ch034720240709000039 - provId: p1e332 + purBillId: Ch034720240912000006 + provId: p1e3cd provName: - subProvId: p1e332 + subProvId: p1e3cd purDetailId: - goodsName: 新型冠状病毒检测试剂t(I8N + goodsName: 新型冠状病毒检测试剂jGRMV goodsGg: G-31891 mfrsId: mfrs-11229 mfrsName: 德国歌德公司 Geuder AG made: 德国 unit: 支 - sourceBatchId: Ph034724070900003 - targetBatchId: Ph034724070900003 + sourceBatchId: Ph034724091200012 + targetBatchId: Ph034724091200012 pkgDefId: certificateCode: '' productCertCode: @@ -65,21 +65,23 @@ psiPrice: 99.9999 ext: goodsGg: G-31891 - goodsCode: '00004512' + goodsCode: '00005070' purMode: 60 - goodsName: 新型冠状病毒检测试剂t(I8N + goodsName: 新型冠状病毒检测试剂jGRMV ygptCode: '' transCond: '' storageCond: '' - erpCode: '11661465' + erpCode: '11662098' ybDefId: '' contractId: '' normalContractId: '' + normalDetailId: '' fcatId: '' fcatName: '' goodsKindId: '' goodsKindName: '' miTwentysevenCode: '' + chargeFlag: 1 focus_control: '0' focus_control_type: rtnQty: @@ -88,10 +90,13 @@ pkgCodeSee: chargeFlag: stockKind: CK_TK - sourceDeptId: 7b4d11aec57042e096684a46e9148fdd - targetDeptId: d467187bce7f458eb5c4e1007f557353 + sourceDeptId: 327ed981d695457880bc5622fa90d641 + targetDeptId: 2c2069ed30084987b25592be25b1c1fa ableDelFlag: pickType: KS_TK + recTemperature: + recHumidity: + jfCode: list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message18 b/data/b5_spd3_core_business_flow/message18 index fcfa57fc..60d63b1d 100644 --- a/data/b5_spd3_core_business_flow/message18 +++ b/data/b5_spd3_core_business_flow/message18 @@ -1,54 +1,124 @@ 条码信息: list_a: - &id001 - id: '100000142024082200000877' - snCode: '100000142024082200000877' - ssccCode: '010839000192616327' - pkgCodeSee: '01376400000490701124082217250228104444241100000142024082200000877' - hosGoodsId: h034700004907 - hosGoodsCode: '00004907' - goodsCode: '00004907' - goodsName: 新型冠状病毒检测试剂C7HGi - goodsSpec: G-31891 - goodsMfrsName: 德国歌德公司 Geuder AG - unit: 支 - purMode: 60 - batchCode: '4444' - productDate: '2024-08-22' - expdtDate: '2025-02-28' - pkgDefName: '100' - pkgDefQty: 100.0 - stockId: 4188c1ded3aa4c838904ee1cc6013645 - stockName: 东土城路院区Hyl74中心库房 - areaName: 自动化测试 - areaCode: areah03472838 - lockStatus: 0 - unitName: 100支/100 - shelfCode: areah03472838-2-01-01 - shelfName: - shelfNo: 自动化测试-2-01-01 - pkgDefId: 7b0c0e35ef8943abbc87ebd8540e3150 - extInfo: '{"pkgDefId": "7b0c0e35ef8943abbc87ebd8540e3150", "pkgDefQty": 100, "purBillId": - "CG2024082223071", "pkgDefName": "100", "distrBillId": "PSh0347202408220016", - "inStockTime": "2024-08-22 14:23:42", "distrDetailId": "03841116", "certificateCode": - ""}' - bottleId: - pkgType: '66' - miDjmc: '' - miCode: '' - transferRatio: 1.0 - qty: 1 - shelfKind: 0 - shelfKindName: 普通货位 - provName: 国药集团公司lSTdZ - provId: p1e3ae - inStockDate: - mfrCode: - made: 德国 - price: - barName: 100支/100 - purModeText: 检验试剂 - codeType: 66 + - id: '03472024091200000382' + lastModified: + version: + createTime: '2024-09-12 10:24:23' + createUser: + lastModifiedUser: + snCode: '03472024091200000382' + hosId: h0347 + branchId: + stockId: 24d5ec62951d4fe7a18bcf3c05c4af93 + areaCode: areah03472121 + areaName: 自动化测试 + shelfCode: areah03472121-2-01-01 + codeType: 16 + tagType: 0 + hosGoodsId: h034700005069 + mdmGoodsCode: '11662097' + goodsCode: '00005069' + goodsDi: '36410000050690' + barName: 100支/100 + batchCode: '333' + expdtDate: '2025-03-21' + productDate: '2024-09-12' + mfrCode: + mfrCodeSee: + pkgCode: "0136410000050690112409121725032110333\x1D2103472024091200000382" + pkgCodeSee: '01364100000506901124091217250321103332103472024091200000382' + ssccCode: '010839000193105721' + extInfo: + outId: + tbStatus: 20 + goodsCodeDi: + barcodeId: + ext: + pkgDefId: e7da4ed969c94aaa81c61209c298c21e + pkgDefQty: 100 + purBillId: CG2024091216952 + pkgDefName: '100' + distrBillId: PSh0347202409120007 + inStockTime: '2024-09-12 10:27:08' + distrDetailId: '03841377' + certificateCode: '' + sourceDetailId: + purMode: 10 + purModes: + price: + pid: + goodsMfrsName: 德国歌德公司 Geuder AG + mfrsName: + goodsSpec: G-31891 + unit: 支 + goodsName: 一次性注射器_低值Lr^E0 + pkgDefId: e7da4ed969c94aaa81c61209c298c21e + pkgDefQty: 100 + defaultPkgDefQty: + defaultQty: + defaultSurplusQty: + defaultPkgDefId: + purDetailId: + pkgDefName: '100' + printNum: 0 + deptId: + deptName: + billId: + taskId: + made: 德国 + provId: p1e3cd + provName: 国药集团公司Dk&FX + subProvId: p1e3cd + subProvName: 国药集团公司Dk&FX + provHosGoodsId: + sourceType: + taskDate: + sourceOrderNo: + taskType: + detailId: + branchGoodsPkgDefList: + unitName: + areaCodeList: + diType: + mdmGoodsSpecCode: + hosGoodsCode: '00005069' + 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: + scanType: + goodsRegCert: + jfCode: + pkgCount: + subSendFlag: 10 list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message19 b/data/b5_spd3_core_business_flow/message19 index a95b6d81..b91a5160 100644 --- a/data/b5_spd3_core_business_flow/message19 +++ b/data/b5_spd3_core_business_flow/message19 @@ -1,12 +1,12 @@ 产品信息: list_a: - &id001 - - hosGoodsId: h034700004510 - hosGoodsCode: '00004510' - provId: p1e332 - subProvId: p1e332 - subProvName: 国药集团公司L1slG - goodsName: 高值牙钻机Mm)84 + - hosGoodsId: h034700005068 + hosGoodsCode: '00005068' + provId: p1e3cd + subProvId: p1e3cd + subProvName: 国药集团公司Dk&FX + goodsName: 高值牙钻机C^!zw goodsSpec: G-31891 goodsGeneralName: goodsMfrsId: mfrs-11229 diff --git a/data/b5_spd3_core_business_flow/message2 b/data/b5_spd3_core_business_flow/message2 index eba0b926..8c3092b2 100644 --- a/data/b5_spd3_core_business_flow/message2 +++ b/data/b5_spd3_core_business_flow/message2 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2408220014_1 + MSPid: MSP2409120007_1 hosId: h0347 - hosGoodsId: h034700004906 - provGoodsid: provGood-99222158 - goodsAuditBillId: MSP2408220014 - targetId: MSP2408220014_1 + hosGoodsId: h034700005069 + provGoodsid: provGood-99222341 + goodsAuditBillId: MSP2409120007 + targetId: MSP2409120007_1 diff --git a/data/b5_spd3_core_business_flow/message20 b/data/b5_spd3_core_business_flow/message20 index 93dc030d..f5ec4e93 100644 --- a/data/b5_spd3_core_business_flow/message20 +++ b/data/b5_spd3_core_business_flow/message20 @@ -1,34 +1,35 @@ 二级库条码信息: list_a: - &id001 - id: '100000142024070900001202' - snCode: '100000142024070900001202' - ssccCode: '010839000188953221' - pkgCodeSee: '01000000000045101022221124070917250115241100000142024070900001202' - hosGoodsId: h034700004510 - hosGoodsCode: '00004510' - goodsCode: '00004510' - goodsName: 高值牙钻机Mm)84 + id: '8800000001079645' + snCode: '8800000001079645' + ssccCode: '010839000193539724' + pkgCodeSee: '01000000000050681124092317250401102222218800000001079645' + hosGoodsId: h034700005068 + hosGoodsCode: '00005068' + goodsCode: '00005068' + goodsName: 高值牙钻机C^!zw goodsSpec: G-31891 goodsMfrsName: 德国歌德公司 Geuder AG unit: 支 purMode: 20 batchCode: '2222' - productDate: '2024-07-09' - expdtDate: '2025-01-15' + productDate: '2024-09-23' + expdtDate: '2025-04-01' pkgDefName: pkgDefQty: 1.0 - stockId: 26779c8a02644b9a8089cc0909d214c0 + stockId: fef8ed0040dc467db609d7bdd413e388 stockName: 二级检验科002库房 areaName: 默认库区 - areaCode: areah03472686 + areaCode: areah03472120 lockStatus: 0 unitName: 1支 - shelfCode: areah03472686-A-01-01 + shelfCode: areah03472120-A-01-01 + shelfName: shelfNo: A01-A-01-01 pkgDefId: - extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202407090015", "inStockTime": - "2024-07-09 09:02:14", "useFrequency": 1, "distrDetailId": "03839421", "multiChargeFlag": + extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202409230009", "inStockTime": + "2024-09-23 12:09:05", "useFrequency": 1, "distrDetailId": "03841578", "multiChargeFlag": 0}' bottleId: pkgType: '25' @@ -38,9 +39,9 @@ qty: 1 shelfKind: 0 shelfKindName: 普通货位 - provName: 国药集团公司L1slG - provId: p1e332 - inStockDate: '2024-07-09 09:02:13' + provName: 国药集团公司Dk&FX + provId: p1e3cd + inStockDate: '2024-09-23 12:09:10' mfrCode: made: 德国 price: diff --git a/data/b5_spd3_core_business_flow/message21 b/data/b5_spd3_core_business_flow/message21 index fe5f54a3..513b7d10 100644 --- a/data/b5_spd3_core_business_flow/message21 +++ b/data/b5_spd3_core_business_flow/message21 @@ -16,7 +16,7 @@ pkgDefName: '100' pkgDefQty: 100.0 pkgQty: - qty: 1000.0 + qty: 7100.0 goodsImg: [] pkgDefId: ae9b52ae8e5b4f5aa501f8ea717180bb buyPkgQty: @@ -34,7 +34,7 @@ targetStockName: 东土城路院区E3YVe中心库房 purchaseFlag: 1 tempFlag: 0 - grantWay: 1 + grantWay: 3 deptGoodsStatus: codingType: 0 chargeFlag: 1 @@ -43,8 +43,8 @@ goodsRegCert: '' applicationScope: provName: 国药集团公司Dk&FX - noRecPkgQty: 2.0 - noRecQty: 200.0 + noRecPkgQty: 9.0 + noRecQty: 900.0 autoUnpack: 0 consumeQty: consumePkgQty: diff --git a/data/b5_spd3_core_business_flow/message22 b/data/b5_spd3_core_business_flow/message22 index bfb59067..81510520 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: b45a3ceccda94d5ab2f06a00d636d14f - lastModified: '2024-07-09 11:01:55' + - id: 61e842f2ee614679b78328e2aee3ce67 + lastModified: '2024-09-23 12:45:35' version: 6 - createTime: '2024-07-09 05:03:32' - createUser: h0347_UID-051404 - lastModifiedUser: h0347_UID-051404 - stockId: 26779c8a02644b9a8089cc0909d214c0 - shelfCode: areah03472686 + createTime: '2024-09-12 09:15:06' + createUser: h0347_UID-051303 + lastModifiedUser: h0347_UID-051303 + stockId: 17c861b1d8764fd7aaeef0240d87f39b + shelfCode: areah03472119 shelfName: 默认库区 - address: 二级检验科002 + address: 三级检测组003 shelfType: stockType: 0 defaultFlag: 1 @@ -18,13 +18,13 @@ parentId: levelCode: tbStatus: 1 - linkman: h0347_UID-051404 + linkman: h0347_UID-051303 recPhone: None delFlag: 0 shelfNo: A01 shelfKind: 0 hosId: - deptId: 7b4d11aec57042e096684a46e9148fdd + deptId: 31b4f8c5f92a49c08686378f14b74c07 areaCode: areaName: stockName: diff --git a/data/b5_spd3_core_business_flow/message3 b/data/b5_spd3_core_business_flow/message3 index 020ec76c..2ea43775 100644 --- a/data/b5_spd3_core_business_flow/message3 +++ b/data/b5_spd3_core_business_flow/message3 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2408220015_1 + MSPid: MSP2409120008_1 hosId: h0347 - hosGoodsId: h034700004907 - provGoodsid: provGood-99222159 - goodsAuditBillId: MSP2408220015 - targetId: MSP2408220015_1 + hosGoodsId: h034700005070 + provGoodsid: provGood-99222342 + goodsAuditBillId: MSP2409120008 + targetId: MSP2409120008_1 diff --git a/data/b5_spd3_core_business_flow/message4 b/data/b5_spd3_core_business_flow/message4 index 2918523c..4b34ac32 100644 --- a/data/b5_spd3_core_business_flow/message4 +++ b/data/b5_spd3_core_business_flow/message4 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2407090010_1 + MSPid: MSP2409120009_1 hosId: h0347 - hosGoodsId: h034700004513 - provGoodsid: provGood-99221709 - goodsAuditBillId: MSP2407090010 - targetId: MSP2407090010_1 + hosGoodsId: h034700005071 + provGoodsid: provGood-99222343 + goodsAuditBillId: MSP2409120009 + targetId: MSP2409120009_1 diff --git a/data/b5_spd3_core_business_flow/message5 b/data/b5_spd3_core_business_flow/message5 index b8886bca..7fae1da5 100644 --- a/data/b5_spd3_core_business_flow/message5 +++ b/data/b5_spd3_core_business_flow/message5 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2407090011_1 + MSPid: MSP2409120010_1 hosId: h0347 - hosGoodsId: h034700004514 - provGoodsid: provGood-99221710 - goodsAuditBillId: MSP2407090011 - targetId: MSP2407090011_1 + hosGoodsId: h034700005072 + provGoodsid: provGood-99222344 + goodsAuditBillId: MSP2409120010 + targetId: MSP2409120010_1 diff --git a/data/b5_spd3_core_business_flow/message6 b/data/b5_spd3_core_business_flow/message6 index 5c290b12..64c0f4e9 100644 --- a/data/b5_spd3_core_business_flow/message6 +++ b/data/b5_spd3_core_business_flow/message6 @@ -1,3 +1,3 @@ 产品包装信息: - unitPackageid1: 8ce905b956f14453b958d0da398c0350 - unitPackageid2: 8ce905b956f14453b958d0da398c0350 + unitPackageid1: ae9b52ae8e5b4f5aa501f8ea717180bb + unitPackageid2: ae9b52ae8e5b4f5aa501f8ea717180bb diff --git a/data/b5_spd3_core_business_flow/message7 b/data/b5_spd3_core_business_flow/message7 index 43e43001..635430ef 100644 --- a/data/b5_spd3_core_business_flow/message7 +++ b/data/b5_spd3_core_business_flow/message7 @@ -1,3 +1,3 @@ 采购计划单号: - orderNo1: PLAN2024070931921 - orderNo2: PLAN2024070931921 + orderNo1: PLAN2024092424670 + orderNo2: PLAN2024092424670 diff --git a/data/b5_spd3_core_business_flow/message8 b/data/b5_spd3_core_business_flow/message8 index 5c886926..d72f5286 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: Ch034720240709000102 - lastModified: '2024-07-09 11:37:11' + - id: Ch034720240924000056 + lastModified: '2024-09-24 12:42:26' version: 0 - createTime: '2024-07-09 11:37:11' - createUser: h0347_UID-051404 + createTime: '2024-09-24 12:42:26' + createUser: h0347_UID-051303 lastModifiedUser: - orderNo: CG2024070920928 + orderNo: CG2024092417256 billMode: '66' recType: HDI hosId: h0347 - branchId: h0347-3738 + branchId: h0347-3641 deptId: deptName: - recOrgId: 7b4d11aec57042e096684a46e9148fdd + recOrgId: 327ed981d695457880bc5622fa90d641 recOrgName: 二级检验科002 areaCode: areaName: billExpdtDate: - sourceId: Ph034720240709028567 + sourceId: Ph034720240924021314 sourceType: inSettlement: recUser: recPhone: recAddr: 自动化测试 - provId: p1e332 - provName: 国药集团公司L1slG + provId: p1e3cd + provName: 国药集团公司Dk&FX subSendFlag: - exeProvId: p1e332 - exeProvName: 国药集团公司L1slG + exeProvId: p1e3cd + exeProvName: 国药集团公司Dk&FX billRelationJson: extInfo: barcodeFlag: 1 @@ -43,11 +43,13 @@ hosVersion: 3 billType: CGD hosName: 邹城市人民医院(test) - branchName: 东土城路院区8SpTq + branchName: 东土城路院区E3YVe sumQty: 100.0 sumPkgQty: 1.0 sumAmount: '9999.9900' - planOrderNo: PLAN2024070931922 + sumReplQty: 0.0 + planOrderNo: PLAN2024092424669 + replBillNo: list_b: - *id001 list_c: diff --git a/report/summary.html b/report/summary.html index 3d4070bc..dd175d81 100644 --- a/report/summary.html +++ b/report/summary.html @@ -76,9 +76,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 1 - 0 - 0分55秒 - 0.0% + 1 + 0分8秒 + 100.0% @@ -93,9 +93,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 - a_b4流程十一请领业务流_二级库向直送_数据库验证 - 失败 - 55.354 + r_b8库房管理_库区设置_同步库房信息 + 成功 + 8.392 xiaohesheng -- GitLab