From 1b6f7d6e35a75101240de6a8eb898b3ba38c4bb3 Mon Sep 17 00:00:00 2001 From: MarcoE Date: Fri, 19 Jul 2024 17:54:10 +0200 Subject: [PATCH] Aggiunto retrieveAllPartitaMag --- .../model/Migration_20240718150503.java | 21 +++++++++++++++++++ .../WMSPartitaMagazzinoController.java | 13 ++++++++++++ .../service/WMSPartitaMagazzinoService.java | 17 +++++++++++++++ 3 files changed, 51 insertions(+) create mode 100644 ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240718150503.java diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240718150503.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240718150503.java new file mode 100644 index 0000000000..6c63e14b39 --- /dev/null +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240718150503.java @@ -0,0 +1,21 @@ +package it.integry.ems.migration.model; + +import it.integry.ems.migration._base.BaseMigration; +import it.integry.ems.migration._base.MigrationModelInterface; + +public class Migration_20240718150503 extends BaseMigration implements MigrationModelInterface { + + @Override + public void up() throws Exception { + if (isHistoryDB()) + return; + + executeStatement("INSERT INTO stb_gest_setup (key_section, value, tipo_setup, description, query_default, flag_sync, flag_user_view, flag_setup_depo, flag_setup_user_web, flag_tipo_json, flag_tipo_colore, gest_name, section) VALUES('SUGGEST_DATA_SCAD', 'N', NULL, 'Suggerisce la data di scadenza di una partita già esistente', (SELECT TOP 1 cod_query FROM stb_gest_setup_query WHERE query_default = 'SELECT ''S'' UNION ALL SELECT ''N'''), 'N', 'N', 'N', 'N', 'N', 'N', 'PICKING', 'SPEDIZIONE');"); + } + + @Override + public void down() throws Exception { + + } + +} \ No newline at end of file diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/controller/WMSPartitaMagazzinoController.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/controller/WMSPartitaMagazzinoController.java index 5da5f6f0a0..8212f50d93 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/controller/WMSPartitaMagazzinoController.java +++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/controller/WMSPartitaMagazzinoController.java @@ -9,6 +9,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; +import java.util.Date; +import java.util.List; + @RestController @Scope("request") @RequestMapping("wms/partita-magazzino") @@ -27,4 +31,13 @@ public class WMSPartitaMagazzinoController { return ServiceRestResponse.createPositiveResponse(wmsPartitaMagazzinoService.retrievePartitaMag(codMart, partitaMag)); } + + @RequestMapping(value = "retrieveAllPartitaMag", method = RequestMethod.POST) + public @ResponseBody + ServiceRestResponse retrieveAllPartitaMag(@RequestParam(CommonConstants.PROFILE_DB) String profileDB, + @RequestBody List codMarts, + @RequestParam Date dataScad) throws Exception { + + return ServiceRestResponse.createPositiveResponse(wmsPartitaMagazzinoService.retrievePartitaMagList(codMarts, dataScad)); + } } diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSPartitaMagazzinoService.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSPartitaMagazzinoService.java index 5bf4a94968..330fefb286 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSPartitaMagazzinoService.java +++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSPartitaMagazzinoService.java @@ -1,15 +1,19 @@ package it.integry.ems.retail.wms.generic.service; +import com.lmax.disruptor.util.DaemonThreadFactory; import it.integry.ems.service.EntityProcessor; import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager; import it.integry.ems_model.entity.MtbPartitaMag; import it.integry.ems_model.types.OperationType; import it.integry.ems_model.utility.Query; import it.integry.ems_model.utility.UtilityDB; +import it.integry.ems_model.utility.UtilityInteger; +import it.integry.ems_model.utility.UtilityQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; @Service @@ -34,4 +38,17 @@ public class WMSPartitaMagazzinoService { return UtilityDB.executeSimpleQueryOnlyFirstRowDTO(multiDBTransactionManager.getPrimaryConnection(), sql, MtbPartitaMag.class); } + + public List retrievePartitaMagList(List codMarts, Date dataScad) throws Exception { + String sql = String.format( + "SELECT *\n" + + "FROM mtb_partita_mag\n" + + "WHERE data_scad >= %s\n" + + " AND cod_mart in (%s)", + UtilityDB.valueToString(dataScad), + UtilityDB.listValueToString(codMarts) + ); + + return UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, MtbPartitaMag.class); + } }