Fix collisione classi ArticoloPartita

ems-core/src/main/java/it/integry/ems/dto/ArticoloPartitaCommessaDTO.java

@@ -0,0 +1,30 @@
+package it.integry.ems.dto;
+
+import java.util.Objects;
+
+public class ArticoloPartitaCommessaDTO extends ArticoloPartitaDTO {
+
+    private String codJcom;
+
+    @Override
+    public boolean equals(Object o) {
+        if (!(o instanceof ArticoloPartitaCommessaDTO)) return false;
+        if (!super.equals(o)) return false;
+        ArticoloPartitaCommessaDTO that = (ArticoloPartitaCommessaDTO) o;
+        return Objects.equals(getCodJcom(), that.getCodJcom());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), getCodJcom());
+    }
+
+    public String getCodJcom() {
+        return codJcom;
+    }
+
+    public ArticoloPartitaCommessaDTO setCodJcom(String codJcom) {
+        this.codJcom = codJcom;
+        return this;
+    }
+}

ems-core/src/main/java/it/integry/ems/dto/ArticoloPartitaDTO.java

@@ -1,4 +1,4 @@
-package it.integry.ems.document.dto;
+package it.integry.ems.dto;
 
 import java.util.Objects;
 

ems-engine/src/main/java/it/integry/ems/document/dto/UlVenditaDTO.java

@@ -1,5 +1,6 @@
 package it.integry.ems.document.dto;
 
+import it.integry.ems.dto.ArticoloPartitaDTO;
 import it.integry.ems_model.annotation.SqlField;
 
 import java.math.BigDecimal;

ems-engine/src/main/java/it/integry/ems/retail/wms/dto/ArticoloPartitaDTO.java

@@ -1,35 +0,0 @@
-package it.integry.ems.retail.wms.dto;
-
-public class ArticoloPartitaDTO {
-
-    private String codMart;
-    private String partitaMag;
-    private String codJcom;
-
-    public String getCodMart() {
-        return codMart;
-    }
-
-    public ArticoloPartitaDTO setCodMart(String codMart) {
-        this.codMart = codMart;
-        return this;
-    }
-
-    public String getPartitaMag() {
-        return partitaMag;
-    }
-
-    public ArticoloPartitaDTO setPartitaMag(String partitaMag) {
-        this.partitaMag = partitaMag;
-        return this;
-    }
-
-    public String getCodJcom() {
-        return codJcom;
-    }
-
-    public ArticoloPartitaDTO setCodJcom(String codJcom) {
-        this.codJcom = codJcom;
-        return this;
-    }
-}

ems-engine/src/main/java/it/integry/ems/retail/wms/resi/dto/RetrieveUltimeConsegneClienteWithBarcodesRequestDTO.java

@@ -1,6 +1,6 @@
 package it.integry.ems.retail.wms.resi.dto;
 
-import it.integry.ems.retail.wms.dto.ArticoloPartitaDTO;
+import it.integry.ems.dto.ArticoloPartitaCommessaDTO;
 
 import java.util.List;
 
@@ -8,7 +8,7 @@ public class RetrieveUltimeConsegneClienteWithBarcodesRequestDTO {
 
     private String codMdep;
     private String codAnag;
-    private List<ArticoloPartitaDTO> arts;
+    private List<ArticoloPartitaCommessaDTO> arts;
     private Integer limitConsegnePerCli;
     private Integer limitDays;
 
@@ -30,11 +30,11 @@ public class RetrieveUltimeConsegneClienteWithBarcodesRequestDTO {
         return this;
     }
 
-    public List<ArticoloPartitaDTO> getArts() {
+    public List<ArticoloPartitaCommessaDTO> getArts() {
         return arts;
     }
 
-    public RetrieveUltimeConsegneClienteWithBarcodesRequestDTO setArts(List<ArticoloPartitaDTO> arts) {
+    public RetrieveUltimeConsegneClienteWithBarcodesRequestDTO setArts(List<ArticoloPartitaCommessaDTO> arts) {
         this.arts = arts;
         return this;
     }

ems-engine/src/main/java/it/integry/ems/retail/wms/resi/service/WMSResiClientiService.java

@@ -1,6 +1,6 @@
 package it.integry.ems.retail.wms.resi.service;
 
-import it.integry.ems.retail.wms.dto.ArticoloPartitaDTO;
+import it.integry.ems.dto.ArticoloPartitaCommessaDTO;
 import it.integry.ems.retail.wms.resi.dto.ResoClienteDTO;
 import it.integry.ems.retail.wms.resi.dto.ResoClienteWithBarcodeDTO;
 import it.integry.ems.retail.wms.resi.dto.ScaricoUdcInDocumentDTO;
@@ -62,7 +62,7 @@ public class WMSResiClientiService {
         return result;
     }
 
-    public List<ResoClienteWithBarcodeDTO> retrieveUltimeConsegneWithBarcodes(String codMdep, String codAnag, List<ArticoloPartitaDTO> arts, Integer limitConsegnePerCli, Integer limitDays) throws Exception {
+    public List<ResoClienteWithBarcodeDTO> retrieveUltimeConsegneWithBarcodes(String codMdep, String codAnag, List<ArticoloPartitaCommessaDTO> arts, Integer limitConsegnePerCli, Integer limitDays) throws Exception {
 
         String sql = "SELECT consegne.*, " +
                 "       rag_soc," +
@@ -191,7 +191,7 @@ public class WMSResiClientiService {
         return result;
     }
 
-    public List<ResoClienteWithBarcodeDTO> retrieveScarichiInDocuments(List<DtbDoctKey> documents, List<ArticoloPartitaDTO> artsToFilter) throws Exception {
+    public List<ResoClienteWithBarcodeDTO> retrieveScarichiInDocuments(List<DtbDoctKey> documents, List<ArticoloPartitaCommessaDTO> artsToFilter) throws Exception {
         userSession.checkUser();
 
         String sql = "SELECT mtb_colt.cod_anag,\n" +