diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java index 4005b2dc..b2d05bde 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java @@ -231,7 +231,7 @@ public class ConsignmachiningIn 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())) { + if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) { return true; } } @@ -289,7 +289,7 @@ public class ConsignmachiningIn 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())) { + if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) { return true; } } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java index 4468b888..3e9bc337 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java @@ -230,7 +230,7 @@ public class ProxyPurchaseReturn extends PluginBaseEntity { public boolean test(HeaderDetailsDto headerDetailsDto) { HeaderDto header = headerDetailsDto.getHeader(); if (header != null && header.getCompanyCode() != null) { - if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode())) { + if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) { return true; } } @@ -287,7 +287,7 @@ public class ProxyPurchaseReturn extends PluginBaseEntity { public boolean test(HeaderDetailsDto headerDetailsDto) { HeaderDto header = headerDetailsDto.getHeader(); if (header != null && header.getCompanyCode() != null) { - if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode())) { + if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) { return true; } } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java index 60fd55a7..7c6ec951 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java @@ -229,7 +229,7 @@ public class ProxyPurchaseWarehousOrder extends PluginBaseEntity { public boolean test(OfsPoOrderData headerDetailsDto) { OfsPoOrderHeader header = headerDetailsDto.getHeader(); if (header != null && header.getCompanyCode() != null) { - if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode())) { + if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) { return true; } } @@ -286,7 +286,7 @@ public class ProxyPurchaseWarehousOrder extends PluginBaseEntity { public boolean test(OfsPoOrderData headerDetailsDto) { OfsPoOrderHeader header = headerDetailsDto.getHeader(); if (header != null && header.getCompanyCode() != null) { - if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode())) { + if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) { return true; } } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java index 2c3f0161..162f93df 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java @@ -227,7 +227,7 @@ public class ProxyPurchaseWarehousWarehouse 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())) { + if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) { return true; } } @@ -284,7 +284,7 @@ public class ProxyPurchaseWarehousWarehouse 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())) { + if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) { return true; } } 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 6d07f3fb..9871c421 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 @@ -278,7 +278,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity { public boolean test(HeaderDetailsDto headerDetailsDto) { HeaderDto header = headerDetailsDto.getHeader(); if (header != null && header.getCompanyCode() != null) { - if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode())) { + if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) { return true; } } @@ -336,7 +336,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity { public boolean test(HeaderDetailsDto headerDetailsDto) { HeaderDto header = headerDetailsDto.getHeader(); if (header != null && header.getCompanyCode() != null) { - if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode())) { + if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) { return true; } } @@ -390,7 +390,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity { public boolean test(HeaderDetailsDto headerDetailsDto) { HeaderDto header = headerDetailsDto.getHeader(); if (header != null && header.getCompanyCode() != null) { - if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode())) { + if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) { return true; } } 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 f8ce2c80..85ec12b3 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 @@ -251,7 +251,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { public boolean test(HeaderDetailsDto headerDetailsDto) { HeaderDto header = headerDetailsDto.getHeader(); if (header != null && header.getCompanyCode() != null) { - if (header.getCompanyCode().contains(ProfilesActiveConstant.FILTER_COMPANY)) { + if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) { return true; } } @@ -311,7 +311,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { public boolean test(HeaderDetailsDto headerDetailsDto) { HeaderDto header = headerDetailsDto.getHeader(); if (header != null && header.getCompanyCode() != null) { - if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode())) { + if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) { return true; } } @@ -365,7 +365,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { public boolean test(HeaderDetailsDto headerDetailsDto) { HeaderDto header = headerDetailsDto.getHeader(); if (header != null && header.getCompanyCode() != null) { - if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode())) { + if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) { return true; } } @@ -430,7 +430,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { public boolean test(HeaderDetailsDto headerDetailsDto) { HeaderDto header = headerDetailsDto.getHeader(); if (header != null && header.getCompanyCode() != null) { - if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode())) { + if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) { return true; } } 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 0d86737d..28f805be 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 @@ -278,7 +278,7 @@ public class SoSaleReturnPluginInitializerToB 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())) { + if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) { return true; } } @@ -338,7 +338,7 @@ public class SoSaleReturnPluginInitializerToB 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())) { + if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) { return true; } } @@ -396,7 +396,7 @@ public class SoSaleReturnPluginInitializerToB 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())) { + if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) { return true; } } 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 96606acf..3d38917f 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 @@ -238,7 +238,7 @@ 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())) { + if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) { return true; } } @@ -292,7 +292,7 @@ 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())) { + if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) { return true; } } @@ -350,7 +350,7 @@ 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())) { + if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) { return true; } } diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java index b33a3fa6..59232cab 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java @@ -110,7 +110,7 @@ class SoSaleOutPluginInitializerToCTest { // soSaleOutPluginInitializerToC.startImplementStockByCode(aaa, "tran"); // String aaa = "LETS-SH2024102800021196"; - soSaleOutPluginInitializerToC.startImplementStockByTime("2024-12-06 09:25:39", "2024-12-06 09:25:39"); +// soSaleOutPluginInitializerToC.startImplementStockByTime("2024-12-06 09:25:39", "2024-12-06 09:25:39"); // soSaleOutPluginInitializerToC.startImplementStockByTime("2024-11-15 00:00:00", "2024-11-15 23:59:59"); } catch (Exception e) { @@ -120,7 +120,7 @@ class SoSaleOutPluginInitializerToCTest { // soSaleOutPluginInitializerToC.sendU8CTOCOrder("123446"); try { -// soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024120500018494", "stock"); + soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024113000012787", "stock"); // soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024110500013375", "tran"); // soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024111700013756", "tran");