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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Valerio Castellana
2024-09-18 16:39:31 +02:00
parent 7ae54057a4 724c875f72
commit 5fa18833e7
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ems-engine/src/main/java/it/integry/ems/customizations/production/service/RossoGarganoProductionService.java
View File

@@ -282,7 +282,7 @@ public class RossoGarganoProductionService {
" collo.data_collo AS dataCollo,\n" + " collo.data_collo AS dataCollo,\n" +
" collo.num_collo AS numCollo,\n" + " collo.num_collo AS numCollo,\n" +
" collo.ser_collo AS serCollo,\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.cod_mdep AS codMdepProd,\n" +
" collo.ora_fine_prep AS oraFinePrep,\n" + " collo.ora_fine_prep AS oraFinePrep,\n" +
" collo.ora_iniz_prep AS oraInizPrep,\n" + " collo.ora_iniz_prep AS oraInizPrep,\n" +

5
ems-engine/src/main/java/it/integry/ems/production/dto/ortofrutta/AccettazioneOrtoFruttaDTO.java
View File

@@ -5,6 +5,7 @@ import it.integry.ems_model.annotation.SqlField;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Objects;
public class AccettazioneOrtoFruttaDTO implements Cloneable { public class AccettazioneOrtoFruttaDTO implements Cloneable {
@@ -672,7 +673,7 @@ public class AccettazioneOrtoFruttaDTO implements Cloneable {
if (this.original == null) if (this.original == null)
return false; return false;
return !this.original.getCodAnag().equalsIgnoreCase(this.codAnag) return !Objects.equals(this.original.getCodAnag(),this.codAnag)
|| !this.original.getCodDtip().equalsIgnoreCase(this.codDtip); || !this.original.getCodDtip().equalsIgnoreCase(this.codDtip);
} }
@@ -681,7 +682,7 @@ public class AccettazioneOrtoFruttaDTO implements Cloneable {
if (this.original == null) if (this.original == null)
return false; 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.getCodDtipProvv().equalsIgnoreCase(this.codDtipProvv)
|| !(this.original.getNumDocProvv().equals(this.numDocProvv)) || !(this.original.getNumDocProvv().equals(this.numDocProvv))
|| !this.original.getSerDocProvv().equalsIgnoreCase(this.serDocProvv) || !this.original.getSerDocProvv().equalsIgnoreCase(this.serDocProvv)