From 21021cec1f13a5160f40332c9b1e572de36fd249 Mon Sep 17 00:00:00 2001 From: ValerioC Date: Mon, 13 May 2024 11:17:02 +0200 Subject: [PATCH 01/11] Aggiunta setup per controllo ordini multipli su mes --- .../model/Migration_20240513110702.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513110702.java diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513110702.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513110702.java new file mode 100644 index 0000000000..d77ce0be43 --- /dev/null +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513110702.java @@ -0,0 +1,26 @@ +package it.integry.ems.migration.model; + +import it.integry.ems.migration._base.BaseMigration; +import it.integry.ems.migration._base.IntegryCustomer; +import it.integry.ems.migration._base.MigrationModelInterface; + +public class Migration_20240513110702 extends BaseMigration implements MigrationModelInterface { + + @Override + public void up() throws Exception { + if (isHistoryDB()) + return; + + String value = "N"; + if (isCustomer(IntegryCustomer.RossoGargano)) + value = "S"; + + createSetup("PVM","MONITORAGGIO_LINEE_V2","ALLOW_MULTIPLE_ORDERS_OPEN",value,"Se impostato a S permette di avviare più ordini contemporaneamente sulla linea","SI_NO"); + } + + @Override + public void down() throws Exception { + + } + +} \ No newline at end of file From 0376b4c79052b244813d6e1ee12d394405312e7d Mon Sep 17 00:00:00 2001 From: FabioN Date: Mon, 13 May 2024 15:27:02 +0200 Subject: [PATCH 02/11] Aggiunta campo Flag_calc_peso_intra --- .../model/Migration_20240513103201.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513103201.java diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513103201.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513103201.java new file mode 100644 index 0000000000..0260670ebe --- /dev/null +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513103201.java @@ -0,0 +1,17 @@ +package it.integry.ems.migration.model;import it.integry.ems.migration._base.BaseMigration; +import it.integry.ems.migration._base.MigrationModelInterface; + +public class Migration_20240513103201 extends BaseMigration implements MigrationModelInterface{ + + @Override + public void up()throws Exception { + if(isHistoryDB()) + return; + } + + @Override + public void down()throws Exception{ + + } + +} \ No newline at end of file From 4d38fd8fb35f295074dbbbed6a9a8858fe7613ab Mon Sep 17 00:00:00 2001 From: FabioN Date: Mon, 13 May 2024 15:27:14 +0200 Subject: [PATCH 03/11] Aggiunta campo Flag_calc_peso_intra --- .../migration/model/Migration_20240513103201.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513103201.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513103201.java index 0260670ebe..bc875f532f 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513103201.java +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513103201.java @@ -1,16 +1,20 @@ -package it.integry.ems.migration.model;import it.integry.ems.migration._base.BaseMigration; +package it.integry.ems.migration.model; + +import it.integry.ems.migration._base.BaseMigration; import it.integry.ems.migration._base.MigrationModelInterface; -public class Migration_20240513103201 extends BaseMigration implements MigrationModelInterface{ +public class Migration_20240513103201 extends BaseMigration implements MigrationModelInterface { @Override - public void up()throws Exception { - if(isHistoryDB()) + public void up() throws Exception { + if (isHistoryDB()) return; + + executeStatement("alter table dtb_tipi add flag_calc_peso_intra varchar (1) null;"); } @Override - public void down()throws Exception{ + public void down() throws Exception { } From 37219b4fb6786177dabba77e49f07833ad2d06d1 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 13 May 2024 17:30:58 +0200 Subject: [PATCH 04/11] [AGRIBOOK] Modificate logiche gestione previsione raccolta --- .../ems_model/entity/MtbPartitaMagCarat.java | 10 +-- .../ems_model/utility/UtilityLocalDate.java | 7 ++ .../agribook/AgribookActivityService.java | 76 ++++--------------- .../agribook/AgribookOrderService.java | 71 ++++++++--------- .../agribook/AgribookReportService.java | 8 +- ...TO.java => AgribookHarvestHistoryDTO.java} | 8 +- .../agribook/model/AgribookOrderDTO.java | 20 ++--- .../model/AgribookPrevRaccoltaDTO.java | 18 ++--- .../agribook/model/AgribookReportDTO.java | 8 +- 9 files changed, 86 insertions(+), 140 deletions(-) rename ems-engine/src/main/java/it/integry/ems/production/agribook/model/{HarvestHistoryDTO.java => AgribookHarvestHistoryDTO.java} (74%) diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/MtbPartitaMagCarat.java b/ems-core/src/main/java/it/integry/ems_model/entity/MtbPartitaMagCarat.java index 461b8e59d9..8bb66a0541 100644 --- a/ems-core/src/main/java/it/integry/ems_model/entity/MtbPartitaMagCarat.java +++ b/ems-core/src/main/java/it/integry/ems_model/entity/MtbPartitaMagCarat.java @@ -7,8 +7,8 @@ import it.integry.ems_model.annotation.SqlField; import it.integry.ems_model.annotation.Table; import it.integry.ems_model.base.EntityBase; import org.kie.api.definition.type.PropertyReactive; -import java.util.Date; -import it.integry.ems_model.annotation.FK; + +import java.time.LocalDateTime; @PropertyReactive @Table(MtbPartitaMagCarat.ENTITY) @@ -42,7 +42,7 @@ public class MtbPartitaMagCarat extends EntityBase { private String fonte; @SqlField(value = "data_rilevazione", nullable = true) - private Date dataRilevazione; + private LocalDateTime dataRilevazione; @SqlField(value = "activity_id", maxLength = 15) private String activityId; @@ -105,11 +105,11 @@ public class MtbPartitaMagCarat extends EntityBase { return this; } - public Date getDataRilevazione() { + public LocalDateTime getDataRilevazione() { return dataRilevazione; } - public MtbPartitaMagCarat setDataRilevazione(Date dataRilevazione) { + public MtbPartitaMagCarat setDataRilevazione(LocalDateTime dataRilevazione) { this.dataRilevazione = dataRilevazione; return this; } diff --git a/ems-core/src/main/java/it/integry/ems_model/utility/UtilityLocalDate.java b/ems-core/src/main/java/it/integry/ems_model/utility/UtilityLocalDate.java index 0a2966bcf6..469795a76f 100644 --- a/ems-core/src/main/java/it/integry/ems_model/utility/UtilityLocalDate.java +++ b/ems-core/src/main/java/it/integry/ems_model/utility/UtilityLocalDate.java @@ -86,6 +86,13 @@ public class UtilityLocalDate { return TimeUnit.DAYS.toSeconds(localDate.toEpochDay()); } + public static Date localDateTimeToDate(LocalDateTime localDateTime) { + if(localDateTime == null) return null; + + long seconds = localDateTimeToTime(localDateTime, null); + return new Date(seconds * 1000); + } + public static Date localDateTimeToDate(LocalDateTime localDateTime, @Nullable String timezone) { long seconds = localDateTimeToTime(localDateTime, timezone); return new Date(seconds * 1000); diff --git a/ems-engine/src/main/java/it/integry/ems/production/agribook/AgribookActivityService.java b/ems-engine/src/main/java/it/integry/ems/production/agribook/AgribookActivityService.java index 55d9d02d46..930c97428e 100644 --- a/ems-engine/src/main/java/it/integry/ems/production/agribook/AgribookActivityService.java +++ b/ems-engine/src/main/java/it/integry/ems/production/agribook/AgribookActivityService.java @@ -9,12 +9,14 @@ import it.integry.ems_model.entity.MtbPartitaMagCarat; import it.integry.ems_model.entity.StbActivity; import it.integry.ems_model.types.OperationType; import it.integry.ems_model.utility.UtilityDB; +import it.integry.ems_model.utility.UtilityLocalDate; import it.integry.ems_model.utility.UtilityString; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Service; +import java.time.LocalDateTime; import java.util.Collections; import java.util.Date; import java.util.List; @@ -37,7 +39,7 @@ public class AgribookActivityService { //TODO: Replace with a gest-setup config private static String ACTIVITY_TYPE_ID = "RILEVAZIONE"; - public StbActivity postActivity(OperationType operation, String codAnag, String codVdes, String codMart, String partitaMag, Date dataPianificazione, Date dataRilevazione, Date dataChiusura, String descrizione, String note, String username) throws Exception { + public StbActivity postActivity(OperationType operation, String codAnag, String codVdes, String codMart, String partitaMag, LocalDateTime dataPianificazione, LocalDateTime dataRilevazione, LocalDateTime dataChiusura, String descrizione, String note, String username) throws Exception { if (UtilityString.isNullOrEmpty(username)) { username = requestDataDTO.getUsername(); } @@ -49,11 +51,11 @@ public class AgribookActivityService { .setPartitaMag(partitaMag) .setUserName(username) .setActivityTypeId(ACTIVITY_TYPE_ID) - .setEstimatedDate(dataPianificazione) - .setEstimatedTime(dataPianificazione) - .setEffectiveDate(dataRilevazione) - .setEffectiveTime(dataRilevazione) - .setEffectiveEndtime(dataChiusura) + .setEstimatedDate(UtilityLocalDate.localDateTimeToDate(dataPianificazione)) + .setEstimatedTime(UtilityLocalDate.localDateTimeToDate(dataPianificazione)) + .setEffectiveDate(UtilityLocalDate.localDateTimeToDate(dataRilevazione)) + .setEffectiveTime(UtilityLocalDate.localDateTimeToDate(dataRilevazione)) + .setEffectiveEndtime(UtilityLocalDate.localDateTimeToDate(dataChiusura)) .setActivityDescription(descrizione) .setNote(note); @@ -65,7 +67,7 @@ public class AgribookActivityService { return stbActivity; } - public StbActivity postActivity(OperationType operation, String codAnag, String codVdes, String codMart, String partitaMag, Date dataPianificazione, Date dataRilevazione, Date dataChiusura, String descrizione, String note) throws Exception { + public StbActivity postActivity(OperationType operation, String codAnag, String codVdes, String codMart, String partitaMag, LocalDateTime dataPianificazione, LocalDateTime dataRilevazione, LocalDateTime dataChiusura, String descrizione, String note) throws Exception { return this.postActivity(operation, codAnag, codVdes, codMart, partitaMag, dataPianificazione, dataRilevazione, dataChiusura, descrizione, note, requestDataDTO.getUsername()); } @@ -112,15 +114,7 @@ public class AgribookActivityService { throw new Exception("Nessuna data di pianificazione specificata"); } - StbActivity stbActivity = new StbActivity() - .setCodAnag(codAnag) - .setCodVdes(codVdes) - .setCodMart(codMart) - .setPartitaMag(partitaMag) - .setUserName(UtilityString.isNullOrEmpty(userName) ? requestDataDTO.getUsername() : userName) - .setActivityDescription(description) - .setEstimatedTime(planDate) - .setActivityTypeId(ACTIVITY_TYPE_ID); + StbActivity stbActivity = new StbActivity().setCodAnag(codAnag).setCodVdes(codVdes).setCodMart(codMart).setPartitaMag(partitaMag).setUserName(UtilityString.isNullOrEmpty(userName) ? requestDataDTO.getUsername() : userName).setActivityDescription(description).setEstimatedTime(planDate).setActivityTypeId(ACTIVITY_TYPE_ID); stbActivity.setOperation(OperationType.INSERT); @@ -130,33 +124,7 @@ public class AgribookActivityService { } public List retrieveActivity(String activityId, List codAnag, List codVdes, String codMart, String partitaMag, String username) throws Exception { - String sql = "SELECT ISNULL(vtb_dest.destinatario, gtb_anag.rag_soc) AS destinatario,\n" + - " activity_id,\n" + - " activity_result_id,\n" + - " activity_type_id,\n" + - " data_ins_act,\n" + - " activity_description,\n" + - " parent_activity_id,\n" + - " user_name,\n" + - " stb_activity.cod_anag,\n" + - " estimated_time,\n" + - " effective_time,\n" + - " result_description,\n" + - " estimated_endtime,\n" + - " effective_endtime,\n" + - " user_creator,\n" + - " stb_activity.note,\n" + - " ora_ins_act,\n" + - " user_modifier,\n" + - " ora_mod_act,\n" + - " cod_mart,\n" + - " stb_activity.cod_vdes,\n" + - " partita_mag\n" + - "FROM stb_activity\n" + - "LEFT OUTER JOIN vtb_dest ON vtb_dest.cod_anag = stb_activity.cod_anag AND\n" + - " vtb_dest.cod_vdes = stb_activity.cod_vdes\n" + - " LEFT OUTER JOIN gtb_anag ON gtb_anag.cod_anag = stb_activity.cod_anag\n" + - "WHERE activity_type_id = '" + ACTIVITY_TYPE_ID + "' "; + String sql = "SELECT ISNULL(vtb_dest.destinatario, gtb_anag.rag_soc) AS destinatario,\n" + " activity_id,\n" + " activity_result_id,\n" + " activity_type_id,\n" + " data_ins_act,\n" + " activity_description,\n" + " parent_activity_id,\n" + " user_name,\n" + " stb_activity.cod_anag,\n" + " estimated_time,\n" + " effective_time,\n" + " result_description,\n" + " estimated_endtime,\n" + " effective_endtime,\n" + " user_creator,\n" + " stb_activity.note,\n" + " ora_ins_act,\n" + " user_modifier,\n" + " ora_mod_act,\n" + " cod_mart,\n" + " stb_activity.cod_vdes,\n" + " partita_mag\n" + "FROM stb_activity\n" + "LEFT OUTER JOIN vtb_dest ON vtb_dest.cod_anag = stb_activity.cod_anag AND\n" + " vtb_dest.cod_vdes = stb_activity.cod_vdes\n" + " LEFT OUTER JOIN gtb_anag ON gtb_anag.cod_anag = stb_activity.cod_anag\n" + "WHERE activity_type_id = '" + ACTIVITY_TYPE_ID + "' "; if (!UtilityString.isNullOrEmpty(activityId)) { sql += " AND activity_id = " + UtilityDB.valueToString(activityId); @@ -192,28 +160,20 @@ public class AgribookActivityService { StbActivity activityToDelete = new StbActivity(); - activityToDelete - .setActivityId(activityId) - .setOperation(OperationType.SELECT_OBJECT); + activityToDelete.setActivityId(activityId).setOperation(OperationType.SELECT_OBJECT); entityProcessor.processEntity(activityToDelete, multiDBTransactionManager); if (!UtilityString.isNullOrEmpty(activityToDelete.getCodMart()) && !(UtilityString.isNullOrEmpty(activityToDelete.getPartitaMag()))) { - String sql = "SELECT id_riga FROM " + MtbPartitaMagCarat.ENTITY + - " WHERE carat = " + UtilityDB.valueToString(ACTIVITY_ID_KEY) + - " AND val_carat = " + UtilityDB.valueToString(activityId); + String sql = "SELECT id_riga FROM " + MtbPartitaMagCarat.ENTITY + " WHERE carat = " + UtilityDB.valueToString(ACTIVITY_ID_KEY) + " AND val_carat = " + UtilityDB.valueToString(activityId); Integer idRigaToDelete = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql); - MtbPartitaMagCarat mtbPartitaMagCarat = new MtbPartitaMagCarat() - .setIdRiga(idRigaToDelete); + MtbPartitaMagCarat mtbPartitaMagCarat = new MtbPartitaMagCarat().setIdRiga(idRigaToDelete); mtbPartitaMagCarat.setOperation(OperationType.DELETE); - MtbPartitaMag mtbPartitaMag = new MtbPartitaMag() - .setCodMart(activityToDelete.getCodMart()) - .setPartitaMag(activityToDelete.getPartitaMag()) - .setMtbPartitaMagCarat(Collections.singletonList(mtbPartitaMagCarat)); + MtbPartitaMag mtbPartitaMag = new MtbPartitaMag().setCodMart(activityToDelete.getCodMart()).setPartitaMag(activityToDelete.getPartitaMag()).setMtbPartitaMagCarat(Collections.singletonList(mtbPartitaMagCarat)); mtbPartitaMag.setOperation(OperationType.NO_OP); @@ -232,11 +192,7 @@ public class AgribookActivityService { throw new Exception("Nessuna data di pianificazione specificata"); } - StbActivity stbActivity = new StbActivity() - .setActivityId(activityId) - .setUserName(UtilityString.isNullOrEmpty(userName) ? requestDataDTO.getUsername() : userName) - .setActivityDescription(description) - .setEstimatedTime(planDate); + StbActivity stbActivity = new StbActivity().setActivityId(activityId).setUserName(UtilityString.isNullOrEmpty(userName) ? requestDataDTO.getUsername() : userName).setActivityDescription(description).setEstimatedTime(planDate); stbActivity.setOperation(OperationType.UPDATE); diff --git a/ems-engine/src/main/java/it/integry/ems/production/agribook/AgribookOrderService.java b/ems-engine/src/main/java/it/integry/ems/production/agribook/AgribookOrderService.java index 30e9770fd0..a760a4e6e2 100644 --- a/ems-engine/src/main/java/it/integry/ems/production/agribook/AgribookOrderService.java +++ b/ems-engine/src/main/java/it/integry/ems/production/agribook/AgribookOrderService.java @@ -25,6 +25,7 @@ import org.springframework.web.context.ContextLoader; import javax.annotation.Nullable; import java.math.BigDecimal; import java.time.LocalDate; +import java.time.LocalDateTime; import java.time.ZoneId; import java.util.*; import java.util.concurrent.atomic.AtomicReference; @@ -338,45 +339,37 @@ public class AgribookOrderService { final short initialWeekDayShort = Short.parseShort(setupGest.getSetup("PVM", "DELIVERY_PLAN", "GIORNO_INIZIO_SETTIMANA")); - List reports = Stream.of(allReports) + List reports = allReports.stream() .filter(x -> x.getCodMart().equalsIgnoreCase(agribookOrderDTO.getCodMart()) && x.getPartitaMag().equalsIgnoreCase(agribookOrderDTO.getPartitaMag()) - ).toList(); + ).collect(Collectors.toList()); - if (!reports.isEmpty()) { - agribookOrderDTO.setPrevRaccNumeroSettimane( - Stream.of(reports) - .map(AgribookReportDTO::getPrevRaccNumSett) - .toList() - ); + agribookOrderDTO.setPrevisioniRaccolta( + Stream.of(reports) + .filter(x -> x.getPrevRaccNumSett() != null && x.getPrevRaccNumSett() >= UtilityDate.dateToWeekNumber(LocalDate.now(), initialWeekDayShort)) + .groupBy(agribookReportDTO -> agribookReportDTO.getPrevRaccNumSett() == null ? "" : agribookReportDTO.getPrevRaccNumSett().toString()) + .map(reportsGroup -> { + AgribookReportDTO lastReport = Iterables.getLast(reportsGroup.getValue()); - agribookOrderDTO.setPrevisioniRaccolta( - Stream.of(reports) - .filter(x -> x.getPrevRaccNumSett() == null || x.getPrevRaccNumSett() > UtilityDate.dateToWeekNumber(LocalDate.now(), initialWeekDayShort)) - .groupBy(agribookReportDTO -> agribookReportDTO.getPrevRaccNumSett() == null ? "" : agribookReportDTO.getPrevRaccNumSett().toString()) - .map(reportsGroup -> { - AgribookReportDTO lastReport = Iterables.getLast(reportsGroup.getValue()); + int lastPrevRaccQtaSett = lastReport.getPrevRaccQtaSett() == null ? 0 : lastReport.getPrevRaccQtaSett(); - int lastPrevRaccQtaSett = lastReport.getPrevRaccQtaSett() == null ? 0 : lastReport.getPrevRaccQtaSett(); + int sumQtaClassePremium = lastPrevRaccQtaSett + * lastReport.getPrevRaccPercClassePremium() / 100; + int sumQtaClasse1 = lastPrevRaccQtaSett + * lastReport.getPrevRaccPercClasse1() / 100; + int sumQtaClasse2 = lastPrevRaccQtaSett + * lastReport.getPrevRaccPercClasse2() / 100; - int sumQtaClassePremium = lastPrevRaccQtaSett - * lastReport.getPrevRaccPercClassePremium() / 100; - int sumQtaClasse1 = lastPrevRaccQtaSett - * lastReport.getPrevRaccPercClasse1() / 100; - int sumQtaClasse2 = lastPrevRaccQtaSett - * lastReport.getPrevRaccPercClasse2() / 100; - - return new AgribookPrevRaccoltaDTO() - .setDataRilevazione(lastReport.getDataRilevazione()) - .setNumSettimana(reportsGroup.getKey().equalsIgnoreCase("") ? null : Integer.valueOf(reportsGroup.getKey())) - .setQtaSettimana(lastPrevRaccQtaSett) - .setPercClassePremium(Float.valueOf((float) sumQtaClassePremium / lastPrevRaccQtaSett * 100).intValue()) - .setPercClasse1(Float.valueOf((float) sumQtaClasse1 / lastPrevRaccQtaSett * 100).intValue()) - .setPercClasse2(Float.valueOf((float) sumQtaClasse2 / lastPrevRaccQtaSett * 100).intValue()); - }) - .toList() - ); - } + return new AgribookPrevRaccoltaDTO() + .setDataRilevazione(lastReport.getDataRilevazione()) + .setNumSettimana(reportsGroup.getKey().equalsIgnoreCase("") ? null : Integer.valueOf(reportsGroup.getKey())) + .setQtaSettimana(lastPrevRaccQtaSett) + .setPercClassePremium(Float.valueOf((float) sumQtaClassePremium / lastPrevRaccQtaSett * 100).intValue()) + .setPercClasse1(Float.valueOf((float) sumQtaClasse1 / lastPrevRaccQtaSett * 100).intValue()) + .setPercClasse2(Float.valueOf((float) sumQtaClasse2 / lastPrevRaccQtaSett * 100).intValue()); + }) + .toList() + ); sql = Query.format( "SELECT mtb_colr.data_collo AS 'data', SUM(mtb_colr.qta_col) AS 'qta', jtb_flav.nome AS 'squadra'\n" + @@ -406,7 +399,7 @@ public class AgribookOrderService { agribookOrderDTO.getPartitaMag(), year); - agribookOrderDTO.setHarvestHistory(UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, HarvestHistoryDTO.class)); + agribookOrderDTO.setStoricoRaccolta(UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, AgribookHarvestHistoryDTO.class)); } @@ -415,7 +408,7 @@ public class AgribookOrderService { public void updatePercClassi(String codMart, String partitaMag, int newPercClasse1, int newPercClasse2, int newPercClassePremium) throws Exception { - Date dataRilevazione = new Date(); + LocalDateTime dataRilevazione = UtilityLocalDate.getNowTime(); MtbPartitaMagCarat caratClasse1 = new MtbPartitaMagCarat() .setDataRilevazione(dataRilevazione) @@ -466,14 +459,14 @@ public class AgribookOrderService { MtbPartitaMagCarat caratActivityId = new MtbPartitaMagCarat() - .setDataRilevazione(new Date()) + .setDataRilevazione(UtilityLocalDate.getNowTime()) .setCarat("activity-id") .setValCarat(stbActivity.getActivityId()); caratActivityId.setOperation(OperationType.INSERT); MtbPartitaMagCarat caratQtaResidua = new MtbPartitaMagCarat() - .setDataRilevazione(new Date()) + .setDataRilevazione(UtilityLocalDate.getNowTime()) .setCarat("qta-residua") .setValCarat(String.valueOf(qtaResidua)); caratQtaResidua.setOperation(OperationType.INSERT); @@ -513,7 +506,7 @@ public class AgribookOrderService { MtbPartitaMagCarat caratActivityId = new MtbPartitaMagCarat() - .setDataRilevazione(new Date()) + .setDataRilevazione(UtilityLocalDate.getNowTime()) .setCarat("activity-id") .setValCarat(stbActivity.getActivityId()); caratActivityId.setOperation(OperationType.INSERT); @@ -548,7 +541,7 @@ public class AgribookOrderService { .setIdRiga(idRiga) .setCarat("n-piante") .setValCarat(String.valueOf(piantePartita)) - .setDataRilevazione(new Date()); + .setDataRilevazione(UtilityLocalDate.getNowTime()); caratNPiante.setOperation(OperationType.INSERT_OR_UPDATE); diff --git a/ems-engine/src/main/java/it/integry/ems/production/agribook/AgribookReportService.java b/ems-engine/src/main/java/it/integry/ems/production/agribook/AgribookReportService.java index 9dc53c80b4..1d46d0727f 100644 --- a/ems-engine/src/main/java/it/integry/ems/production/agribook/AgribookReportService.java +++ b/ems-engine/src/main/java/it/integry/ems/production/agribook/AgribookReportService.java @@ -2,7 +2,6 @@ package it.integry.ems.production.agribook; import com.annimon.stream.Optional; import com.annimon.stream.Stream; -import it.integry.common.var.CommonConstants; import it.integry.ems.javabeans.RequestDataDTO; import it.integry.ems.json.JSONObjectMapper; import it.integry.ems.media.MimeTypesHandler; @@ -18,6 +17,7 @@ import it.integry.ems_model.entity.StbActivity; import it.integry.ems_model.entity.StbActivityFile; import it.integry.ems_model.types.OperationType; import it.integry.ems_model.utility.UtilityDB; +import it.integry.ems_model.utility.UtilityLocalDate; import it.integry.ems_model.utility.UtilityQuery; import it.integry.ems_model.utility.UtilityString; import org.springframework.beans.factory.annotation.Autowired; @@ -265,8 +265,8 @@ public class AgribookReportService { } else { stbActivity = new StbActivity() .setActivityId(reportToInsert.getActivityId()) - .setEffectiveTime(reportToInsert.getDataRilevazione()) - .setEffectiveEndtime(reportToInsert.getDataRilevazione()); + .setEffectiveTime(UtilityLocalDate.localDateTimeToDate(reportToInsert.getDataRilevazione())) + .setEffectiveEndtime(UtilityLocalDate.localDateTimeToDate(reportToInsert.getDataRilevazione())); stbActivity.setOperation(OperationType.UPDATE); @@ -320,7 +320,7 @@ public class AgribookReportService { " AND carat = '%s'", mtbPartitaMagCarat.getCodMart(), mtbPartitaMagCarat.getPartitaMag(), - UtilityDB.valueDateToString(mtbPartitaMagCarat.getDataRilevazione(), CommonConstants.DATETIME_FORMAT_YMD), + UtilityDB.valueToString(mtbPartitaMagCarat.getDataRilevazione()), key ); diff --git a/ems-engine/src/main/java/it/integry/ems/production/agribook/model/HarvestHistoryDTO.java b/ems-engine/src/main/java/it/integry/ems/production/agribook/model/AgribookHarvestHistoryDTO.java similarity index 74% rename from ems-engine/src/main/java/it/integry/ems/production/agribook/model/HarvestHistoryDTO.java rename to ems-engine/src/main/java/it/integry/ems/production/agribook/model/AgribookHarvestHistoryDTO.java index 7ecafb04c5..5969a3d113 100644 --- a/ems-engine/src/main/java/it/integry/ems/production/agribook/model/HarvestHistoryDTO.java +++ b/ems-engine/src/main/java/it/integry/ems/production/agribook/model/AgribookHarvestHistoryDTO.java @@ -5,7 +5,7 @@ import it.integry.ems_model.annotation.SqlField; import java.math.BigDecimal; import java.time.LocalDate; -public class HarvestHistoryDTO { +public class AgribookHarvestHistoryDTO { @SqlField("data") public LocalDate data; @@ -18,7 +18,7 @@ public class HarvestHistoryDTO { return data; } - public HarvestHistoryDTO setData(LocalDate data) { + public AgribookHarvestHistoryDTO setData(LocalDate data) { this.data = data; return this; } @@ -27,7 +27,7 @@ public class HarvestHistoryDTO { return qta; } - public HarvestHistoryDTO setQta(BigDecimal qta) { + public AgribookHarvestHistoryDTO setQta(BigDecimal qta) { this.qta = qta; return this; } @@ -36,7 +36,7 @@ public class HarvestHistoryDTO { return squadra; } - public HarvestHistoryDTO setSquadra(String squadra) { + public AgribookHarvestHistoryDTO setSquadra(String squadra) { this.squadra = squadra; return this; } diff --git a/ems-engine/src/main/java/it/integry/ems/production/agribook/model/AgribookOrderDTO.java b/ems-engine/src/main/java/it/integry/ems/production/agribook/model/AgribookOrderDTO.java index 4e5c25ec99..4f88a8734e 100644 --- a/ems-engine/src/main/java/it/integry/ems/production/agribook/model/AgribookOrderDTO.java +++ b/ems-engine/src/main/java/it/integry/ems/production/agribook/model/AgribookOrderDTO.java @@ -71,8 +71,7 @@ public class AgribookOrderDTO extends ComposedEntityBase { private AgribookDestinatarioDTO destinatario; private MtbDepo mtbDepo; private List previsioniRaccolta; - private List prevRaccNumeroSettimane; - private List harvestHistory; + private List storicoRaccolta; private List attachments; @@ -361,21 +360,12 @@ public class AgribookOrderDTO extends ComposedEntityBase { return this; } - public List getHarvestHistory() { - return harvestHistory; + public List getStoricoRaccolta() { + return storicoRaccolta; } - public AgribookOrderDTO setHarvestHistory(List harvestHistory) { - this.harvestHistory = harvestHistory; - return this; - } - - public List getPrevRaccNumeroSettimane() { - return prevRaccNumeroSettimane; - } - - public AgribookOrderDTO setPrevRaccNumeroSettimane(List prevRaccNumeroSettimane) { - this.prevRaccNumeroSettimane = prevRaccNumeroSettimane; + public AgribookOrderDTO setStoricoRaccolta(List storicoRaccolta) { + this.storicoRaccolta = storicoRaccolta; return this; } } diff --git a/ems-engine/src/main/java/it/integry/ems/production/agribook/model/AgribookPrevRaccoltaDTO.java b/ems-engine/src/main/java/it/integry/ems/production/agribook/model/AgribookPrevRaccoltaDTO.java index dd755942db..a6e5c6e035 100644 --- a/ems-engine/src/main/java/it/integry/ems/production/agribook/model/AgribookPrevRaccoltaDTO.java +++ b/ems-engine/src/main/java/it/integry/ems/production/agribook/model/AgribookPrevRaccoltaDTO.java @@ -1,21 +1,21 @@ package it.integry.ems.production.agribook.model; -import java.util.Date; +import java.time.LocalDateTime; public class AgribookPrevRaccoltaDTO { - Date dataRilevazione; - Integer numSettimana; - Integer qtaSettimana; - Integer percClassePremium; - Integer percClasse1; - Integer percClasse2; + private LocalDateTime dataRilevazione; + private Integer numSettimana; + private Integer qtaSettimana; + private Integer percClassePremium; + private Integer percClasse1; + private Integer percClasse2; - public Date getDataRilevazione() { + public LocalDateTime getDataRilevazione() { return dataRilevazione; } - public AgribookPrevRaccoltaDTO setDataRilevazione(Date dataRilevazione) { + public AgribookPrevRaccoltaDTO setDataRilevazione(LocalDateTime dataRilevazione) { this.dataRilevazione = dataRilevazione; return this; } diff --git a/ems-engine/src/main/java/it/integry/ems/production/agribook/model/AgribookReportDTO.java b/ems-engine/src/main/java/it/integry/ems/production/agribook/model/AgribookReportDTO.java index 503610b99b..d3675b0194 100644 --- a/ems-engine/src/main/java/it/integry/ems/production/agribook/model/AgribookReportDTO.java +++ b/ems-engine/src/main/java/it/integry/ems/production/agribook/model/AgribookReportDTO.java @@ -3,7 +3,7 @@ package it.integry.ems.production.agribook.model; import it.integry.ems_model.annotation.SqlField; import it.integry.ems_model.entity.StbActivity; -import java.util.Date; +import java.time.LocalDateTime; import java.util.List; public class AgribookReportDTO { @@ -25,7 +25,7 @@ public class AgribookReportDTO { @SqlField("destinazione") private List destinazioni; @SqlField("data_rilevazione") - private Date dataRilevazione; + private LocalDateTime dataRilevazione; @SqlField("note") private String note; @SqlField("activity_id") @@ -117,11 +117,11 @@ public class AgribookReportDTO { return this; } - public Date getDataRilevazione() { + public LocalDateTime getDataRilevazione() { return dataRilevazione; } - public AgribookReportDTO setDataRilevazione(Date dataRilevazione) { + public AgribookReportDTO setDataRilevazione(LocalDateTime dataRilevazione) { this.dataRilevazione = dataRilevazione; return this; } From b1a7ea448214e96f92e8cd42616dbc2f404dca40 Mon Sep 17 00:00:00 2001 From: AnthonyS Date: Mon, 13 May 2024 17:50:00 +0200 Subject: [PATCH 05/11] Corretto inserimento data chiusura lotto in caso di terminazione linea --- .../service/MesProductionServiceV2.java | 1 + .../production/service/ProductionService.java | 38 +++++++++++-------- 2 files changed, 24 insertions(+), 15 deletions(-) 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 61bf9696df..0a56e7d656 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 @@ -1213,6 +1213,7 @@ public class MesProductionServiceV2 { break; case CLOSE: this.closeStep(ordine.getDataOrd(), ordine.getNumOrd(), ordine.getGestione(), groupStepDTO.getCodJfas(), null, null); + break; case STOP: String codDtipScar = setupGest.getSetup("W_PORDI_RC", "SETUP_DOCUMENTI", "COD_DTIP_SCAR"); diff --git a/ems-engine/src/main/java/it/integry/ems/production/service/ProductionService.java b/ems-engine/src/main/java/it/integry/ems/production/service/ProductionService.java index 612d7c48e0..da78d4dc9c 100644 --- a/ems-engine/src/main/java/it/integry/ems/production/service/ProductionService.java +++ b/ems-engine/src/main/java/it/integry/ems/production/service/ProductionService.java @@ -813,18 +813,6 @@ public class ProductionService { if (chiusuraLavorazioneDTO.isChiudiOrdine()) { entityBaseList.addAll(evadiIdLotto(chiusuraLavorazioneDTO.getIdLotto(), chiusuraLavorazioneDTO.getCodJfas())); - - Date dataDoc = chiusuraLavorazioneDTO.getCaricoLavorazioneDTO() != null && chiusuraLavorazioneDTO.getCaricoLavorazioneDTO().getDataDoc() != null ? chiusuraLavorazioneDTO.getCaricoLavorazioneDTO().getDataDoc() : new Date(); - - JtbLott jtbLott = new JtbLott() - .setIdLotto(chiusuraLavorazioneDTO.getIdLotto()) - .setCodJfas(chiusuraLavorazioneDTO.getCodJfas()) - .setDataChiusura(dataDoc) - .setFlagComp("S"); - - jtbLott.setOperation(OperationType.UPDATE); - - entityBaseList.add(jtbLott); } else if (chiusuraLavorazioneDTO.isTerminaLavorazioneLinea()) { entityBaseList.add(terminaLavorazioneLinea(chiusuraLavorazioneDTO.getOrdine(), chiusuraLavorazioneDTO.getCodJfas())); } @@ -833,6 +821,26 @@ public class ProductionService { entityBaseList.addAll(documentProdService.generaDocumentiLavorazioneIdLotto(chiusuraLavorazioneDTO)); } + Date dataDoc; + + if (chiusuraLavorazioneDTO.getCaricoLavorazioneDTO() != null && chiusuraLavorazioneDTO.getCaricoLavorazioneDTO().getDataDoc() != null) { + dataDoc = chiusuraLavorazioneDTO.getCaricoLavorazioneDTO().getDataDoc(); + } else if (chiusuraLavorazioneDTO.getScaricoLavorazioneDTO() != null && chiusuraLavorazioneDTO.getScaricoLavorazioneDTO().getDataDoc() != null) { + dataDoc = chiusuraLavorazioneDTO.getScaricoLavorazioneDTO().getDataDoc(); + } else { + dataDoc = new Date(); + } + + JtbLott jtbLott = new JtbLott() + .setIdLotto(chiusuraLavorazioneDTO.getIdLotto()) + .setCodJfas(chiusuraLavorazioneDTO.getCodJfas()) + .setDataChiusura(dataDoc) + .setFlagComp("S"); + + jtbLott.setOperation(OperationType.UPDATE); + + entityBaseList.add(jtbLott); + if (chiusuraLavorazioneDTO.isSalvaDocumenti()) { entityProcessor.processEntityList(entityBaseList, true); } @@ -1019,17 +1027,17 @@ public class ProductionService { DtbOrdr rigaDist = righeOrdLav.stream().filter(x -> x.getCodMart().equalsIgnoreCase(mod.getCodMart())).findFirst().orElse(null); if (rigaDist != null) { rigaDist.setOperation(OperationType.UPDATE); - if (!UtilityString.isNullOrEmpty(mod.getPartitaMag())){ + if (!UtilityString.isNullOrEmpty(mod.getPartitaMag())) { rigaDist.setPartitaMag(mod.getPartitaMag()); } - if (!UtilityBigDecimal.isNullOrZero(mod.getValUnt())){ + if (!UtilityBigDecimal.isNullOrZero(mod.getValUnt())) { rigaDist.setValUnt(mod.getValUnt()); } ordLav.getDtbOrdr().add(rigaDist); } } - entityProcessor.processEntity(ordLav,multiDBTransactionManager); + entityProcessor.processEntity(ordLav, multiDBTransactionManager); UtilityEntity.throwEntityException(ordLav); } } From 432e52536b2d57e62dd991419c3ac7dfff7ed237 Mon Sep 17 00:00:00 2001 From: FabioN Date: Mon, 13 May 2024 18:01:44 +0200 Subject: [PATCH 06/11] Aggiunta campo Flag_calc_peso_intra --- .../model/Migration_20240513175747.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513175747.java diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513175747.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513175747.java new file mode 100644 index 0000000000..2636d08b6f --- /dev/null +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513175747.java @@ -0,0 +1,17 @@ +package it.integry.ems.migration.model;import it.integry.ems.migration._base.BaseMigration; +import it.integry.ems.migration._base.MigrationModelInterface; + +public class Migration_20240513175747 extends BaseMigration implements MigrationModelInterface{ + + @Override + public void up()throws Exception { + if(isHistoryDB()) + return; + } + + @Override + public void down()throws Exception{ + + } + +} \ No newline at end of file From cf526b8003d5275472c1a6131497ef82fd6836d6 Mon Sep 17 00:00:00 2001 From: FabioN Date: Mon, 13 May 2024 18:02:03 +0200 Subject: [PATCH 07/11] Aggiunta campo Flag_calc_peso_intra --- .../migration/model/Migration_20240513175747.java | 15 ++++++++++----- .../java/it/integry/ems_model/entity/DtbTipi.java | 14 ++++++++++++++ 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513175747.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513175747.java index 2636d08b6f..7b94d7af92 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513175747.java +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513175747.java @@ -1,16 +1,21 @@ -package it.integry.ems.migration.model;import it.integry.ems.migration._base.BaseMigration; +package it.integry.ems.migration.model; + +import it.integry.ems.migration._base.BaseMigration; import it.integry.ems.migration._base.MigrationModelInterface; -public class Migration_20240513175747 extends BaseMigration implements MigrationModelInterface{ +public class Migration_20240513175747 extends BaseMigration implements MigrationModelInterface { @Override - public void up()throws Exception { - if(isHistoryDB()) + public void up() throws Exception { + if (isHistoryDB()) return; + + executeStatement("update dtb_tipi set flag_calc_peso_intra = 'N';"); + executeStatement("ALTER TABLE dtb_tipi ALTER COLUMN flag_calc_peso_intra varchar(1) not null;"); } @Override - public void down()throws Exception{ + public void down() throws Exception { } diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/DtbTipi.java b/ems-core/src/main/java/it/integry/ems_model/entity/DtbTipi.java index 3ad68f713a..c3e4dd6410 100644 --- a/ems-core/src/main/java/it/integry/ems_model/entity/DtbTipi.java +++ b/ems-core/src/main/java/it/integry/ems_model/entity/DtbTipi.java @@ -7,6 +7,8 @@ import it.integry.ems_model.annotation.*; import it.integry.ems_model.base.EntityBase; import it.integry.ems_model.utility.UtilityString; import org.kie.api.definition.type.PropertyReactive; + +import javax.persistence.criteria.CriteriaBuilder; import java.util.Date; import java.util.List; @@ -201,6 +203,9 @@ public class DtbTipi extends EntityBase { @SqlField(value = "flag_cons_consumi", nullable = false, defaultObjectValue = "0") private Boolean flagConsConsumi; + @SqlField(value = "flag_sezione", nullable = false) + private String flagSezione; + @EntityChild private List dtbTipiAnag; @@ -710,6 +715,15 @@ public class DtbTipi extends EntityBase { return this; } + public String getFlagSezione() { + return flagSezione; + } + + public DtbTipi setFlagSezione(String flagSezione) { + this.flagSezione = flagSezione; + return this; + } + public List getDtbTipiAnag() { return dtbTipiAnag; } From b1d10af8217eac3b441925a08ce47edf1db5bbd6 Mon Sep 17 00:00:00 2001 From: FabioN Date: Mon, 13 May 2024 18:20:34 +0200 Subject: [PATCH 08/11] Aggiunta campo Flag_calc_peso_intra --- .../model/Migration_20240513175747.java | 22 ------------------- 1 file changed, 22 deletions(-) delete mode 100644 ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513175747.java diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513175747.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513175747.java deleted file mode 100644 index 7b94d7af92..0000000000 --- a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513175747.java +++ /dev/null @@ -1,22 +0,0 @@ -package it.integry.ems.migration.model; - -import it.integry.ems.migration._base.BaseMigration; -import it.integry.ems.migration._base.MigrationModelInterface; - -public class Migration_20240513175747 extends BaseMigration implements MigrationModelInterface { - - @Override - public void up() throws Exception { - if (isHistoryDB()) - return; - - executeStatement("update dtb_tipi set flag_calc_peso_intra = 'N';"); - executeStatement("ALTER TABLE dtb_tipi ALTER COLUMN flag_calc_peso_intra varchar(1) not null;"); - } - - @Override - public void down() throws Exception { - - } - -} \ No newline at end of file From 77435690346e995c8a7d3a14c83b8968729727e6 Mon Sep 17 00:00:00 2001 From: FabioN Date: Mon, 13 May 2024 18:32:59 +0200 Subject: [PATCH 09/11] Aggiunta campo Flag_calc_peso_intra --- .../model/Migration_20240513103201.java | 21 ------------------- .../model/Migration_20240513182721.java | 17 +++++++++++++++ 2 files changed, 17 insertions(+), 21 deletions(-) delete mode 100644 ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513103201.java create mode 100644 ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513182721.java diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513103201.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513103201.java deleted file mode 100644 index bc875f532f..0000000000 --- a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513103201.java +++ /dev/null @@ -1,21 +0,0 @@ -package it.integry.ems.migration.model; - -import it.integry.ems.migration._base.BaseMigration; -import it.integry.ems.migration._base.MigrationModelInterface; - -public class Migration_20240513103201 extends BaseMigration implements MigrationModelInterface { - - @Override - public void up() throws Exception { - if (isHistoryDB()) - return; - - executeStatement("alter table dtb_tipi add flag_calc_peso_intra varchar (1) null;"); - } - - @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_20240513182721.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513182721.java new file mode 100644 index 0000000000..59e1abeebc --- /dev/null +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513182721.java @@ -0,0 +1,17 @@ +package it.integry.ems.migration.model;import it.integry.ems.migration._base.BaseMigration; +import it.integry.ems.migration._base.MigrationModelInterface; + +public class Migration_20240513182721 extends BaseMigration implements MigrationModelInterface{ + + @Override + public void up()throws Exception { + if(isHistoryDB()) + return; + } + + @Override + public void down()throws Exception{ + + } + +} \ No newline at end of file From 5c46e4aed5538190664c03164515bdc32e74abba Mon Sep 17 00:00:00 2001 From: FabioN Date: Mon, 13 May 2024 18:33:06 +0200 Subject: [PATCH 10/11] Aggiunta campo Flag_calc_peso_intra --- .../migration/model/Migration_20240513182721.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513182721.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513182721.java index 59e1abeebc..fd3299b22c 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513182721.java +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240513182721.java @@ -1,16 +1,20 @@ -package it.integry.ems.migration.model;import it.integry.ems.migration._base.BaseMigration; +package it.integry.ems.migration.model; + +import it.integry.ems.migration._base.BaseMigration; import it.integry.ems.migration._base.MigrationModelInterface; -public class Migration_20240513182721 extends BaseMigration implements MigrationModelInterface{ +public class Migration_20240513182721 extends BaseMigration implements MigrationModelInterface { @Override - public void up()throws Exception { - if(isHistoryDB()) + public void up() throws Exception { + if (isHistoryDB()) return; + + executeStatement("alter table dtb_tipi add flag_calc_peso_intra varchar (1) null;"); } @Override - public void down()throws Exception{ + public void down() throws Exception { } From 03b3a25b861491fe3cfca69df7ef7721c45af688 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 14 May 2024 11:39:05 +0200 Subject: [PATCH 11/11] Migration per AnsiPadding --- .../model/Migration_20240426173500.java | 2 +- .../model/Migration_20240506152142.java | 10 ++-- .../model/Migration_20240514113425.java | 58 +++++++++++++++++++ .../service/MesProductionServiceV2.java | 4 +- 4 files changed, 65 insertions(+), 9 deletions(-) create mode 100644 ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240514113425.java diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240426173500.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240426173500.java index e9c6a156bf..be5aaf0fd6 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240426173500.java +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240426173500.java @@ -17,7 +17,7 @@ public class Migration_20240426173500 extends BaseMigration implements Migration if (!isCustomerDb( IntegryCustomerDB.Carelli_Format) ) - return; + return; updateSetupValue("EXPORT_DOCUMENTI VENDITA", "DIALOGO", "INSERT_LOG", "S"); } diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240506152142.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240506152142.java index 173f700c35..ff9e9cd2b8 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240506152142.java +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240506152142.java @@ -11,12 +11,12 @@ public class Migration_20240506152142 extends BaseMigration implements Migration if (isHistoryDB()) return; - if (!isCustomerDb( - IntegryCustomerDB.Gramm_Gramm)){ - return; - } + if (!isCustomerDb( + IntegryCustomerDB.Gramm_Gramm)) { + return; + } - createSetup("IMPORT_ORDINI", "EURITMO", "SET_DATA_CONS_CLIE_C2339", "N", "Se impostato a S allora la data di consegna non viene calcolata, ma presa quella del cliente", false, null, false, false, false, false, false, null, false, null); + createSetup("IMPORT_ORDINI", "EURITMO", "SET_DATA_CONS_CLIE_C2339", "N", "Se impostato a S allora la data di consegna non viene calcolata, ma presa quella del cliente", false, null, false, false, false, false, false, null, false, null); } @Override diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240514113425.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240514113425.java new file mode 100644 index 0000000000..069d8802dd --- /dev/null +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240514113425.java @@ -0,0 +1,58 @@ +package it.integry.ems.migration.model; + +import it.integry.ems.entity_logger.db_schema_manager.component.SQLServerDBSchemaManager; +import it.integry.ems.migration._base.BaseMigration; +import it.integry.ems.migration._base.IntegryCustomer; +import it.integry.ems.migration._base.MigrationModelInterface; + +import java.util.List; + +public class Migration_20240514113425 extends BaseMigration implements MigrationModelInterface { + + @Override + public void up() throws Exception { + if (isHistoryDB()) + return; + + if (isCustomer( + IntegryCustomer.Biolevante, + IntegryCustomer.Cosmapack, + IntegryCustomer.Didonna, + IntegryCustomer.DolceBonta, + IntegryCustomer.Dulciar, + IntegryCustomer.FolliesGroup, + IntegryCustomer.Fiume, + IntegryCustomer.Frudis, + IntegryCustomer.Idrotecnica, + IntegryCustomer.Ime, + IntegryCustomer.Ivr, + IntegryCustomer.Lamonarca, + IntegryCustomer.Maggio, + IntegryCustomer.Materica, + IntegryCustomer.Midel, + IntegryCustomer.Morgante, + IntegryCustomer.ResinaColor, + IntegryCustomer.RossoGargano, + IntegryCustomer.Salpar, + IntegryCustomer.Sardinya, + IntegryCustomer.Smetar, + IntegryCustomer.Tosca, + IntegryCustomer.TwoBrothers, + IntegryCustomer.Vinella)) { + updateSetupValue("DATI_AZIENDA", "SETUP", "DELIMITED_IDENTIFIER", "1"); + updateSetupValue("DATI_AZIENDA", "SETUP", "FLAG_ANSI_PADDING", "S"); + updateSetupValue("DATI_AZIENDA", "SETUP", "FLAG_CONCAT_NULL_YIELDS_NULL", "S"); + + SQLServerDBSchemaManager schemaManager = new SQLServerDBSchemaManager(this.advancedDataSource.getConnection()); + final List queries = schemaManager.generateAlterTableToDisableAnsiPadding(); + + //executeStatement(queries.toArray(new String[0])); + } + } + + @Override + public void down() throws Exception { + + } + +} \ No newline at end of file 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 0a56e7d656..8d0b0fd3b4 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 @@ -46,7 +46,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import java.text.SimpleDateFormat; import java.util.*; @Service @@ -902,12 +901,11 @@ public class MesProductionServiceV2 { public MtbColt createColloCaricoProdottoFinito(CaricoProdottoFinitoDTO dto) throws Exception { - - DtbOrdt ordineLav = new DtbOrdt() .setDataOrd(dto.getDataOrd()) .setGestione(dto.getGestione()) .setNumOrd(dto.getNumOrd()); + ordineLav.setOperation(OperationType.SELECT_OBJECT); entityProcessor.processEntity(ordineLav, multiDBTransactionManager); MtbAart mtbAart = new MtbAart().setCodMart(ordineLav.getCodProd());