From fbec27880456087097e7f0b04c98ebee6fc5967b Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 12 Dec 2024 10:19:01 +0100 Subject: [PATCH] Cambiate altre chiamate alla gest setup (inclusa connection) --- .../wms/accettazione/service/WMSAccettazioneService.java | 2 +- .../ems/retail/wms/colli/controller/WMSColliController.java | 5 ++++- .../ems/retail/wms/generic/service/WMSGenericService.java | 6 +++--- .../retail/wms/inventario/service/WMSInventarioService.java | 3 +-- .../wms/lavorazione/service/WMSLavorazioneService.java | 2 +- .../retail/wms/vendita/service/WMSSpedizioneService.java | 4 ++-- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/service/WMSAccettazioneService.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/service/WMSAccettazioneService.java index fb98dff305..9815c31ce1 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/service/WMSAccettazioneService.java +++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/service/WMSAccettazioneService.java @@ -151,7 +151,7 @@ public class WMSAccettazioneService { } if (createUDCRequestDTO.getOrders() == null) { - boolean useCodAnagAziendale = setupGest.getSetupBoolean("PICKING", "SETUP", "FLAG_USE_COD_ANAG_AZIENDALE"); + boolean useCodAnagAziendale = setupGest.getSetupBoolean(multiDBTransactionManager.getPrimaryConnection(), "PICKING", "SETUP", "FLAG_USE_COD_ANAG_AZIENDALE"); if (UtilityString.isNullOrEmpty(createUDCRequestDTO.getCodAnag()) && useCodAnagAziendale) { String defaultCodAnag = aziendaService.retrieveInternalCodAnagFornitore(); diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/colli/controller/WMSColliController.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/colli/controller/WMSColliController.java index 46dab12a93..4f0239d870 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/wms/colli/controller/WMSColliController.java +++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/colli/controller/WMSColliController.java @@ -6,6 +6,7 @@ import it.integry.ems.logistic.service.LogisticService; import it.integry.ems.response.EsitoType; import it.integry.ems.response.ServiceRestResponse; import it.integry.ems.retail.wms.colli.service.WMSColliService; +import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager; import it.integry.ems_model.base.EntityBase; import it.integry.ems_model.config.EmsRestConstants; import it.integry.ems_model.entity.MtbColt; @@ -35,6 +36,8 @@ public class WMSColliController { @Autowired private SetupGest setupGest; + @Autowired + private MultiDBTransactionManager multiDBTransactionManager; @RequestMapping(value = { EmsRestConstants.PATH_SMART_ENTERPRISE_DISTRIBUZIONE_RIGHE_COLLO, @@ -48,7 +51,7 @@ public class WMSColliController { try { response = new ServiceRestResponse(EsitoType.OK); - boolean useNewDistribution = setupGest.getSetupBoolean("PICKING", "LOGISTICA", "FLAG_USA_NUOVA_DISTRIBUZIONE"); + boolean useNewDistribution = setupGest.getSetupBoolean(multiDBTransactionManager.getPrimaryConnection(), "PICKING", "LOGISTICA", "FLAG_USA_NUOVA_DISTRIBUZIONE"); if (useNewDistribution) 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 fd302bbfc3..66d53abe8e 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 @@ -574,7 +574,7 @@ public class WMSGenericService { public List getArticoliFromOrdini(List pickingListDTOs, String codMdep) throws Exception { - final boolean enableCheckCodJcom = setupGest.getSetupBoolean("PICKING", "SPEDIZIONE", "ENABLE_CHECK_COD_JCOM_PICKING_LIST"); + final boolean enableCheckCodJcom = setupGest.getSetupBoolean(multiDBTransactionManager.getPrimaryConnection(), "PICKING", "SPEDIZIONE", "ENABLE_CHECK_COD_JCOM_PICKING_LIST"); final boolean enableScanArt = setupGest.getSetupDepoBoolean("PICKING", "SPEDIZIONE", "ENABLE_SCAN_ART", codMdep); String gestioneOrd = pickingListDTOs.get(0).getGestione(); @@ -749,8 +749,8 @@ public class WMSGenericService { public List getSuggestedPickingList(List sourceOrders, String codMdep) throws Exception { List pickingListToReturn = new ArrayList<>(); - final boolean enableCheckCodJcom = setupGest.getSetupBoolean("PICKING", "SPEDIZIONE", "ENABLE_CHECK_COD_JCOM_PICKING_LIST"); - final boolean enableCheckCodMdep = setupGest.getSetupBoolean("PICKING", "SPEDIZIONE", "ENABLE_CHECK_DEPOSITO"); + final boolean enableCheckCodJcom = setupGest.getSetupBoolean(multiDBTransactionManager.getPrimaryConnection(), "PICKING", "SPEDIZIONE", "ENABLE_CHECK_COD_JCOM_PICKING_LIST"); + final boolean enableCheckCodMdep = setupGest.getSetupBoolean(multiDBTransactionManager.getPrimaryConnection(), "PICKING", "SPEDIZIONE", "ENABLE_CHECK_DEPOSITO"); final String commessaMagazzino = setupGest.getSetup("PICKING", "SETUP", "COMMESSA_MAGAZZINO"); //Carico tutte le informazioni riguardanti gli articoli 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 09ab0cf282..5d25d8d189 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 @@ -15,7 +15,6 @@ import it.integry.ems_model.entity.MtbInvenr; import it.integry.ems_model.entity.MtbInvent; import it.integry.ems_model.entity.MtbUntMis; import it.integry.ems_model.entity._enum.GestioneEnum; -import it.integry.ems_model.resolver.SqlFieldHolder; import it.integry.ems_model.service.SetupGest; import it.integry.ems_model.types.OperationType; import it.integry.ems_model.utility.Query; @@ -61,7 +60,7 @@ public class WMSInventarioService { public MtbInvent loadInventarioIfExists(int inventoryId, String codMdep) throws Exception { - boolean loadDailyInv = setupGest.getSetupBoolean("PICKING", "INVENTARIO", "LOAD_DAILY_INV"); + boolean loadDailyInv = setupGest.getSetupBoolean(multiDBTransactionManager.getPrimaryConnection(), "PICKING", "INVENTARIO", "LOAD_DAILY_INV"); MtbInvent mtbInvent = new MtbInvent() .setIdInventario(inventoryId) .setCodMdep(codMdep); 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 bb73b213e3..9f0ecd8001 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 @@ -563,7 +563,7 @@ public class WMSLavorazioneService { if (createUDCRequestDTO.getOrders() == null) { - boolean useCodAnagAziendale = setupGest.getSetupBoolean("PICKING", "SETUP", "FLAG_USE_COD_ANAG_AZIENDALE"); + boolean useCodAnagAziendale = setupGest.getSetupBoolean(multiDBTransactionManager.getPrimaryConnection(), "PICKING", "SETUP", "FLAG_USE_COD_ANAG_AZIENDALE"); if (UtilityString.isNullOrEmpty(createUDCRequestDTO.getCodAnag()) && useCodAnagAziendale) { String defaultCodAnag = aziendaService.retrieveInternalCodAnagFornitore(); 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 11d686c81b..7d92f23b03 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 @@ -150,7 +150,7 @@ public class WMSSpedizioneService { udsMtbColt .setCodAnag(foundCodAnagOrds.get(0)); - boolean dataConsInFiltro = setupGest.getSetupBoolean("PICKING", "SPEDIZIONE", "ADD_DATACONS_IN_FILTRO"); + boolean dataConsInFiltro = setupGest.getSetupBoolean(multiDBTransactionManager.getPrimaryConnection(), "PICKING", "SPEDIZIONE", "ADD_DATACONS_IN_FILTRO"); String filtroOrdini = MtbColtUtils.generaFiltroOrdini(null, createUDSRequestDTO.getOrders().stream() @@ -205,7 +205,7 @@ public class WMSSpedizioneService { .setNumCollo(mtbColtToClose.getNumCollo()) .setCriterioDistribuzione(criterioDistribuzione.getText()), false); - boolean generaDoc = setupGest.getSetupBoolean("PICKING", "SPEDIZIONE", "GENERA_DOC"); + boolean generaDoc = setupGest.getSetupBoolean(multiDBTransactionManager.getPrimaryConnection(), "PICKING", "SPEDIZIONE", "GENERA_DOC"); if (generaDoc) generaDoc(distributedUDS);