From f31cc1a7516edf4d195d6b9a4ef035f546527038 Mon Sep 17 00:00:00 2001 From: xiao-hesheng Date: Sun, 29 Sep 2024 08:04:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BA=94=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...56\345\272\223\351\252\214\350\257\201.py" | 16 +- data/a2_mdm3_ea/message | 4 +- data/a3_mdm3_hs/message | 4 +- data/a5_mdm3_pdm/message2 | 10 +- data/a6_mdm3_si/message | 62 ++-- 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/message13 | 22 +- data/b5_spd3_core_business_flow/message14 | 21 +- data/b5_spd3_core_business_flow/message15 | 4 +- data/b5_spd3_core_business_flow/message16 | 291 +----------------- data/b5_spd3_core_business_flow/message17 | 51 +-- data/b5_spd3_core_business_flow/message18 | 167 +++------- 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 | 28 +- 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 | 28 +- data/b5_spd3_core_business_flow/message9 | 34 +- .../data | 8 +- 34 files changed, 296 insertions(+), 631 deletions(-) diff --git "a/air_case/b6_spd3_core_business_flow_database_check/a_a5\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_a5\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" "b/air_case/b6_spd3_core_business_flow_database_check/a_a5\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_a5\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" index 9fab43f3..09e1b37e 100644 --- "a/air_case/b6_spd3_core_business_flow_database_check/a_a5\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_a5\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" +++ "b/air_case/b6_spd3_core_business_flow_database_check/a_a5\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_a5\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" @@ -314,11 +314,11 @@ def check_mcms_purchase(type=16): dept_name1 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid1'] dept_name2 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'] rec_org_id = process_tuple( - get_id("select id from sys_org where branch_id='%s' and ename='%s';" % (branch_id, dept_name2))) - rec_org_name = dept_name2 + get_id("select id from sys_org where branch_id='%s' and ename='%s';" % (branch_id, dept_name1))) + rec_org_name = dept_name1 info = FileUtils().r_info8("b5_spd3_core_business_flow", "库区信息", 'message22') list_a = info['list_a'] - area_code =get_stockAreaId_new_fromDb(dept_name2, 2) + area_code =get_stockAreaId_new_fromDb(dept_name1, 1) sql1 = "select area_name from mcms_purchase where branch_id='%s' and id='%s' order by create_time desc LIMIT 1;" % ( branch_id, id1) area_name = process_tuple(get_id(sql1)) @@ -372,12 +372,12 @@ def check_mcms_purchase(type=16): id1)) source_id = planBillId expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', - 'mcms_purchase', id1, order_no, hos_id, + 'mcms_purchase_0927', id1, order_no, hos_id, get_branch_id(), dept_id1, dept_name1, rec_org_id, rec_org_name, area_code, area_name, bill_expdt_date, source_id, rec_user, - rec_addr, prov_id, prov_name, exe_prov_id, exe_prov_name, buyBillId, + rec_addr, prov_id, prov_name, exe_prov_id, exe_prov_name, planBillId, planOrderNo, - buyOrderNo, purOrderNo, purBillId, close_date, create_user, + purOrderNo, purBillId, close_date, create_user, create_time, last_modified, last_auditor, last_audit_time ) @@ -408,7 +408,7 @@ def check_mcms_purchase(type=16): id1)) source_id = planBillId expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', - 'mcms_purchase2', id1, order_no, hos_id, + 'mcms_purchase2_0927', id1, order_no, hos_id, get_branch_id(), dept_id1, dept_name1, rec_org_id, rec_org_name, area_code, area_name, bill_expdt_date, source_id, rec_user, rec_addr, prov_id, prov_name, exe_prov_id, exe_prov_name, buyBillId, @@ -443,7 +443,7 @@ def check_mcms_purchase(type=16): id1)) source_id = planBillId expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', - 'mcms_purchase3', id1, order_no, hos_id, + 'mcms_purchase3_0927', id1, order_no, hos_id, get_branch_id(), dept_id1, dept_name1, rec_org_id, rec_org_name, area_code, area_name, bill_expdt_date, source_id, rec_user, rec_addr, prov_id, prov_name, exe_prov_id, exe_prov_name, buyBillId, diff --git a/data/a2_mdm3_ea/message b/data/a2_mdm3_ea/message index 9f6150f4..85c83287 100644 --- a/data/a2_mdm3_ea/message +++ b/data/a2_mdm3_ea/message @@ -1,3 +1,3 @@ 企业信息: - e_id: CR202409120038 - cname: 国药集团公司Dk&FX + e_id: CR202409260093 + cname: 国药集团公司ieTV9 diff --git a/data/a3_mdm3_hs/message b/data/a3_mdm3_hs/message index 55af8fa8..a465a2af 100644 --- a/data/a3_mdm3_hs/message +++ b/data/a3_mdm3_hs/message @@ -1,3 +1,3 @@ 医院信息: - h_id: 湖南省人民医院bIoAC - h_name: 湖南省人民医院bIoAC + h_id: 湖南省人民医院aPYC! + h_name: 湖南省人民医院aPYC! diff --git a/data/a5_mdm3_pdm/message2 b/data/a5_mdm3_pdm/message2 index 7fae1da5..2d302e97 100644 --- a/data/a5_mdm3_pdm/message2 +++ b/data/a5_mdm3_pdm/message2 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2409120010_1 + MSPid: MSP2409260026_1 hosId: h0347 - hosGoodsId: h034700005072 - provGoodsid: provGood-99222344 - goodsAuditBillId: MSP2409120010 - targetId: MSP2409120010_1 + hosGoodsId: h034700005173 + provGoodsid: provGood-99222460 + goodsAuditBillId: MSP2409260026 + targetId: MSP2409260026_1 diff --git a/data/a6_mdm3_si/message b/data/a6_mdm3_si/message index 7e59c97f..76aea26f 100644 --- a/data/a6_mdm3_si/message +++ b/data/a6_mdm3_si/message @@ -1,11 +1,11 @@ 结算开票信息: list_a: - &id001 - settleMonth: '202409' - pid: OBh0347202409240006 - hosGoodsId: h034700005069 - goodsCode: '00005069' - goodsName: 一次性注射器_低值Lr^E0 + settleMonth: '202410' + pid: OBh0347202409270004 + hosGoodsId: h034700005170 + goodsCode: '00005170' + goodsName: 一次性注射器_低值gChwy goodsGg: G-31891 mfrsName: 德国歌德公司 Geuder AG unit: 支 @@ -20,14 +20,14 @@ normalContractId: normalContract: '1' detailList: - - pid: OBh0347202409240006 - settleMonth: '202409' - accountDate: '2024-09-24' - hosGoodsId: h034700005069 + - pid: OBh0347202409270004 + settleMonth: '202410' + accountDate: '2024-09-27' + hosGoodsId: h034700005170 batchCode: '333' - distrDetailId: '03841377' - distrId: PSh0347202409120007 - distrOrderNo: PSh0347202409120007 + distrDetailId: '03841700' + distrId: PSh0347202409260003 + distrOrderNo: PSh0347202409260003 settlePrice: 99.9999 maxSettleQty: -100.0 maxSettleAmount: -9999.99 @@ -36,11 +36,11 @@ leftSettleQty: -100.0 leftSettleAmount: -9999.99 hosId: h0347 - provId: p1e3cd - branchId: h0347-3641 - balanceDetId: OBh0347202409240006-000001 + provId: p1e41a + branchId: h0347-3647 + balanceDetId: OBh0347202409270004-000001 purMode: 10 - barCode: '01364100000506901124091217250321103332103472024091200000382' + barCode: 013647000005170011240926172504041033321UT240926000015 batchId: price: maxQty: @@ -53,15 +53,15 @@ volumeFlag: onlineKind: invoicePrice: 99.9999 - viewId: 202409OBh0347202409240006h034700005069 - - pid: OBh0347202409240006 - settleMonth: '202409' - accountDate: '2024-09-24' - hosGoodsId: h034700005069 + viewId: 202410OBh0347202409270004h034700005170 + - pid: OBh0347202409270004 + settleMonth: '202410' + accountDate: '2024-09-27' + hosGoodsId: h034700005170 batchCode: '333' - distrDetailId: '03841610' - distrId: PSh0347202409240007 - distrOrderNo: PSh0347202409240007 + distrDetailId: '03842561' + distrId: PSh0347202409270132 + distrOrderNo: PSh0347202409270132 settlePrice: 99.9999 maxSettleQty: 100.0 maxSettleAmount: 9999.99 @@ -70,11 +70,11 @@ leftSettleQty: 100.0 leftSettleAmount: 9999.99 hosId: h0347 - provId: p1e3cd - branchId: h0347-3641 - balanceDetId: OBh0347202409240006-000002 + provId: p1e41a + branchId: h0347-3647 + balanceDetId: OBh0347202409270004-000002 purMode: 10 - barCode: 013641000005069011240924172504021033321UT240924000008 + barCode: 013647000005170011240927172504051033321UT240927000014 batchId: price: maxQty: @@ -87,11 +87,11 @@ volumeFlag: onlineKind: invoicePrice: 99.9999 - viewId: 202409OBh0347202409240006h034700005069 - unique: 202409OBh0347202409240006h034700005069 + viewId: 202410OBh0347202409270004h034700005170 + unique: 202410OBh0347202409270004h034700005170 invoicePrice: onlineKind: '10' - viewId: 202409OBh0347202409240006h034700005069 + viewId: 202410OBh0347202409270004h034700005170 list_b: - *id001 list_c: diff --git a/data/b2_herp3_bs/message b/data/b2_herp3_bs/message index c6e7048c..8cd4c833 100644 --- a/data/b2_herp3_bs/message +++ b/data/b2_herp3_bs/message @@ -1,6 +1,6 @@ 院区新增: - branch_id: h0347-3641 - branch_name: 东土城路院区E3YVe + branch_id: h0347-3647 + branch_name: 东土城路院区PQGl^ 科室信息: - dept2_id: 327ed981d695457880bc5622fa90d641 + dept2_id: 06572f979cbc4c1d9b9c8c0264bf8b72 dept2_name: 二级检验科002 diff --git a/data/b2_herp3_bs/message3 b/data/b2_herp3_bs/message3 index 2da34cf7..9f835b8b 100644 --- a/data/b2_herp3_bs/message3 +++ b/data/b2_herp3_bs/message3 @@ -1,3 +1,3 @@ 用户名信息: - username1: 自动化测试gief4 - username2: 自动化测试gief4 + username1: 自动化测试yZdS6 + username2: 自动化测试yZdS6 diff --git a/data/b2_herp3_bs/message4 b/data/b2_herp3_bs/message4 index 064afd38..bc9598fa 100644 --- a/data/b2_herp3_bs/message4 +++ b/data/b2_herp3_bs/message4 @@ -1,3 +1,3 @@ 一级科室信息: - dept1_id: 2c2069ed30084987b25592be25b1c1fa + dept1_id: 2f7f18c7f19b45eb91dc5b27a097c70d dept1_name: 设备科001 diff --git a/data/b2_herp3_bs/message6 b/data/b2_herp3_bs/message6 index 3cf9068a..96431acf 100644 --- a/data/b2_herp3_bs/message6 +++ b/data/b2_herp3_bs/message6 @@ -1,9 +1,9 @@ 所有科室id: - deptid1: d467187bce7f458eb5c4e1007f557353 - deptid2: 7b4d11aec57042e096684a46e9148fdd - deptid3: 9a0e8ab0eb5544deafbeb2ce79eabf72 - deptid4: 319b64576fe24cc2b24bff3e7d8815c7 - deptid5: ec0ec1a2feb94132ba4c7daba5133159 + deptid1: 2f7f18c7f19b45eb91dc5b27a097c70d + deptid2: 06572f979cbc4c1d9b9c8c0264bf8b72 + deptid3: 721213398bfd4b879c89e18eb68f58fd + deptid4: 059b362457584214b4caafe9ef1fb49d + deptid5: 014d75a72009449089f263c9bd70c548 所有科室name: deptid1: 设备科001 deptid2: 二级检验科002 diff --git a/data/b2_herp3_bs/message7 b/data/b2_herp3_bs/message7 index befd9865..1d3ab923 100644 --- a/data/b2_herp3_bs/message7 +++ b/data/b2_herp3_bs/message7 @@ -1,4 +1,4 @@ shelfinfo: - shelfid: 0908ff9f96b74524a56bb8dab2182aa3 - shelfCode: areah03472121 + shelfid: 2641a5ee7ee24592919b30ef01eed02e + shelfCode: areah03472158 areaName: 自动化测试 diff --git a/data/b5_spd3_core_business_flow/message b/data/b5_spd3_core_business_flow/message index 1613698a..3cb48966 100644 --- a/data/b5_spd3_core_business_flow/message +++ b/data/b5_spd3_core_business_flow/message @@ -1,5 +1,5 @@ 供货关系申请2: - e_corpId: p1e3cd + e_corpId: p1e41a h_corpId: h0347 - e_username: 国药集团公司Dk&FX + e_username: 国药集团公司ieTV9 h_name: test_1 diff --git a/data/b5_spd3_core_business_flow/message1 b/data/b5_spd3_core_business_flow/message1 index ef348b6b..9d427898 100644 --- a/data/b5_spd3_core_business_flow/message1 +++ b/data/b5_spd3_core_business_flow/message1 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2409120006_1 + MSPid: MSP2409260022_1 hosId: h0347 - hosGoodsId: h034700005068 - provGoodsid: provGood-99222340 - goodsAuditBillId: MSP2409120006 - targetId: MSP2409120006_1 + hosGoodsId: h034700005169 + provGoodsid: provGood-99222456 + goodsAuditBillId: MSP2409260022 + targetId: MSP2409260022_1 diff --git a/data/b5_spd3_core_business_flow/message10 b/data/b5_spd3_core_business_flow/message10 index a9dac506..0be30227 100644 --- a/data/b5_spd3_core_business_flow/message10 +++ b/data/b5_spd3_core_business_flow/message10 @@ -1,9 +1,9 @@ 低值配送单号: - distrBillId1: PSh0347202409240026 - distrBillId2: PSh0347202409240026 + distrBillId1: PSh0347202409270151 + distrBillId2: PSh0347202409270151 高值配送单号: - distrBillId1: PSh0347202409240027 - distrBillId2: PSh0347202409240027 + distrBillId1: PSh0347202409270152 + distrBillId2: PSh0347202409270152 试剂配送单号: - distrBillId1: PSh0347202409240028 - distrBillId2: PSh0347202409240028 + distrBillId1: PSh0347202409270153 + distrBillId2: PSh0347202409270153 diff --git a/data/b5_spd3_core_business_flow/message11 b/data/b5_spd3_core_business_flow/message11 index 6ebb1a52..40b982c2 100644 --- a/data/b5_spd3_core_business_flow/message11 +++ b/data/b5_spd3_core_business_flow/message11 @@ -1,3 +1,3 @@ 采购计划单号高值: - orderNo1: PLAN2024092424668 - orderNo2: PLAN2024092424668 + orderNo1: PLAN2024092724930 + orderNo2: PLAN2024092724930 diff --git a/data/b5_spd3_core_business_flow/message12 b/data/b5_spd3_core_business_flow/message12 index 9ea812a9..541e0bdb 100644 --- a/data/b5_spd3_core_business_flow/message12 +++ b/data/b5_spd3_core_business_flow/message12 @@ -1,3 +1,3 @@ 采购计划单号试剂: - orderNo1: PLAN2024092424669 - orderNo2: PLAN2024092424669 + orderNo1: PLAN2024092724929 + orderNo2: PLAN2024092724929 diff --git a/data/b5_spd3_core_business_flow/message13 b/data/b5_spd3_core_business_flow/message13 index 9295791d..402fe5bf 100644 --- a/data/b5_spd3_core_business_flow/message13 +++ b/data/b5_spd3_core_business_flow/message13 @@ -3,27 +3,27 @@ - &id001 - id: hosId: h0347 - branchId: h0347-3641 + branchId: h0347-3647 deptId: taskType: 1 - sourceOrgId: p1e3cd - sourceOrgName: 国药集团公司Dk&FX - sourceOrderNo: PSh0347202409240028 + sourceOrgId: p1e41a + sourceOrgName: 国药集团公司ieTV9 + sourceOrderNo: PSh0347202409270153 billMode: '66' stockKind: purMode: - sourceId: PSh0347202409240028 + sourceId: PSh0347202409270153 sourceDetailId: sourceType: PSD sourceTypeName: 配送单 sourceVersion: 1 - planOrderNo: PLAN2024092424669 - purOrderNo: CG2024092417256 - recOrgId: 327ed981d695457880bc5622fa90d641 + planOrderNo: PLAN2024092724929 + purOrderNo: CG2024092717428 + recOrgId: 06572f979cbc4c1d9b9c8c0264bf8b72 recOrgName: 二级检验科002 - 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' + billRelationJson: '{"buyBillId":"Bh03472024092700042","planBillId":"Ph034720240927021574","planOrderNo":"PLAN2024092724929","buyOrderNo":"BUY2024092704885","purOrderNo":"CG2024092717428","purBillId":"Ch034720240927000025","purBillDate":"2024-09-27 + 12:38:35","distrBillId":"PSh0347202409270153","distrOrderNo":"PSh0347202409270153"}' + taskDate: '2024-09-27 12:39:00' taskDateStart: taskDateEnd: billModeList: diff --git a/data/b5_spd3_core_business_flow/message14 b/data/b5_spd3_core_business_flow/message14 index 077a8ed7..b0aeec96 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: h034700005070 + hosGoodsId: h034700005171 mdmGoodsCode: - spdGoodsCode: '11662098' - goodsCode: '00005070' - goodsName: 新型冠状病毒检测试剂jGRMV + spdGoodsCode: '11662214' + goodsCode: '00005171' + goodsName: 新型冠状病毒检测试剂q5TJn goodsGg: G-31891 mfrsId: mfrsName: 德国歌德公司 Geuder AG @@ -22,16 +22,16 @@ pkgDefName: '100' pkgDefQty: 100.0 batchCode: '4444' - expdtDate: '2025-04-02' - productDate: '2024-09-24' - provName: 国药集团公司Dk&FX + expdtDate: '2025-04-05' + productDate: '2024-09-27' + provName: 国药集团公司ieTV9 provId: - viewId: '03841631' + viewId: '03842582' verifyFlag: 0 hasSterilize: 0 - id: '03841631' + id: '03842582' detailRelationJson: - extInfo: '{"goodsGg":"G-31891","goodsCode":"00005070","purMode":60,"goodsName":"新型冠状病毒检测试剂jGRMV","ygptCode":"","transCond":"","storageCond":"","erpCode":"11662098","ybDefId":""}' + extInfo: '{"goodsGg":"G-31891","goodsCode":"00005171","purMode":60,"goodsName":"新型冠状病毒检测试剂q5TJn","ygptCode":"","transCond":"","storageCond":"","erpCode":"11662214","ybDefId":""}' recTemperature: 20 recHumidity: 30 distrPrice: 99.9999 @@ -59,6 +59,7 @@ limitMessage: autoUnpack: 0 orderNo: + expireType: 0 list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message15 b/data/b5_spd3_core_business_flow/message15 index 5f360c3b..686dca25 100644 --- a/data/b5_spd3_core_business_flow/message15 +++ b/data/b5_spd3_core_business_flow/message15 @@ -1,3 +1,3 @@ 验收单号: - CHECK_NO1: CHECKh03472024092400031 - CHECK_NO2: CHECKh03472024092400031 + CHECK_NO1: CHECKh03472024092700035 + CHECK_NO2: CHECKh03472024092700035 diff --git a/data/b5_spd3_core_business_flow/message16 b/data/b5_spd3_core_business_flow/message16 index 459e6ef7..851b2395 100644 --- a/data/b5_spd3_core_business_flow/message16 +++ b/data/b5_spd3_core_business_flow/message16 @@ -5,309 +5,34 @@ lastModified: version: createTime: - createUser: h0347_UID-051303 + createUser: h0347_UID-051309 lastModifiedUser: billMode: '66' recType: stockKind: purMode: - sourceId: DRh034720240924000086 + sourceId: DRh034720240927000112 sourceType: CK_TK sourceVersion: 1 batchList: billRelationJson: hosId: h0347 - deptId: 2c2069ed30084987b25592be25b1c1fa + deptId: 2f7f18c7f19b45eb91dc5b27a097c70d deptName: - branchId: h0347-3641 + branchId: h0347-3647 branchName: taskType: 2 - sourceOrgId: 327ed981d695457880bc5622fa90d641 + sourceOrgId: 06572f979cbc4c1d9b9c8c0264bf8b72 sourceOrgName: 二级检验科002 - sourceOrderNo: DN20240924000086 - taskSourceNo: DN20240924000086 + sourceOrderNo: DN20240927000112 + taskSourceNo: DN20240927000112 areaCode: areaName: goodsName: goodsGg: startDate: endDate: - taskDate: '2024-09-24 12:51:06' - 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: '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: 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: 2c2069ed30084987b25592be25b1c1fa - deptName: - branchId: h0347-3641 - branchName: - taskType: 1 - sourceOrgId: p1e3cd - sourceOrgName: 国药集团公司Dk&FX - sourceOrderNo: YS240912023 - taskSourceNo: PSh0347202409120018 - areaCode: areah03472121 - areaName: 自动化测试 - goodsName: - goodsGg: - startDate: - endDate: - taskDate: '2024-09-12 13:31:43' - 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: '20' - recType: - stockKind: - purMode: - sourceId: CHECKh03472024091200022 - sourceType: PSD - sourceVersion: 0 - batchList: - billRelationJson: - hosId: h0347 - deptId: 2c2069ed30084987b25592be25b1c1fa - deptName: - branchId: h0347-3641 - branchName: - taskType: 1 - sourceOrgId: p1e3cd - sourceOrgName: 国药集团公司Dk&FX - sourceOrderNo: YS240912022 - taskSourceNo: PSh0347202409120017 - areaCode: areah03472121 - areaName: 自动化测试 - goodsName: - goodsGg: - startDate: - endDate: - taskDate: '2024-09-12 13:31:18' - 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: CHECKh03472024091200021 - sourceType: PSD - sourceVersion: 0 - batchList: - billRelationJson: - hosId: h0347 - deptId: 2c2069ed30084987b25592be25b1c1fa - deptName: - branchId: h0347-3641 - branchName: - taskType: 1 - sourceOrgId: p1e3cd - sourceOrgName: 国药集团公司Dk&FX - sourceOrderNo: YS240912021 - taskSourceNo: PSh0347202409120016 - areaCode: areah03472121 - areaName: 自动化测试 - goodsName: - goodsGg: - startDate: - endDate: - taskDate: '2024-09-12 13:30:47' + taskDate: '2024-09-27 12:47:13' pkgTaskId: pkgFlag: remark: '' diff --git a/data/b5_spd3_core_business_flow/message17 b/data/b5_spd3_core_business_flow/message17 index 7366d618..7a09ec68 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: DRh0347202409240000860001 + - id: DRh0347202409270001120001 lastModified: version: createTime: @@ -10,54 +10,55 @@ rowIdx: purMode: 60 unitName: 100支/100 - pid: DRh034720240924000086 - hosGoodsId: h034700005070 + pid: DRh034720240927000112 + hosGoodsId: h034700005171 batchCode: '4444' - expdtDate: '2025-03-21' - productDate: '2024-09-12' + expdtDate: '2025-04-04' + productDate: '2024-09-26' batchPrice: 99.9999 settlement: 1 batchType: 40 - srcBatchId: Ph034724091200012 + srcBatchId: Ph034724092600028 srcBatchPrice: 99.9999 - shelfCode: areah03472121-2-01-01 + shelfCode: areah03472158-2-01-01 shelfKind: - barcodeId: '03472024091200000525' + barcodeId: UT240926000104 subBarcodeId: qty: 100.0 pkgQty: 1 - distrId: PSh0347202409120009 - distrDetailId: '03841379' + distrId: PSh0347202409260005 + distrDetailId: '03841702' pkgDefQty: pkgDefName: - viewId: h03470000507044442025-03-21100支/100 + viewId: h03470000517144442025-04-04100支/100 codingType: batchFlag: hasSterilize: 0 sterilizeQty: sterilizePassQty: sterilizeRejectQty: + expireType: 0 orderNo: - sourceDetailId: PICKh03472409240064660001 - mdmGoodsCode: '11662098' - goodsCode: '00005070' + sourceDetailId: PICKh03472409270087660001 + mdmGoodsCode: '11662214' + goodsCode: '00005171' tbStatus: billMode: hosId: branchId: - purBillId: Ch034720240912000006 - provId: p1e3cd + purBillId: Ch034720240926000036 + provId: p1e41a provName: - subProvId: p1e3cd + subProvId: p1e41a purDetailId: - goodsName: 新型冠状病毒检测试剂jGRMV + goodsName: 新型冠状病毒检测试剂q5TJn goodsGg: G-31891 mfrsId: mfrs-11229 mfrsName: 德国歌德公司 Geuder AG made: 德国 unit: 支 - sourceBatchId: Ph034724091200012 - targetBatchId: Ph034724091200012 + sourceBatchId: Ph034724092600028 + targetBatchId: Ph034724092600028 pkgDefId: certificateCode: '' productCertCode: @@ -65,13 +66,13 @@ psiPrice: 99.9999 ext: goodsGg: G-31891 - goodsCode: '00005070' + goodsCode: '00005171' purMode: 60 - goodsName: 新型冠状病毒检测试剂jGRMV + goodsName: 新型冠状病毒检测试剂q5TJn ygptCode: '' transCond: '' storageCond: '' - erpCode: '11662098' + erpCode: '11662214' ybDefId: '' contractId: '' normalContractId: '' @@ -90,8 +91,8 @@ pkgCodeSee: chargeFlag: stockKind: CK_TK - sourceDeptId: 327ed981d695457880bc5622fa90d641 - targetDeptId: 2c2069ed30084987b25592be25b1c1fa + sourceDeptId: 06572f979cbc4c1d9b9c8c0264bf8b72 + targetDeptId: 2f7f18c7f19b45eb91dc5b27a097c70d ableDelFlag: pickType: KS_TK recTemperature: diff --git a/data/b5_spd3_core_business_flow/message18 b/data/b5_spd3_core_business_flow/message18 index 60d63b1d..ae60dbdd 100644 --- a/data/b5_spd3_core_business_flow/message18 +++ b/data/b5_spd3_core_business_flow/message18 @@ -1,124 +1,55 @@ 条码信息: list_a: - &id001 - - 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 + id: UT240926000130 + snCode: UT240926000130 + ssccCode: '010839000193647122' + pkgCodeSee: 0136470000051710112409261725040410444421UT240926000130 + hosGoodsId: h034700005171 + hosGoodsCode: '00005171' + goodsCode: '00005171' + goodsName: 新型冠状病毒检测试剂q5TJn + goodsSpec: G-31891 + goodsMfrsName: 德国歌德公司 Geuder AG + unit: 支 + purMode: 60 + batchCode: '4444' + productDate: '2024-09-26' + expdtDate: '2025-04-04' + pkgDefName: '100' + pkgDefQty: 100.0 + stockId: 25d9ea259c91434586ce8dd869a2a04f + stockName: 东土城路院区PQGl^中心库房 + areaName: 自动化测试 + areaCode: areah03472158 + lockStatus: 0 + unitName: 100支/100 + shelfCode: areah03472158-2-01-01 + shelfName: + shelfNo: 自动化测试-2-01-01 + pkgDefId: 23401924f06e45d6af05793af40b4a6d + extInfo: '{"pkgDefId": "23401924f06e45d6af05793af40b4a6d", "pkgDefQty": 100, "purBillId": + "CG2024092617369", "pkgDefName": "100", "distrBillId": "PSh0347202409260005", + "inStockTime": "2024-09-26 09:23:42", "distrDetailId": "03841702", "certificateCode": + ""}' + bottleId: + pkgType: '66' + miDjmc: '' + miCode: '' + transferRatio: 1.0 + qty: 1 + shelfKind: 0 + shelfKindName: 普通货位 + provName: 国药集团公司ieTV9 + provId: p1e41a + inStockDate: + mfrCode: + made: 德国 + price: + barName: 100支/100 + purModeText: 检验试剂 + codeType: 66 + expireType: 0 list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message19 b/data/b5_spd3_core_business_flow/message19 index b91a5160..ceaa152a 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: h034700005068 - hosGoodsCode: '00005068' - provId: p1e3cd - subProvId: p1e3cd - subProvName: 国药集团公司Dk&FX - goodsName: 高值牙钻机C^!zw + - hosGoodsId: h034700005169 + hosGoodsCode: '00005169' + provId: p1e41a + subProvId: p1e41a + subProvName: 国药集团公司ieTV9 + goodsName: 高值牙钻机!kKfh 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 8c3092b2..7616f884 100644 --- a/data/b5_spd3_core_business_flow/message2 +++ b/data/b5_spd3_core_business_flow/message2 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2409120007_1 + MSPid: MSP2409260023_1 hosId: h0347 - hosGoodsId: h034700005069 - provGoodsid: provGood-99222341 - goodsAuditBillId: MSP2409120007 - targetId: MSP2409120007_1 + hosGoodsId: h034700005170 + provGoodsid: provGood-99222457 + goodsAuditBillId: MSP2409260023 + targetId: MSP2409260023_1 diff --git a/data/b5_spd3_core_business_flow/message20 b/data/b5_spd3_core_business_flow/message20 index f5ec4e93..0dd554cf 100644 --- a/data/b5_spd3_core_business_flow/message20 +++ b/data/b5_spd3_core_business_flow/message20 @@ -1,35 +1,35 @@ 二级库条码信息: list_a: - &id001 - id: '8800000001079645' - snCode: '8800000001079645' - ssccCode: '010839000193539724' - pkgCodeSee: '01000000000050681124092317250401102222218800000001079645' - hosGoodsId: h034700005068 - hosGoodsCode: '00005068' - goodsCode: '00005068' - goodsName: 高值牙钻机C^!zw + id: '8800000001080649' + snCode: '8800000001080649' + ssccCode: '010839000193733122' + pkgCodeSee: '01000000000051691124092717250405102222218800000001080649' + hosGoodsId: h034700005169 + hosGoodsCode: '00005169' + goodsCode: '00005169' + goodsName: 高值牙钻机!kKfh goodsSpec: G-31891 goodsMfrsName: 德国歌德公司 Geuder AG unit: 支 purMode: 20 batchCode: '2222' - productDate: '2024-09-23' - expdtDate: '2025-04-01' + productDate: '2024-09-27' + expdtDate: '2025-04-05' pkgDefName: pkgDefQty: 1.0 - stockId: fef8ed0040dc467db609d7bdd413e388 + stockId: 3cacedf1254b4aa29009858eb41eff2f stockName: 二级检验科002库房 areaName: 默认库区 - areaCode: areah03472120 + areaCode: areah03472155 lockStatus: 0 unitName: 1支 - shelfCode: areah03472120-A-01-01 + shelfCode: areah03472155-A-01-01 shelfName: shelfNo: A01-A-01-01 pkgDefId: - extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202409230009", "inStockTime": - "2024-09-23 12:09:05", "useFrequency": 1, "distrDetailId": "03841578", "multiChargeFlag": + extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202409270135", "inStockTime": + "2024-09-27 12:05:57", "useFrequency": 1, "distrDetailId": "03842564", "multiChargeFlag": 0}' bottleId: pkgType: '25' @@ -39,15 +39,16 @@ qty: 1 shelfKind: 0 shelfKindName: 普通货位 - provName: 国药集团公司Dk&FX - provId: p1e3cd - inStockDate: '2024-09-23 12:09:10' + provName: 国药集团公司ieTV9 + provId: p1e41a + inStockDate: '2024-09-27 12:05:56' mfrCode: made: 德国 price: barName: 1支 purModeText: 高值耗材 codeType: 25 + expireType: 0 list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message21 b/data/b5_spd3_core_business_flow/message21 index 513b7d10..cce70b98 100644 --- a/data/b5_spd3_core_business_flow/message21 +++ b/data/b5_spd3_core_business_flow/message21 @@ -1,14 +1,14 @@ 二级库请领产品信息: list_a: - &id001 - - hosGoodsId: h034700005070 + - hosGoodsId: h034700005171 purMode: 60 grantRule: id: - goodsName: 新型冠状病毒检测试剂jGRMV + goodsName: 新型冠状病毒检测试剂q5TJn goodsSpec: G-31891 - mdmGoodsCode: '11662098' - goodsCode: '00005070' + mdmGoodsCode: '11662214' + goodsCode: '00005171' unit: 支 goodsMfrsName: 德国歌德公司 Geuder AG miDjmc: '' @@ -16,25 +16,25 @@ pkgDefName: '100' pkgDefQty: 100.0 pkgQty: - qty: 7100.0 + qty: 3500.0 goodsImg: [] - pkgDefId: ae9b52ae8e5b4f5aa501f8ea717180bb + pkgDefId: 23401924f06e45d6af05793af40b4a6d buyPkgQty: unitName: 100支/100 price: 99.9999 hosId: branchId: - deptId: 327ed981d695457880bc5622fa90d641 + deptId: 06572f979cbc4c1d9b9c8c0264bf8b72 deptName: areaCode: areaName: - targetDeptId: 2c2069ed30084987b25592be25b1c1fa + targetDeptId: 2f7f18c7f19b45eb91dc5b27a097c70d targetDeptName: 设备科001 - targetStockId: 24d5ec62951d4fe7a18bcf3c05c4af93 - targetStockName: 东土城路院区E3YVe中心库房 + targetStockId: 25d9ea259c91434586ce8dd869a2a04f + targetStockName: 东土城路院区PQGl^中心库房 purchaseFlag: 1 tempFlag: 0 - grantWay: 3 + grantWay: 2 deptGoodsStatus: codingType: 0 chargeFlag: 1 @@ -42,9 +42,9 @@ goodsGeneralName: 检测试剂 goodsRegCert: '' applicationScope: - provName: 国药集团公司Dk&FX - noRecPkgQty: 9.0 - noRecQty: 900.0 + provName: 国药集团公司ieTV9 + noRecPkgQty: 4.0 + noRecQty: 400.0 autoUnpack: 0 consumeQty: consumePkgQty: diff --git a/data/b5_spd3_core_business_flow/message22 b/data/b5_spd3_core_business_flow/message22 index 81510520..509b6236 100644 --- a/data/b5_spd3_core_business_flow/message22 +++ b/data/b5_spd3_core_business_flow/message22 @@ -1,14 +1,14 @@ 库区信息: list_a: - &id001 - - id: 61e842f2ee614679b78328e2aee3ce67 - lastModified: '2024-09-23 12:45:35' - version: 6 - createTime: '2024-09-12 09:15:06' - createUser: h0347_UID-051303 - lastModifiedUser: h0347_UID-051303 - stockId: 17c861b1d8764fd7aaeef0240d87f39b - shelfCode: areah03472119 + - id: 16a5e9b8dbd74241b1d68bce7a4a89a5 + lastModified: '2024-09-26 16:05:48' + version: 3 + createTime: '2024-09-26 09:18:44' + createUser: h0347_UID-051309 + lastModifiedUser: h0347_UID-051309 + stockId: 8b784896734c46da89ea04534f9e564b + shelfCode: areah03472157 shelfName: 默认库区 address: 三级检测组003 shelfType: @@ -18,13 +18,13 @@ parentId: levelCode: tbStatus: 1 - linkman: h0347_UID-051303 + linkman: h0347_UID-051309 recPhone: None delFlag: 0 shelfNo: A01 shelfKind: 0 hosId: - deptId: 31b4f8c5f92a49c08686378f14b74c07 + deptId: 721213398bfd4b879c89e18eb68f58fd areaCode: areaName: stockName: diff --git a/data/b5_spd3_core_business_flow/message3 b/data/b5_spd3_core_business_flow/message3 index 2ea43775..e4a6913e 100644 --- a/data/b5_spd3_core_business_flow/message3 +++ b/data/b5_spd3_core_business_flow/message3 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2409120008_1 + MSPid: MSP2409260024_1 hosId: h0347 - hosGoodsId: h034700005070 - provGoodsid: provGood-99222342 - goodsAuditBillId: MSP2409120008 - targetId: MSP2409120008_1 + hosGoodsId: h034700005171 + provGoodsid: provGood-99222458 + goodsAuditBillId: MSP2409260024 + targetId: MSP2409260024_1 diff --git a/data/b5_spd3_core_business_flow/message4 b/data/b5_spd3_core_business_flow/message4 index 4b34ac32..71a3d717 100644 --- a/data/b5_spd3_core_business_flow/message4 +++ b/data/b5_spd3_core_business_flow/message4 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2409120009_1 + MSPid: MSP2409260025_1 hosId: h0347 - hosGoodsId: h034700005071 - provGoodsid: provGood-99222343 - goodsAuditBillId: MSP2409120009 - targetId: MSP2409120009_1 + hosGoodsId: h034700005172 + provGoodsid: provGood-99222459 + goodsAuditBillId: MSP2409260025 + targetId: MSP2409260025_1 diff --git a/data/b5_spd3_core_business_flow/message5 b/data/b5_spd3_core_business_flow/message5 index 7fae1da5..2d302e97 100644 --- a/data/b5_spd3_core_business_flow/message5 +++ b/data/b5_spd3_core_business_flow/message5 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2409120010_1 + MSPid: MSP2409260026_1 hosId: h0347 - hosGoodsId: h034700005072 - provGoodsid: provGood-99222344 - goodsAuditBillId: MSP2409120010 - targetId: MSP2409120010_1 + hosGoodsId: h034700005173 + provGoodsid: provGood-99222460 + goodsAuditBillId: MSP2409260026 + targetId: MSP2409260026_1 diff --git a/data/b5_spd3_core_business_flow/message6 b/data/b5_spd3_core_business_flow/message6 index 64c0f4e9..42012232 100644 --- a/data/b5_spd3_core_business_flow/message6 +++ b/data/b5_spd3_core_business_flow/message6 @@ -1,3 +1,3 @@ 产品包装信息: - unitPackageid1: ae9b52ae8e5b4f5aa501f8ea717180bb - unitPackageid2: ae9b52ae8e5b4f5aa501f8ea717180bb + unitPackageid1: 64003f53d3dc4fc3933e287d2f14ea33 + unitPackageid2: 64003f53d3dc4fc3933e287d2f14ea33 diff --git a/data/b5_spd3_core_business_flow/message7 b/data/b5_spd3_core_business_flow/message7 index 635430ef..571fbfe8 100644 --- a/data/b5_spd3_core_business_flow/message7 +++ b/data/b5_spd3_core_business_flow/message7 @@ -1,3 +1,3 @@ 采购计划单号: - orderNo1: PLAN2024092424670 - orderNo2: PLAN2024092424670 + orderNo1: PLAN2024092724935 + orderNo2: PLAN2024092724935 diff --git a/data/b5_spd3_core_business_flow/message8 b/data/b5_spd3_core_business_flow/message8 index d72f5286..a1a26eb5 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: Ch034720240924000056 - lastModified: '2024-09-24 12:42:26' + - id: Ch034720240927000025 + lastModified: '2024-09-27 12:38:35' version: 0 - createTime: '2024-09-24 12:42:26' - createUser: h0347_UID-051303 + createTime: '2024-09-27 12:38:35' + createUser: h0347_UID-051309 lastModifiedUser: - orderNo: CG2024092417256 + orderNo: CG2024092717428 billMode: '66' recType: HDI hosId: h0347 - branchId: h0347-3641 + branchId: h0347-3647 deptId: deptName: - recOrgId: 327ed981d695457880bc5622fa90d641 + recOrgId: 06572f979cbc4c1d9b9c8c0264bf8b72 recOrgName: 二级检验科002 areaCode: areaName: billExpdtDate: - sourceId: Ph034720240924021314 + sourceId: Ph034720240927021574 sourceType: inSettlement: recUser: recPhone: recAddr: 自动化测试 - provId: p1e3cd - provName: 国药集团公司Dk&FX + provId: p1e41a + provName: 国药集团公司ieTV9 subSendFlag: - exeProvId: p1e3cd - exeProvName: 国药集团公司Dk&FX + exeProvId: p1e41a + exeProvName: 国药集团公司ieTV9 billRelationJson: extInfo: barcodeFlag: 1 @@ -43,12 +43,12 @@ hosVersion: 3 billType: CGD hosName: 邹城市人民医院(test) - branchName: 东土城路院区E3YVe + branchName: 东土城路院区PQGl^ sumQty: 100.0 sumPkgQty: 1.0 sumAmount: '9999.9900' sumReplQty: 0.0 - planOrderNo: PLAN2024092424669 + planOrderNo: PLAN2024092724929 replBillNo: list_b: - *id001 diff --git a/data/b5_spd3_core_business_flow/message9 b/data/b5_spd3_core_business_flow/message9 index 541580b8..5deaf331 100644 --- a/data/b5_spd3_core_business_flow/message9 +++ b/data/b5_spd3_core_business_flow/message9 @@ -1,22 +1,22 @@ 配送订单详细信息: list_a: - &id001 - - id: a5210a576c294154a5a4eeafbbf44564 + - id: 71cfa815982d4303becdfa38adad6a77 lastModified: version: createTime: createUser: lastModifiedUser: - pid: Ch034720240924000056 - orderNo: CG2024092417256 - sourceId: f3c2fbd85df04171a0eab092bca54ced - hosGoodsId: h034700005070 - mdmGoodsCode: '11662098' - goodsCode: '00005070' + pid: Ch034720240927000025 + orderNo: CG2024092717428 + sourceId: d20d8b93375d4ca79219ce4493e4843d + hosGoodsId: h034700005171 + mdmGoodsCode: '11662214' + goodsCode: '00005171' purMode: 60 price: '99.9999' - supplyId: c8809711fc324f7a9a9a9eff1a6de7c8 - pkgDefId: ae9b52ae8e5b4f5aa501f8ea717180bb + supplyId: c080b7956d4847679b6c1a00eac5863c + pkgDefId: 23401924f06e45d6af05793af40b4a6d pkgDefName: '100' pkgDefQty: 100.0 pkgQty: 1.0 @@ -31,18 +31,18 @@ notSendPkgQty: 0.0 inSettlement: 1 closeType: 1 - detailRelationJson: '{"planBillId":"Ph034720240924021314","buyDetailId":"Bh034720240924000480001","planDetailId":"f3c2fbd85df04171a0eab092bca54ced"}' - extInfo: '{"goodsGg":"G-31891","goodsCode":"00005070","purMode":60,"goodsName":"新型冠状病毒检测试剂jGRMV"}' + detailRelationJson: '{"planBillId":"Ph034720240927021574","buyDetailId":"Bh034720240927000420001","planDetailId":"d20d8b93375d4ca79219ce4493e4843d"}' + extInfo: '{"goodsGg":"G-31891","goodsCode":"00005171","purMode":60,"goodsName":"新型冠状病毒检测试剂q5TJn"}' remark: tbStatus: hosVersion: unit: 支 - goodsName: 新型冠状病毒检测试剂jGRMV + goodsName: 新型冠状病毒检测试剂q5TJn mfrsId: mfrs-11229 mfrsName: 德国歌德公司 Geuder AG goodsGg: G-31891 - mdmGoodsSpecCode: '11662098' - erpCode: '11662098' + mdmGoodsSpecCode: '11662214' + erpCode: '11662214' made: 德国 goodsDi: '01123456789012' miDjmc: @@ -66,14 +66,14 @@ transCond: '' storageCond: '' diType: gs1 - diUse: '36410000050700' + diUse: '36470000051710' multiChargeFlag: 0 useFrequency: 1 chargeUnit: amount: '9999.9900' unitName: 100支/100 - subProvId: p1e3cd - subProvName: 国药集团公司Dk&FX + subProvId: p1e41a + subProvName: 国药集团公司ieTV9 subPrice: 99.9999 replPkgQty: 1.0 replQty: 100.0 diff --git a/data/b6_spd3_core_business_flow_database_check/data b/data/b6_spd3_core_business_flow_database_check/data index 1184c546..3fd194c1 100644 --- a/data/b6_spd3_core_business_flow_database_check/data +++ b/data/b6_spd3_core_business_flow_database_check/data @@ -413,4 +413,10 @@ #采购订单子表 "mcms_purchase_detail_0927": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_id": "%s", "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "pur_mode": 10, "price": Decimal("99.999900"), "supply_id": "%s", "pkg_def_id": "%s", "pkg_def_name": "100", "pkg_def_qty": Decimal("100.00"), "pkg_qty": Decimal("100.00"), "qty": Decimal("10000.00"), "con_pkg_qty": Decimal("0.00"), "con_qty": Decimal("0.00"), "up_pkg_qty": Decimal("0.00"), "up_qty": Decimal("0.00"), "check_pkg_qty": Decimal("0.00"), "check_qty": Decimal("0.00"), "distr_pkg_qty": Decimal("0.00"), "distr_qty": Decimal("0.00"), "not_send_qty": Decimal("0.00"), "not_send_pkg_qty": Decimal("0.00"), "in_settlement": 1, "close_type": 1, "detail_relation_json": "{"planBillId":"%s","planDetailId":"%s"}", "ext_info": "{"goodsGg":"%s","goodsCode":"%s","purMode":10,"goodsName":"%s"}", "remark": None, "tb_status": 10, "detail_up_status":None,"pur_task_id": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "del_flag": 0}' "mcms_purchase_detail1_0927": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_id": "%s", "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "pur_mode": 20, "price": Decimal("99.999900"), "supply_id": "%s", "pkg_def_id": %s, "pkg_def_name": null, "pkg_def_qty": Decimal("1.00"), "pkg_qty": Decimal("100.00"), "qty": Decimal("100.00"), "con_pkg_qty": Decimal("0.00"), "con_qty": Decimal("0.00"), "up_pkg_qty": Decimal("0.00"), "up_qty": Decimal("0.00"), "check_pkg_qty": Decimal("0.00"), "check_qty": Decimal("0.00"), "distr_pkg_qty": Decimal("0.00"), "distr_qty": Decimal("0.00"), "not_send_qty": Decimal("0.00"), "not_send_pkg_qty": Decimal("0.00"), "in_settlement": 1, "close_type": 1, "detail_relation_json": "{"planBillId":"%s","buyDetailId":"%s","planDetailId":"%s"}", "ext_info": "{"goodsGg":"%s","goodsCode":"%s","purMode":20,"goodsName":"%s"}", "remark": None, "tb_status": 10, "detail_up_status":None,"pur_task_id": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "del_flag": 0}' -"mcms_purchase_detail2_0927": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_id": "%s", "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "pur_mode": 60, "price": Decimal("99.999900"), "supply_id": "%s", "pkg_def_id": "%s", "pkg_def_name": "100", "pkg_def_qty": Decimal("100.00"), "pkg_qty": Decimal("100.00"), "qty": Decimal("10000.00"), "con_pkg_qty": Decimal("0.00"), "con_qty": Decimal("0.00"), "up_pkg_qty": Decimal("0.00"), "up_qty": Decimal("0.00"), "check_pkg_qty": Decimal("0.00"), "check_qty": Decimal("0.00"), "distr_pkg_qty": Decimal("0.00"), "distr_qty": Decimal("0.00"), "not_send_qty": Decimal("0.00"), "not_send_pkg_qty": Decimal("0.00"), "in_settlement": 1, "close_type": 1, "detail_relation_json": "{"planBillId":"%s","buyDetailId":"%s","planDetailId":"%s"}", "ext_info": "{"goodsGg":"%s","goodsCode":"%s","purMode":60,"goodsName":"%s"}", "remark": None, "tb_status": 10,"detail_up_status":None,"pur_task_id": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "del_flag": 0}' \ No newline at end of file +"mcms_purchase_detail2_0927": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_id": "%s", "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "pur_mode": 60, "price": Decimal("99.999900"), "supply_id": "%s", "pkg_def_id": "%s", "pkg_def_name": "100", "pkg_def_qty": Decimal("100.00"), "pkg_qty": Decimal("100.00"), "qty": Decimal("10000.00"), "con_pkg_qty": Decimal("0.00"), "con_qty": Decimal("0.00"), "up_pkg_qty": Decimal("0.00"), "up_qty": Decimal("0.00"), "check_pkg_qty": Decimal("0.00"), "check_qty": Decimal("0.00"), "distr_pkg_qty": Decimal("0.00"), "distr_qty": Decimal("0.00"), "not_send_qty": Decimal("0.00"), "not_send_pkg_qty": Decimal("0.00"), "in_settlement": 1, "close_type": 1, "detail_relation_json": "{"planBillId":"%s","buyDetailId":"%s","planDetailId":"%s"}", "ext_info": "{"goodsGg":"%s","goodsCode":"%s","purMode":60,"goodsName":"%s"}", "remark": None, "tb_status": 10,"detail_up_status":None,"pur_task_id": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "del_flag": 0}' + + +#采购订单主表 +"mcms_purchase_0927": '{"id": "%s", "order_no": "%s", "bill_mode": "16", "rec_type": "YND", "hos_id": "%s", "branch_id": "%s", "dept_id": "%s", "dept_name": "%s", "rec_org_id": "%s", "rec_org_name": "%s", "area_code": "%s", "area_name": "%s", "bill_expdt_date": %s, "source_id": "%s", "source_type": "CGJH", "in_settlement": None, "rec_user": "%s", "rec_phone": "xhs", "rec_addr": "%s", "prov_id": "%s", "prov_name": "%s", "sub_send_flag": 10, "exe_prov_id": "%s", "exe_prov_name": "%s", "bill_relation_json": "{"planBillId":"%s","planOrderNo":"%s","purOrderNo":"%s","purBillId":"%s"}", "ext_info": "{"epidemicFlag":0,"purMode":10}", "barcode_flag": 1, "pkg_flag": 1, "remark": "", "priority": 0, "close_status": 0, "close_date": %s, "up_status": 0, "tb_status": 30, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": None, "version": 0, "del_flag": 0, "last_auditor": "%s", "last_audit_time": %s}' +"mcms_purchase2_0927": '{"id": "%s", "order_no": "%s", "bill_mode": "20", "rec_type": "YND", "hos_id": "%s", "branch_id": "%s", "dept_id": "%s", "dept_name": "%s", "rec_org_id": "%s", "rec_org_name": "%s", "area_code": "%s", "area_name": "%s", "bill_expdt_date": %s, "source_id": "%s", "source_type": "CGJH", "in_settlement": None, "rec_user": "%s", "rec_phone": "xhs", "rec_addr": "%s", "prov_id": "%s", "prov_name": "%s", "sub_send_flag": 10, "exe_prov_id": "%s", "exe_prov_name": "%s", "bill_relation_json": "{"planBillId":"%s","planOrderNo":"%s","purOrderNo":"%s","purBillId":"%s"}", "ext_info": "{"epidemicFlag":0,"purMode":20}", "barcode_flag": 1, "pkg_flag": 0, "remark": "", "priority": 0, "close_status": 0, "close_date": %s, "up_status": 0, "tb_status": 30, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": None, "version": 0, "del_flag": 0, "last_auditor": "%s", "last_audit_time": %s}' +"mcms_purchase3_0927": '{"id": "%s", "order_no": "%s", "bill_mode": "66", "rec_type": "YND", "hos_id": "%s", "branch_id": "%s", "dept_id": "%s", "dept_name": "%s", "rec_org_id": "%s", "rec_org_name": "%s", "area_code": "%s", "area_name": "%s", "bill_expdt_date": %s, "source_id": "%s", "source_type": "CGJH", "in_settlement": None, "rec_user": "%s", "rec_phone": "xhs", "rec_addr": "%s", "prov_id": "%s", "prov_name": "%s", "sub_send_flag": 10, "exe_prov_id": "%s", "exe_prov_name": "%s", "bill_relation_json": "{"planBillId":"%s","planOrderNo":"%s","purOrderNo":"%s","purBillId":"%s"}", "ext_info": "{"epidemicFlag":0,"purMode":60}", "barcode_flag": 1, "pkg_flag": 1, "remark": "", "priority": 0, "close_status": 0, "close_date": %s, "up_status": 0, "tb_status": 30, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": None, "version": 0, "del_flag": 0, "last_auditor": "%s", "last_audit_time": %s}' -- GitLab