Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Lisa Sportelli
2025-02-14 09:30:31 +01:00
parent dfd3974c53 fbcfed3997
commit ff1996ed43
4 changed files with 76 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250211173350.java Normal file
View File

@@ -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 {
}
}

25
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250213095521.java Normal file
View File

@@ -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 {
}
}

11
ems-engine/src/main/java/it/integry/ems/production/dto/CaricoProdottoFinitoDTO.java
View File

@@ -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;
}
}

8
ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java
View File

@@ -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);