From fbcfed3997481742117e0920dab7d502ae8bf6a8 Mon Sep 17 00:00:00 2001 From: ValerioC Date: Fri, 14 Feb 2025 09:27:44 +0100 Subject: [PATCH] [carelli] - aggiunta setup per prefisso codice ispezioni [rossogargano] - aggiunto indice su id_lotto in mtb_colt per miglrioare MEs_getworkorders - modifiche al servizio creazione prodotto finito per poter definire in anticipo la data di versamento --- .../model/Migration_20250211173350.java | 32 +++++++++++++++++++ .../model/Migration_20250213095521.java | 25 +++++++++++++++ .../dto/CaricoProdottoFinitoDTO.java | 11 +++++++ .../service/MesProductionServiceV2.java | 8 +++++ 4 files changed, 76 insertions(+) create mode 100644 ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250211173350.java create mode 100644 ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250213095521.java diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250211173350.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250211173350.java new file mode 100644 index 0000000000..0ebcd2a9d5 --- /dev/null +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250211173350.java @@ -0,0 +1,32 @@ +package it.integry.ems.migration.model; + +import it.integry.ems.migration._base.BaseMigration; +import it.integry.ems.migration._base.MigrationModelInterface; +import it.integry.ems_model.utility.UtilityDB; +import it.integry.ems_model.utility.dto.IndexTableDTO; + +import java.util.Arrays; +import java.util.Collections; + +public class Migration_20250211173350 extends BaseMigration implements MigrationModelInterface { + + @Override + public void up() throws Exception { + if (isHistoryDB()) + return; + + IndexTableDTO indexTableDTO = + new IndexTableDTO() + .setTableName("mtb_colt") + .setIndexName("mtb_colt_id_lotto_index") + .setClustered(false) + .setColumnsIndex(Collections.singletonList( + new IndexTableDTO.ColumnIndex("id_lotto") + )); + UtilityDB.createIndex(advancedDataSource.getConnection(),indexTableDTO); + } + + @Override + public void down() throws Exception { + } +} \ No newline at end of file diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250213095521.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250213095521.java new file mode 100644 index 0000000000..4dfd2a872f --- /dev/null +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250213095521.java @@ -0,0 +1,25 @@ +package it.integry.ems.migration.model; + +import it.integry.ems.migration._base.BaseMigration; +import it.integry.ems.migration._base.IntegryCustomerDB; +import it.integry.ems.migration._base.MigrationModelInterface; + +public class Migration_20250213095521 extends BaseMigration implements MigrationModelInterface { + + @Override + public void up() throws Exception { + if (isHistoryDB()) + return; + + String value = null; + if (isCustomerDb(IntegryCustomerDB.Carelli_Winact)) + value = "I"; + + createSetup("PVM","MODELLINI","PREFIX_ISPEZIONI",value,"Prefisso da utilizzare per la generazione dei cod_jfas per le ispezioni nella gestione dei modellini, verrà seguito da un progressivo numerico",null); + + } + + @Override + public void down() throws Exception { + } +} \ No newline at end of file diff --git a/ems-engine/src/main/java/it/integry/ems/production/dto/CaricoProdottoFinitoDTO.java b/ems-engine/src/main/java/it/integry/ems/production/dto/CaricoProdottoFinitoDTO.java index 34da6d2db8..271d550ed8 100644 --- a/ems-engine/src/main/java/it/integry/ems/production/dto/CaricoProdottoFinitoDTO.java +++ b/ems-engine/src/main/java/it/integry/ems/production/dto/CaricoProdottoFinitoDTO.java @@ -2,6 +2,7 @@ package it.integry.ems.production.dto; import java.math.BigDecimal; import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.Date; public class CaricoProdottoFinitoDTO { @@ -26,6 +27,7 @@ public class CaricoProdottoFinitoDTO { private boolean aggiornaDettagliOrdine; private boolean accodaAdEsistenti = true; private boolean segnaQuarantena = false; + private LocalDateTime dataVers; public String getCodMart() { @@ -217,4 +219,13 @@ public class CaricoProdottoFinitoDTO { this.segnaQuarantena = segnaQuarantena; return this; } + + public LocalDateTime getDataVers() { + return dataVers; + } + + public CaricoProdottoFinitoDTO setDataVers(LocalDateTime dataVers) { + this.dataVers = dataVers; + return this; + } } 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 2f83b3b086..d0c7ca78b3 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 @@ -1036,9 +1036,13 @@ public class MesProductionServiceV2 { .setCodVdes(ordineLav.getCodVdes()) .setPreparatoDa(dto.getPreparatoDa()) .setNumOrd(dto.getNumOrd()); + if (dto.getDataCollo() != null) { mtbColtToInsert.setDataCollo(UtilityLocalDate.localDateFromDate(dto.getDataCollo())); } + if (dto.getDataVers() != null) { + mtbColtToInsert.setDataVers(dto.getDataVers()); + } if (dto.isSegnaQuarantena()) { String codDtipProvv = setupGest.getSetup("MES", "SETUP", "COD_DTIP_PROVV"); @@ -1064,6 +1068,10 @@ public class MesProductionServiceV2 { .setNumEtich(dto.getNumEtich()) .setNote(dto.getNote()) .setQtaCol(dto.getQtaCollo()); + if (dto.getDataVers() != null) { + mtbColrToInsert.setDatetimeRow(dto.getDataVers()); + } + mtbColrToInsert.setOperation(OperationType.INSERT); mtbColtToInsert.getMtbColr().add(mtbColrToInsert);