From 30e599140dbb63d1ebfa70b64c2cb71e42618e70 Mon Sep 17 00:00:00 2001 From: ValerioC Date: Wed, 18 Sep 2024 16:39:22 +0200 Subject: [PATCH] [ROSSOGARGANO] corretta imoortazione certificati valorizzati --- .../production/service/RossoGarganoProductionService.java | 2 +- .../production/dto/ortofrutta/AccettazioneOrtoFruttaDTO.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ems-engine/src/main/java/it/integry/ems/customizations/production/service/RossoGarganoProductionService.java b/ems-engine/src/main/java/it/integry/ems/customizations/production/service/RossoGarganoProductionService.java index 7c18980b91..101ea3b65f 100644 --- a/ems-engine/src/main/java/it/integry/ems/customizations/production/service/RossoGarganoProductionService.java +++ b/ems-engine/src/main/java/it/integry/ems/customizations/production/service/RossoGarganoProductionService.java @@ -282,7 +282,7 @@ public class RossoGarganoProductionService { " collo.data_collo AS dataCollo,\n" + " collo.num_collo AS numCollo,\n" + " collo.ser_collo AS serCollo,\n" + - " ddt.cod_anag AS codAnag,\n" + + " ISNULL(ddt.cod_anag, Certificato.cod_anag) AS codAnag,\n" + " collo.cod_mdep AS codMdepProd,\n" + " collo.ora_fine_prep AS oraFinePrep,\n" + " collo.ora_iniz_prep AS oraInizPrep,\n" + diff --git a/ems-engine/src/main/java/it/integry/ems/production/dto/ortofrutta/AccettazioneOrtoFruttaDTO.java b/ems-engine/src/main/java/it/integry/ems/production/dto/ortofrutta/AccettazioneOrtoFruttaDTO.java index 46f5aceb52..5e3614b27a 100644 --- a/ems-engine/src/main/java/it/integry/ems/production/dto/ortofrutta/AccettazioneOrtoFruttaDTO.java +++ b/ems-engine/src/main/java/it/integry/ems/production/dto/ortofrutta/AccettazioneOrtoFruttaDTO.java @@ -5,6 +5,7 @@ import it.integry.ems_model.annotation.SqlField; import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; +import java.util.Objects; public class AccettazioneOrtoFruttaDTO implements Cloneable { @@ -672,7 +673,7 @@ public class AccettazioneOrtoFruttaDTO implements Cloneable { if (this.original == null) return false; - return !this.original.getCodAnag().equalsIgnoreCase(this.codAnag) + return !Objects.equals(this.original.getCodAnag(),this.codAnag) || !this.original.getCodDtip().equalsIgnoreCase(this.codDtip); } @@ -681,7 +682,7 @@ public class AccettazioneOrtoFruttaDTO implements Cloneable { if (this.original == null) return false; - return !this.original.getCodAnag().equalsIgnoreCase(this.codAnag) + return !Objects.equals(this.original.getCodAnag(),this.codAnag) || !this.original.getCodDtipProvv().equalsIgnoreCase(this.codDtipProvv) || !(this.original.getNumDocProvv().equals(this.numDocProvv)) || !this.original.getSerDocProvv().equalsIgnoreCase(this.serDocProvv)