From ed21d4ce9d54edcf6b8c7fc2de3be653c82a1788 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Tue, 29 Oct 2024 15:17:44 +0800 Subject: [PATCH] =?UTF-8?q?refactor(sales):=20=E9=87=8D=E6=9E=84=E9=94=80?= =?UTF-8?q?=E5=94=AE=E5=87=BA=E5=BA=93=E5=92=8C=E9=94=80=E5=94=AE=E9=80=80?= =?UTF-8?q?=E8=B4=A7=E5=88=9D=E5=A7=8B=E5=8C=96=E9=80=BB=E8=BE=91-=20?= =?UTF-8?q?=E5=9C=A8=20SoSaleOutPluginInitializerToB=20=E5=92=8C=20SoSaleR?= =?UTF-8?q?eturnPluginInitializerToB=20=E7=B1=BB=E4=B8=AD=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=20replaceCompanyCode=E5=8F=98=E9=87=8F=20-=20?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=20queryU8CEntityUtil.queryBdDefDocByPkDefDoc?= =?UTF-8?q?List=20=E6=96=B9=E6=B3=95=E8=8E=B7=E5=8F=96=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E5=90=8E=E7=9A=84=E5=85=AC=E5=8F=B8=E4=BB=A3=E7=A0=81=20-=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=20BdCorpEntity=20=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E4=BD=BF=E7=94=A8=E6=9B=BF=E6=8D=A2=E5=90=8E?= =?UTF-8?q?=E7=9A=84=E5=85=AC=E5=8F=B8=E4=BB=A3=E7=A0=81=20-=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E7=94=A8=E6=9B=BF=E6=8D=A2=E5=90=8E=E7=9A=84?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sales/SoSaleOutPluginInitializerToB.java | 18 +++++++++----- .../SoSaleReturnPluginInitializerToB.java | 24 +++++++++++-------- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java index 99f37869..73f0d561 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java @@ -1017,15 +1017,18 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity { // header.setCompanyCode("SHLZ"); String companyCode = header.getCompanyCode(); Assert.notNull(companyCode, "O表头公司不能为空"); + String replaceCompanyCode = queryU8CEntityUtil.queryBdDefDocByPkDefDocList(companyCode.trim()); + Assert.notNull(replaceCompanyCode, "replaceCompanyCode不能为空！"); + BdCorpEntity bdCorpEntity = new BdCorpEntity(); bdCorpEntity.setDr(0); bdCorpEntity.setDataSourceCode("lets_u8c"); - bdCorpEntity.setUnitcode(companyCode.trim()); + bdCorpEntity.setUnitcode(replaceCompanyCode); List bdCorpEntityList = iBdCorpDao.query(bdCorpEntity); if (bdCorpEntityList.size() == 0) { - Assert.state(false, "根据O货主编码{}，无法匹配到U8C销售公司", companyCode); + Assert.state(false, "根据O货主编码{}，无法匹配到U8C销售公司", replaceCompanyCode); } else if (bdCorpEntityList.size() >= 2) { - Assert.state(false, "根据O货主编码{}，匹配到U8C销售公司{}个", companyCode, bdCorpEntityList.size()); + Assert.state(false, "根据O货主编码{}，匹配到U8C销售公司{}个", replaceCompanyCode, bdCorpEntityList.size()); } // 发货库存组织 @@ -1575,15 +1578,18 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity { // header.setCompanyCode("SHLZ"); String companyCode = header.getCompanyCode(); Assert.notNull(companyCode, "O表头公司不能为空"); + String replaceCompanyCode = queryU8CEntityUtil.queryBdDefDocByPkDefDocList(companyCode.trim()); + Assert.notNull(replaceCompanyCode, "replaceCompanyCode不能为空！"); + BdCorpEntity bdCorpEntity = new BdCorpEntity(); bdCorpEntity.setDr(0); bdCorpEntity.setDataSourceCode("lets_u8c"); - bdCorpEntity.setUnitcode(companyCode.trim()); + bdCorpEntity.setUnitcode(replaceCompanyCode); List bdCorpEntityList = iBdCorpDao.query(bdCorpEntity); if (bdCorpEntityList.size() == 0) { - Assert.state(false, "根据O货主编码{}，无法匹配到U8C销售公司", companyCode); + Assert.state(false, "根据O货主编码{}，无法匹配到U8C销售公司", replaceCompanyCode); } else if (bdCorpEntityList.size() >= 2) { - Assert.state(false, "根据O货主编码{}，匹配到U8C销售公司{}个", companyCode, bdCorpEntityList.size()); + Assert.state(false, "根据O货主编码{}，匹配到U8C销售公司{}个", replaceCompanyCode, bdCorpEntityList.size()); } // 发货库存组织 diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java index 1f5bbd7b..5c71e4cf 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java @@ -963,18 +963,20 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity { // 销售公司、发货公司 String companyCode = header.getCompanyCode(); - //测试 -// companyCode = "SHLZ"; Assert.notNull(companyCode, "O表头公司不能为空"); + + String replaceCompanyCode = queryU8CEntityUtil.queryBdDefDocByPkDefDocList(companyCode.trim()); + Assert.notNull(replaceCompanyCode, "replaceCompanyCode不能为空！"); + BdCorpEntity bdCorpEntity = new BdCorpEntity(); bdCorpEntity.setDr(0); bdCorpEntity.setDataSourceCode("lets_u8c"); - bdCorpEntity.setUnitcode(companyCode.trim()); + bdCorpEntity.setUnitcode(replaceCompanyCode); List bdCorpEntityList = iBdCorpDao.query(bdCorpEntity); if (bdCorpEntityList.size() == 0) { - Assert.state(false, "根据O货主编码{}，无法匹配到U8C销售公司", companyCode); + Assert.state(false, "根据O货主编码{}，无法匹配到U8C销售公司", replaceCompanyCode); } else if (bdCorpEntityList.size() >= 2) { - Assert.state(false, "根据O货主编码{}，匹配到U8C销售公司{}个", companyCode, bdCorpEntityList.size()); + Assert.state(false, "根据O货主编码{}，匹配到U8C销售公司{}个", replaceCompanyCode, bdCorpEntityList.size()); } // 发货库存组织 @@ -1276,18 +1278,20 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity { // 销售公司、发货公司 String companyCode = header.getCompanyCode(); - //测试 -// companyCode = "SHLZ"; Assert.notNull(companyCode, "O表头公司不能为空"); + + String replaceCompanyCode = queryU8CEntityUtil.queryBdDefDocByPkDefDocList(companyCode.trim()); + Assert.notNull(replaceCompanyCode, "replaceCompanyCode不能为空！"); + BdCorpEntity bdCorpEntity = new BdCorpEntity(); bdCorpEntity.setDr(0); bdCorpEntity.setDataSourceCode("lets_u8c"); - bdCorpEntity.setUnitcode(companyCode.trim()); + bdCorpEntity.setUnitcode(replaceCompanyCode); List bdCorpEntityList = iBdCorpDao.query(bdCorpEntity); if (bdCorpEntityList.size() == 0) { - Assert.state(false, "根据O货主编码{}，无法匹配到U8C销售公司", companyCode); + Assert.state(false, "根据O货主编码{}，无法匹配到U8C销售公司", replaceCompanyCode); } else if (bdCorpEntityList.size() >= 2) { - Assert.state(false, "根据O货主编码{}，匹配到U8C销售公司{}个", companyCode, bdCorpEntityList.size()); + Assert.state(false, "根据O货主编码{}，匹配到U8C销售公司{}个", replaceCompanyCode, bdCorpEntityList.size()); } // 发货库存组织