From 2137a6bca6d924c686936888ac6121bc721f6d85 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Wed, 18 Sep 2024 16:38:29 +0800 Subject: [PATCH] =?UTF-8?q?```=E8=A7=A3=E5=86=B3=E9=94=80=E5=94=AE?= =?UTF-8?q?=E9=80=80=E8=B4=A7=E5=88=9D=E5=A7=8B=E5=8C=96=E5=99=A8=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E5=BC=82=E5=B8=B8=E5=92=8C=E6=B5=8B=E8=AF=95=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 注释掉导致长度异常的代码行，避免pk_defxxx长度不足的问题。- 调整测试代码，移除硬编码的测试值，以防止测试对实际业务流程的影响。 - 修复公司代码和会员ID的硬编码测试逻辑，确保在实际使用时不预设固定值。 ``` --- .../lets/plugin/sales/SoSaleOutPluginInitializerToB.java | 3 ++- .../lets/plugin/sales/SoSaleOutPluginInitializerToC.java | 4 ++-- .../plugin/sales/SoSaleReturnPluginInitializerToB.java | 8 ++++---- 3 files changed, 8 insertions(+), 7 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 e49c23b3..be9fa17c 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 @@ -804,7 +804,8 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity { saleorderRequestChildrenDto.setNoriginalcurtaxprice(noriginalcurtaxprice.stripTrailingZeros().toPlainString());//含税单价 saleorderRequestChildrenDto.setNtaxrate(new BigDecimal(bdTaxitemsEntity1.getTaxratio()).stripTrailingZeros().toPlainString());//税率 //2024年8月30日 10:52:55 抛出异常pk_defxxx长度不够的问题，已经提交给总部 - saleorderRequestChildrenDto.setVdef19(header.getCode());//原单单号 + //TODO 先不传，抛出长度异常，后续再改 +// saleorderRequestChildrenDto.setVdef19(header.getCode());//原单单号 saleorderRequestChildrenDto.setVdef20(detailsDto.getId());//原单明细主键 saleorderRequestChildrenDtoList.add(saleorderRequestChildrenDto); } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java index 29fe32b1..eb6c5d8a 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java @@ -915,7 +915,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { */ private String createGenerateBusinessDateStock(com.hzya.frame.ttxofs.dto.ofssaleorderoutsearch.HeaderDto header) { //TODO 测试 - header.setShipAt("2024-09-14"); +// header.setShipAt("2024-09-14"); if (header != null && header.getShipAt() != null) { //TOC以出库日期作为业务日期 String shipAt = header.getShipAt(); @@ -1006,7 +1006,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { // String corpName = "上海丽知品牌管理有限公司"; String companyCode = header.getCompanyCode(); //TODO 测试 - companyCode = "SHLZ"; +// companyCode = "SHLZ"; Assert.notNull(companyCode, "O出库单表头货主不能为空！"); BdCorpEntity bdCorpEntity = cacheTocMapVo.getStringBdCorpEntityMap().get(companyCode); Assert.notNull(bdCorpEntity, "根据公司编码({})没有匹配到U8C公司档案(公司编码=O货主)", companyCode); 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 020c8d2e..fb7404be 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 @@ -910,7 +910,7 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity { HeaderDto header1 = saleOrderMessageDto.getData().get(0).getHeader(); String memberId = header1.getMemberId(); //TODO 会员id - memberId = "GYS00002"; +// memberId = "GYS00002"; Assert.notNull(memberId, "TOB销售订单(OFS)表头会员id不能为空，否则无法匹配U8C客商档案！"); Assert.state(!"".equals(memberId.trim()), "TOB销售订单(OFS)表头会员id不能为空，否则无法匹配U8C客商档案！"); @@ -924,7 +924,7 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity { // 销售公司、发货公司 String companyCode = header.getCompanyCode(); //TODO 测试 - companyCode = "SHLZ"; +// companyCode = "SHLZ"; Assert.notNull(companyCode, "O表头公司不能为空"); BdCorpEntity bdCorpEntity = new BdCorpEntity(); bdCorpEntity.setDr(0); @@ -1134,7 +1134,7 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity { HeaderDto header1 = saleOrderMessageDto.getData().get(0).getHeader(); String memberId = header1.getMemberId(); //TODO 测试 - memberId = "GYS00002"; +// memberId = "GYS00002"; Assert.notNull(memberId, "TOB销售订单(OFS)表头会员id不能为空，否则无法匹配U8C客商档案！"); Assert.state(!"".equals(memberId.trim()), "TOB销售订单(OFS)表头会员id不能为空，否则无法匹配U8C客商档案！"); @@ -1204,7 +1204,7 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity { // 销售公司、发货公司 String companyCode = header.getCompanyCode(); //TODO 测试 - companyCode = "SHLZ"; +// companyCode = "SHLZ"; Assert.notNull(companyCode, "O表头公司不能为空"); BdCorpEntity bdCorpEntity = new BdCorpEntity(); bdCorpEntity.setDr(0);