From f3fbdb22973452093081c29ba1cc3698e27828c3 Mon Sep 17 00:00:00 2001 From: xiao-hesheng Date: Tue, 18 Jun 2024 16:53:31 +0800 Subject: [PATCH] =?UTF-8?q?20240618=E5=A4=96=E7=BD=91=E5=9C=A8=E9=85=8D?= =?UTF-8?q?=E9=80=81=E7=9A=84=E6=97=B6=E5=80=99=E5=A2=9E=E5=8A=A0=E4=BA=86?= =?UTF-8?q?DI=E9=AA=8C=E8=AF=81=EF=BC=8C=E5=8A=A0=E5=85=A5=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4di=E7=9A=84=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...45\345\222\214\345\256\241\346\211\271.py" | 2 +- data/a2_mdm3_ea/message | 4 +- data/a3_mdm3_hs/message | 4 +- data/a5_mdm3_pdm/message2 | 10 ++-- data/a6_mdm3_si/message | 54 +++++++++-------- data/b2_herp3_bs/message | 6 +- data/b2_herp3_bs/message3 | 4 +- data/b2_herp3_bs/message4 | 2 +- data/b2_herp3_bs/message5 | 4 +- 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 | 22 +++---- data/b5_spd3_core_business_flow/message15 | 4 +- data/b5_spd3_core_business_flow/message16 | 20 +++---- data/b5_spd3_core_business_flow/message17 | 58 +++++++++--------- data/b5_spd3_core_business_flow/message18 | 59 ++++++++++--------- data/b5_spd3_core_business_flow/message19 | 12 ++-- data/b5_spd3_core_business_flow/message2 | 10 ++-- data/b5_spd3_core_business_flow/message20 | 36 +++++------ data/b5_spd3_core_business_flow/message21 | 20 +++---- data/b5_spd3_core_business_flow/message22 | 18 +++--- 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 | 36 +++++------ 34 files changed, 262 insertions(+), 259 deletions(-) diff --git "a/air_case/b5_spd3_core_business_flow/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271.air/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271.py" "b/air_case/b5_spd3_core_business_flow/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271.air/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271.py" index ba93f385..460c3102 100644 --- "a/air_case/b5_spd3_core_business_flow/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271.air/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271.py" +++ "b/air_case/b5_spd3_core_business_flow/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271.air/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271.py" @@ -393,7 +393,7 @@ try: #20240618外网在配送的时候增加了DI验证，加入维护di的脚本 supplyProvHosGoods_add_DI() # ==============分割线 暂时注释=============== - commonFuc().check_text_exist_result_text('succeed', 'succeed') + commonFuc().check_text_exist_result_text('succees', 'succees') except: print('新增产品信息出现异常,后续的脚本必然无法走通,需要检查程序或者脚本或者环境是否出现问题') commonFuc().check_text_exist_result_text('产品新增失败', '产品新增成功') diff --git a/data/a2_mdm3_ea/message b/data/a2_mdm3_ea/message index c7b1f4e2..5db0a60f 100644 --- a/data/a2_mdm3_ea/message +++ b/data/a2_mdm3_ea/message @@ -1,3 +1,3 @@ 企业信息: - e_id: CR202406170038 - cname: 国药集团公司AKO54 + e_id: CR202406180076 + cname: 国药集团公司gFOwi diff --git a/data/a3_mdm3_hs/message b/data/a3_mdm3_hs/message index 40dbdb6f..b300ae32 100644 --- a/data/a3_mdm3_hs/message +++ b/data/a3_mdm3_hs/message @@ -1,3 +1,3 @@ 医院信息: - h_id: 湖南省人民医院HRwjx - h_name: 湖南省人民医院HRwjx + h_id: 湖南省人民医院GF(j) + h_name: 湖南省人民医院GF(j) diff --git a/data/a5_mdm3_pdm/message2 b/data/a5_mdm3_pdm/message2 index 0f59135d..6e077f19 100644 --- a/data/a5_mdm3_pdm/message2 +++ b/data/a5_mdm3_pdm/message2 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406170011_1 + MSPid: MSP2406180021_1 hosId: h0347 - hosGoodsId: h034700004152 - provGoodsid: provGood-99221340 - goodsAuditBillId: MSP2406170011 - targetId: MSP2406170011_1 + hosGoodsId: h034700004173 + provGoodsid: provGood-99221361 + goodsAuditBillId: MSP2406180021 + targetId: MSP2406180021_1 diff --git a/data/a6_mdm3_si/message b/data/a6_mdm3_si/message index b1732f83..86bef4ce 100644 --- a/data/a6_mdm3_si/message +++ b/data/a6_mdm3_si/message @@ -2,10 +2,10 @@ list_a: - &id001 settleMonth: '202407' - pid: OBh0347202406170004 - hosGoodsId: h034700004149 - goodsCode: '00004149' - goodsName: 一次性注射器_低值RO^f5 + pid: OBh0347202406180005 + hosGoodsId: h034700004170 + goodsCode: '00004170' + goodsName: 一次性注射器_低值D4tGq goodsGg: G-31891 mfrsName: 德国歌德公司 Geuder AG unit: 支 @@ -20,13 +20,14 @@ normalContractId: normalContract: '1' detailList: - - pid: OBh0347202406170004 + - pid: OBh0347202406180005 settleMonth: '202407' - hosGoodsId: h034700004149 + accountDate: '2024-06-18' + hosGoodsId: h034700004170 batchCode: '333' - distrDetailId: '03838516' - distrId: PSh0347202406170005 - distrOrderNo: PSh0347202406170005 + distrDetailId: '03838557' + distrId: PSh0347202406180020 + distrOrderNo: PSh0347202406180020 settlePrice: 99.9999 maxSettleQty: -100.0 maxSettleAmount: -9999.99 @@ -35,11 +36,11 @@ leftSettleQty: -100.0 leftSettleAmount: -9999.99 hosId: h0347 - provId: p1e2a2 - branchId: h0347-3677 - balanceDetId: OBh0347202406170004-000001 + provId: p1e2aa + branchId: h0347-3681 + balanceDetId: OBh0347202406180005-000001 purMode: 10 - barCode: 013677000004149010333112406171724122421UT240617000202 + barCode: 013681000004170010333112406181724122521UT240618000802 batchId: price: maxQty: @@ -52,14 +53,15 @@ volumeFlag: onlineKind: invoicePrice: 99.9999 - viewId: 202407OBh0347202406170004h034700004149 - - pid: OBh0347202406170004 + viewId: 202407OBh0347202406180005h034700004170 + - pid: OBh0347202406180005 settleMonth: '202407' - hosGoodsId: h034700004149 + accountDate: '2024-06-18' + hosGoodsId: h034700004170 batchCode: '333' - distrDetailId: '03838516' - distrId: PSh0347202406170005 - distrOrderNo: PSh0347202406170005 + distrDetailId: '03838557' + distrId: PSh0347202406180020 + distrOrderNo: PSh0347202406180020 settlePrice: 99.9999 maxSettleQty: 100.0 maxSettleAmount: 9999.99 @@ -68,11 +70,11 @@ leftSettleQty: 100.0 leftSettleAmount: 9999.99 hosId: h0347 - provId: p1e2a2 - branchId: h0347-3677 - balanceDetId: OBh0347202406170004-000002 + provId: p1e2aa + branchId: h0347-3681 + balanceDetId: OBh0347202406180005-000002 purMode: 10 - barCode: 013677000004149010333112406171724122421UT240617000243 + barCode: 013681000004170010333112406181724122521UT240618000846 batchId: price: maxQty: @@ -85,10 +87,10 @@ volumeFlag: onlineKind: invoicePrice: 99.9999 - viewId: 202407OBh0347202406170004h034700004149 - unique: 202407OBh0347202406170004h034700004149 + viewId: 202407OBh0347202406180005h034700004170 + unique: 202407OBh0347202406180005h034700004170 onlineKind: '10' - viewId: 202407OBh0347202406170004h034700004149 + viewId: 202407OBh0347202406180005h034700004170 list_b: - *id001 list_c: diff --git a/data/b2_herp3_bs/message b/data/b2_herp3_bs/message index 0d1e35e7..bcee588a 100644 --- a/data/b2_herp3_bs/message +++ b/data/b2_herp3_bs/message @@ -1,6 +1,6 @@ 院区新增: - branch_id: h0347-3677 - branch_name: 东土城路院区Y4EjC + branch_id: h0347-3681 + branch_name: 东土城路院区!IhMl 科室信息: - dept2_id: 93e0ba6cbd5b4fefabbfdf16d67d9c5c + dept2_id: 841867446f2943f98fc5e32eb3d096a4 dept2_name: 二级检验科002 diff --git a/data/b2_herp3_bs/message3 b/data/b2_herp3_bs/message3 index 2c7d88e8..a5fb0756 100644 --- a/data/b2_herp3_bs/message3 +++ b/data/b2_herp3_bs/message3 @@ -1,3 +1,3 @@ 用户名信息: - username1: 自动化测试1EWs4 - username2: 自动化测试1EWs4 + username1: 自动化测试8M)(@ + username2: 自动化测试8M)(@ diff --git a/data/b2_herp3_bs/message4 b/data/b2_herp3_bs/message4 index b0f22a4f..af51eef8 100644 --- a/data/b2_herp3_bs/message4 +++ b/data/b2_herp3_bs/message4 @@ -1,3 +1,3 @@ 一级科室信息: - dept1_id: d4f47a79620b4b4e8a797ce80d9d9b02 + dept1_id: fc63d8b32f764950916d8ebd54cfb292 dept1_name: 设备科001 diff --git a/data/b2_herp3_bs/message5 b/data/b2_herp3_bs/message5 index 88be9936..35178d85 100644 --- a/data/b2_herp3_bs/message5 +++ b/data/b2_herp3_bs/message5 @@ -1,3 +1,3 @@ 部门和库区信息: - dept1_id: d4f47a79620b4b4e8a797ce80d9d9b02 - stockAreaId: 77f668239c8f4d8eac3623a2607d24ad + dept1_id: fc63d8b32f764950916d8ebd54cfb292 + stockAreaId: 748ea274a2cd4f1e809dc34eaf6f71df diff --git a/data/b2_herp3_bs/message6 b/data/b2_herp3_bs/message6 index 5b9947a0..a156ca92 100644 --- a/data/b2_herp3_bs/message6 +++ b/data/b2_herp3_bs/message6 @@ -1,9 +1,9 @@ 所有科室id: - deptid1: d4f47a79620b4b4e8a797ce80d9d9b02 - deptid2: 93e0ba6cbd5b4fefabbfdf16d67d9c5c - deptid3: 05296212d9a947e6bac56b79ff8b0fc4 - deptid4: 6d973e90b8ea457a8870c91548b47d6d - deptid5: 753cbb636cb243c896e8a921074d0436 + deptid1: fc63d8b32f764950916d8ebd54cfb292 + deptid2: 841867446f2943f98fc5e32eb3d096a4 + deptid3: ec3821ff59384808871a2a10458b564b + deptid4: 3e3d90abd5744f59b3f8a747df56bdd0 + deptid5: 34fc2c77ac44430382834b2282846ede 所有科室name: deptid1: 设备科001 deptid2: 二级检验科002 diff --git a/data/b2_herp3_bs/message7 b/data/b2_herp3_bs/message7 index 8738abe8..e80c7b0d 100644 --- a/data/b2_herp3_bs/message7 +++ b/data/b2_herp3_bs/message7 @@ -1,4 +1,4 @@ shelfinfo: - shelfid: 77f668239c8f4d8eac3623a2607d24ad - shelfCode: areah03472355 + shelfid: 748ea274a2cd4f1e809dc34eaf6f71df + shelfCode: areah03472376 areaName: 自动化测试 diff --git a/data/b5_spd3_core_business_flow/message b/data/b5_spd3_core_business_flow/message index 07dbfe14..6ac3f1c1 100644 --- a/data/b5_spd3_core_business_flow/message +++ b/data/b5_spd3_core_business_flow/message @@ -1,5 +1,5 @@ 供货关系申请2: - e_corpId: p1e2a2 + e_corpId: p1e2aa h_corpId: h0347 - e_username: 国药集团公司7X@tw + e_username: 国药集团公司gFOwi h_name: test001 diff --git a/data/b5_spd3_core_business_flow/message1 b/data/b5_spd3_core_business_flow/message1 index 166353e7..51d17de4 100644 --- a/data/b5_spd3_core_business_flow/message1 +++ b/data/b5_spd3_core_business_flow/message1 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406170007_1 + MSPid: MSP2406180017_1 hosId: h0347 - hosGoodsId: h034700004148 - provGoodsid: provGood-99221336 - goodsAuditBillId: MSP2406170007 - targetId: MSP2406170007_1 + hosGoodsId: h034700004169 + provGoodsid: provGood-99221357 + goodsAuditBillId: MSP2406180017 + targetId: MSP2406180017_1 diff --git a/data/b5_spd3_core_business_flow/message10 b/data/b5_spd3_core_business_flow/message10 index 7091be8c..443b2c85 100644 --- a/data/b5_spd3_core_business_flow/message10 +++ b/data/b5_spd3_core_business_flow/message10 @@ -1,9 +1,9 @@ 低值配送单号: - distrBillId1: PSh0347202406170021 - distrBillId2: PSh0347202406170021 + distrBillId1: PSh0347202406180036 + distrBillId2: PSh0347202406180036 高值配送单号: - distrBillId1: PSh0347202406170022 - distrBillId2: PSh0347202406170022 + distrBillId1: PSh0347202406180037 + distrBillId2: PSh0347202406180037 试剂配送单号: - distrBillId1: PSh0347202406170023 - distrBillId2: PSh0347202406170023 + distrBillId1: PSh0347202406180038 + distrBillId2: PSh0347202406180038 diff --git a/data/b5_spd3_core_business_flow/message11 b/data/b5_spd3_core_business_flow/message11 index 07e9351c..4026a060 100644 --- a/data/b5_spd3_core_business_flow/message11 +++ b/data/b5_spd3_core_business_flow/message11 @@ -1,3 +1,3 @@ 采购计划单号高值: - orderNo1: PLAN2024061728987 - orderNo2: PLAN2024061728987 + orderNo1: PLAN2024061829162 + orderNo2: PLAN2024061829162 diff --git a/data/b5_spd3_core_business_flow/message12 b/data/b5_spd3_core_business_flow/message12 index a9f5fcd2..73ebd6fc 100644 --- a/data/b5_spd3_core_business_flow/message12 +++ b/data/b5_spd3_core_business_flow/message12 @@ -1,3 +1,3 @@ 采购计划单号试剂: - orderNo1: PLAN2024061728989 - orderNo2: PLAN2024061728989 + orderNo1: PLAN2024061829164 + orderNo2: PLAN2024061829164 diff --git a/data/b5_spd3_core_business_flow/message13 b/data/b5_spd3_core_business_flow/message13 index a62a4340..5bc0896a 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-3677 + branchId: h0347-3681 deptId: taskType: 1 - sourceOrgId: p1e2a2 - sourceOrgName: 国药集团公司7X@tw - sourceOrderNo: PSh0347202406170023 + sourceOrgId: p1e2aa + sourceOrgName: 国药集团公司gFOwi + sourceOrderNo: PSh0347202406180038 billMode: '66' stockKind: purMode: - sourceId: PSh0347202406170023 + sourceId: PSh0347202406180038 sourceDetailId: sourceType: PSD sourceTypeName: 配送单 sourceVersion: 1 - planOrderNo: PLAN2024061728989 - purOrderNo: CG2024061718990 - recOrgId: 93e0ba6cbd5b4fefabbfdf16d67d9c5c + planOrderNo: PLAN2024061829164 + purOrderNo: CG2024061819122 + recOrgId: 841867446f2943f98fc5e32eb3d096a4 recOrgName: 二级检验科002 - billRelationJson: '{"buyBillId":"Bh03472024061700015","planBillId":"Ph034720240617025634","planOrderNo":"PLAN2024061728989","buyOrderNo":"BUY2024061705078","purOrderNo":"CG2024061718990","purBillId":"Ch034720240617000081","purBillDate":"2024-06-17 - 07:42:59","distrBillId":"PSh0347202406170023","distrOrderNo":"PSh0347202406170023"}' - taskDate: '2024-06-17 07:43:57' + billRelationJson: '{"buyBillId":"Bh03472024061800015","planBillId":"Ph034720240618025809","planOrderNo":"PLAN2024061829164","buyOrderNo":"BUY2024061805110","purOrderNo":"CG2024061819122","purBillId":"Ch034720240618000120","purBillDate":"2024-06-18 + 10:44:44","distrBillId":"PSh0347202406180038","distrOrderNo":"PSh0347202406180038"}' + taskDate: '2024-06-18 10:45:24' taskDateStart: taskDateEnd: billModeList: diff --git a/data/b5_spd3_core_business_flow/message14 b/data/b5_spd3_core_business_flow/message14 index 803b7164..8292e90a 100644 --- a/data/b5_spd3_core_business_flow/message14 +++ b/data/b5_spd3_core_business_flow/message14 @@ -3,17 +3,17 @@ - &id001 - purMode: 60 unitName: 100支/100 - hosGoodsId: h034700004150 + hosGoodsId: h034700004171 mdmGoodsCode: - spdGoodsCode: '11661099' - goodsCode: '00004150' - goodsName: 新型冠状病毒检测试剂(xFLb + spdGoodsCode: '11661120' + goodsCode: '00004171' + goodsName: 新型冠状病毒检测试剂IkfpG goodsGg: G-31891 mfrsId: mfrsName: 德国歌德公司 Geuder AG made: unit: 支 - goodsDi: + goodsDi: '01123456789012' miCode: miDjmc: certificateCode: '' @@ -22,16 +22,16 @@ pkgDefName: '100' pkgDefQty: 100.0 batchCode: '4444' - expdtDate: '2024-12-24' - productDate: '2024-06-17' - provName: 国药集团公司7X@tw + expdtDate: '2024-12-25' + productDate: '2024-06-18' + provName: 国药集团公司gFOwi provId: - viewId: '03838534' + viewId: '03838575' verifyFlag: 0 hasSterilize: 0 - id: '03838534' + id: '03838575' detailRelationJson: - extInfo: '{"goodsGg":"G-31891","goodsCode":"00004150","purMode":60,"goodsName":"新型冠状病毒检测试剂(xFLb","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661099","ybDefId":""}' + extInfo: '{"goodsGg":"G-31891","goodsCode":"00004171","purMode":60,"goodsName":"新型冠状病毒检测试剂IkfpG","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661120","ybDefId":""}' recTemperature: 20 recHumidity: 30 distrPrice: 99.9999 diff --git a/data/b5_spd3_core_business_flow/message15 b/data/b5_spd3_core_business_flow/message15 index e890e43a..137647b8 100644 --- a/data/b5_spd3_core_business_flow/message15 +++ b/data/b5_spd3_core_business_flow/message15 @@ -1,3 +1,3 @@ 验收单号: - CHECK_NO1: CHECKh03472024061700014 - CHECK_NO2: CHECKh03472024061700014 + CHECK_NO1: CHECKh03472024061800016 + CHECK_NO2: CHECKh03472024061800016 diff --git a/data/b5_spd3_core_business_flow/message16 b/data/b5_spd3_core_business_flow/message16 index a2c37cb9..3d148416 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-051341 + createUser: h0347_UID-051346 lastModifiedUser: billMode: '16' recType: stockKind: purMode: - sourceId: CHECKh03472024061700002 + sourceId: CHECKh03472024061800004 sourceType: PSD sourceVersion: 0 batchList: billRelationJson: hosId: h0347 - deptId: d4f47a79620b4b4e8a797ce80d9d9b02 + deptId: fc63d8b32f764950916d8ebd54cfb292 deptName: - branchId: h0347-3677 + branchId: h0347-3681 branchName: taskType: 1 - sourceOrgId: p1e2a2 - sourceOrgName: 国药集团公司7X@tw - sourceOrderNo: YS240617002 - taskSourceNo: PSh0347202406170005 - areaCode: areah03472355 + sourceOrgId: p1e2aa + sourceOrgName: 国药集团公司gFOwi + sourceOrderNo: YS240618004 + taskSourceNo: PSh0347202406180020 + areaCode: areah03472376 areaName: 自动化测试 goodsName: goodsGg: startDate: endDate: - taskDate: '2024-06-17 07:12:13' + taskDate: '2024-06-18 10:16:19' pkgTaskId: pkgFlag: remark: '' diff --git a/data/b5_spd3_core_business_flow/message17 b/data/b5_spd3_core_business_flow/message17 index 5d647462..53e7cff6 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: CHECKh034720240617000020001 + - id: CHECKh034720240618000040001 lastModified: version: createTime: @@ -10,27 +10,27 @@ rowIdx: purMode: 10 unitName: 100支/100 - pid: CHECKh03472024061700002 - hosGoodsId: h034700004149 + pid: CHECKh03472024061800004 + hosGoodsId: h034700004170 batchCode: '333' - expdtDate: '2024-12-24' - productDate: '2024-06-17' + expdtDate: '2024-12-25' + productDate: '2024-06-18' batchPrice: 99.9999 settlement: 1 batchType: 20 - srcBatchId: '03838516' + srcBatchId: '03838557' srcBatchPrice: 99.9999 - shelfCode: areah03472355-2-01-01 + shelfCode: areah03472376-2-01-01 shelfKind: - barcodeId: UT240617000201 + barcodeId: UT240618000801 subBarcodeId: qty: 10000.0 pkgQty: 100 - distrId: PSh0347202406170005 - distrDetailId: '03838516' + distrId: PSh0347202406180020 + distrDetailId: '03838557' pkgDefQty: 100.0 pkgDefName: '100' - viewId: h0347000041493332024-12-24100支/100 + viewId: h0347000041703332024-12-25100支/100 codingType: batchFlag: hasSterilize: 0 @@ -38,31 +38,31 @@ sterilizePassQty: sterilizeRejectQty: orderNo: - sourceDetailId: '03838516' - mdmGoodsCode: '11661098' - goodsCode: '00004149' + sourceDetailId: '03838557' + mdmGoodsCode: '11661119' + goodsCode: '00004170' tbStatus: 1 billMode: '16' hosId: h0347 - branchId: h0347-3677 - purBillId: Ch034720240617000048 - provId: p1e2a2 - provName: 国药集团公司7X@tw + branchId: h0347-3681 + purBillId: Ch034720240618000087 + provId: p1e2aa + provName: 国药集团公司gFOwi subSendFlag: 10 - exeProvId: p1e2a2 - exeProvName: 国药集团公司7X@tw - purDetailId: 1c4d5483a9c046ae8221b476c5566da0 - goodsName: 一次性注射器_低值RO^f5 + exeProvId: p1e2aa + exeProvName: 国药集团公司gFOwi + purDetailId: 5a9052477c5a4fb4ad5c2d35da7cb7c2 + goodsName: 一次性注射器_低值D4tGq goodsGg: G-31891 mfrsId: mfrs-11229 mfrsName: 德国歌德公司 Geuder AG made: 德国 unit: 支 purPrice: 99.9999 - pkgDefId: b5a1eb2a8cb44a668a16c60666c8e9ca - supplyId: 3fbf9f923395474788c5205a46c1b5d0 - subProvId: p1e2a2 - subProvName: 国药集团公司7X@tw + pkgDefId: 6a72ee6d39dc4c2fb68511c3f43e5cec + supplyId: a588a1647e4c43f2a39c0b62905be306 + subProvId: p1e2aa + subProvName: 国药集团公司gFOwi subPrice: 99.9999 distrPrice: 99.9999 distrPkgQty: 100.0 @@ -74,13 +74,13 @@ psiPrice: 99.9999 ext: goodsGg: G-31891 - goodsCode: '00004149' + goodsCode: '00004170' purMode: 10 - goodsName: 一次性注射器_低值RO^f5 + goodsName: 一次性注射器_低值D4tGq ygptCode: '' transCond: '' storageCond: '' - erpCode: '11661098' + erpCode: '11661119' ybDefId: '' purTaskId: multiChargeFlag: diff --git a/data/b5_spd3_core_business_flow/message18 b/data/b5_spd3_core_business_flow/message18 index d495c712..6b28eebd 100644 --- a/data/b5_spd3_core_business_flow/message18 +++ b/data/b5_spd3_core_business_flow/message18 @@ -1,52 +1,53 @@ 条码信息: list_a: - &id001 - id: '8800000001067686' - snCode: '8800000001067686' - ssccCode: '010839000184652227' - pkgCodeSee: '0100000000004148102221124061717241224218800000001067686' - hosGoodsId: h034700004148 - hosGoodsCode: '00004148' - goodsCode: '00004148' - goodsName: 高值牙钻机zmbS( + id: UT240618001402 + snCode: UT240618001402 + ssccCode: '010839000184853822' + pkgCodeSee: 0136810000041710104444112406181724122521UT240618001402 + hosGoodsId: h034700004171 + hosGoodsCode: '00004171' + goodsCode: '00004171' + goodsName: 新型冠状病毒检测试剂IkfpG goodsSpec: G-31891 goodsMfrsName: 德国歌德公司 Geuder AG unit: 支 - purMode: 20 - batchCode: '222' - productDate: '2024-06-17' - expdtDate: '2024-12-24' - pkgDefName: - pkgDefQty: 1.0 - stockId: 7ab7815fa64e4be7917935a98af2ae95 + purMode: 60 + batchCode: '4444' + productDate: '2024-06-18' + expdtDate: '2024-12-25' + pkgDefName: '100' + pkgDefQty: 100.0 + stockId: 581f3e9c002a45dd9c660928d3f86bfb stockName: 二级检验科002库房 areaName: 默认库区 - areaCode: areah03472353 + areaCode: areah03472373 lockStatus: 0 - unitName: 1支 - shelfCode: areah03472353-A-01-01 + unitName: 100支/100 + shelfCode: areah03472373-A-01-01 shelfNo: A01-A-01-01 - pkgDefId: - extInfo: '{"pkgDefQty": 1, "purBillId": "CG2024061718986", "distrBillId": "PSh0347202406170016", - "inStockTime": "2024-06-17 07:36:48", "useFrequency": 1, "distrDetailId": "03838527", - "certificateCode": "", "multiChargeFlag": 0}' + pkgDefId: 64e44170045f437983f34884f8f89fa7 + extInfo: '{"pkgDefId": "64e44170045f437983f34884f8f89fa7", "pkgDefQty": 100, "purBillId": + "CG2024061819116", "pkgDefName": "100", "distrBillId": "PSh0347202406180032", + "inStockTime": "2024-06-18 10:39:06", "distrDetailId": "03838569", "certificateCode": + ""}' bottleId: - pkgType: '20' + pkgType: '66' miDjmc: '' miCode: '' transferRatio: 1.0 qty: 1 shelfKind: 0 shelfKindName: 普通货位 - provName: 国药集团公司7X@tw - provId: p1e2a2 - inStockDate: '2024-06-17 07:36:47' + provName: 国药集团公司gFOwi + provId: p1e2aa + inStockDate: '2024-06-18 10:39:06' mfrCode: made: 德国 price: - barName: 1支 - purModeText: 高值耗材 - codeType: 20 + barName: 100支/100 + purModeText: 检验试剂 + codeType: 66 list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message19 b/data/b5_spd3_core_business_flow/message19 index b5d372d3..2423d09a 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: h034700004148 - hosGoodsCode: '00004148' - provId: p1e2a2 - subProvId: p1e2a2 - subProvName: 国药集团公司7X@tw - goodsName: 高值牙钻机zmbS( + - hosGoodsId: h034700004169 + hosGoodsCode: '00004169' + provId: p1e2aa + subProvId: p1e2aa + subProvName: 国药集团公司gFOwi + goodsName: 高值牙钻机@xK^5 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 04b88ac3..234ff9a8 100644 --- a/data/b5_spd3_core_business_flow/message2 +++ b/data/b5_spd3_core_business_flow/message2 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406170008_1 + MSPid: MSP2406180018_1 hosId: h0347 - hosGoodsId: h034700004149 - provGoodsid: provGood-99221337 - goodsAuditBillId: MSP2406170008 - targetId: MSP2406170008_1 + hosGoodsId: h034700004170 + provGoodsid: provGood-99221358 + goodsAuditBillId: MSP2406180018 + targetId: MSP2406180018_1 diff --git a/data/b5_spd3_core_business_flow/message20 b/data/b5_spd3_core_business_flow/message20 index 39815ce9..d31ce461 100644 --- a/data/b5_spd3_core_business_flow/message20 +++ b/data/b5_spd3_core_business_flow/message20 @@ -1,34 +1,34 @@ 二级库条码信息: list_a: - &id001 - id: '8800000001067685' - snCode: '8800000001067685' - ssccCode: '010839000184652029' - pkgCodeSee: '01000000000041481022221124061717241224218800000001067685' - hosGoodsId: h034700004148 - hosGoodsCode: '00004148' - goodsCode: '00004148' - goodsName: 高值牙钻机zmbS( + id: '8800000001068210' + snCode: '8800000001068210' + ssccCode: '010839000184853525' + pkgCodeSee: '01000000000041691022221124061817241225218800000001068210' + hosGoodsId: h034700004169 + hosGoodsCode: '00004169' + goodsCode: '00004169' + goodsName: 高值牙钻机@xK^5 goodsSpec: G-31891 goodsMfrsName: 德国歌德公司 Geuder AG unit: 支 purMode: 20 batchCode: '2222' - productDate: '2024-06-17' - expdtDate: '2024-12-24' + productDate: '2024-06-18' + expdtDate: '2024-12-25' pkgDefName: pkgDefQty: 1.0 - stockId: 7ab7815fa64e4be7917935a98af2ae95 + stockId: 581f3e9c002a45dd9c660928d3f86bfb stockName: 二级检验科002库房 areaName: 默认库区 - areaCode: areah03472353 + areaCode: areah03472373 lockStatus: 0 unitName: 1支 - shelfCode: areah03472353-A-01-01 + shelfCode: areah03472373-A-01-01 shelfNo: A01-A-01-01 pkgDefId: - extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202406170014", "inStockTime": - "2024-06-17 07:27:41", "useFrequency": 1, "distrDetailId": "03838525", "multiChargeFlag": + extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202406180029", "inStockTime": + "2024-06-18 10:30:15", "useFrequency": 1, "distrDetailId": "03838566", "multiChargeFlag": 0}' bottleId: pkgType: '25' @@ -38,9 +38,9 @@ qty: 1 shelfKind: 0 shelfKindName: 普通货位 - provName: 国药集团公司7X@tw - provId: p1e2a2 - inStockDate: '2024-06-17 07:27:41' + provName: 国药集团公司gFOwi + provId: p1e2aa + inStockDate: '2024-06-18 10:30:14' mfrCode: made: 德国 price: diff --git a/data/b5_spd3_core_business_flow/message21 b/data/b5_spd3_core_business_flow/message21 index d9bef2cc..c18888ea 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: h034700004150 + - hosGoodsId: h034700004171 purMode: 60 grantRule: id: - goodsName: 新型冠状病毒检测试剂(xFLb + goodsName: 新型冠状病毒检测试剂IkfpG goodsSpec: G-31891 - mdmGoodsCode: '11661099' - goodsCode: '00004150' + mdmGoodsCode: '11661120' + goodsCode: '00004171' unit: 支 goodsMfrsName: 德国歌德公司 Geuder AG miDjmc: '' @@ -18,20 +18,20 @@ pkgQty: qty: 300.0 goodsImg: [] - pkgDefId: 2ff83886472c4480bf745082fcb13670 + pkgDefId: 64e44170045f437983f34884f8f89fa7 buyPkgQty: unitName: 100支/100 price: 99.9999 hosId: branchId: - deptId: 93e0ba6cbd5b4fefabbfdf16d67d9c5c + deptId: 841867446f2943f98fc5e32eb3d096a4 deptName: areaCode: areaName: - targetDeptId: d4f47a79620b4b4e8a797ce80d9d9b02 + targetDeptId: fc63d8b32f764950916d8ebd54cfb292 targetDeptName: 设备科001 - targetStockId: 5e02b94cd4854a6fb287c1a25490fd33 - targetStockName: 东土城路院区Y4EjC中心库房 + targetStockId: bd5e7522df07403db5cb95604d2bcbb2 + targetStockName: 东土城路院区!IhMl中心库房 purchaseFlag: 1 tempFlag: 0 grantWay: 3 @@ -39,7 +39,7 @@ codingType: 0 purModeText: 检验试剂 goodsGeneralName: 检测试剂 - provName: 国药集团公司7X@tw + provName: 国药集团公司gFOwi noRecPkgQty: 1.0 noRecQty: 100.0 autoUnpack: diff --git a/data/b5_spd3_core_business_flow/message22 b/data/b5_spd3_core_business_flow/message22 index 4a868b6a..fafc68fa 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: 71ddeca2621b4e07a202733444e6605a - lastModified: '2024-06-17 07:49:40' + - id: 900f30591f3a45bcba8517d08082916f + lastModified: '2024-06-18 10:50:51' version: 1 - createTime: '2024-06-17 07:04:17' - createUser: h0347_UID-051341 - lastModifiedUser: h0347_UID-051341 - stockId: 8ed8d207e07d432cb8845c16e60350bc - shelfCode: areah03472352 + createTime: '2024-06-18 10:08:22' + createUser: h0347_UID-051346 + lastModifiedUser: h0347_UID-051346 + stockId: 6e25e19bbe05485a9fa0e91b7041cdc3 + shelfCode: areah03472374 shelfName: 默认库区 address: 三级检测组003 shelfType: @@ -18,13 +18,13 @@ parentId: levelCode: tbStatus: 1 - linkman: h0347_UID-051341 + linkman: h0347_UID-051346 recPhone: None delFlag: 0 shelfNo: A01 shelfKind: 0 hosId: - deptId: 05296212d9a947e6bac56b79ff8b0fc4 + deptId: ec3821ff59384808871a2a10458b564b areaCode: areaName: stockName: diff --git a/data/b5_spd3_core_business_flow/message3 b/data/b5_spd3_core_business_flow/message3 index e36553b2..33b3aaca 100644 --- a/data/b5_spd3_core_business_flow/message3 +++ b/data/b5_spd3_core_business_flow/message3 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406170009_1 + MSPid: MSP2406180019_1 hosId: h0347 - hosGoodsId: h034700004150 - provGoodsid: provGood-99221338 - goodsAuditBillId: MSP2406170009 - targetId: MSP2406170009_1 + hosGoodsId: h034700004171 + provGoodsid: provGood-99221359 + goodsAuditBillId: MSP2406180019 + targetId: MSP2406180019_1 diff --git a/data/b5_spd3_core_business_flow/message4 b/data/b5_spd3_core_business_flow/message4 index 4a9b9bbe..78a9197e 100644 --- a/data/b5_spd3_core_business_flow/message4 +++ b/data/b5_spd3_core_business_flow/message4 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406170010_1 + MSPid: MSP2406180020_1 hosId: h0347 - hosGoodsId: h034700004151 - provGoodsid: provGood-99221339 - goodsAuditBillId: MSP2406170010 - targetId: MSP2406170010_1 + hosGoodsId: h034700004172 + provGoodsid: provGood-99221360 + goodsAuditBillId: MSP2406180020 + targetId: MSP2406180020_1 diff --git a/data/b5_spd3_core_business_flow/message5 b/data/b5_spd3_core_business_flow/message5 index 0f59135d..6e077f19 100644 --- a/data/b5_spd3_core_business_flow/message5 +++ b/data/b5_spd3_core_business_flow/message5 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406170011_1 + MSPid: MSP2406180021_1 hosId: h0347 - hosGoodsId: h034700004152 - provGoodsid: provGood-99221340 - goodsAuditBillId: MSP2406170011 - targetId: MSP2406170011_1 + hosGoodsId: h034700004173 + provGoodsid: provGood-99221361 + goodsAuditBillId: MSP2406180021 + targetId: MSP2406180021_1 diff --git a/data/b5_spd3_core_business_flow/message6 b/data/b5_spd3_core_business_flow/message6 index 4844df36..272b9138 100644 --- a/data/b5_spd3_core_business_flow/message6 +++ b/data/b5_spd3_core_business_flow/message6 @@ -1,3 +1,3 @@ 产品包装信息: - unitPackageid1: 2ff83886472c4480bf745082fcb13670 - unitPackageid2: 2ff83886472c4480bf745082fcb13670 + unitPackageid1: 64e44170045f437983f34884f8f89fa7 + unitPackageid2: 64e44170045f437983f34884f8f89fa7 diff --git a/data/b5_spd3_core_business_flow/message7 b/data/b5_spd3_core_business_flow/message7 index d0061a02..a8366923 100644 --- a/data/b5_spd3_core_business_flow/message7 +++ b/data/b5_spd3_core_business_flow/message7 @@ -1,3 +1,3 @@ 采购计划单号: - orderNo1: PLAN2024061728988 - orderNo2: PLAN2024061728988 + orderNo1: PLAN2024061829163 + orderNo2: PLAN2024061829163 diff --git a/data/b5_spd3_core_business_flow/message8 b/data/b5_spd3_core_business_flow/message8 index 2f213134..9a14e7e4 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: Ch034720240617000081 - lastModified: '2024-06-17 07:42:59' + - id: Ch034720240618000120 + lastModified: '2024-06-18 10:44:44' version: 0 - createTime: '2024-06-17 07:42:59' - createUser: h0347_UID-051341 + createTime: '2024-06-18 10:44:44' + createUser: h0347_UID-051346 lastModifiedUser: - orderNo: CG2024061718990 + orderNo: CG2024061819122 billMode: '66' recType: HDI hosId: h0347 - branchId: h0347-3677 + branchId: h0347-3681 deptId: deptName: - recOrgId: 93e0ba6cbd5b4fefabbfdf16d67d9c5c + recOrgId: 841867446f2943f98fc5e32eb3d096a4 recOrgName: 二级检验科002 areaCode: areaName: billExpdtDate: - sourceId: Ph034720240617025634 + sourceId: Ph034720240618025809 sourceType: inSettlement: recUser: recPhone: recAddr: 自动化测试 - provId: p1e2a2 - provName: 国药集团公司7X@tw + provId: p1e2aa + provName: 国药集团公司gFOwi subSendFlag: - exeProvId: p1e2a2 - exeProvName: 国药集团公司7X@tw + exeProvId: p1e2aa + exeProvName: 国药集团公司gFOwi billRelationJson: extInfo: barcodeFlag: 1 @@ -43,11 +43,11 @@ hosVersion: 3 billType: CGD hosName: 邹城市人民医院(test) - branchName: 东土城路院区Y4EjC + branchName: 东土城路院区!IhMl sumQty: 100.0 sumPkgQty: 1.0 sumAmount: '9999.9900' - planOrderNo: PLAN2024061728989 + planOrderNo: PLAN2024061829164 list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message9 b/data/b5_spd3_core_business_flow/message9 index aeea04ba..94cec672 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: 5e80beb929e94f10905cfd9e24212ff3 + - id: 187c2c7490ad41098e444c9641258fad lastModified: version: createTime: createUser: lastModifiedUser: - pid: Ch034720240617000081 - orderNo: CG2024061718990 - sourceId: 3f13b9cd3142442fa882f4ae982bf2f6 - hosGoodsId: h034700004150 - mdmGoodsCode: '11661099' - goodsCode: '00004150' + pid: Ch034720240618000120 + orderNo: CG2024061819122 + sourceId: c3f00ad869614a949ca38f58b0d53559 + hosGoodsId: h034700004171 + mdmGoodsCode: '11661120' + goodsCode: '00004171' purMode: 60 price: '99.9999' - supplyId: c668ba18c1924d6992f322a3b54e4da9 - pkgDefId: 2ff83886472c4480bf745082fcb13670 + supplyId: bd97573615c644359cf761b0afd1072a + pkgDefId: 64e44170045f437983f34884f8f89fa7 pkgDefName: '100' pkgDefQty: 100.0 pkgQty: 1.0 @@ -31,20 +31,20 @@ notSendPkgQty: 0.0 inSettlement: 1 closeType: 1 - detailRelationJson: '{"planBillId":"Ph034720240617025634","buyDetailId":"Bh034720240617000150001","planDetailId":"3f13b9cd3142442fa882f4ae982bf2f6"}' - extInfo: '{"goodsGg":"G-31891","goodsCode":"00004150","purMode":60,"goodsName":"新型冠状病毒检测试剂(xFLb"}' + detailRelationJson: '{"planBillId":"Ph034720240618025809","buyDetailId":"Bh034720240618000150001","planDetailId":"c3f00ad869614a949ca38f58b0d53559"}' + extInfo: '{"goodsGg":"G-31891","goodsCode":"00004171","purMode":60,"goodsName":"新型冠状病毒检测试剂IkfpG"}' remark: tbStatus: hosVersion: unit: 支 - goodsName: 新型冠状病毒检测试剂(xFLb + goodsName: 新型冠状病毒检测试剂IkfpG mfrsId: mfrs-11229 mfrsName: 德国歌德公司 Geuder AG goodsGg: G-31891 - mdmGoodsSpecCode: '11661099' - erpCode: '11661099' + mdmGoodsSpecCode: '11661120' + erpCode: '11661120' made: 德国 - goodsDi: + goodsDi: '01123456789012' miDjmc: miGoodsGg: miGoodsXh: @@ -66,14 +66,14 @@ transCond: '' storageCond: '' diType: gs1 - diUse: '36770000041500' + diUse: '36810000041710' multiChargeFlag: 0 useFrequency: 1 chargeUnit: amount: '9999.9900' unitName: 100支/100 - subProvId: p1e2a2 - subProvName: 国药集团公司7X@tw + subProvId: p1e2aa + subProvName: 国药集团公司gFOwi subPrice: 99.9999 replPkgQty: 1.0 replQty: 100.0 -- GitLab