diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java index 3b62c98b..f219925b 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java @@ -313,6 +313,9 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) { return true; } + if (sceneType.equals("tran") && (header.getClosedAt() == null || "".equals(header.getClosedAt().trim()))) { + return true; + } } return false; } @@ -386,9 +389,14 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { public boolean test(StockinOrderSearchResponse.StockinOrder headerDetailsDto) { StockinOrderSearchResponse.StockinOrder.StockinH header = headerDetailsDto.getHeader(); if (header != null && header.getCompanyCode() != null) { + //过滤掉不需要的公司 if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) { return true; } + //过滤掉入库日期为空的单据 + if (header.getClosedAt() == null || "".equals(header.getClosedAt().trim())) { + return true; + } } return false; } @@ -1447,7 +1455,7 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { // String storeCode2 = header.getStoreCode(); // Assert.notNull(storeCode2, "O店铺编码不能为空!"); BdDefdocEntity bdDefdocEntity1 = cacheTocMapVoV2.getStringBdDefdocEntityMap1().get(storeCode.trim()); - Assert.notNull(bdDefdocEntity1, "根据O店铺编码({})无法匹配到U8C店铺档案", storeCode); + Assert.notNull(bdDefdocEntity1, "根据O店铺编码({})无法匹配到U8C店铺档案", storeCode.trim()); //字段拷贝 for (int j = 0; j < details.size(); j++) { diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java index 3d6414dc..ccb66a8a 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java @@ -44,9 +44,10 @@ public class SoSaleReturnPluginInitializerToCTest { // List startAndEndVos = soSaleReturnPluginInitializerToC.calculateCalculateEntireDayPeriod(null); // soSaleReturnPluginInitializerToC.startImplementStockByTime(startAndEndVos.get(0).getStart_time(), startAndEndVos.get(0).getEnd_time()); - try { - soSaleReturnPluginInitializerToC.startImplementByTradeTime("2024-12-23 23:05:34", "2024-12-23 23:05:34", "2"); +// soSaleReturnPluginInitializerToC.startImplementByTradeTime("2024-12-23 23:05:34", "2024-12-23 23:05:34", "2"); + + soSaleReturnPluginInitializerToC.startImplementByCode("LETS-RE2024122500002233", "tran"); // soSaleReturnPluginInitializerToC.startImplementStockByTime("2024-12-24 16:02:17", "2024-12-24 16:02:17", "0");