From d3200d28c88716fe7a5cb4b873eca398d07452f5 Mon Sep 17 00:00:00 2001 From: AnthonyS Date: Thu, 24 Apr 2025 10:19:11 +0200 Subject: [PATCH] Fix query duplicaOrdiniGiornoDopo --- .../model/Migration_20250424101450.java | 23 +++++++++++++++++++ .../service/MesProductionServiceV2.java | 10 ++++---- 2 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250424101450.java diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250424101450.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250424101450.java new file mode 100644 index 0000000000..3c9a48b09c --- /dev/null +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250424101450.java @@ -0,0 +1,23 @@ +package it.integry.ems.migration.model; + +import it.integry.ems.migration._base.BaseMigration; +import it.integry.ems.migration._base.MigrationModelInterface; + +public class Migration_20250424101450 extends BaseMigration implements MigrationModelInterface { + + @Override + public void up() throws Exception { + if (isHistoryDB()) + return; + + updateSetupValue("MES", "SETUP", "CONTROLLO_SCADENZA_MULTIPLA", null, + "Se true sulle linee scelte attiva la logica di generazione dei lotti con scadenza multipla e se esiste la pianificata duplicaOrdiniGiornoDopo viene generato un ordine di lavorazione (partendo da quelli in corso) con il lotto del giorno.", false, "SI_NO", false, false, false, + false, false, "jtb_fasi", false, "SELECT 'S' UNION ALL SELECT 'N'"); + } + + @Override + public void down() 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 f0999b8312..452c74b6e0 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 @@ -2092,13 +2092,11 @@ public class MesProductionServiceV2 { " FROM stb_gest_setup_det\n" + " WHERE gest_name = 'MES'\n" + " AND section = 'SETUP'\n" + - " AND key_section = 'COD_MGRP_SCADENZA_MULTIPLA'\n" + + " AND key_section = 'CONTROLLO_SCADENZA_MULTIPLA'\n" + " AND value = 'S')\n" + "SELECT ordini.*\n" + - "FROM MES_GetWorkOrders(%s, DATEADD(DAY, -30, GETDATE()), NULL, NULL, NULL) ordini\n" + - " INNER JOIN mtb_aart ma ON ordini.cod_prod = ma.cod_mart\n" + - " INNER JOIN mtb_grup mg ON ma.cod_mgrp = mg.cod_mgrp\n" + - " INNER JOIN setup ON val_col_rif = mg.cod_mgrp\n" + + "FROM MES_GetWorkOrders(%s, DATEADD(DAY, -30, GETDATE()), DATEADD(DAY, -1, GETDATE()), NULL, NULL) ordini\n" + + " INNER JOIN setup ON val_col_rif = ordini.cod_jfas\n" + "WHERE ordini.stato = 'IN CORSO'\n" + "ORDER BY ordini.sort", codJfas @@ -2114,7 +2112,7 @@ public class MesProductionServiceV2 { List ordiniSalvati = new ArrayList<>(); for (OrdineLavorazioneDTO ordine : ordini) { - Date dataOrd = UtilityDate.dateAdd(UtilityDate.getTodayWithoutTime(), 1); + Date dataOrd = UtilityDate.getTodayWithoutTime(); // ORDINE DI PRODUZIONE DtbOrdt ordProd = new DtbOrdt()