diff --git a/ems-core/src/main/java/it/integry/ems/utility/entity/MtbAartBarcodeUtils.java b/ems-core/src/main/java/it/integry/ems/utility/entity/MtbAartBarcodeUtils.java new file mode 100644 index 0000000000..d9dab7bdaa --- /dev/null +++ b/ems-core/src/main/java/it/integry/ems/utility/entity/MtbAartBarcodeUtils.java @@ -0,0 +1,30 @@ +package it.integry.ems.utility.entity; + +import it.integry.ems._context.ApplicationContextProvider; +import it.integry.ems.dynamic_cache.EntityCacheComponent; +import it.integry.ems.sync.MultiDBTransaction.Connection; +import it.integry.ems_model.entity.MtbAartBarCode; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +public class MtbAartBarcodeUtils { + + + public static final List getAlternativeMtbAartBarCodes(List codMarts, Connection conn) { + codMarts = codMarts.stream() + .distinct().collect(Collectors.toList()); + + final EntityCacheComponent entityCacheComponent = ApplicationContextProvider.getApplicationContext().getBean(EntityCacheComponent.class); + + List finalCodMarts = codMarts; + List barCodeList = entityCacheComponent.getCachedEntitiesList( + conn.getIntegryCustomerDB(), + MtbAartBarCode.ENTITY, + x -> finalCodMarts.stream().anyMatch(y -> y.equalsIgnoreCase(x.getCodMart()))); + + return barCodeList != null ? barCodeList : new ArrayList<>(); + } + +} diff --git a/ems-core/src/main/java/it/integry/ems/utility/entity/MtbAartUtils.java b/ems-core/src/main/java/it/integry/ems/utility/entity/MtbAartUtils.java new file mode 100644 index 0000000000..78d0da1a96 --- /dev/null +++ b/ems-core/src/main/java/it/integry/ems/utility/entity/MtbAartUtils.java @@ -0,0 +1,82 @@ +package it.integry.ems.utility.entity; + +import com.annimon.stream.Optional; +import com.annimon.stream.Stream; +import it.integry.ems._context.ApplicationContextProvider; +import it.integry.ems.dynamic_cache.EntityCacheComponent; +import it.integry.ems.sync.MultiDBTransaction.Connection; +import it.integry.ems_model.entity.MtbAart; +import it.integry.ems_model.entity.MtbAartBarCode; +import it.integry.ems_model.entity.MtbUntMis; +import it.integry.ems_model.utility.UtilityString; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.stream.Collectors; + +public class MtbAartUtils { + + public static MtbAart getArticoloByCodMart(String codMart, Connection connection) throws Exception { + if (UtilityString.isNullOrEmpty(codMart)) + return null; + + List mtbAarts = getArticoliByCodMarts(new ArrayList<>(Collections.singleton(codMart)), connection); + if (mtbAarts == null || mtbAarts.isEmpty()) + return null; + + return mtbAarts.get(0); + } + + public static List getArticoliByCodMarts(List codMarts, Connection connection) throws Exception { + if (codMarts == null || codMarts.isEmpty()) return null; + + codMarts.replaceAll(String::toUpperCase); + + final EntityCacheComponent entityCacheComponent = ApplicationContextProvider.getApplicationContext().getBean(EntityCacheComponent.class); + + List listMtbAart = entityCacheComponent.getCachedEntitiesList( + connection.getIntegryCustomerDB(), MtbAart.ENTITY, x -> codMarts.contains(x.getCodMart().toUpperCase())); + + List barCodeFromCod = MtbAartBarcodeUtils.getAlternativeMtbAartBarCodes(codMarts, connection); + + if (listMtbAart != null && !listMtbAart.isEmpty()) { + List untMisStrings = listMtbAart.stream() + .map(MtbAart::getUntMis) + .collect(Collectors.toList()); + List listUntMis = MtbUntMisUtils.getFromCods(untMisStrings, connection); + + for (final MtbAart mtbAart : listMtbAart) { + Optional mtbUntMis = Stream.of(listUntMis) + .filter(mtbUntMis1 -> mtbUntMis1.getUntMis().equalsIgnoreCase(mtbAart.getUntMis())) + .findFirst(); + + List barcodeList = Stream.of(barCodeFromCod) + .filter(x -> x.getCodMart().equalsIgnoreCase(mtbAart.getCodMart())) + .toList(); + + if (!barcodeList.isEmpty()) { + mtbAart.getMtbAartBarCode().addAll(barcodeList); + } + + if (mtbUntMis.isPresent()) { + mtbAart.setMtbUntMis(new ArrayList<>()); + mtbAart.getMtbUntMis().add(mtbUntMis.get()); + } + } + + } + + return listMtbAart; + } + + public static final HashMap getArticoliByCodMartsAsMap(List codMarts, Connection connection) throws Exception { + List mtbAarts = getArticoliByCodMarts(codMarts, connection); + if (mtbAarts == null || mtbAarts.isEmpty()) return new HashMap<>(); + + return mtbAarts.stream() + .collect(Collectors.toMap(MtbAart::getCodMart, a -> a, (a, b) -> a, HashMap::new)); + } + +} diff --git a/ems-core/src/main/java/it/integry/ems/utility/entity/MtbUntMisUtils.java b/ems-core/src/main/java/it/integry/ems/utility/entity/MtbUntMisUtils.java index 1b921c3336..4905e35a38 100644 --- a/ems-core/src/main/java/it/integry/ems/utility/entity/MtbUntMisUtils.java +++ b/ems-core/src/main/java/it/integry/ems/utility/entity/MtbUntMisUtils.java @@ -3,10 +3,15 @@ package it.integry.ems.utility.entity; import it.integry.ems._context.ApplicationContextProvider; import it.integry.ems.dynamic_cache.EntityCacheComponent; import it.integry.ems.migration._base.IntegryCustomerDB; +import it.integry.ems.sync.MultiDBTransaction.Connection; import it.integry.ems_model.entity.MtbAart; import it.integry.ems_model.entity.MtbUntMis; import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; public class MtbUntMisUtils { @@ -31,4 +36,21 @@ public class MtbUntMisUtils { return mtbUntMis; } + + public static List getFromCods(List untMisCods, Connection connection) { + List untMisStrings = untMisCods.stream() + .filter(Objects::nonNull) + .distinct() + .collect(Collectors.toList()); + + final EntityCacheComponent entityCacheComponent = ApplicationContextProvider.getApplicationContext().getBean(EntityCacheComponent.class); + + List mtbUntMis = entityCacheComponent.getCachedEntitiesList( + connection.getIntegryCustomerDB(), + MtbUntMis.ENTITY, + x -> untMisCods.contains(x.getUntMis())); + + return mtbUntMis != null ? mtbUntMis : new ArrayList<>(); + } + } diff --git a/ems-engine/src/main/java/it/integry/ems/logistic/service/DistribuzioneColliService.java b/ems-engine/src/main/java/it/integry/ems/logistic/service/DistribuzioneColliService.java index af9c265e6c..0c9ddf9b0b 100644 --- a/ems-engine/src/main/java/it/integry/ems/logistic/service/DistribuzioneColliService.java +++ b/ems-engine/src/main/java/it/integry/ems/logistic/service/DistribuzioneColliService.java @@ -7,9 +7,9 @@ import it.integry.common.var.CommonConstants; import it.integry.ems._context.ApplicationContextProvider; import it.integry.ems.logistic.dto.sm2.FiltroDistribuzioneColloDTO; import it.integry.ems.product.importaz.service.ProductServices; -import it.integry.ems.retail.wms.Utility.WMSUtility; import it.integry.ems.service.EntityProcessor; import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager; +import it.integry.ems.utility.entity.MtbAartUtils; import it.integry.ems_model.base.EntityBase; import it.integry.ems_model.base.EntityNotFound; import it.integry.ems_model.entity.*; @@ -116,7 +116,7 @@ public class DistribuzioneColliService { .map(MtbColr::getCodMart) .collect(Collectors.toList()); - List mtbAarts = WMSUtility.getArticoliByCodMarts(codMarts, multiDBTransactionManager.getPrimaryConnection()); + List mtbAarts = MtbAartUtils.getArticoliByCodMarts(codMarts, multiDBTransactionManager.getPrimaryConnection()); //Lettura del filtro ordini diff --git a/ems-engine/src/main/java/it/integry/ems/order/Import/service/OrdiniMaxiDataImportService.java b/ems-engine/src/main/java/it/integry/ems/order/Import/service/OrdiniMaxiDataImportService.java index 516c312167..04bbb0515e 100644 --- a/ems-engine/src/main/java/it/integry/ems/order/Import/service/OrdiniMaxiDataImportService.java +++ b/ems-engine/src/main/java/it/integry/ems/order/Import/service/OrdiniMaxiDataImportService.java @@ -3,11 +3,11 @@ package it.integry.ems.order.Import.service; import it.integry.common.var.CommonConstants; import it.integry.ems._context.ApplicationContextProvider; import it.integry.ems.exception.PrimaryDatabaseNotPresentException; -import it.integry.ems.retail.wms.Utility.WMSUtility; import it.integry.ems.service.EntityProcessor; import it.integry.ems.sync.MultiDBTransaction.Connection; import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager; import it.integry.ems.utility.UtilityEntity; +import it.integry.ems.utility.entity.MtbAartUtils; import it.integry.ems_model.base.EntityBase; import it.integry.ems_model.config.EmsRestConstants; import it.integry.ems_model.entity.*; @@ -132,7 +132,7 @@ public class OrdiniMaxiDataImportService { if (schedeProduzione == null || schedeProduzione.isEmpty()) return new ArrayList<>(); - List anafraficheArticoli = WMSUtility.getArticoliByCodMarts( + List anafraficheArticoli = MtbAartUtils.getArticoliByCodMarts( schedeProduzione.stream() .map(MaxidataUveBII40V2BLLUVE2kSchedeProd::getIdProdotto) .distinct() diff --git a/ems-engine/src/main/java/it/integry/ems/product/importaz/service/ProductServices.java b/ems-engine/src/main/java/it/integry/ems/product/importaz/service/ProductServices.java index 4785057e94..12fae3efbb 100644 --- a/ems-engine/src/main/java/it/integry/ems/product/importaz/service/ProductServices.java +++ b/ems-engine/src/main/java/it/integry/ems/product/importaz/service/ProductServices.java @@ -11,12 +11,12 @@ import it.integry.ems.product.importaz.dto.ArticoliMorganteDTO; import it.integry.ems.product.importaz.dto.ContrattiVenditaDTO; import it.integry.ems.product.importaz.dto.StatoArticoloDTO; import it.integry.ems.properties.EmsProperties; -import it.integry.ems.retail.wms.Utility.WMSUtility; import it.integry.ems.rules.completing.QueryRules; import it.integry.ems.service.EntityProcessor; import it.integry.ems.sync.MultiDBTransaction.Connection; import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager; import it.integry.ems.utility.UtilityEntity; +import it.integry.ems.utility.entity.MtbAartUtils; import it.integry.ems_model.base.EntityBase; import it.integry.ems_model.db.ResultSetMapper; import it.integry.ems_model.entity.*; @@ -235,7 +235,7 @@ public class ProductServices { } public List getArticoliByCodMarts(List codMarts) throws Exception { - return WMSUtility.getArticoliByCodMarts(codMarts, multiDBTransactionManager.getPrimaryConnection()); + return MtbAartUtils.getArticoliByCodMarts(codMarts, multiDBTransactionManager.getPrimaryConnection()); } public List importArticoliBiolevante() throws Exception { diff --git a/ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java b/ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java index 5137204f71..60dc11d04b 100644 --- a/ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java +++ b/ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java @@ -22,7 +22,6 @@ import it.integry.ems.production.event.ProductionUlCreatedEvent; import it.integry.ems.report.dto.JasperDTO; import it.integry.ems.report.dto.PairsDTO; import it.integry.ems.retail.pvmRetail.service.PvmService; -import it.integry.ems.retail.wms.Utility.WMSUtility; import it.integry.ems.retail.wms.accettazione.service.WMSAccettazioneService; import it.integry.ems.retail.wms.dto.*; import it.integry.ems.retail.wms.generic.dto.MvwSitArtUdcDetInventarioDTO; @@ -42,6 +41,7 @@ import it.integry.ems.service.production.ProductionOrderDataHandlerService; import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager; import it.integry.ems.utility.UtilityDebug; import it.integry.ems.utility.UtilityEntity; +import it.integry.ems.utility.entity.MtbAartUtils; import it.integry.ems_model.base.EntityBase; import it.integry.ems_model.business_logic.dto.DatiMaterialiDTO; import it.integry.ems_model.config.EmsRestConstants; @@ -1126,7 +1126,7 @@ public class MesProductionServiceV2 { entityProcessor.processEntity(ordineLav, true, multiDBTransactionManager); MtbAart mtbAart = - WMSUtility.getArticoloByCodMart(ordineLav.getCodProd(), multiDBTransactionManager.getPrimaryConnection()); + MtbAartUtils.getArticoloByCodMart(ordineLav.getCodProd(), multiDBTransactionManager.getPrimaryConnection()); if (UtilityBigDecimal.isNullOrZero(dto.getQtaCollo())) { if (UtilityBigDecimal.isNullOrZero(dto.getColliPedana())) { diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/Utility/WMSUtility.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/Utility/WMSUtility.java index 5fb15562b4..0faf08cd63 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/wms/Utility/WMSUtility.java +++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/Utility/WMSUtility.java @@ -1,9 +1,7 @@ package it.integry.ems.retail.wms.Utility; -import com.annimon.stream.Optional; import com.annimon.stream.Stream; import it.integry.ems._context.ApplicationContextProvider; -import it.integry.ems.dynamic_cache.EntityCacheComponent; import it.integry.ems.exception.MissingDataException; import it.integry.ems.exception.PrimaryDatabaseNotPresentException; import it.integry.ems.javabeans.RequestDataDTO; @@ -19,6 +17,7 @@ import it.integry.ems.service.production.ProductionOrderDataHandlerService; import it.integry.ems.sync.MultiDBTransaction.Connection; import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager; import it.integry.ems.utility.UtilityEntity; +import it.integry.ems.utility.entity.MtbAartUtils; import it.integry.ems_model.entity.*; import it.integry.ems_model.entity._enum.GestioneEnum; import it.integry.ems_model.rulescompleting.DroolsDataCompleting; @@ -30,7 +29,10 @@ import java.io.IOException; import java.math.BigDecimal; import java.sql.SQLException; import java.time.LocalDate; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; import java.util.stream.Collectors; public class WMSUtility { @@ -252,7 +254,7 @@ public class WMSUtility { if (targetMtbColt == null) throw new Exception("Nessun collo di destinazione specificato durante l'inserimento di una riga in una UDS (targetMtbColt null)"); - MtbAart mtbAart = WMSUtility.getArticoloByCodMart(insertUDSRowRequestDTO.getCodMart(), connection); + MtbAart mtbAart = MtbAartUtils.getArticoloByCodMart(insertUDSRowRequestDTO.getCodMart(), connection); if (mtbAart == null) throw new InvalidArticoloException(insertUDSRowRequestDTO.getCodMart()); @@ -538,7 +540,7 @@ public class WMSUtility { if (insertUDCRowRequestDTO.getCodMart() != null) { - MtbAart mtbAart = getArticoloByCodMart(insertUDCRowRequestDTO.getCodMart(), multiDBTransactionManager.getPrimaryConnection()); + MtbAart mtbAart = MtbAartUtils.getArticoloByCodMart(insertUDCRowRequestDTO.getCodMart(), multiDBTransactionManager.getPrimaryConnection()); if (mtbAart == null) throw new InvalidArticoloException(insertUDCRowRequestDTO.getCodMart()); @@ -567,84 +569,7 @@ public class WMSUtility { .setSavedMtbColr(targetMtbColr); } - public static MtbAart getArticoloByCodMart(String codMart, Connection connection) throws Exception { - if (UtilityString.isNullOrEmpty(codMart)) - return null; - List mtbAarts = getArticoliByCodMarts(new ArrayList<>(Collections.singleton(codMart)), connection); - if (mtbAarts == null || mtbAarts.isEmpty()) - return null; - - return mtbAarts.get(0); - } - - public static List getArticoliByCodMarts(List codMarts, Connection connection) throws Exception { - if (codMarts == null || codMarts.isEmpty()) return null; - - codMarts.replaceAll(String::toUpperCase); - - final EntityCacheComponent entityCacheComponent = ApplicationContextProvider.getApplicationContext().getBean(EntityCacheComponent.class); - - List listMtbAart = entityCacheComponent.getCachedEntitiesList( - connection.getIntegryCustomerDB(), MtbAart.ENTITY, x -> codMarts.contains(x.getCodMart().toUpperCase())); - - List barCodeFromCod = getAlternativeMtbAartBarCodes(codMarts, connection); - - if (listMtbAart != null && !listMtbAart.isEmpty()) { - List untMisStrings = listMtbAart.stream() - .map(MtbAart::getUntMis) - .collect(Collectors.toList()); - List listUntMis = getUntMisFromCod(untMisStrings, connection); - - for (final MtbAart mtbAart : listMtbAart) { - Optional mtbUntMis = Stream.of(listUntMis) - .filter(mtbUntMis1 -> mtbUntMis1.getUntMis().equalsIgnoreCase(mtbAart.getUntMis())) - .findFirst(); - - List barcodeList = Stream.of(barCodeFromCod) - .filter(x -> x.getCodMart().equalsIgnoreCase(mtbAart.getCodMart())) - .toList(); - - if (!barcodeList.isEmpty()) { - mtbAart.getMtbAartBarCode().addAll(barcodeList); - } - - if (mtbUntMis.isPresent()) { - mtbAart.setMtbUntMis(new ArrayList<>()); - mtbAart.getMtbUntMis().add(mtbUntMis.get()); - } - } - - } - - return listMtbAart; - } - - public static List getUntMisFromCod(List untMisCods, Connection connection) throws Exception { - List untMisStrings = Stream.of(untMisCods) - .withoutNulls() - .distinct() - .toList(); - - String queryUntMis = "SELECT * FROM mtb_unt_mis WHERE unt_mis IN (" + UtilityQuery.concatStringFieldsWithSeparator(untMisStrings, ",") + ")"; - final List mtbUntMis = UtilityDB.executeSimpleQueryDTO(connection, queryUntMis, MtbUntMis.class); - return mtbUntMis != null ? mtbUntMis : new ArrayList<>(); - } - - public static List getAlternativeMtbAartBarCodes(List codMarts, Connection conn) { - codMarts = codMarts.stream() - .distinct().collect(Collectors.toList()); - - final EntityCacheComponent entityCacheComponent = ApplicationContextProvider.getApplicationContext().getBean(EntityCacheComponent.class); - - List finalCodMarts = codMarts; - List barCodeList = entityCacheComponent.getCachedEntitiesList( - conn.getIntegryCustomerDB(), - MtbAartBarCode.ENTITY, - x -> finalCodMarts.stream().anyMatch(y -> y.equalsIgnoreCase(x.getCodMart()))); - - return barCodeList != null ? barCodeList : new ArrayList<>(); - } public static MtbColt createInternalMovement(String codMdep) { diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/service/WMSAccettazioneBollaService.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/service/WMSAccettazioneBollaService.java index 689360db0c..1da33d18b7 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/service/WMSAccettazioneBollaService.java +++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/service/WMSAccettazioneBollaService.java @@ -2,13 +2,13 @@ package it.integry.ems.retail.wms.accettazione.service; import it.integry.ems.javabeans.RequestDataDTO; import it.integry.ems.product.importaz.service.ProductServices; -import it.integry.ems.retail.wms.Utility.WMSUtility; import it.integry.ems.retail.wms.accettazione.dto.AlreadyRegisteredUlDTO; import it.integry.ems.retail.wms.accettazione.dto.BollaAccettazioneDTO; import it.integry.ems.retail.wms.accettazione.dto.SitBollaAccettazioneDTO; import it.integry.ems.service.EntityProcessor; import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager; import it.integry.ems.user.UserSession; +import it.integry.ems.utility.entity.MtbAartUtils; import it.integry.ems_model.entity.MtbAart; import it.integry.ems_model.entity.WdtbDoct; import it.integry.ems_model.types.OperationType; @@ -166,7 +166,7 @@ public class WMSAccettazioneBollaService { if (sitBollaAccettazioneDTOS == null || sitBollaAccettazioneDTOS.isEmpty()) return null; - final List articoliByCodMarts = WMSUtility.getArticoliByCodMarts(sitBollaAccettazioneDTOS.stream() + final List articoliByCodMarts = MtbAartUtils.getArticoliByCodMarts(sitBollaAccettazioneDTOS.stream() .map(SitBollaAccettazioneDTO::getCodMart) .filter(Objects::nonNull) .distinct() diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/documenti/service/WMSDocumentService.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/documenti/service/WMSDocumentService.java index dc23607ea7..4ff42ed4d3 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/wms/documenti/service/WMSDocumentService.java +++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/documenti/service/WMSDocumentService.java @@ -4,11 +4,11 @@ import it.integry.ems.product.importaz.service.ProductServices; import it.integry.ems.retail.pvmRetail.dto.PvmArticoliChildDTO; import it.integry.ems.retail.pvmRetail.dto.PvmArticoliDTO; import it.integry.ems.retail.pvmRetail.service.PvmService; -import it.integry.ems.retail.wms.Utility.WMSUtility; import it.integry.ems.retail.wms.documenti.dto.DocumentArtDTO; import it.integry.ems.retail.wms.documenti.dto.RetrieveLottiDTO; import it.integry.ems.sync.MultiDBTransaction.Connection; import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager; +import it.integry.ems.utility.entity.MtbUntMisUtils; import it.integry.ems_model.entity.MtbUntMis; import it.integry.ems_model.entity._enum.GestioneEnum; import it.integry.ems_model.service.SetupGest; @@ -114,7 +114,7 @@ public class WMSDocumentService { .distinct() .collect(Collectors.toList()); - final List untMisFromCod = WMSUtility.getUntMisFromCod(untMiss,multiDBTransactionManager.getPrimaryConnection()); + final List untMisFromCod = MtbUntMisUtils.getFromCods(untMiss, multiDBTransactionManager.getPrimaryConnection()); for (DocumentArtDTO art : arts) { final MtbUntMis mtbUntMis = untMisFromCod.stream().filter(x -> x.getUntMis().equalsIgnoreCase(art.getUntMis())) diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java index 648a13fc47..fd8b501bc2 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java +++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java @@ -36,6 +36,7 @@ import it.integry.ems.service.dto.production.OrdineInevasoGroupMercDTO; import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager; import it.integry.ems.user.UserSession; import it.integry.ems.utility.UtilityEntity; +import it.integry.ems.utility.entity.MtbAartUtils; import it.integry.ems_model.base.EntityBase; import it.integry.ems_model.config.EmsRestConstants; import it.integry.ems_model.db.ResultSetMapper; @@ -783,7 +784,7 @@ public class WMSGenericService { .distinct() .toList(); - final List mtbAarts = WMSUtility.getArticoliByCodMarts(codMarts, multiDBTransactionManager.getPrimaryConnection()); + final List mtbAarts = MtbAartUtils.getArticoliByCodMarts(codMarts, multiDBTransactionManager.getPrimaryConnection()); //Carico la giacenza degli articoli @@ -2513,7 +2514,7 @@ public class WMSGenericService { .distinct() .toList(); - List mtbAarts = WMSUtility.getArticoliByCodMarts(codMarts, multiDBTransactionManager.getPrimaryConnection()); + List mtbAarts = MtbAartUtils.getArticoliByCodMarts(codMarts, multiDBTransactionManager.getPrimaryConnection()); List mtbColtToSave = new ArrayList<>(); List successMtbColr = new ArrayList<>(); diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/inventario/service/WMSInventarioService.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/inventario/service/WMSInventarioService.java index aad4222a3c..1a3fd06e35 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/wms/inventario/service/WMSInventarioService.java +++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/inventario/service/WMSInventarioService.java @@ -6,12 +6,12 @@ import it.integry.ems.product.importaz.service.ProductServices; import it.integry.ems.retail.pvmRetail.dto.PvmArticoliChildDTO; import it.integry.ems.retail.pvmRetail.dto.PvmArticoliDTO; import it.integry.ems.retail.pvmRetail.service.PvmService; -import it.integry.ems.retail.wms.Utility.WMSUtility; import it.integry.ems.retail.wms.inventario.dto.InventarioArtDTO; import it.integry.ems.service.EntityProcessor; import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager; import it.integry.ems.utility.UtilityDirs; import it.integry.ems.utility.UtilityFile; +import it.integry.ems.utility.entity.MtbUntMisUtils; import it.integry.ems_model.entity.MtbInvenr; import it.integry.ems_model.entity.MtbInvent; import it.integry.ems_model.entity.MtbUntMis; @@ -136,7 +136,7 @@ public class WMSInventarioService { .distinct() .collect(Collectors.toList()); - final List untMisFromCod = WMSUtility.getUntMisFromCod(untMiss,multiDBTransactionManager.getPrimaryConnection()); + final List untMisFromCod = MtbUntMisUtils.getFromCods(untMiss, multiDBTransactionManager.getPrimaryConnection()); for (InventarioArtDTO art : arts) { final MtbUntMis mtbUntMis = untMisFromCod.stream().filter(x -> x.getUntMis().equalsIgnoreCase(art.getUntMis())) diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSLavorazioneService.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSLavorazioneService.java index b7ccc2d75b..95c33b7c47 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSLavorazioneService.java +++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSLavorazioneService.java @@ -23,6 +23,7 @@ import it.integry.ems.service.production.ProductionOrderDataHandlerService; import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager; import it.integry.ems.user.UserSession; import it.integry.ems.utility.UtilityEntity; +import it.integry.ems.utility.entity.MtbAartUtils; import it.integry.ems_model.base.EntityBase; import it.integry.ems_model.entity.*; import it.integry.ems_model.entity._enum.GestioneEnum; @@ -264,7 +265,7 @@ public class WMSLavorazioneService { entityProcessor.processEntity(targetMtbColt, true, multiDBTransactionManager); - MtbAart mtbAart = WMSUtility.getArticoloByCodMart(insertUDSRowRequestDTO.getCodMart(), multiDBTransactionManager.getPrimaryConnection()); + MtbAart mtbAart = MtbAartUtils.getArticoloByCodMart(insertUDSRowRequestDTO.getCodMart(), multiDBTransactionManager.getPrimaryConnection()); if (mtbAart == null) throw new InvalidArticoloException(insertUDSRowRequestDTO.getCodMart()); diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSMaterialiService.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSMaterialiService.java index 810f103dfe..967995465a 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSMaterialiService.java +++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSMaterialiService.java @@ -11,6 +11,7 @@ import it.integry.ems.service.EntityProcessor; import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager; import it.integry.ems.user.UserSession; import it.integry.ems.utility.UtilityEntity; +import it.integry.ems.utility.entity.MtbAartUtils; import it.integry.ems_model.base.EntityBase; import it.integry.ems_model.entity.*; import it.integry.ems_model.service.SetupGest; @@ -93,7 +94,7 @@ public class WMSMaterialiService { if (!versamentoDirettoEnabled) { MvwSitArtUdcDetInventarioDTO itemDaVersare = artsInGiacenza.get(0); - MtbAart mtbAart = WMSUtility.getArticoloByCodMart(itemDaVersare.getCodMart(), multiDBTransactionManager.getPrimaryConnection()); + MtbAart mtbAart = MtbAartUtils.getArticoloByCodMart(itemDaVersare.getCodMart(), multiDBTransactionManager.getPrimaryConnection()); if (mtbAart == null) throw new InvalidArticoloException(request.getCodMart()); @@ -134,7 +135,7 @@ public class WMSMaterialiService { // throw new Exception("Impossibile recuperare le informazioni della posizione (" + request.getPosizioneVersamento() + ")"); // // for(MvwSitArtUdcDetInventarioDTO artInGiacenza : artsInGiacenza) { -// final MtbAart currentArtAnag = WMSUtility.getArticoloByCodMart(artInGiacenza.getCodMart(), multiDBTransactionManager.getPrimaryConnection()); +// final MtbAart currentArtAnag = MtbAartUtils.getArticoloByCodMart(artInGiacenza.getCodMart(), multiDBTransactionManager.getPrimaryConnection()); // // if(currentArtAnag == null) // continue; @@ -275,7 +276,7 @@ public class WMSMaterialiService { final boolean versamentoDirettoEnabled = setupGest.getSetupBoolean(multiDBTransactionManager.getPrimaryConnection(), "PICKING", "PRODUZIONE", "FLAG_VERSAMENTO_DIRETTO"); final boolean forceAllToColli = setupGest.getSetupBoolean(multiDBTransactionManager.getPrimaryConnection(), "PICKING", "SETUP", "FLAG_FORCE_ALL_TO_COLLI"); - MtbAart mtbAart = WMSUtility.getArticoloByCodMart(request.getCodMart(), multiDBTransactionManager.getPrimaryConnection()); + MtbAart mtbAart = MtbAartUtils.getArticoloByCodMart(request.getCodMart(), multiDBTransactionManager.getPrimaryConnection()); if (mtbAart == null) throw new InvalidArticoloException(request.getCodMart()); diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/vendita/service/WMSSpedizioneService.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/vendita/service/WMSSpedizioneService.java index 415f59d291..d990dbec2c 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/wms/vendita/service/WMSSpedizioneService.java +++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/vendita/service/WMSSpedizioneService.java @@ -19,6 +19,7 @@ import it.integry.ems.service.EntityProcessor; import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager; import it.integry.ems.user.UserSession; import it.integry.ems.utility.UtilityEntity; +import it.integry.ems.utility.entity.MtbAartUtils; import it.integry.ems_model.base.EntityBase; import it.integry.ems_model.entity.DtbOrdt; import it.integry.ems_model.entity.MtbAart; @@ -244,7 +245,7 @@ public class WMSSpedizioneService { entityProcessor.processEntity(targetMtbColt, multiDBTransactionManager); - MtbAart mtbAart = WMSUtility.getArticoloByCodMart(insertUDSRowRequestDTO.getCodMart(), multiDBTransactionManager.getPrimaryConnection()); + MtbAart mtbAart = MtbAartUtils.getArticoloByCodMart(insertUDSRowRequestDTO.getCodMart(), multiDBTransactionManager.getPrimaryConnection()); if (mtbAart == null) throw new InvalidArticoloException(insertUDSRowRequestDTO.getCodMart());