diff --git a/ems-core/src/main/java/it/integry/ems_model/base/EquatableEntityInterface.java b/ems-core/src/main/java/it/integry/ems_model/base/EquatableEntityInterface.java
index 2198e2d8e7..60d0d860af 100644
--- a/ems-core/src/main/java/it/integry/ems_model/base/EquatableEntityInterface.java
+++ b/ems-core/src/main/java/it/integry/ems_model/base/EquatableEntityInterface.java
@@ -2,10 +2,13 @@ package it.integry.ems_model.base;
 
 public interface EquatableEntityInterface<T> extends EntityInterface {
 
+    int hashCodeKey();
+
+    int hashCode();
 
     boolean equalsKey(T other);
 
-    boolean equalsContent(T other);
+    boolean equals(Object other);
 
 
 }
diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/DtbDocr.java b/ems-core/src/main/java/it/integry/ems_model/entity/DtbDocr.java
index 7eaf1df7a9..9eba4f2db5 100644
--- a/ems-core/src/main/java/it/integry/ems_model/entity/DtbDocr.java
+++ b/ems-core/src/main/java/it/integry/ems_model/entity/DtbDocr.java
@@ -1425,17 +1425,19 @@ public class DtbDocr extends DtbBaseDocR implements EquatableEntityInterface<Dtb
     }
 
     @Override
-    public boolean equalsKey(DtbDocr other) {
-        if (this == other)
-            return true;
-        return Objects.equals(getCodAnag(), other.getCodAnag()) && Objects.equals(getCodDtip(), other.getCodDtip()) && Objects.equals(getDataDoc(), other.getDataDoc()) && Objects.equals(getIdRiga(), other.getIdRiga()) && Objects.equals(getNumDoc(), other.getNumDoc()) && Objects.equals(getSerDoc(), other.getSerDoc());
+    public int hashCodeKey() {
+        return Objects.hash(getCodAnag(), getCodDtip(), getDataDoc(), getNumDoc(), getSerDoc(), getIdRiga());
     }
 
     @Override
-    public boolean equalsContent(DtbDocr other) {
+    public boolean equalsKey(DtbDocr other) {
         if (this == other)
             return true;
-        return Objects.equals(getCodAnag(), other.getCodAnag()) && Objects.equals(getCodDtip(), other.getCodDtip()) && Objects.equals(getDataDoc(), other.getDataDoc()) && Objects.equals(getIdRiga(), other.getIdRiga()) && Objects.equals(getNumDoc(), other.getNumDoc()) && Objects.equals(getSerDoc(), other.getSerDoc()) && Objects.equals(getCodAliq(), other.getCodAliq()) && Objects.equals(getCodAnagComp(), other.getCodAnagComp()) && Objects.equals(getCodArtFor(), other.getCodArtFor()) && Objects.equals(getCodCol(), other.getCodCol()) && Objects.equals(getCodDtipComp(), other.getCodDtipComp()) && Objects.equals(getCodJcom(), other.getCodJcom()) && Objects.equals(getCodMart(), other.getCodMart()) && Objects.equals(getCodMdep(), other.getCodMdep()) && Objects.equals(getCodPromo(), other.getCodPromo()) && Objects.equals(getCodTagl(), other.getCodTagl()) && Objects.equals(getCostoUnt(), other.getCostoUnt()) && Objects.equals(getDataDocComp(), other.getDataDocComp()) && Objects.equals(getDataOrd(), other.getDataOrd()) && Objects.equals(getDescrizione(), other.getDescrizione()) && Objects.equals(getDescrizioneEstesa(), other.getDescrizioneEstesa()) && Objects.equals(getFlagEvasoForzato(), other.getFlagEvasoForzato()) && Objects.equals(getImportoRiga(), other.getImportoRiga()) && Objects.equals(getNumCnf(), other.getNumCnf()) && Objects.equals(getNumDocComp(), other.getNumDocComp()) && Objects.equals(getNumOrd(), other.getNumOrd()) && Objects.equals(getPartitaMag(), other.getPartitaMag()) && Objects.equals(getPercGest(), other.getPercGest()) && Objects.equals(getPercIspe(), other.getPercIspe()) && Objects.equals(getPercOneri(), other.getPercOneri()) && Objects.equals(getPercPromo(), other.getPercPromo()) && Objects.equals(getPercProv(), other.getPercProv()) && Objects.equals(getPercProv2(), other.getPercProv2()) && Objects.equals(getPesoLordo(), other.getPesoLordo()) && Objects.equals(getPosizione(), other.getPosizione()) && Objects.equals(getQtaCnf(), other.getQtaCnf()) && Objects.equals(getQtaDoc(), other.getQtaDoc()) && Objects.equals(getQtaDoc2(), other.getQtaDoc2()) && Objects.equals(getQtaDoc3(), other.getQtaDoc3()) && Objects.equals(getRapConv(), other.getRapConv()) && Objects.equals(getRigaOrd(), other.getRigaOrd()) && Objects.equals(getSconto5(), other.getSconto5()) && Objects.equals(getSconto6(), other.getSconto6()) && Objects.equals(getSconto7(), other.getSconto7()) && Objects.equals(getSconto8(), other.getSconto8()) && Objects.equals(getSerDocComp(), other.getSerDocComp()) && Objects.equals(getUntDoc(), other.getUntDoc()) && Objects.equals(getUntDoc2(), other.getUntDoc2()) && Objects.equals(getUntDoc3(), other.getUntDoc3()) && Objects.equals(getValGest(), other.getValGest()) && Objects.equals(getValIspe(), other.getValIspe()) && Objects.equals(getValOneri(), other.getValOneri()) && Objects.equals(getValPromo(), other.getValPromo()) && Objects.equals(getValProv(), other.getValProv()) && Objects.equals(getValProv2(), other.getValProv2()) && Objects.equals(getValUnt(), other.getValUnt()) && Objects.equals(getValUntIva(), other.getValUntIva()) && Objects.equals(getCodMtip(), other.getCodMtip()) && Objects.equals(getMatricola(), other.getMatricola()) && Objects.equals(getDataInizComp(), other.getDataInizComp()) && Objects.equals(getDataFineComp(), other.getDataFineComp()) && Objects.equals(getCodKit(), other.getCodKit()) && Objects.equals(getCodAlis(), other.getCodAlis()) && Objects.equals(getDataInsRow(), other.getDataInsRow()) && Objects.equals(getNote(), other.getNote()) && Objects.equals(getCodTcolUi(), other.getCodTcolUi()) && Objects.equals(getCodTcolUl(), other.getCodTcolUl()) && Objects.equals(getColliPedana(), other.getColliPedana()) && Objects.equals(getActivityIdRow(), other.getActivityIdRow()) && Objects.equals(getIdContratto(), other.getIdContratto()) && Objects.equals(getFlagSezione(), other.getFlagSezione());
+
+        if(hashCodeKey() != other.hashCodeKey())
+            return false;
+
+        return Objects.equals(getCodAnag(), other.getCodAnag()) && Objects.equals(getCodDtip(), other.getCodDtip()) && Objects.equals(getDataDoc(), other.getDataDoc()) && Objects.equals(getIdRiga(), other.getIdRiga()) && Objects.equals(getNumDoc(), other.getNumDoc()) && Objects.equals(getSerDoc(), other.getSerDoc());
     }
 
     @Override
@@ -1444,12 +1446,13 @@ public class DtbDocr extends DtbBaseDocR implements EquatableEntityInterface<Dtb
             return true;
         if (!(object instanceof DtbDocr))
             return false;
-        DtbDocr dtbDocr = (DtbDocr) object;
-        return Objects.equals(getCodAnag(), dtbDocr.getCodAnag()) && Objects.equals(getCodDtip(), dtbDocr.getCodDtip()) && Objects.equals(getDataDoc(), dtbDocr.getDataDoc()) && Objects.equals(getIdRiga(), dtbDocr.getIdRiga()) && Objects.equals(getNumDoc(), dtbDocr.getNumDoc()) && Objects.equals(getSerDoc(), dtbDocr.getSerDoc()) && Objects.equals(getCodAliq(), dtbDocr.getCodAliq()) && Objects.equals(getCodAnagComp(), dtbDocr.getCodAnagComp()) && Objects.equals(getCodArtFor(), dtbDocr.getCodArtFor()) && Objects.equals(getCodCol(), dtbDocr.getCodCol()) && Objects.equals(getCodDtipComp(), dtbDocr.getCodDtipComp()) && Objects.equals(getCodJcom(), dtbDocr.getCodJcom()) && Objects.equals(getCodMart(), dtbDocr.getCodMart()) && Objects.equals(getCodMdep(), dtbDocr.getCodMdep()) && Objects.equals(getCodPromo(), dtbDocr.getCodPromo()) && Objects.equals(getCodTagl(), dtbDocr.getCodTagl()) && Objects.equals(getCostoUnt(), dtbDocr.getCostoUnt()) && Objects.equals(getDataDocComp(), dtbDocr.getDataDocComp()) && Objects.equals(getDataOrd(), dtbDocr.getDataOrd()) && Objects.equals(getDescrizione(), dtbDocr.getDescrizione()) && Objects.equals(getDescrizioneEstesa(), dtbDocr.getDescrizioneEstesa()) && Objects.equals(getFlagEvasoForzato(), dtbDocr.getFlagEvasoForzato()) && Objects.equals(getImportoRiga(), dtbDocr.getImportoRiga()) && Objects.equals(getNumCnf(), dtbDocr.getNumCnf()) && Objects.equals(getNumDocComp(), dtbDocr.getNumDocComp()) && Objects.equals(getNumOrd(), dtbDocr.getNumOrd()) && Objects.equals(getPartitaMag(), dtbDocr.getPartitaMag()) && Objects.equals(getPercGest(), dtbDocr.getPercGest()) && Objects.equals(getPercIspe(), dtbDocr.getPercIspe()) && Objects.equals(getPercOneri(), dtbDocr.getPercOneri()) && Objects.equals(getPercPromo(), dtbDocr.getPercPromo()) && Objects.equals(getPercProv(), dtbDocr.getPercProv()) && Objects.equals(getPercProv2(), dtbDocr.getPercProv2()) && Objects.equals(getPesoLordo(), dtbDocr.getPesoLordo()) && Objects.equals(getPosizione(), dtbDocr.getPosizione()) && Objects.equals(getQtaCnf(), dtbDocr.getQtaCnf()) && Objects.equals(getQtaDoc(), dtbDocr.getQtaDoc()) && Objects.equals(getQtaDoc2(), dtbDocr.getQtaDoc2()) && Objects.equals(getQtaDoc3(), dtbDocr.getQtaDoc3()) && Objects.equals(getRapConv(), dtbDocr.getRapConv()) && Objects.equals(getRigaOrd(), dtbDocr.getRigaOrd()) && Objects.equals(getSconto5(), dtbDocr.getSconto5()) && Objects.equals(getSconto6(), dtbDocr.getSconto6()) && Objects.equals(getSconto7(), dtbDocr.getSconto7()) && Objects.equals(getSconto8(), dtbDocr.getSconto8()) && Objects.equals(getSerDocComp(), dtbDocr.getSerDocComp()) && Objects.equals(getUntDoc(), dtbDocr.getUntDoc()) && Objects.equals(getUntDoc2(), dtbDocr.getUntDoc2()) && Objects.equals(getUntDoc3(), dtbDocr.getUntDoc3()) && Objects.equals(getValGest(), dtbDocr.getValGest()) && Objects.equals(getValIspe(), dtbDocr.getValIspe()) && Objects.equals(getValOneri(), dtbDocr.getValOneri()) && Objects.equals(getValPromo(), dtbDocr.getValPromo()) && Objects.equals(getValProv(), dtbDocr.getValProv()) && Objects.equals(getValProv2(), dtbDocr.getValProv2()) && Objects.equals(getValUnt(), dtbDocr.getValUnt()) && Objects.equals(getValUntIva(), dtbDocr.getValUntIva()) && Objects.equals(getCodMtip(), dtbDocr.getCodMtip()) && Objects.equals(getMatricola(), dtbDocr.getMatricola()) && Objects.equals(getDataInizComp(), dtbDocr.getDataInizComp()) && Objects.equals(getDataFineComp(), dtbDocr.getDataFineComp()) && Objects.equals(getCodKit(), dtbDocr.getCodKit()) && Objects.equals(getCodAlis(), dtbDocr.getCodAlis()) && Objects.equals(getDataInsRow(), dtbDocr.getDataInsRow()) && Objects.equals(getNote(), dtbDocr.getNote()) && Objects.equals(getCodTcolUi(), dtbDocr.getCodTcolUi()) && Objects.equals(getCodTcolUl(), dtbDocr.getCodTcolUl()) && Objects.equals(getColliPedana(), dtbDocr.getColliPedana()) && Objects.equals(getActivityIdRow(), dtbDocr.getActivityIdRow()) && Objects.equals(getIdContratto(), dtbDocr.getIdContratto()) && Objects.equals(getFlagSezione(), dtbDocr.getFlagSezione());
+        DtbDocr other = (DtbDocr) object;
+        return Objects.equals(getCodAnag(), other.getCodAnag()) && Objects.equals(getCodDtip(), other.getCodDtip()) && Objects.equals(getDataDoc(), other.getDataDoc()) && Objects.equals(getIdRiga(), other.getIdRiga()) && Objects.equals(getNumDoc(), other.getNumDoc()) && Objects.equals(getSerDoc(), other.getSerDoc()) && Objects.equals(getCodAliq(), other.getCodAliq()) && Objects.equals(getCodAnagComp(), other.getCodAnagComp()) && Objects.equals(getCodArtFor(), other.getCodArtFor()) && Objects.equals(getCodCol(), other.getCodCol()) && Objects.equals(getCodDtipComp(), other.getCodDtipComp()) && Objects.equals(getCodJcom(), other.getCodJcom()) && Objects.equals(getCodMart(), other.getCodMart()) && Objects.equals(getCodMdep(), other.getCodMdep()) && Objects.equals(getCodPromo(), other.getCodPromo()) && Objects.equals(getCodTagl(), other.getCodTagl()) && Objects.equals(getCostoUnt(), other.getCostoUnt()) && Objects.equals(getDataDocComp(), other.getDataDocComp()) && Objects.equals(getDataOrd(), other.getDataOrd()) && Objects.equals(getDescrizione(), other.getDescrizione()) && Objects.equals(getDescrizioneEstesa(), other.getDescrizioneEstesa()) && Objects.equals(getFlagEvasoForzato(), other.getFlagEvasoForzato()) && Objects.equals(getImportoRiga(), other.getImportoRiga()) && Objects.equals(getNumCnf(), other.getNumCnf()) && Objects.equals(getNumDocComp(), other.getNumDocComp()) && Objects.equals(getNumOrd(), other.getNumOrd()) && Objects.equals(getPartitaMag(), other.getPartitaMag()) && Objects.equals(getPercGest(), other.getPercGest()) && Objects.equals(getPercIspe(), other.getPercIspe()) && Objects.equals(getPercOneri(), other.getPercOneri()) && Objects.equals(getPercPromo(), other.getPercPromo()) && Objects.equals(getPercProv(), other.getPercProv()) && Objects.equals(getPercProv2(), other.getPercProv2()) && Objects.equals(getPesoLordo(), other.getPesoLordo()) && Objects.equals(getPosizione(), other.getPosizione()) && Objects.equals(getQtaCnf(), other.getQtaCnf()) && Objects.equals(getQtaDoc(), other.getQtaDoc()) && Objects.equals(getQtaDoc2(), other.getQtaDoc2()) && Objects.equals(getQtaDoc3(), other.getQtaDoc3()) && Objects.equals(getRapConv(), other.getRapConv()) && Objects.equals(getRigaOrd(), other.getRigaOrd()) && Objects.equals(getSconto5(), other.getSconto5()) && Objects.equals(getSconto6(), other.getSconto6()) && Objects.equals(getSconto7(), other.getSconto7()) && Objects.equals(getSconto8(), other.getSconto8()) && Objects.equals(getSerDocComp(), other.getSerDocComp()) && Objects.equals(getUntDoc(), other.getUntDoc()) && Objects.equals(getUntDoc2(), other.getUntDoc2()) && Objects.equals(getUntDoc3(), other.getUntDoc3()) && Objects.equals(getValGest(), other.getValGest()) && Objects.equals(getValIspe(), other.getValIspe()) && Objects.equals(getValOneri(), other.getValOneri()) && Objects.equals(getValPromo(), other.getValPromo()) && Objects.equals(getValProv(), other.getValProv()) && Objects.equals(getValProv2(), other.getValProv2()) && Objects.equals(getValUnt(), other.getValUnt()) && Objects.equals(getValUntIva(), other.getValUntIva()) && Objects.equals(getCodMtip(), other.getCodMtip()) && Objects.equals(getMatricola(), other.getMatricola()) && Objects.equals(getDataInizComp(), other.getDataInizComp()) && Objects.equals(getDataFineComp(), other.getDataFineComp()) && Objects.equals(getCodKit(), other.getCodKit()) && Objects.equals(getCodAlis(), other.getCodAlis()) && Objects.equals(getDataInsRow(), other.getDataInsRow()) && Objects.equals(getNote(), other.getNote()) && Objects.equals(getCodTcolUi(), other.getCodTcolUi()) && Objects.equals(getCodTcolUl(), other.getCodTcolUl()) && Objects.equals(getColliPedana(), other.getColliPedana()) && Objects.equals(getActivityIdRow(), other.getActivityIdRow()) && Objects.equals(getIdContratto(), other.getIdContratto()) && Objects.equals(getFlagSezione(), other.getFlagSezione());
     }
 
+
     @Override
     public int hashCode() {
-        return Objects.hash(getCodAnag(), getCodDtip(), getDataDoc(), getIdRiga(), getNumDoc(), getSerDoc(), getCodAliq(), getCodAnagComp(), getCodArtFor(), getCodCol(), getCodDtipComp(), getCodJcom(), getCodMart(), getCodMdep(), getCodPromo(), getCodTagl(), getCostoUnt(), getDataDocComp(), getDataOrd(), getDescrizione(), getDescrizioneEstesa(), getFlagEvasoForzato(), getImportoRiga(), getNumCnf(), getNumDocComp(), getNumOrd(), getPartitaMag(), getPercGest(), getPercIspe(), getPercOneri(), getPercPromo(), getPercProv(), getPercProv2(), getPesoLordo(), getPosizione(), getQtaCnf(), getQtaDoc(), getQtaDoc2(), getQtaDoc3(), getRapConv(), getRigaOrd(), getSconto5(), getSconto6(), getSconto7(), getSconto8(), getSerDocComp(), getUntDoc(), getUntDoc2(), getUntDoc3(), getValGest(), getValIspe(), getValOneri(), getValPromo(), getValProv(), getValProv2(), getValUnt(), getValUntIva(), getCodMtip(), getMatricola(), getDataInizComp(), getDataFineComp(), getCodKit(), getCodAlis(), getDataInsRow(), getNote(), getCodTcolUi(), getCodTcolUl(), getColliPedana(), getActivityIdRow(), getIdContratto(), getFlagSezione());
+        return Objects.hash(getCodAnag(), getCodDtip(), getDataDoc(), getIdRiga(), getNumDoc(), getSerDoc(), getCodAliq(), getCodAnagComp(), getCodArtFor(), getCodCol(), getCodDtipComp(), getCodJcom(), getCodMart(), getCodMdep(), getCodPromo(), getCodTagl(), getCostoUnt(), getDataDocComp(), getDataOrd(), getDescrizione(), getDescrizioneEstesa(), getFlagEvasoForzato(), getImportoRiga(), getNumCnf(), getNumDocComp(), getNumOrd(), getPartitaMag(), getPercGest(), getPercIspe(), getPercOneri(), getPercPromo(), getPercProv(), getPercProv2(), getPesoLordo(), getPosizione(), getQtaCnf(), getQtaDoc(), getQtaDoc2(), getQtaDoc3(), getRapConv(), getRigaOrd(), getSconto5(), getSconto6(), getSconto7(), getSconto8(), getSerDocComp(), getUntDoc(), getUntDoc2(), getUntDoc3(), getValGest(), getValIspe(), getValOneri(), getValPromo(), getValProv(), getValProv2(), getValUnt(), getValUntIva(), getCodMtip(), getMatricola(), getDataInizComp(), getDataFineComp(), getCodKit(), getCodAlis(), getDataInsRow(), getNote(), getCodTcolUi(), getCodTcolUl(), getColliPedana(), getActivityIdRow(), getIdContratto(), getFlagSezione(), getPesoNetto(), getRigaKit(), getFlagIsKit(), getCodJfas(), getGestione(), getCodVdes(), getListino(), getFlagTd(), getSconto1(), getSconto2(), getSconto3(), getSconto4(), getPercAliq(), getDataScad(), getReso(), getFuoriAssortimento(), getMtbAart(), getUntMisDTO(), getGeneraMovCont(), getMtbPartitaMag(), getTipoIva(), getCodFornTd(), getCodVage(), getCodDivi(), getFlagPrzScontati(), getCambio(), getFlagCosto(), getTipoEmissione(), getDataReg(), getCodCcon(), getFlagPrzIva(), getSetDatiLisv(), getCodDtipBolla(), getDataDocBolla(), getSerDocBolla(), getNumDocBolla(), getIdRigaBolla(), getDocAp(), getDataInsTestata(), getCorrispettivo(), getDtbDocrBolla());
     }
 }
diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/DtbDoct.java b/ems-core/src/main/java/it/integry/ems_model/entity/DtbDoct.java
index 2eaf3c6d8b..557290dafd 100644
--- a/ems-core/src/main/java/it/integry/ems_model/entity/DtbDoct.java
+++ b/ems-core/src/main/java/it/integry/ems_model/entity/DtbDoct.java
@@ -1713,31 +1713,31 @@ public class DtbDoct extends DtbBaseDocT implements EquatableEntityInterface<Dtb
     }
 
     @Override
-    public boolean equals(Object object) {
-        if (this == object)
-            return true;
-        if (!(object instanceof DtbDoct))
-            return false;
-        DtbDoct dtbDoct = (DtbDoct) object;
-        return isUpdProgMaga() == dtbDoct.isUpdProgMaga() && Objects.equals(getCodAnag(), dtbDoct.getCodAnag()) && Objects.equals(getCodDtip(), dtbDoct.getCodDtip()) && Objects.equals(getDataDoc(), dtbDoct.getDataDoc()) && Objects.equals(getNumDoc(), dtbDoct.getNumDoc()) && Objects.equals(getSerDoc(), dtbDoct.getSerDoc()) && Objects.equals(getAcconto(), dtbDoct.getAcconto()) && Objects.equals(getActivityId(), dtbDoct.getActivityId()) && Objects.equals(getAnnotazioni(), dtbDoct.getAnnotazioni()) && Objects.equals(getAspettoBeni(), dtbDoct.getAspettoBeni()) && Objects.equals(getCambio(), dtbDoct.getCambio()) && Objects.equals(getCausaleTrasp(), dtbDoct.getCausaleTrasp()) && Objects.equals(getCodAbi(), dtbDoct.getCodAbi()) && Objects.equals(getCodAuto(), dtbDoct.getCodAuto()) && Objects.equals(getCodBanc(), dtbDoct.getCodBanc()) && Objects.equals(getCodBancAzi(), dtbDoct.getCodBancAzi()) && Objects.equals(getCodCab(), dtbDoct.getCodCab()) && Objects.equals(getCodDivi(), dtbDoct.getCodDivi()) && Objects.equals(getCodDtipVal(), dtbDoct.getCodDtipVal()) && Objects.equals(getCodFornTd(), dtbDoct.getCodFornTd()) && Objects.equals(getCodJcom(), dtbDoct.getCodJcom()) && Objects.equals(getCodJfas(), dtbDoct.getCodJfas()) && Objects.equals(getCodMdep(), dtbDoct.getCodMdep()) && Objects.equals(getCodPaga(), dtbDoct.getCodPaga()) && Objects.equals(getCodProd(), dtbDoct.getCodProd()) && Objects.equals(getCodVage(), dtbDoct.getCodVage()) && Objects.equals(getCodVage2(), dtbDoct.getCodVage2()) && Objects.equals(getCodVdes(), dtbDoct.getCodVdes()) && Objects.equals(getCodVvet(), dtbDoct.getCodVvet()) && Objects.equals(getCodVvet2(), dtbDoct.getCodVvet2()) && Objects.equals(getCodVzon(), dtbDoct.getCodVzon()) && Objects.equals(getCompilatoDa(), dtbDoct.getCompilatoDa()) && Objects.equals(getUserName(), dtbDoct.getUserName()) && Objects.equals(getControllatoDa(), dtbDoct.getControllatoDa()) && Objects.equals(getDataChkDoc(), dtbDoct.getDataChkDoc()) && Objects.equals(getDataDocVal(), dtbDoct.getDataDocVal()) && Objects.equals(getDataInizTrasp(), dtbDoct.getDataInizTrasp()) && Objects.equals(getDataIns(), dtbDoct.getDataIns()) && Objects.equals(getDataOrd(), dtbDoct.getDataOrd()) && Objects.equals(getDataReg(), dtbDoct.getDataReg()) && Objects.equals(getDataRifScad(), dtbDoct.getDataRifScad()) && Objects.equals(getDataUltMod(), dtbDoct.getDataUltMod()) && Objects.equals(getDescrizionePaga(), dtbDoct.getDescrizionePaga()) && Objects.equals(getFlagPrzScontati(), dtbDoct.getFlagPrzScontati()) && Objects.equals(getGestione(), dtbDoct.getGestione()) && Objects.equals(getKmPercorsi(), dtbDoct.getKmPercorsi()) && Objects.equals(getListino(), dtbDoct.getListino()) && Objects.equals(getMezzo(), dtbDoct.getMezzo()) && Objects.equals(getModificatoDa(), dtbDoct.getModificatoDa()) && Objects.equals(getNettoMerce(), dtbDoct.getNettoMerce()) && Objects.equals(getNumCmov(), dtbDoct.getNumCmov()) && Objects.equals(getNumColli(), dtbDoct.getNumColli()) && Objects.equals(getNumDocVal(), dtbDoct.getNumDocVal()) && Objects.equals(getNumOrd(), dtbDoct.getNumOrd()) && Objects.equals(getNumVettura(), dtbDoct.getNumVettura()) && Objects.equals(getOraInizTrasp(), dtbDoct.getOraInizTrasp()) && Objects.equals(getPartitaMag(), dtbDoct.getPartitaMag()) && Objects.equals(getPeso(), dtbDoct.getPeso()) && Objects.equals(getPorto(), dtbDoct.getPorto()) && Objects.equals(getPrevistaFat(), dtbDoct.getPrevistaFat()) && Objects.equals(getQtaProd(), dtbDoct.getQtaProd()) && Objects.equals(getRapConvProd(), dtbDoct.getRapConvProd()) && Objects.equals(getRifOrd(), dtbDoct.getRifOrd()) && Objects.equals(getSconto1(), dtbDoct.getSconto1()) && Objects.equals(getSconto2(), dtbDoct.getSconto2()) && Objects.equals(getSconto3(), dtbDoct.getSconto3()) && Objects.equals(getSconto4(), dtbDoct.getSconto4()) && Objects.equals(getSerDocVal(), dtbDoct.getSerDocVal()) && Objects.equals(getTermCons(), dtbDoct.getTermCons()) && Objects.equals(getTipoAnag(), dtbDoct.getTipoAnag()) && Objects.equals(getTotImponib(), dtbDoct.getTotImponib()) && Objects.equals(getTotIva(), dtbDoct.getTotIva()) && Objects.equals(getTotMerce(), dtbDoct.getTotMerce()) && Objects.equals(getTotOmaggi(), dtbDoct.getTotOmaggi()) && Objects.equals(getTotProvvig(), dtbDoct.getTotProvvig()) && Objects.equals(getUntMisProd(), dtbDoct.getUntMisProd()) && Objects.equals(getIdViaggio(), dtbDoct.getIdViaggio()) && Objects.equals(getNumDocForn(), dtbDoct.getNumDocForn()) && Objects.equals(getGeneraMovCont(), dtbDoct.getGeneraMovCont()) && Objects.equals(getTarga(), dtbDoct.getTarga()) && Objects.equals(getTargaRim(), dtbDoct.getTargaRim()) && Objects.equals(getPostiPallet(), dtbDoct.getPostiPallet()) && Objects.equals(getTempMedia(), dtbDoct.getTempMedia()) && Objects.equals(getDataCons(), dtbDoct.getDataCons()) && Objects.equals(getNolo(), dtbDoct.getNolo()) && Objects.equals(getNolo2(), dtbDoct.getNolo2()) && Objects.equals(getConducente(), dtbDoct.getConducente()) && Objects.equals(getIban(), dtbDoct.getIban()) && Objects.equals(getMrn(), dtbDoct.getMrn()) && Objects.equals(getPesoNettoKg(), dtbDoct.getPesoNettoKg()) && Objects.equals(getStatoConsegna(), dtbDoct.getStatoConsegna()) && Objects.equals(getCodLingua(), dtbDoct.getCodLingua()) && Objects.equals(getIdLotto(), dtbDoct.getIdLotto());
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(getCodAnag(), getCodDtip(), getDataDoc(), getNumDoc(), getSerDoc(), getAcconto(), getActivityId(), getAnnotazioni(), getAspettoBeni(), getCambio(), getCausaleTrasp(), getCodAbi(), getCodAuto(), getCodBanc(), getCodBancAzi(), getCodCab(), getCodDivi(), getCodDtipVal(), getCodFornTd(), getCodJcom(), getCodJfas(), getCodMdep(), getCodPaga(), getCodProd(), getCodVage(), getCodVage2(), getCodVdes(), getCodVvet(), getCodVvet2(), getCodVzon(), getCompilatoDa(), getUserName(), getControllatoDa(), getDataChkDoc(), getDataDocVal(), getDataInizTrasp(), getDataIns(), getDataOrd(), getDataReg(), getDataRifScad(), getDataUltMod(), getDescrizionePaga(), getFlagPrzScontati(), getGestione(), getKmPercorsi(), getListino(), getMezzo(), getModificatoDa(), getNettoMerce(), getNumCmov(), getNumColli(), getNumDocVal(), getNumOrd(), getNumVettura(), getOraInizTrasp(), getPartitaMag(), getPeso(), getPorto(), getPrevistaFat(), getQtaProd(), getRapConvProd(), getRifOrd(), getSconto1(), getSconto2(), getSconto3(), getSconto4(), getSerDocVal(), getTermCons(), getTipoAnag(), getTotImponib(), getTotIva(), getTotMerce(), getTotOmaggi(), getTotProvvig(), getUntMisProd(), getIdViaggio(), getNumDocForn(), getGeneraMovCont(), isUpdProgMaga(), getTarga(), getTargaRim(), getPostiPallet(), getTempMedia(), getDataCons(), getNolo(), getNolo2(), getConducente(), getIban(), getMrn(), getPesoNettoKg(), getStatoConsegna(), getCodLingua(), getIdLotto());
+    public int hashCodeKey() {
+        return Objects.hash(getCodAnag(), getCodDtip(), getDataDoc(), getNumDoc(), getSerDoc());
     }
 
     @Override
     public boolean equalsKey(DtbDoct other) {
         if (this == other)
             return true;
+
+        if(hashCodeKey() != other.hashCodeKey())
+            return false;
+
         return Objects.equals(getCodAnag(), other.getCodAnag()) && Objects.equals(getCodDtip(), other.getCodDtip()) && Objects.equals(getDataDoc(), other.getDataDoc()) && Objects.equals(getNumDoc(), other.getNumDoc()) && Objects.equals(getSerDoc(), other.getSerDoc());
     }
 
     @Override
-    public boolean equalsContent(DtbDoct other) {
-        if (this == other)
-            return true;
-        return isUpdProgMaga() == other.isUpdProgMaga() && Objects.equals(getCodAnag(), other.getCodAnag()) && Objects.equals(getCodDtip(), other.getCodDtip()) && Objects.equals(getDataDoc(), other.getDataDoc()) && Objects.equals(getNumDoc(), other.getNumDoc()) && Objects.equals(getSerDoc(), other.getSerDoc()) && Objects.equals(getAcconto(), other.getAcconto()) && Objects.equals(getActivityId(), other.getActivityId()) && Objects.equals(getAnnotazioni(), other.getAnnotazioni()) && Objects.equals(getAspettoBeni(), other.getAspettoBeni()) && Objects.equals(getCambio(), other.getCambio()) && Objects.equals(getCausaleTrasp(), other.getCausaleTrasp()) && Objects.equals(getCodAbi(), other.getCodAbi()) && Objects.equals(getCodAuto(), other.getCodAuto()) && Objects.equals(getCodBanc(), other.getCodBanc()) && Objects.equals(getCodBancAzi(), other.getCodBancAzi()) && Objects.equals(getCodCab(), other.getCodCab()) && Objects.equals(getCodDivi(), other.getCodDivi()) && Objects.equals(getCodDtipVal(), other.getCodDtipVal()) && Objects.equals(getCodFornTd(), other.getCodFornTd()) && Objects.equals(getCodJcom(), other.getCodJcom()) && Objects.equals(getCodJfas(), other.getCodJfas()) && Objects.equals(getCodMdep(), other.getCodMdep()) && Objects.equals(getCodPaga(), other.getCodPaga()) && Objects.equals(getCodProd(), other.getCodProd()) && Objects.equals(getCodVage(), other.getCodVage()) && Objects.equals(getCodVage2(), other.getCodVage2()) && Objects.equals(getCodVdes(), other.getCodVdes()) && Objects.equals(getCodVvet(), other.getCodVvet()) && Objects.equals(getCodVvet2(), other.getCodVvet2()) && Objects.equals(getCodVzon(), other.getCodVzon()) && Objects.equals(getCompilatoDa(), other.getCompilatoDa()) && Objects.equals(getUserName(), other.getUserName()) && Objects.equals(getControllatoDa(), other.getControllatoDa()) && Objects.equals(getDataChkDoc(), other.getDataChkDoc()) && Objects.equals(getDataDocVal(), other.getDataDocVal()) && Objects.equals(getDataInizTrasp(), other.getDataInizTrasp()) && Objects.equals(getDataIns(), other.getDataIns()) && Objects.equals(getDataOrd(), other.getDataOrd()) && Objects.equals(getDataReg(), other.getDataReg()) && Objects.equals(getDataRifScad(), other.getDataRifScad()) && Objects.equals(getDataUltMod(), other.getDataUltMod()) && Objects.equals(getDescrizionePaga(), other.getDescrizionePaga()) && Objects.equals(getFlagPrzScontati(), other.getFlagPrzScontati()) && Objects.equals(getGestione(), other.getGestione()) && Objects.equals(getKmPercorsi(), other.getKmPercorsi()) && Objects.equals(getListino(), other.getListino()) && Objects.equals(getMezzo(), other.getMezzo()) && Objects.equals(getModificatoDa(), other.getModificatoDa()) && Objects.equals(getNettoMerce(), other.getNettoMerce()) && Objects.equals(getNumCmov(), other.getNumCmov()) && Objects.equals(getNumColli(), other.getNumColli()) && Objects.equals(getNumDocVal(), other.getNumDocVal()) && Objects.equals(getNumOrd(), other.getNumOrd()) && Objects.equals(getNumVettura(), other.getNumVettura()) && Objects.equals(getOraInizTrasp(), other.getOraInizTrasp()) && Objects.equals(getPartitaMag(), other.getPartitaMag()) && Objects.equals(getPeso(), other.getPeso()) && Objects.equals(getPorto(), other.getPorto()) && Objects.equals(getPrevistaFat(), other.getPrevistaFat()) && Objects.equals(getQtaProd(), other.getQtaProd()) && Objects.equals(getRapConvProd(), other.getRapConvProd()) && Objects.equals(getRifOrd(), other.getRifOrd()) && Objects.equals(getSconto1(), other.getSconto1()) && Objects.equals(getSconto2(), other.getSconto2()) && Objects.equals(getSconto3(), other.getSconto3()) && Objects.equals(getSconto4(), other.getSconto4()) && Objects.equals(getSerDocVal(), other.getSerDocVal()) && Objects.equals(getTermCons(), other.getTermCons()) && Objects.equals(getTipoAnag(), other.getTipoAnag()) && Objects.equals(getTotImponib(), other.getTotImponib()) && Objects.equals(getTotIva(), other.getTotIva()) && Objects.equals(getTotMerce(), other.getTotMerce()) && Objects.equals(getTotOmaggi(), other.getTotOmaggi()) && Objects.equals(getTotProvvig(), other.getTotProvvig()) && Objects.equals(getUntMisProd(), other.getUntMisProd()) && Objects.equals(getIdViaggio(), other.getIdViaggio()) && Objects.equals(getNumDocForn(), other.getNumDocForn()) && Objects.equals(getGeneraMovCont(), other.getGeneraMovCont()) && Objects.equals(getTarga(), other.getTarga()) && Objects.equals(getTargaRim(), other.getTargaRim()) && Objects.equals(getPostiPallet(), other.getPostiPallet()) && Objects.equals(getTempMedia(), other.getTempMedia()) && Objects.equals(getDataCons(), other.getDataCons()) && Objects.equals(getNolo(), other.getNolo()) && Objects.equals(getNolo2(), other.getNolo2()) && Objects.equals(getConducente(), other.getConducente()) && Objects.equals(getIban(), other.getIban()) && Objects.equals(getMrn(), other.getMrn()) && Objects.equals(getPesoNettoKg(), other.getPesoNettoKg()) && Objects.equals(getStatoConsegna(), other.getStatoConsegna()) && Objects.equals(getCodLingua(), other.getCodLingua()) && Objects.equals(getIdLotto(), other.getIdLotto());
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof DtbDoct)) return false;
+        DtbDoct dtbDoct = (DtbDoct) o;
+        return isUpdProgMaga() == dtbDoct.isUpdProgMaga() && Objects.equals(getCodAnag(), dtbDoct.getCodAnag()) && Objects.equals(getCodDtip(), dtbDoct.getCodDtip()) && Objects.equals(getDataDoc(), dtbDoct.getDataDoc()) && Objects.equals(getNumDoc(), dtbDoct.getNumDoc()) && Objects.equals(getSerDoc(), dtbDoct.getSerDoc()) && Objects.equals(getAcconto(), dtbDoct.getAcconto()) && Objects.equals(getActivityId(), dtbDoct.getActivityId()) && Objects.equals(getAnnotazioni(), dtbDoct.getAnnotazioni()) && Objects.equals(getAspettoBeni(), dtbDoct.getAspettoBeni()) && Objects.equals(getCambio(), dtbDoct.getCambio()) && Objects.equals(getCausaleTrasp(), dtbDoct.getCausaleTrasp()) && Objects.equals(getCodAbi(), dtbDoct.getCodAbi()) && Objects.equals(getCodAuto(), dtbDoct.getCodAuto()) && Objects.equals(getCodBanc(), dtbDoct.getCodBanc()) && Objects.equals(getCodBancAzi(), dtbDoct.getCodBancAzi()) && Objects.equals(getCodCab(), dtbDoct.getCodCab()) && Objects.equals(getCodDivi(), dtbDoct.getCodDivi()) && Objects.equals(getCodDtipVal(), dtbDoct.getCodDtipVal()) && Objects.equals(getCodFornTd(), dtbDoct.getCodFornTd()) && Objects.equals(getCodJcom(), dtbDoct.getCodJcom()) && Objects.equals(getCodJfas(), dtbDoct.getCodJfas()) && Objects.equals(getCodMdep(), dtbDoct.getCodMdep()) && Objects.equals(getCodPaga(), dtbDoct.getCodPaga()) && Objects.equals(getCodProd(), dtbDoct.getCodProd()) && Objects.equals(getCodVage(), dtbDoct.getCodVage()) && Objects.equals(getCodVage2(), dtbDoct.getCodVage2()) && Objects.equals(getCodVdes(), dtbDoct.getCodVdes()) && Objects.equals(getCodVvet(), dtbDoct.getCodVvet()) && Objects.equals(getCodVvet2(), dtbDoct.getCodVvet2()) && Objects.equals(getCodVzon(), dtbDoct.getCodVzon()) && Objects.equals(getCompilatoDa(), dtbDoct.getCompilatoDa()) && Objects.equals(getUserName(), dtbDoct.getUserName()) && Objects.equals(getControllatoDa(), dtbDoct.getControllatoDa()) && Objects.equals(getDataChkDoc(), dtbDoct.getDataChkDoc()) && Objects.equals(getDataDocVal(), dtbDoct.getDataDocVal()) && Objects.equals(getDataInizTrasp(), dtbDoct.getDataInizTrasp()) && Objects.equals(getDataIns(), dtbDoct.getDataIns()) && Objects.equals(getDataOrd(), dtbDoct.getDataOrd()) && Objects.equals(getDataReg(), dtbDoct.getDataReg()) && Objects.equals(getDataRifScad(), dtbDoct.getDataRifScad()) && Objects.equals(getDataUltMod(), dtbDoct.getDataUltMod()) && Objects.equals(getDescrizionePaga(), dtbDoct.getDescrizionePaga()) && Objects.equals(getFlagPrzScontati(), dtbDoct.getFlagPrzScontati()) && Objects.equals(getGestione(), dtbDoct.getGestione()) && Objects.equals(getKmPercorsi(), dtbDoct.getKmPercorsi()) && Objects.equals(getListino(), dtbDoct.getListino()) && Objects.equals(getMezzo(), dtbDoct.getMezzo()) && Objects.equals(getModificatoDa(), dtbDoct.getModificatoDa()) && Objects.equals(getNettoMerce(), dtbDoct.getNettoMerce()) && Objects.equals(getNumCmov(), dtbDoct.getNumCmov()) && Objects.equals(getNumColli(), dtbDoct.getNumColli()) && Objects.equals(getNumDocVal(), dtbDoct.getNumDocVal()) && Objects.equals(getNumOrd(), dtbDoct.getNumOrd()) && Objects.equals(getNumVettura(), dtbDoct.getNumVettura()) && Objects.equals(getOraInizTrasp(), dtbDoct.getOraInizTrasp()) && Objects.equals(getPartitaMag(), dtbDoct.getPartitaMag()) && Objects.equals(getPeso(), dtbDoct.getPeso()) && Objects.equals(getPorto(), dtbDoct.getPorto()) && Objects.equals(getPrevistaFat(), dtbDoct.getPrevistaFat()) && Objects.equals(getQtaProd(), dtbDoct.getQtaProd()) && Objects.equals(getRapConvProd(), dtbDoct.getRapConvProd()) && Objects.equals(getRifOrd(), dtbDoct.getRifOrd()) && Objects.equals(getSconto1(), dtbDoct.getSconto1()) && Objects.equals(getSconto2(), dtbDoct.getSconto2()) && Objects.equals(getSconto3(), dtbDoct.getSconto3()) && Objects.equals(getSconto4(), dtbDoct.getSconto4()) && Objects.equals(getSerDocVal(), dtbDoct.getSerDocVal()) && Objects.equals(getTermCons(), dtbDoct.getTermCons()) && Objects.equals(getTipoAnag(), dtbDoct.getTipoAnag()) && Objects.equals(getTotImponib(), dtbDoct.getTotImponib()) && Objects.equals(getTotIva(), dtbDoct.getTotIva()) && Objects.equals(getTotMerce(), dtbDoct.getTotMerce()) && Objects.equals(getTotOmaggi(), dtbDoct.getTotOmaggi()) && Objects.equals(getTotProvvig(), dtbDoct.getTotProvvig()) && Objects.equals(getUntMisProd(), dtbDoct.getUntMisProd()) && Objects.equals(getIdViaggio(), dtbDoct.getIdViaggio()) && Objects.equals(getNumDocForn(), dtbDoct.getNumDocForn()) && Objects.equals(getGeneraMovCont(), dtbDoct.getGeneraMovCont()) && Objects.equals(getTarga(), dtbDoct.getTarga()) && Objects.equals(getTargaRim(), dtbDoct.getTargaRim()) && Objects.equals(getPostiPallet(), dtbDoct.getPostiPallet()) && Objects.equals(getTempMedia(), dtbDoct.getTempMedia()) && Objects.equals(getDataCons(), dtbDoct.getDataCons()) && Objects.equals(getNolo(), dtbDoct.getNolo()) && Objects.equals(getNolo2(), dtbDoct.getNolo2()) && Objects.equals(getConducente(), dtbDoct.getConducente()) && Objects.equals(getIban(), dtbDoct.getIban()) && Objects.equals(getMrn(), dtbDoct.getMrn()) && Objects.equals(getPesoNettoKg(), dtbDoct.getPesoNettoKg()) && Objects.equals(getStatoConsegna(), dtbDoct.getStatoConsegna()) && Objects.equals(getCodLingua(), dtbDoct.getCodLingua()) && Objects.equals(getIdLotto(), dtbDoct.getIdLotto()) && Objects.equals(getExplodeKit(), dtbDoct.getExplodeKit()) && Objects.equals(getFlagPrzIva(), dtbDoct.getFlagPrzIva()) && Objects.equals(getFlagCheckPlafond(), dtbDoct.getFlagCheckPlafond()) && Objects.equals(getTipoEmissione(), dtbDoct.getTipoEmissione()) && Objects.equals(getSetDataDecorrenza2DataRic(), dtbDoct.getSetDataDecorrenza2DataRic()) && Objects.equals(getTotSpese(), dtbDoct.getTotSpese()) && Objects.equals(getChkArtListino(), dtbDoct.getChkArtListino()) && Objects.equals(getDataCmov(), dtbDoct.getDataCmov()) && Objects.equals(getReso(), dtbDoct.getReso()) && Objects.equals(getNumCmovAutofattura(), dtbDoct.getNumCmovAutofattura());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getCodAnag(), getCodDtip(), getDataDoc(), getNumDoc(), getSerDoc(), getAcconto(), getActivityId(), getAnnotazioni(), getAspettoBeni(), getCambio(), getCausaleTrasp(), getCodAbi(), getCodAuto(), getCodBanc(), getCodBancAzi(), getCodCab(), getCodDivi(), getCodDtipVal(), getCodFornTd(), getCodJcom(), getCodJfas(), getCodMdep(), getCodPaga(), getCodProd(), getCodVage(), getCodVage2(), getCodVdes(), getCodVvet(), getCodVvet2(), getCodVzon(), getCompilatoDa(), getUserName(), getControllatoDa(), getDataChkDoc(), getDataDocVal(), getDataInizTrasp(), getDataIns(), getDataOrd(), getDataReg(), getDataRifScad(), getDataUltMod(), getDescrizionePaga(), getFlagPrzScontati(), getGestione(), getKmPercorsi(), getListino(), getMezzo(), getModificatoDa(), getNettoMerce(), getNumCmov(), getNumColli(), getNumDocVal(), getNumOrd(), getNumVettura(), getOraInizTrasp(), getPartitaMag(), getPeso(), getPorto(), getPrevistaFat(), getQtaProd(), getRapConvProd(), getRifOrd(), getSconto1(), getSconto2(), getSconto3(), getSconto4(), getSerDocVal(), getTermCons(), getTipoAnag(), getTotImponib(), getTotIva(), getTotMerce(), getTotOmaggi(), getTotProvvig(), getUntMisProd(), getIdViaggio(), getNumDocForn(), getGeneraMovCont(), isUpdProgMaga(), getTarga(), getTargaRim(), getPostiPallet(), getTempMedia(), getDataCons(), getNolo(), getNolo2(), getConducente(), getIban(), getMrn(), getPesoNettoKg(), getStatoConsegna(), getCodLingua(), getIdLotto(), getExplodeKit(), getFlagPrzIva(), getFlagCheckPlafond(), getTipoEmissione(), getSetDataDecorrenza2DataRic(), getTotSpese(), getChkArtListino(), getDataCmov(), getReso(), getNumCmovAutofattura());
     }
 }
diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/DtbOrdr.java b/ems-core/src/main/java/it/integry/ems_model/entity/DtbOrdr.java
index 5e23877a1f..c767f47386 100644
--- a/ems-core/src/main/java/it/integry/ems_model/entity/DtbOrdr.java
+++ b/ems-core/src/main/java/it/integry/ems_model/entity/DtbOrdr.java
@@ -1403,28 +1403,28 @@ public class DtbOrdr extends DtbOrdCommonR implements EquatableEntityInterface<D
     public boolean equalsKey(DtbOrdr other) {
         if (this == other)
             return true;
+
+        if(hashCodeKey() != other.hashCodeKey())
+            return false;
+
         return Objects.equals(getDataOrd(), other.getDataOrd()) && Objects.equals(getGestione(), other.getGestione()) && Objects.equals(getNumOrd(), other.getNumOrd()) && Objects.equals(getRigaOrd(), other.getRigaOrd());
     }
 
     @Override
-    public boolean equalsContent(DtbOrdr other) {
-        if (this == other)
-            return true;
-        return getRigaKit() == other.getRigaKit() && Objects.equals(getDataOrd(), other.getDataOrd()) && Objects.equals(getGestione(), other.getGestione()) && Objects.equals(getNumOrd(), other.getNumOrd()) && Objects.equals(getRigaOrd(), other.getRigaOrd()) && Objects.equals(getCodAliq(), other.getCodAliq()) && Objects.equals(getCodArtFor(), other.getCodArtFor()) && Objects.equals(getCodAsso(), other.getCodAsso()) && Objects.equals(getCodCol(), other.getCodCol()) && Objects.equals(getCodJcom(), other.getCodJcom()) && Objects.equals(getCodMart(), other.getCodMart()) && Objects.equals(getCodMcon(), other.getCodMcon()) && Objects.equals(getCodMdep(), other.getCodMdep()) && Objects.equals(getCodOann(), other.getCodOann()) && Objects.equals(getCodPromo(), other.getCodPromo()) && Objects.equals(getCodTagl(), other.getCodTagl()) && Objects.equals(getCodTcolUi(), other.getCodTcolUi()) && Objects.equals(getCodTcolUl(), other.getCodTcolUl()) && Objects.equals(getColliPedana(), other.getColliPedana()) && Objects.equals(getDataCons(), other.getDataCons()) && Objects.equals(getDescrizione(), other.getDescrizione()) && Objects.equals(getDescrizioneEstesa(), other.getDescrizioneEstesa()) && Objects.equals(getFlagEvaso(), other.getFlagEvaso()) && Objects.equals(getFlagEvasoForzato(), other.getFlagEvasoForzato()) && Objects.equals(getGgCons(), other.getGgCons()) && Objects.equals(getGruppoCons(), other.getGruppoCons()) && Objects.equals(getIdArt(), other.getIdArt()) && Objects.equals(getImportoRiga(), other.getImportoRiga()) && Objects.equals(getNote(), other.getNote()) && Objects.equals(getNumCnf(), other.getNumCnf()) && Objects.equals(getNumFase(), other.getNumFase()) && Objects.equals(getPartitaMag(), other.getPartitaMag()) && Objects.equals(getPercGest(), other.getPercGest()) && Objects.equals(getPercIspe(), other.getPercIspe()) && Objects.equals(getPercOneri(), other.getPercOneri()) && Objects.equals(getPercPromo(), other.getPercPromo()) && Objects.equals(getPercProv(), other.getPercProv()) && Objects.equals(getPercProv2(), other.getPercProv2()) && Objects.equals(getPesoLordo(), other.getPesoLordo()) && Objects.equals(getPosRiga(), other.getPosRiga()) && Objects.equals(getQtaAcc(), other.getQtaAcc()) && Objects.equals(getQtaCnf(), other.getQtaCnf()) && Objects.equals(getQtaCol(), other.getQtaCol()) && Objects.equals(getQtaEvasa(), other.getQtaEvasa()) && Objects.equals(getQtaOrd(), other.getQtaOrd()) && Objects.equals(getQtaOrd2(), other.getQtaOrd2()) && Objects.equals(getQtaOrd3(), other.getQtaOrd3()) && Objects.equals(getRapConv(), other.getRapConv()) && Objects.equals(getSconto5(), other.getSconto5()) && Objects.equals(getSconto6(), other.getSconto6()) && Objects.equals(getSconto7(), other.getSconto7()) && Objects.equals(getSconto8(), other.getSconto8()) && Objects.equals(getSystemNote(), other.getSystemNote()) && Objects.equals(getUntOrd(), other.getUntOrd()) && Objects.equals(getUntOrd2(), other.getUntOrd2()) && Objects.equals(getUntOrd3(), other.getUntOrd3()) && Objects.equals(getValGest(), other.getValGest()) && Objects.equals(getValIspe(), other.getValIspe()) && Objects.equals(getValOneri(), other.getValOneri()) && Objects.equals(getValPromo(), other.getValPromo()) && Objects.equals(getValProv(), other.getValProv()) && Objects.equals(getValProv2(), other.getValProv2()) && Objects.equals(getValUnt(), other.getValUnt()) && Objects.equals(getValUntIva(), other.getValUntIva()) && Objects.equals(getCodMtip(), other.getCodMtip()) && Objects.equals(getMatricola(), other.getMatricola()) && Objects.equals(getDataInizComp(), other.getDataInizComp()) && Objects.equals(getDataFineComp(), other.getDataFineComp()) && Objects.equals(getCodAlis(), other.getCodAlis()) && Objects.equals(getCodKit(), other.getCodKit()) && Objects.equals(getNumCnfEvasa(), other.getNumCnfEvasa()) && Objects.equals(getIdViaggio(), other.getIdViaggio()) && Objects.equals(getDataConsAnag(), other.getDataConsAnag()) && Objects.equals(getIdContratto(), other.getIdContratto()) && Objects.equals(getFlagIsKit(), other.getFlagIsKit());
+    public int hashCodeKey() {
+        return Objects.hash(getDataOrd(), getGestione(), getNumOrd(), getRigaOrd());
     }
 
     @Override
     public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
+        if (this == o) return true;
+        if (!(o instanceof DtbOrdr)) return false;
         DtbOrdr dtbOrdr = (DtbOrdr) o;
-        return getRigaKit() == dtbOrdr.getRigaKit() && Objects.equals(getDataOrd(), dtbOrdr.getDataOrd()) && Objects.equals(getGestione(), dtbOrdr.getGestione()) && Objects.equals(getNumOrd(), dtbOrdr.getNumOrd()) && Objects.equals(getRigaOrd(), dtbOrdr.getRigaOrd()) && Objects.equals(getCodAliq(), dtbOrdr.getCodAliq()) && Objects.equals(getCodArtFor(), dtbOrdr.getCodArtFor()) && Objects.equals(getCodAsso(), dtbOrdr.getCodAsso()) && Objects.equals(getCodCol(), dtbOrdr.getCodCol()) && Objects.equals(getCodJcom(), dtbOrdr.getCodJcom()) && Objects.equals(getCodMart(), dtbOrdr.getCodMart()) && Objects.equals(getCodMcon(), dtbOrdr.getCodMcon()) && Objects.equals(getCodMdep(), dtbOrdr.getCodMdep()) && Objects.equals(getCodOann(), dtbOrdr.getCodOann()) && Objects.equals(getCodPromo(), dtbOrdr.getCodPromo()) && Objects.equals(getCodTagl(), dtbOrdr.getCodTagl()) && Objects.equals(getCodTcolUi(), dtbOrdr.getCodTcolUi()) && Objects.equals(getCodTcolUl(), dtbOrdr.getCodTcolUl()) && Objects.equals(getColliPedana(), dtbOrdr.getColliPedana()) && Objects.equals(getDataCons(), dtbOrdr.getDataCons()) && Objects.equals(getDescrizione(), dtbOrdr.getDescrizione()) && Objects.equals(getDescrizioneEstesa(), dtbOrdr.getDescrizioneEstesa()) && Objects.equals(getFlagEvaso(), dtbOrdr.getFlagEvaso()) && Objects.equals(getFlagEvasoForzato(), dtbOrdr.getFlagEvasoForzato()) && Objects.equals(getGgCons(), dtbOrdr.getGgCons()) && Objects.equals(getGruppoCons(), dtbOrdr.getGruppoCons()) && Objects.equals(getIdArt(), dtbOrdr.getIdArt()) && Objects.equals(getImportoRiga(), dtbOrdr.getImportoRiga()) && Objects.equals(getNote(), dtbOrdr.getNote()) && Objects.equals(getNumCnf(), dtbOrdr.getNumCnf()) && Objects.equals(getNumFase(), dtbOrdr.getNumFase()) && Objects.equals(getPartitaMag(), dtbOrdr.getPartitaMag()) && Objects.equals(getPercGest(), dtbOrdr.getPercGest()) && Objects.equals(getPercIspe(), dtbOrdr.getPercIspe()) && Objects.equals(getPercOneri(), dtbOrdr.getPercOneri()) && Objects.equals(getPercPromo(), dtbOrdr.getPercPromo()) && Objects.equals(getPercProv(), dtbOrdr.getPercProv()) && Objects.equals(getPercProv2(), dtbOrdr.getPercProv2()) && Objects.equals(getPesoLordo(), dtbOrdr.getPesoLordo()) && Objects.equals(getPosRiga(), dtbOrdr.getPosRiga()) && Objects.equals(getQtaAcc(), dtbOrdr.getQtaAcc()) && Objects.equals(getQtaCnf(), dtbOrdr.getQtaCnf()) && Objects.equals(getQtaCol(), dtbOrdr.getQtaCol()) && Objects.equals(getQtaEvasa(), dtbOrdr.getQtaEvasa()) && Objects.equals(getQtaOrd(), dtbOrdr.getQtaOrd()) && Objects.equals(getQtaOrd2(), dtbOrdr.getQtaOrd2()) && Objects.equals(getQtaOrd3(), dtbOrdr.getQtaOrd3()) && Objects.equals(getRapConv(), dtbOrdr.getRapConv()) && Objects.equals(getSconto5(), dtbOrdr.getSconto5()) && Objects.equals(getSconto6(), dtbOrdr.getSconto6()) && Objects.equals(getSconto7(), dtbOrdr.getSconto7()) && Objects.equals(getSconto8(), dtbOrdr.getSconto8()) && Objects.equals(getSystemNote(), dtbOrdr.getSystemNote()) && Objects.equals(getUntOrd(), dtbOrdr.getUntOrd()) && Objects.equals(getUntOrd2(), dtbOrdr.getUntOrd2()) && Objects.equals(getUntOrd3(), dtbOrdr.getUntOrd3()) && Objects.equals(getValGest(), dtbOrdr.getValGest()) && Objects.equals(getValIspe(), dtbOrdr.getValIspe()) && Objects.equals(getValOneri(), dtbOrdr.getValOneri()) && Objects.equals(getValPromo(), dtbOrdr.getValPromo()) && Objects.equals(getValProv(), dtbOrdr.getValProv()) && Objects.equals(getValProv2(), dtbOrdr.getValProv2()) && Objects.equals(getValUnt(), dtbOrdr.getValUnt()) && Objects.equals(getValUntIva(), dtbOrdr.getValUntIva()) && Objects.equals(getCodMtip(), dtbOrdr.getCodMtip()) && Objects.equals(getMatricola(), dtbOrdr.getMatricola()) && Objects.equals(getDataInizComp(), dtbOrdr.getDataInizComp()) && Objects.equals(getDataFineComp(), dtbOrdr.getDataFineComp()) && Objects.equals(getCodAlis(), dtbOrdr.getCodAlis()) && Objects.equals(getCodKit(), dtbOrdr.getCodKit()) && Objects.equals(getNumCnfEvasa(), dtbOrdr.getNumCnfEvasa()) && Objects.equals(getIdViaggio(), dtbOrdr.getIdViaggio()) && Objects.equals(getDataConsAnag(), dtbOrdr.getDataConsAnag()) && Objects.equals(getIdContratto(), dtbOrdr.getIdContratto()) && Objects.equals(getFlagIsKit(), dtbOrdr.getFlagIsKit()) && Objects.equals(getFlagPrzIva(), dtbOrdr.getFlagPrzIva()) && Objects.equals(getCodJcomTestata(), dtbOrdr.getCodJcomTestata()) && Objects.equals(getCambio(), dtbOrdr.getCambio()) && Objects.equals(getCodAnag(), dtbOrdr.getCodAnag()) && Objects.equals(getCodFornTd(), dtbOrdr.getCodFornTd()) && Objects.equals(getCodVage(), dtbOrdr.getCodVage()) && Objects.equals(getCodVdes(), dtbOrdr.getCodVdes()) && Objects.equals(getListino(), dtbOrdr.getListino()) && Objects.equals(getFlagTd(), dtbOrdr.getFlagTd()) && Objects.equals(getSconto1(), dtbOrdr.getSconto1()) && Objects.equals(getSconto2(), dtbOrdr.getSconto2()) && Objects.equals(getSconto3(), dtbOrdr.getSconto3()) && Objects.equals(getFlagPrzScontati(), dtbOrdr.getFlagPrzScontati()) && Objects.equals(getGestisciStralciOrdV(), dtbOrdr.getGestisciStralciOrdV()) && Objects.equals(getCodDivi(), dtbOrdr.getCodDivi()) && Objects.equals(getIdViaggioTestata(), dtbOrdr.getIdViaggioTestata()) && Objects.equals(getGestioneRif(), dtbOrdr.getGestioneRif()) && Objects.equals(getPercAliq(), dtbOrdr.getPercAliq()) && Objects.equals(getTipoIva(), dtbOrdr.getTipoIva()) && Objects.equals(getDataInizProd(), dtbOrdr.getDataInizProd()) && Objects.equals(getDataOrdRif(), dtbOrdr.getDataOrdRif()) && Objects.equals(getNumOrdRif(), dtbOrdr.getNumOrdRif()) && Objects.equals(getRigaOrdRif(), dtbOrdr.getRigaOrdRif()) && Objects.equals(getCodJfas(), dtbOrdr.getCodJfas()) && Objects.equals(getCodJflav(), dtbOrdr.getCodJflav()) && Objects.equals(getMtbAart(), dtbOrdr.getMtbAart()) && Objects.equals(getUntMisDTO(), dtbOrdr.getUntMisDTO()) && Objects.equals(getMtbPartitaMag(), dtbOrdr.getMtbPartitaMag()) && Objects.equals(getJtbComt(), dtbOrdr.getJtbComt());
+        return getRigaKit() == dtbOrdr.getRigaKit() && Objects.equals(getDataOrd(), dtbOrdr.getDataOrd()) && Objects.equals(getGestione(), dtbOrdr.getGestione()) && Objects.equals(getNumOrd(), dtbOrdr.getNumOrd()) && Objects.equals(getRigaOrd(), dtbOrdr.getRigaOrd()) && Objects.equals(getCodAliq(), dtbOrdr.getCodAliq()) && Objects.equals(getCodArtFor(), dtbOrdr.getCodArtFor()) && Objects.equals(getCodAsso(), dtbOrdr.getCodAsso()) && Objects.equals(getCodCol(), dtbOrdr.getCodCol()) && Objects.equals(getCodJcom(), dtbOrdr.getCodJcom()) && Objects.equals(getCodMart(), dtbOrdr.getCodMart()) && Objects.equals(getCodMcon(), dtbOrdr.getCodMcon()) && Objects.equals(getCodMdep(), dtbOrdr.getCodMdep()) && Objects.equals(getCodOann(), dtbOrdr.getCodOann()) && Objects.equals(getCodPromo(), dtbOrdr.getCodPromo()) && Objects.equals(getCodTagl(), dtbOrdr.getCodTagl()) && Objects.equals(getCodTcolUi(), dtbOrdr.getCodTcolUi()) && Objects.equals(getCodTcolUl(), dtbOrdr.getCodTcolUl()) && Objects.equals(getColliPedana(), dtbOrdr.getColliPedana()) && Objects.equals(getDataCons(), dtbOrdr.getDataCons()) && Objects.equals(getDescrizione(), dtbOrdr.getDescrizione()) && Objects.equals(getDescrizioneEstesa(), dtbOrdr.getDescrizioneEstesa()) && Objects.equals(getFlagEvaso(), dtbOrdr.getFlagEvaso()) && Objects.equals(getFlagEvasoForzato(), dtbOrdr.getFlagEvasoForzato()) && Objects.equals(getGgCons(), dtbOrdr.getGgCons()) && Objects.equals(getGruppoCons(), dtbOrdr.getGruppoCons()) && Objects.equals(getIdArt(), dtbOrdr.getIdArt()) && Objects.equals(getImportoRiga(), dtbOrdr.getImportoRiga()) && Objects.equals(getNote(), dtbOrdr.getNote()) && Objects.equals(getNumCnf(), dtbOrdr.getNumCnf()) && Objects.equals(getNumFase(), dtbOrdr.getNumFase()) && Objects.equals(getPartitaMag(), dtbOrdr.getPartitaMag()) && Objects.equals(getPercGest(), dtbOrdr.getPercGest()) && Objects.equals(getPercIspe(), dtbOrdr.getPercIspe()) && Objects.equals(getPercOneri(), dtbOrdr.getPercOneri()) && Objects.equals(getPercPromo(), dtbOrdr.getPercPromo()) && Objects.equals(getPercProv(), dtbOrdr.getPercProv()) && Objects.equals(getPercProv2(), dtbOrdr.getPercProv2()) && Objects.equals(getPesoLordo(), dtbOrdr.getPesoLordo()) && Objects.equals(getPosRiga(), dtbOrdr.getPosRiga()) && Objects.equals(getQtaAcc(), dtbOrdr.getQtaAcc()) && Objects.equals(getQtaCnf(), dtbOrdr.getQtaCnf()) && Objects.equals(getQtaCol(), dtbOrdr.getQtaCol()) && Objects.equals(getQtaEvasa(), dtbOrdr.getQtaEvasa()) && Objects.equals(getQtaOrd(), dtbOrdr.getQtaOrd()) && Objects.equals(getQtaOrd2(), dtbOrdr.getQtaOrd2()) && Objects.equals(getQtaOrd3(), dtbOrdr.getQtaOrd3()) && Objects.equals(getRapConv(), dtbOrdr.getRapConv()) && Objects.equals(getSconto5(), dtbOrdr.getSconto5()) && Objects.equals(getSconto6(), dtbOrdr.getSconto6()) && Objects.equals(getSconto7(), dtbOrdr.getSconto7()) && Objects.equals(getSconto8(), dtbOrdr.getSconto8()) && Objects.equals(getSystemNote(), dtbOrdr.getSystemNote()) && Objects.equals(getUntOrd(), dtbOrdr.getUntOrd()) && Objects.equals(getUntOrd2(), dtbOrdr.getUntOrd2()) && Objects.equals(getUntOrd3(), dtbOrdr.getUntOrd3()) && Objects.equals(getValGest(), dtbOrdr.getValGest()) && Objects.equals(getValIspe(), dtbOrdr.getValIspe()) && Objects.equals(getValOneri(), dtbOrdr.getValOneri()) && Objects.equals(getValPromo(), dtbOrdr.getValPromo()) && Objects.equals(getValProv(), dtbOrdr.getValProv()) && Objects.equals(getValProv2(), dtbOrdr.getValProv2()) && Objects.equals(getValUnt(), dtbOrdr.getValUnt()) && Objects.equals(getValUntIva(), dtbOrdr.getValUntIva()) && Objects.equals(getCodMtip(), dtbOrdr.getCodMtip()) && Objects.equals(getMatricola(), dtbOrdr.getMatricola()) && Objects.equals(getDataInizComp(), dtbOrdr.getDataInizComp()) && Objects.equals(getDataFineComp(), dtbOrdr.getDataFineComp()) && Objects.equals(getCodAlis(), dtbOrdr.getCodAlis()) && Objects.equals(getCodKit(), dtbOrdr.getCodKit()) && Objects.equals(getNumCnfEvasa(), dtbOrdr.getNumCnfEvasa()) && Objects.equals(getIdViaggio(), dtbOrdr.getIdViaggio()) && Objects.equals(getDataConsAnag(), dtbOrdr.getDataConsAnag()) && Objects.equals(getIdContratto(), dtbOrdr.getIdContratto()) && Objects.equals(getFlagIsKit(), dtbOrdr.getFlagIsKit()) && Objects.equals(getFlagPrzIva(), dtbOrdr.getFlagPrzIva()) && Objects.equals(getCodJcomTestata(), dtbOrdr.getCodJcomTestata()) && Objects.equals(getOrdLav(), dtbOrdr.getOrdLav()) && Objects.equals(getCambio(), dtbOrdr.getCambio()) && Objects.equals(getCodAnag(), dtbOrdr.getCodAnag()) && Objects.equals(getCodFornTd(), dtbOrdr.getCodFornTd()) && Objects.equals(getCodVage(), dtbOrdr.getCodVage()) && Objects.equals(getCodVdes(), dtbOrdr.getCodVdes()) && Objects.equals(getListino(), dtbOrdr.getListino()) && Objects.equals(getFlagTd(), dtbOrdr.getFlagTd()) && Objects.equals(getSconto1(), dtbOrdr.getSconto1()) && Objects.equals(getSconto2(), dtbOrdr.getSconto2()) && Objects.equals(getSconto3(), dtbOrdr.getSconto3()) && Objects.equals(getFlagPrzScontati(), dtbOrdr.getFlagPrzScontati()) && Objects.equals(getGestisciStralciOrdV(), dtbOrdr.getGestisciStralciOrdV()) && Objects.equals(getCodDivi(), dtbOrdr.getCodDivi()) && Objects.equals(getIdViaggioTestata(), dtbOrdr.getIdViaggioTestata()) && Objects.equals(getGestioneRif(), dtbOrdr.getGestioneRif()) && Objects.equals(getPercAliq(), dtbOrdr.getPercAliq()) && Objects.equals(getTipoIva(), dtbOrdr.getTipoIva()) && Objects.equals(getDataInizProd(), dtbOrdr.getDataInizProd()) && Objects.equals(getDataOrdRif(), dtbOrdr.getDataOrdRif()) && Objects.equals(getNumOrdRif(), dtbOrdr.getNumOrdRif()) && Objects.equals(getRigaOrdRif(), dtbOrdr.getRigaOrdRif()) && Objects.equals(getCodJfas(), dtbOrdr.getCodJfas()) && Objects.equals(getCodJflav(), dtbOrdr.getCodJflav());
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(getDataOrd(), getGestione(), getNumOrd(), getRigaOrd(), getCodAliq(), getCodArtFor(), getCodAsso(), getCodCol(), getCodJcom(), getCodMart(), getCodMcon(), getCodMdep(), getCodOann(), getCodPromo(), getCodTagl(), getCodTcolUi(), getCodTcolUl(), getColliPedana(), getDataCons(), getDescrizione(), getDescrizioneEstesa(), getFlagEvaso(), getFlagEvasoForzato(), getGgCons(), getGruppoCons(), getIdArt(), getImportoRiga(), getNote(), getNumCnf(), getNumFase(), getPartitaMag(), getPercGest(), getPercIspe(), getPercOneri(), getPercPromo(), getPercProv(), getPercProv2(), getPesoLordo(), getPosRiga(), getQtaAcc(), getQtaCnf(), getQtaCol(), getQtaEvasa(), getQtaOrd(), getQtaOrd2(), getQtaOrd3(), getRapConv(), getSconto5(), getSconto6(), getSconto7(), getSconto8(), getSystemNote(), getUntOrd(), getUntOrd2(), getUntOrd3(), getValGest(), getValIspe(), getValOneri(), getValPromo(), getValProv(), getValProv2(), getValUnt(), getValUntIva(), getCodMtip(), getMatricola(), getDataInizComp(), getDataFineComp(), getCodAlis(), getCodKit(), getNumCnfEvasa(), getIdViaggio(), getDataConsAnag(), getIdContratto(), getRigaKit(), getFlagIsKit(), getFlagPrzIva(), getCodJcomTestata(), getCambio(), getCodAnag(), getCodFornTd(), getCodVage(), getCodVdes(), getListino(), getFlagTd(), getSconto1(), getSconto2(), getSconto3(), getFlagPrzScontati(), getGestisciStralciOrdV(), getCodDivi(), getIdViaggioTestata(), getGestioneRif(), getPercAliq(), getTipoIva(), getDataInizProd(), getDataOrdRif(), getNumOrdRif(), getRigaOrdRif(), getCodJfas(), getCodJflav(), getMtbAart(), getUntMisDTO(), getMtbPartitaMag(), getJtbComt());
+        return Objects.hash(getDataOrd(), getGestione(), getNumOrd(), getRigaOrd(), getCodAliq(), getCodArtFor(), getCodAsso(), getCodCol(), getCodJcom(), getCodMart(), getCodMcon(), getCodMdep(), getCodOann(), getCodPromo(), getCodTagl(), getCodTcolUi(), getCodTcolUl(), getColliPedana(), getDataCons(), getDescrizione(), getDescrizioneEstesa(), getFlagEvaso(), getFlagEvasoForzato(), getGgCons(), getGruppoCons(), getIdArt(), getImportoRiga(), getNote(), getNumCnf(), getNumFase(), getPartitaMag(), getPercGest(), getPercIspe(), getPercOneri(), getPercPromo(), getPercProv(), getPercProv2(), getPesoLordo(), getPosRiga(), getQtaAcc(), getQtaCnf(), getQtaCol(), getQtaEvasa(), getQtaOrd(), getQtaOrd2(), getQtaOrd3(), getRapConv(), getSconto5(), getSconto6(), getSconto7(), getSconto8(), getSystemNote(), getUntOrd(), getUntOrd2(), getUntOrd3(), getValGest(), getValIspe(), getValOneri(), getValPromo(), getValProv(), getValProv2(), getValUnt(), getValUntIva(), getCodMtip(), getMatricola(), getDataInizComp(), getDataFineComp(), getCodAlis(), getCodKit(), getNumCnfEvasa(), getIdViaggio(), getDataConsAnag(), getIdContratto(), getRigaKit(), getFlagIsKit(), getFlagPrzIva(), getCodJcomTestata(), getOrdLav(), getCambio(), getCodAnag(), getCodFornTd(), getCodVage(), getCodVdes(), getListino(), getFlagTd(), getSconto1(), getSconto2(), getSconto3(), getFlagPrzScontati(), getGestisciStralciOrdV(), getCodDivi(), getIdViaggioTestata(), getGestioneRif(), getPercAliq(), getTipoIva(), getDataInizProd(), getDataOrdRif(), getNumOrdRif(), getRigaOrdRif(), getCodJfas(), getCodJflav());
     }
 }
diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/DtbOrds.java b/ems-core/src/main/java/it/integry/ems_model/entity/DtbOrds.java
index a91b871545..4b78e07e1b 100644
--- a/ems-core/src/main/java/it/integry/ems_model/entity/DtbOrds.java
+++ b/ems-core/src/main/java/it/integry/ems_model/entity/DtbOrds.java
@@ -257,13 +257,29 @@ public class DtbOrds extends EntityBase implements EquatableEntityInterface<DtbO
     public boolean equalsKey(DtbOrds other) {
         if (this == other)
             return true;
+
+        if(hashCodeKey() != other.hashCodeKey())
+            return false;
+
         return Objects.equals(getDataOrd(), other.getDataOrd()) && Objects.equals(getGestione(), other.getGestione()) && Objects.equals(getIdRiga(), other.getIdRiga()) && Objects.equals(getNumOrd(), other.getNumOrd());
     }
 
+
     @Override
-    public boolean equalsContent(DtbOrds other) {
-        if (this == other)
-            return true;
-        return Objects.equals(getDataOrd(), other.getDataOrd()) && Objects.equals(getGestione(), other.getGestione()) && Objects.equals(getIdRiga(), other.getIdRiga()) && Objects.equals(getNumOrd(), other.getNumOrd()) && Objects.equals(getCodAliq(), other.getCodAliq()) && Objects.equals(getCodSpes(), other.getCodSpes()) && Objects.equals(getDescrizione(), other.getDescrizione()) && Objects.equals(getImporto(), other.getImporto()) && Objects.equals(getNumFase(), other.getNumFase()) && Objects.equals(getQta(), other.getQta()) && Objects.equals(getUntMis(), other.getUntMis()) && Objects.equals(getValUnt(), other.getValUnt());
+    public int hashCodeKey() {
+        return Objects.hash(getDataOrd(), getGestione(), getIdRiga(), getNumOrd());
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof DtbOrds)) return false;
+        DtbOrds dtbOrds = (DtbOrds) o;
+        return Objects.equals(getDataOrd(), dtbOrds.getDataOrd()) && Objects.equals(getGestione(), dtbOrds.getGestione()) && Objects.equals(getIdRiga(), dtbOrds.getIdRiga()) && Objects.equals(getNumOrd(), dtbOrds.getNumOrd()) && Objects.equals(getCodAliq(), dtbOrds.getCodAliq()) && Objects.equals(getCodSpes(), dtbOrds.getCodSpes()) && Objects.equals(getDescrizione(), dtbOrds.getDescrizione()) && Objects.equals(getImporto(), dtbOrds.getImporto()) && Objects.equals(getNumFase(), dtbOrds.getNumFase()) && Objects.equals(getQta(), dtbOrds.getQta()) && Objects.equals(getUntMis(), dtbOrds.getUntMis()) && Objects.equals(getValUnt(), dtbOrds.getValUnt()) && Objects.equals(getImportoIva(), dtbOrds.getImportoIva()) && Objects.equals(getCodDivi(), dtbOrds.getCodDivi()) && Objects.equals(getCodAnag(), dtbOrds.getCodAnag()) && Objects.equals(getCodVdes(), dtbOrds.getCodVdes()) && Objects.equals(getCodProd(), dtbOrds.getCodProd()) && Objects.equals(getQtaProd(), dtbOrds.getQtaProd());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getDataOrd(), getGestione(), getIdRiga(), getNumOrd(), getCodAliq(), getCodSpes(), getDescrizione(), getImporto(), getNumFase(), getQta(), getUntMis(), getValUnt(), getImportoIva(), getCodDivi(), getCodAnag(), getCodVdes(), getCodProd(), getQtaProd());
     }
 }
diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/DtbOrdt.java b/ems-core/src/main/java/it/integry/ems_model/entity/DtbOrdt.java
index 1fc1b7b690..75c2aa2dc1 100644
--- a/ems-core/src/main/java/it/integry/ems_model/entity/DtbOrdt.java
+++ b/ems-core/src/main/java/it/integry/ems_model/entity/DtbOrdt.java
@@ -1868,35 +1868,6 @@ public class DtbOrdt extends DtbDocOrdT implements EquatableEntityInterface<DtbO
         }
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (!(o instanceof DtbOrdt))
-            return false;
-        DtbOrdt dtbOrdt = (DtbOrdt) o;
-        return getDataOrd().equals(dtbOrdt.getDataOrd()) && getGestione().equals(dtbOrdt.getGestione()) && Objects.equals(getNumOrd(), dtbOrdt.getNumOrd()) && Objects.equals(getAcconto(), dtbOrdt.getAcconto()) && Objects.equals(getActivityId(), dtbOrdt.getActivityId()) && Objects.equals(getActivityTypeId(), dtbOrdt.getActivityTypeId()) && Objects.equals(getAspettoBeni(), dtbOrdt.getAspettoBeni()) && Objects.equals(getCausaleTrasp(), dtbOrdt.getCausaleTrasp()) && Objects.equals(getCodAbi(), dtbOrdt.getCodAbi()) && Objects.equals(getCodAnag(), dtbOrdt.getCodAnag()) && Objects.equals(getCodAuto(), dtbOrdt.getCodAuto()) && Objects.equals(getCodBanc(), dtbOrdt.getCodBanc()) && Objects.equals(getCodBancAzi(), dtbOrdt.getCodBancAzi()) && Objects.equals(getCodCab(), dtbOrdt.getCodCab()) && Objects.equals(getCodDgrpArt(), dtbOrdt.getCodDgrpArt()) && Objects.equals(getCodDivi(), dtbOrdt.getCodDivi()) && Objects.equals(getCodEtic(), dtbOrdt.getCodEtic()) && Objects.equals(getCodFornTd(), dtbOrdt.getCodFornTd()) && Objects.equals(getCodJcom(), dtbOrdt.getCodJcom()) && Objects.equals(getCodJfas(), dtbOrdt.getCodJfas()) && Objects.equals(getCodMdep(), dtbOrdt.getCodMdep()) && Objects.equals(getCodPaga(), dtbOrdt.getCodPaga()) && Objects.equals(getCodProd(), dtbOrdt.getCodProd()) && Objects.equals(getCodTcolUi(), dtbOrdt.getCodTcolUi()) && Objects.equals(getCodTcolUl(), dtbOrdt.getCodTcolUl()) && Objects.equals(getCodVage(), dtbOrdt.getCodVage()) && Objects.equals(getCodVage2(), dtbOrdt.getCodVage2()) && Objects.equals(getCodVdes(), dtbOrdt.getCodVdes()) && Objects.equals(getCodVvet(), dtbOrdt.getCodVvet()) && Objects.equals(getCodVvet2(), dtbOrdt.getCodVvet2()) && Objects.equals(getCodVzon(), dtbOrdt.getCodVzon()) && Objects.equals(getColliPedana(), dtbOrdt.getColliPedana()) && Objects.equals(getCompilatoDa(), dtbOrdt.getCompilatoDa()) && Objects.equals(getControllatoDa(), dtbOrdt.getControllatoDa()) && Objects.equals(getDataConsProd(), dtbOrdt.getDataConsProd()) && Objects.equals(getDataConsProdMax(), dtbOrdt.getDataConsProdMax()) && Objects.equals(getDataEsportazione(), dtbOrdt.getDataEsportazione()) && Objects.equals(getDataConferma(), dtbOrdt.getDataConferma()) && Objects.equals(getDataInizProd(), dtbOrdt.getDataInizProd()) && Objects.equals(getDataInizTrasp(), dtbOrdt.getDataInizTrasp()) && Objects.equals(getDataInsOrd(), dtbOrdt.getDataInsOrd()) && Objects.equals(getDataOrdRif(), dtbOrdt.getDataOrdRif()) && Objects.equals(getRifDataOrd(), dtbOrdt.getRifDataOrd()) && Objects.equals(getDataRicezione(), dtbOrdt.getDataRicezione()) && Objects.equals(getDataRifScad(), dtbOrdt.getDataRifScad()) && Objects.equals(getDataUltMod(), dtbOrdt.getDataUltMod()) && Objects.equals(getDescrEstesaProd(), dtbOrdt.getDescrEstesaProd()) && Objects.equals(getDescrizionePaga(), dtbOrdt.getDescrizionePaga()) && Objects.equals(getDescrizioneProd(), dtbOrdt.getDescrizioneProd()) && Objects.equals(getEanFidelity(), dtbOrdt.getEanFidelity()) && Objects.equals(getFlagAnnulla(), dtbOrdt.getFlagAnnulla()) && Objects.equals(getFlagEscRoyal(), dtbOrdt.getFlagEscRoyal()) && Objects.equals(getFlagEvasoForzato(), dtbOrdt.getFlagEvasoForzato()) && Objects.equals(getFlagEvasoProd(), dtbOrdt.getFlagEvasoProd()) && Objects.equals(getFlagPrzScontati(), dtbOrdt.getFlagPrzScontati()) && Objects.equals(getFlagSospeso(), dtbOrdt.getFlagSospeso()) && Objects.equals(getFlagTipologia(), dtbOrdt.getFlagTipologia()) && Objects.equals(getGestioneRif(), dtbOrdt.getGestioneRif()) && Objects.equals(getItemId(), dtbOrdt.getItemId()) && Objects.equals(getListino(), dtbOrdt.getListino()) && Objects.equals(getLivello(), dtbOrdt.getLivello()) && Objects.equals(getMezzo(), dtbOrdt.getMezzo()) && Objects.equals(getModificatoDa(), dtbOrdt.getModificatoDa()) && Objects.equals(getNettoMerce(), dtbOrdt.getNettoMerce()) && Objects.equals(getNolo(), dtbOrdt.getNolo()) && Objects.equals(getNolo2(), dtbOrdt.getNolo2()) && Objects.equals(getNote(), dtbOrdt.getNote()) && Objects.equals(getNumColli(), dtbOrdt.getNumColli()) && Objects.equals(getNumCons(), dtbOrdt.getNumCons()) && Objects.equals(getNumFase(), dtbOrdt.getNumFase()) && Objects.equals(getNumOrdProvv(), dtbOrdt.getNumOrdProvv()) && Objects.equals(getNumOrdRif(), dtbOrdt.getNumOrdRif()) && Objects.equals(getRifNumOrd(), dtbOrdt.getRifNumOrd()) && Objects.equals(getPartitaMag(), dtbOrdt.getPartitaMag()) && Objects.equals(getPercEsclStat(), dtbOrdt.getPercEsclStat()) && Objects.equals(getPersonaRif(), dtbOrdt.getPersonaRif()) && Objects.equals(getPeso(), dtbOrdt.getPeso()) && Objects.equals(getPorto(), dtbOrdt.getPorto()) && Objects.equals(getQtaEvasaProd(), dtbOrdt.getQtaEvasaProd()) && Objects.equals(getQtaPrenotataRep(), dtbOrdt.getQtaPrenotataRep()) && Objects.equals(getQtaProd(), dtbOrdt.getQtaProd()) && Objects.equals(getRapConvProd(), dtbOrdt.getRapConvProd()) && Objects.equals(getRfid(), dtbOrdt.getRfid()) && Objects.equals(getRifOrd(), dtbOrdt.getRifOrd()) && Objects.equals(getRigaOrdRif(), dtbOrdt.getRigaOrdRif()) && Objects.equals(getSconto1(), dtbOrdt.getSconto1()) && Objects.equals(getSconto2(), dtbOrdt.getSconto2()) && Objects.equals(getSconto3(), dtbOrdt.getSconto3()) && Objects.equals(getSconto4(), dtbOrdt.getSconto4()) && Objects.equals(getSerie(), dtbOrdt.getSerie()) && Objects.equals(getTermCons(), dtbOrdt.getTermCons()) && Objects.equals(getTipoAnag(), dtbOrdt.getTipoAnag()) && Objects.equals(getTotFasi(), dtbOrdt.getTotFasi()) && Objects.equals(getTotImponib(), dtbOrdt.getTotImponib()) && Objects.equals(getTotIva(), dtbOrdt.getTotIva()) && Objects.equals(getTotMerce(), dtbOrdt.getTotMerce()) && Objects.equals(getTotOmaggi(), dtbOrdt.getTotOmaggi()) && Objects.equals(getTotProvvig(), dtbOrdt.getTotProvvig()) && Objects.equals(getUntMisProd(), dtbOrdt.getUntMisProd()) && Objects.equals(getFlagPrzIva(), dtbOrdt.getFlagPrzIva()) && Objects.equals(getNoteConferma(), dtbOrdt.getNoteConferma()) && Objects.equals(getCodJflav(), dtbOrdt.getCodJflav()) && Objects.equals(getTarga(), dtbOrdt.getTarga()) && Objects.equals(getPostiPallet(), dtbOrdt.getPostiPallet()) && Objects.equals(getCambio(), dtbOrdt.getCambio()) && Objects.equals(getUserName(), dtbOrdt.getUserName()) && Objects.equals(getFlagTd(), dtbOrdt.getFlagTd()) && Objects.equals(getGestisciStralciOrdV(), dtbOrdt.getGestisciStralciOrdV()) && Objects.equals(getIdViaggioTestata(), dtbOrdt.getIdViaggioTestata()) && Objects.equals(getExplodeKit(), dtbOrdt.getExplodeKit()) && Objects.equals(getGestisciOrdLavTx(), dtbOrdt.getGestisciOrdLavTx()) && Objects.equals(getOrdTrasf(), dtbOrdt.getOrdTrasf());
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(getDataOrd(), getGestione(), getNumOrd(), getAcconto(), getActivityId(), getActivityTypeId(), getAspettoBeni(), getCausaleTrasp(), getCodAbi(), getCodAnag(), getCodAuto(), getCodBanc(), getCodBancAzi(), getCodCab(), getCodDgrpArt(), getCodDivi(), getCodEtic(), getCodFornTd(), getCodJcom(), getCodJfas(), getCodMdep(), getCodPaga(), getCodProd(), getCodTcolUi(), getCodTcolUl(), getCodVage(), getCodVage2(), getCodVdes(), getCodVvet(), getCodVvet2(), getCodVzon(), getColliPedana(), getCompilatoDa(), getControllatoDa(), getDataConsProd(), getDataConsProdMax(), getDataEsportazione(), getDataConferma(), getDataInizProd(), getDataInizTrasp(), getDataInsOrd(), getDataOrdRif(), getRifDataOrd(), getDataRicezione(), getDataRifScad(), getDataUltMod(), getDescrEstesaProd(), getDescrizionePaga(), getDescrizioneProd(), getEanFidelity(), getFlagAnnulla(), getFlagEscRoyal(), getFlagEvasoForzato(), getFlagEvasoProd(), getFlagPrzScontati(), getFlagSospeso(), getFlagTipologia(), getGestioneRif(), getItemId(), getListino(), getLivello(), getMezzo(), getModificatoDa(), getNettoMerce(), getNolo(), getNolo2(), getNote(), getNumColli(), getNumCons(), getNumFase(), getNumOrdProvv(), getNumOrdRif(), getRifNumOrd(), getPartitaMag(), getPercEsclStat(), getPersonaRif(), getPeso(), getPorto(), getQtaEvasaProd(), getQtaPrenotataRep(), getQtaProd(), getRapConvProd(), getRfid(), getRifOrd(), getRigaOrdRif(), getSconto1(), getSconto2(), getSconto3(), getSconto4(), getSerie(), getTermCons(), getTipoAnag(), getTotFasi(), getTotImponib(), getTotIva(), getTotMerce(), getTotOmaggi(), getTotProvvig(), getUntMisProd(), getFlagPrzIva(), getNoteConferma(), getCodJflav(), getTarga(), getPostiPallet(), getCambio(), getUserName(), getFlagTd(), getGestisciStralciOrdV(), getIdViaggioTestata(), getExplodeKit(), getGestisciOrdLavTx(), getOrdTrasf());
-    }
-
-    @Override
-    public boolean equalsKey(DtbOrdt other) {
-        if (this == other)
-            return true;
-        return getDataOrd().equals(other.getDataOrd()) && getGestione().equals(other.getGestione()) && Objects.equals(getNumOrd(), other.getNumOrd());
-    }
-
-    @Override
-    public boolean equalsContent(DtbOrdt other) {
-        if (this == other)
-            return true;
-        return getDataOrd().equals(other.getDataOrd()) && getGestione().equals(other.getGestione()) && Objects.equals(getNumOrd(), other.getNumOrd()) && Objects.equals(getAcconto(), other.getAcconto()) && Objects.equals(getActivityId(), other.getActivityId()) && Objects.equals(getActivityTypeId(), other.getActivityTypeId()) && Objects.equals(getAspettoBeni(), other.getAspettoBeni()) && Objects.equals(getCausaleTrasp(), other.getCausaleTrasp()) && Objects.equals(getCodAbi(), other.getCodAbi()) && Objects.equals(getCodAnag(), other.getCodAnag()) && Objects.equals(getCodAuto(), other.getCodAuto()) && Objects.equals(getCodBanc(), other.getCodBanc()) && Objects.equals(getCodBancAzi(), other.getCodBancAzi()) && Objects.equals(getCodCab(), other.getCodCab()) && Objects.equals(getCodDgrpArt(), other.getCodDgrpArt()) && Objects.equals(getCodDivi(), other.getCodDivi()) && Objects.equals(getCodEtic(), other.getCodEtic()) && Objects.equals(getCodFornTd(), other.getCodFornTd()) && Objects.equals(getCodJcom(), other.getCodJcom()) && Objects.equals(getCodJfas(), other.getCodJfas()) && Objects.equals(getCodMdep(), other.getCodMdep()) && Objects.equals(getCodPaga(), other.getCodPaga()) && Objects.equals(getCodProd(), other.getCodProd()) && Objects.equals(getCodTcolUi(), other.getCodTcolUi()) && Objects.equals(getCodTcolUl(), other.getCodTcolUl()) && Objects.equals(getCodVage(), other.getCodVage()) && Objects.equals(getCodVage2(), other.getCodVage2()) && Objects.equals(getCodVdes(), other.getCodVdes()) && Objects.equals(getCodVvet(), other.getCodVvet()) && Objects.equals(getCodVvet2(), other.getCodVvet2()) && Objects.equals(getCodVzon(), other.getCodVzon()) && Objects.equals(getColliPedana(), other.getColliPedana()) && Objects.equals(getCompilatoDa(), other.getCompilatoDa()) && Objects.equals(getControllatoDa(), other.getControllatoDa()) && Objects.equals(getDataConsProd(), other.getDataConsProd()) && Objects.equals(getDataConsProdMax(), other.getDataConsProdMax()) && Objects.equals(getDataEsportazione(), other.getDataEsportazione()) && Objects.equals(getDataConferma(), other.getDataConferma()) && Objects.equals(getDataInizProd(), other.getDataInizProd()) && Objects.equals(getDataInizTrasp(), other.getDataInizTrasp()) && Objects.equals(getDataInsOrd(), other.getDataInsOrd()) && Objects.equals(getDataOrdRif(), other.getDataOrdRif()) && Objects.equals(getRifDataOrd(), other.getRifDataOrd()) && Objects.equals(getDataRicezione(), other.getDataRicezione()) && Objects.equals(getDataRifScad(), other.getDataRifScad()) && Objects.equals(getDataUltMod(), other.getDataUltMod()) && Objects.equals(getDescrEstesaProd(), other.getDescrEstesaProd()) && Objects.equals(getDescrizionePaga(), other.getDescrizionePaga()) && Objects.equals(getDescrizioneProd(), other.getDescrizioneProd()) && Objects.equals(getEanFidelity(), other.getEanFidelity()) && Objects.equals(getFlagAnnulla(), other.getFlagAnnulla()) && Objects.equals(getFlagEscRoyal(), other.getFlagEscRoyal()) && Objects.equals(getFlagEvasoForzato(), other.getFlagEvasoForzato()) && Objects.equals(getFlagEvasoProd(), other.getFlagEvasoProd()) && Objects.equals(getFlagPrzScontati(), other.getFlagPrzScontati()) && Objects.equals(getFlagSospeso(), other.getFlagSospeso()) && Objects.equals(getFlagTipologia(), other.getFlagTipologia()) && Objects.equals(getGestioneRif(), other.getGestioneRif()) && Objects.equals(getItemId(), other.getItemId()) && Objects.equals(getListino(), other.getListino()) && Objects.equals(getLivello(), other.getLivello()) && Objects.equals(getMezzo(), other.getMezzo()) && Objects.equals(getModificatoDa(), other.getModificatoDa()) && Objects.equals(getNettoMerce(), other.getNettoMerce()) && Objects.equals(getNolo(), other.getNolo()) && Objects.equals(getNolo2(), other.getNolo2()) && Objects.equals(getNote(), other.getNote()) && Objects.equals(getNumColli(), other.getNumColli()) && Objects.equals(getNumCons(), other.getNumCons()) && Objects.equals(getNumFase(), other.getNumFase()) && Objects.equals(getNumOrdProvv(), other.getNumOrdProvv()) && Objects.equals(getNumOrdRif(), other.getNumOrdRif()) && Objects.equals(getRifNumOrd(), other.getRifNumOrd()) && Objects.equals(getPartitaMag(), other.getPartitaMag()) && Objects.equals(getPercEsclStat(), other.getPercEsclStat()) && Objects.equals(getPersonaRif(), other.getPersonaRif()) && Objects.equals(getPeso(), other.getPeso()) && Objects.equals(getPorto(), other.getPorto()) && Objects.equals(getQtaEvasaProd(), other.getQtaEvasaProd()) && Objects.equals(getQtaPrenotataRep(), other.getQtaPrenotataRep()) && Objects.equals(getQtaProd(), other.getQtaProd()) && Objects.equals(getRapConvProd(), other.getRapConvProd()) && Objects.equals(getRfid(), other.getRfid()) && Objects.equals(getRifOrd(), other.getRifOrd()) && Objects.equals(getRigaOrdRif(), other.getRigaOrdRif()) && Objects.equals(getSconto1(), other.getSconto1()) && Objects.equals(getSconto2(), other.getSconto2()) && Objects.equals(getSconto3(), other.getSconto3()) && Objects.equals(getSconto4(), other.getSconto4()) && Objects.equals(getSerie(), other.getSerie()) && Objects.equals(getTermCons(), other.getTermCons()) && Objects.equals(getTipoAnag(), other.getTipoAnag()) && Objects.equals(getTotFasi(), other.getTotFasi()) && Objects.equals(getTotImponib(), other.getTotImponib()) && Objects.equals(getTotIva(), other.getTotIva()) && Objects.equals(getTotMerce(), other.getTotMerce()) && Objects.equals(getTotOmaggi(), other.getTotOmaggi()) && Objects.equals(getTotProvvig(), other.getTotProvvig()) && Objects.equals(getUntMisProd(), other.getUntMisProd()) && Objects.equals(getFlagPrzIva(), other.getFlagPrzIva()) && Objects.equals(getNoteConferma(), other.getNoteConferma()) && Objects.equals(getCodJflav(), other.getCodJflav()) && Objects.equals(getTarga(), other.getTarga()) && Objects.equals(getPostiPallet(), other.getPostiPallet());
-    }
-
     public boolean isGeneraOrdLavDaProd() {
         return generaOrdLavDaProd;
     }
@@ -1905,4 +1876,33 @@ public class DtbOrdt extends DtbDocOrdT implements EquatableEntityInterface<DtbO
         this.generaOrdLavDaProd = generaOrdLavDaProd;
         return this;
     }
+
+    @Override
+    public int hashCodeKey() {
+        return Objects.hash(getDataOrd(), getGestione(), getNumOrd());
+    }
+
+    @Override
+    public boolean equalsKey(DtbOrdt other) {
+        if (this == other)
+            return true;
+
+        if(hashCodeKey() != other.hashCodeKey())
+            return false;
+
+        return getDataOrd().equals(other.getDataOrd()) && getGestione().equals(other.getGestione()) && Objects.equals(getNumOrd(), other.getNumOrd());
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof DtbOrdt)) return false;
+        DtbOrdt dtbOrdt = (DtbOrdt) o;
+        return isGeneraOrdLavDaProd() == dtbOrdt.isGeneraOrdLavDaProd() && Objects.equals(getDataOrd(), dtbOrdt.getDataOrd()) && Objects.equals(getGestione(), dtbOrdt.getGestione()) && Objects.equals(getNumOrd(), dtbOrdt.getNumOrd()) && Objects.equals(getAcconto(), dtbOrdt.getAcconto()) && Objects.equals(getActivityId(), dtbOrdt.getActivityId()) && Objects.equals(getActivityTypeId(), dtbOrdt.getActivityTypeId()) && Objects.equals(getAspettoBeni(), dtbOrdt.getAspettoBeni()) && Objects.equals(getCausaleTrasp(), dtbOrdt.getCausaleTrasp()) && Objects.equals(getCodAbi(), dtbOrdt.getCodAbi()) && Objects.equals(getCodAnag(), dtbOrdt.getCodAnag()) && Objects.equals(getCodAuto(), dtbOrdt.getCodAuto()) && Objects.equals(getCodBanc(), dtbOrdt.getCodBanc()) && Objects.equals(getCodBancAzi(), dtbOrdt.getCodBancAzi()) && Objects.equals(getCodCab(), dtbOrdt.getCodCab()) && Objects.equals(getCodDgrpArt(), dtbOrdt.getCodDgrpArt()) && Objects.equals(getCodDivi(), dtbOrdt.getCodDivi()) && Objects.equals(getCodEtic(), dtbOrdt.getCodEtic()) && Objects.equals(getCodFornTd(), dtbOrdt.getCodFornTd()) && Objects.equals(getCodJcom(), dtbOrdt.getCodJcom()) && Objects.equals(getCodJfas(), dtbOrdt.getCodJfas()) && Objects.equals(getCodMdep(), dtbOrdt.getCodMdep()) && Objects.equals(getCodPaga(), dtbOrdt.getCodPaga()) && Objects.equals(getCodProd(), dtbOrdt.getCodProd()) && Objects.equals(getCodTcolUi(), dtbOrdt.getCodTcolUi()) && Objects.equals(getCodTcolUl(), dtbOrdt.getCodTcolUl()) && Objects.equals(getCodVage(), dtbOrdt.getCodVage()) && Objects.equals(getCodVage2(), dtbOrdt.getCodVage2()) && Objects.equals(getCodVdes(), dtbOrdt.getCodVdes()) && Objects.equals(getCodVvet(), dtbOrdt.getCodVvet()) && Objects.equals(getCodVvet2(), dtbOrdt.getCodVvet2()) && Objects.equals(getCodVzon(), dtbOrdt.getCodVzon()) && Objects.equals(getColliPedana(), dtbOrdt.getColliPedana()) && Objects.equals(getCompilatoDa(), dtbOrdt.getCompilatoDa()) && Objects.equals(getControllatoDa(), dtbOrdt.getControllatoDa()) && Objects.equals(getDataConsProd(), dtbOrdt.getDataConsProd()) && Objects.equals(getDataConsProdMax(), dtbOrdt.getDataConsProdMax()) && Objects.equals(getDataEsportazione(), dtbOrdt.getDataEsportazione()) && Objects.equals(getDataConferma(), dtbOrdt.getDataConferma()) && Objects.equals(getDataInizProd(), dtbOrdt.getDataInizProd()) && Objects.equals(getDataInizTrasp(), dtbOrdt.getDataInizTrasp()) && Objects.equals(getDataInsOrd(), dtbOrdt.getDataInsOrd()) && Objects.equals(getDataOrdRif(), dtbOrdt.getDataOrdRif()) && Objects.equals(getRifDataOrd(), dtbOrdt.getRifDataOrd()) && Objects.equals(getDataRicezione(), dtbOrdt.getDataRicezione()) && Objects.equals(getDataRifScad(), dtbOrdt.getDataRifScad()) && Objects.equals(getDataUltMod(), dtbOrdt.getDataUltMod()) && Objects.equals(getDescrEstesaProd(), dtbOrdt.getDescrEstesaProd()) && Objects.equals(getDescrizionePaga(), dtbOrdt.getDescrizionePaga()) && Objects.equals(getDescrizioneProd(), dtbOrdt.getDescrizioneProd()) && Objects.equals(getEanFidelity(), dtbOrdt.getEanFidelity()) && Objects.equals(getFlagAnnulla(), dtbOrdt.getFlagAnnulla()) && Objects.equals(getFlagEscRoyal(), dtbOrdt.getFlagEscRoyal()) && Objects.equals(getFlagEvasoForzato(), dtbOrdt.getFlagEvasoForzato()) && Objects.equals(getFlagEvasoProd(), dtbOrdt.getFlagEvasoProd()) && Objects.equals(getFlagPrzScontati(), dtbOrdt.getFlagPrzScontati()) && Objects.equals(getFlagSospeso(), dtbOrdt.getFlagSospeso()) && Objects.equals(getFlagTipologia(), dtbOrdt.getFlagTipologia()) && Objects.equals(getGestioneRif(), dtbOrdt.getGestioneRif()) && Objects.equals(getItemId(), dtbOrdt.getItemId()) && Objects.equals(getListino(), dtbOrdt.getListino()) && Objects.equals(getLivello(), dtbOrdt.getLivello()) && Objects.equals(getMezzo(), dtbOrdt.getMezzo()) && Objects.equals(getModificatoDa(), dtbOrdt.getModificatoDa()) && Objects.equals(getNettoMerce(), dtbOrdt.getNettoMerce()) && Objects.equals(getNolo(), dtbOrdt.getNolo()) && Objects.equals(getNolo2(), dtbOrdt.getNolo2()) && Objects.equals(getNote(), dtbOrdt.getNote()) && Objects.equals(getNumColli(), dtbOrdt.getNumColli()) && Objects.equals(getNumCons(), dtbOrdt.getNumCons()) && Objects.equals(getNumFase(), dtbOrdt.getNumFase()) && Objects.equals(getNumOrdProvv(), dtbOrdt.getNumOrdProvv()) && Objects.equals(getNumOrdRif(), dtbOrdt.getNumOrdRif()) && Objects.equals(getRifNumOrd(), dtbOrdt.getRifNumOrd()) && Objects.equals(getPartitaMag(), dtbOrdt.getPartitaMag()) && Objects.equals(getPercEsclStat(), dtbOrdt.getPercEsclStat()) && Objects.equals(getPersonaRif(), dtbOrdt.getPersonaRif()) && Objects.equals(getPeso(), dtbOrdt.getPeso()) && Objects.equals(getPorto(), dtbOrdt.getPorto()) && Objects.equals(getQtaEvasaProd(), dtbOrdt.getQtaEvasaProd()) && Objects.equals(getQtaPrenotataRep(), dtbOrdt.getQtaPrenotataRep()) && Objects.equals(getQtaProd(), dtbOrdt.getQtaProd()) && Objects.equals(getRapConvProd(), dtbOrdt.getRapConvProd()) && Objects.equals(getRfid(), dtbOrdt.getRfid()) && Objects.equals(getRifOrd(), dtbOrdt.getRifOrd()) && Objects.equals(getRigaOrdRif(), dtbOrdt.getRigaOrdRif()) && Objects.equals(getSconto1(), dtbOrdt.getSconto1()) && Objects.equals(getSconto2(), dtbOrdt.getSconto2()) && Objects.equals(getSconto3(), dtbOrdt.getSconto3()) && Objects.equals(getSconto4(), dtbOrdt.getSconto4()) && Objects.equals(getSerie(), dtbOrdt.getSerie()) && Objects.equals(getTermCons(), dtbOrdt.getTermCons()) && Objects.equals(getTipoAnag(), dtbOrdt.getTipoAnag()) && Objects.equals(getTotFasi(), dtbOrdt.getTotFasi()) && Objects.equals(getTotImponib(), dtbOrdt.getTotImponib()) && Objects.equals(getTotIva(), dtbOrdt.getTotIva()) && Objects.equals(getTotMerce(), dtbOrdt.getTotMerce()) && Objects.equals(getTotOmaggi(), dtbOrdt.getTotOmaggi()) && Objects.equals(getTotProvvig(), dtbOrdt.getTotProvvig()) && Objects.equals(getUntMisProd(), dtbOrdt.getUntMisProd()) && Objects.equals(getFlagPrzIva(), dtbOrdt.getFlagPrzIva()) && Objects.equals(getNoteConferma(), dtbOrdt.getNoteConferma()) && Objects.equals(getCodJflav(), dtbOrdt.getCodJflav()) && Objects.equals(getTarga(), dtbOrdt.getTarga()) && Objects.equals(getPostiPallet(), dtbOrdt.getPostiPallet()) && Objects.equals(getFlagBudget(), dtbOrdt.getFlagBudget()) && Objects.equals(getDataConsRich(), dtbOrdt.getDataConsRich()) && Objects.equals(getNoteExport(), dtbOrdt.getNoteExport()) && Objects.equals(getNumCnfProd(), dtbOrdt.getNumCnfProd()) && Objects.equals(getCodLingua(), dtbOrdt.getCodLingua()) && Objects.equals(getCambio(), dtbOrdt.getCambio()) && Objects.equals(getUserName(), dtbOrdt.getUserName()) && Objects.equals(getFlagTd(), dtbOrdt.getFlagTd()) && Objects.equals(getGestisciStralciOrdV(), dtbOrdt.getGestisciStralciOrdV()) && Objects.equals(getIdViaggioTestata(), dtbOrdt.getIdViaggioTestata()) && Objects.equals(getExplodeKit(), dtbOrdt.getExplodeKit()) && Objects.equals(getGestisciOrdLavTx(), dtbOrdt.getGestisciOrdLavTx()) && Objects.equals(getOrdTrasf(), dtbOrdt.getOrdTrasf());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getDataOrd(), getGestione(), getNumOrd(), getAcconto(), getActivityId(), getActivityTypeId(), getAspettoBeni(), getCausaleTrasp(), getCodAbi(), getCodAnag(), getCodAuto(), getCodBanc(), getCodBancAzi(), getCodCab(), getCodDgrpArt(), getCodDivi(), getCodEtic(), getCodFornTd(), getCodJcom(), getCodJfas(), getCodMdep(), getCodPaga(), getCodProd(), getCodTcolUi(), getCodTcolUl(), getCodVage(), getCodVage2(), getCodVdes(), getCodVvet(), getCodVvet2(), getCodVzon(), getColliPedana(), getCompilatoDa(), getControllatoDa(), getDataConsProd(), getDataConsProdMax(), getDataEsportazione(), getDataConferma(), getDataInizProd(), getDataInizTrasp(), getDataInsOrd(), getDataOrdRif(), getRifDataOrd(), getDataRicezione(), getDataRifScad(), getDataUltMod(), getDescrEstesaProd(), getDescrizionePaga(), getDescrizioneProd(), getEanFidelity(), getFlagAnnulla(), getFlagEscRoyal(), getFlagEvasoForzato(), getFlagEvasoProd(), getFlagPrzScontati(), getFlagSospeso(), getFlagTipologia(), getGestioneRif(), getItemId(), getListino(), getLivello(), getMezzo(), getModificatoDa(), getNettoMerce(), getNolo(), getNolo2(), getNote(), getNumColli(), getNumCons(), getNumFase(), getNumOrdProvv(), getNumOrdRif(), getRifNumOrd(), getPartitaMag(), getPercEsclStat(), getPersonaRif(), getPeso(), getPorto(), getQtaEvasaProd(), getQtaPrenotataRep(), getQtaProd(), getRapConvProd(), getRfid(), getRifOrd(), getRigaOrdRif(), getSconto1(), getSconto2(), getSconto3(), getSconto4(), getSerie(), getTermCons(), getTipoAnag(), getTotFasi(), getTotImponib(), getTotIva(), getTotMerce(), getTotOmaggi(), getTotProvvig(), getUntMisProd(), getFlagPrzIva(), getNoteConferma(), getCodJflav(), getTarga(), getPostiPallet(), getFlagBudget(), getDataConsRich(), getNoteExport(), getNumCnfProd(), getCodLingua(), getCambio(), getUserName(), getFlagTd(), getGestisciStralciOrdV(), getIdViaggioTestata(), getExplodeKit(), getGestisciOrdLavTx(), getOrdTrasf(), isGeneraOrdLavDaProd());
+    }
 }
diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/MtbAart.java b/ems-core/src/main/java/it/integry/ems_model/entity/MtbAart.java
index d84f2178a8..641b85dd2c 100644
--- a/ems-core/src/main/java/it/integry/ems_model/entity/MtbAart.java
+++ b/ems-core/src/main/java/it/integry/ems_model/entity/MtbAart.java
@@ -2,21 +2,20 @@ package it.integry.ems_model.entity;
 
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import it.integry.common.var.CommonConstants;
-import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
 import it.integry.ems_model.annotation.*;
 import it.integry.ems_model.base.EntityBase;
 import it.integry.ems_model.base.EquatableEntityInterface;
 import it.integry.ems_model.utility.Query;
 import it.integry.ems_model.utility.UtilityDB;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.kie.api.definition.type.PropertyReactive;
-import org.springframework.beans.factory.annotation.Autowired;
+
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
-import java.util.ArrayList;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 @Master
 @PropertyReactive
@@ -1338,13 +1337,28 @@ public class MtbAart extends EntityBase implements EquatableEntityInterface<MtbA
     public boolean equalsKey(MtbAart other) {
         if (this == other)
             return true;
+
+        if(hashCodeKey() != other.hashCodeKey())
+            return false;
+
         return Objects.equals(getCodMart(), other.getCodMart());
     }
 
     @Override
-    public boolean equalsContent(MtbAart other) {
-        if (this == other)
-            return true;
-        return Objects.equals(getCodMart(), other.getCodMart()) && Objects.equals(getDescrizione(), other.getDescrizione()) && Objects.equals(getUntMis(), other.getUntMis()) && Objects.equals(getBarCode(), other.getBarCode()) && Objects.equals(getPesoKg(), other.getPesoKg()) && Objects.equals(getQtaCnf(), other.getQtaCnf()) && Objects.equals(getCodAliq(), other.getCodAliq()) && Objects.equals(getCodScoArt(), other.getCodScoArt()) && Objects.equals(getCodTcolUi(), other.getCodTcolUi()) && Objects.equals(getCodTcolUl(), other.getCodTcolUl()) && Objects.equals(getArticoloComposto(), other.getArticoloComposto()) && Objects.equals(getEsposizioneComp(), other.getEsposizioneComp()) && Objects.equals(getDescrizioneEstesa(), other.getDescrizioneEstesa()) && Objects.equals(getCodUltForn(), other.getCodUltForn()) && Objects.equals(getDataUltCar(), other.getDataUltCar()) && Objects.equals(getValUltCar(), other.getValUltCar()) && Objects.equals(getCodUltClie(), other.getCodUltClie()) && Objects.equals(getDataUltScar(), other.getDataUltScar()) && Objects.equals(getValUltScar(), other.getValUltScar()) && Objects.equals(getTipoCodice(), other.getTipoCodice()) && Objects.equals(getNote(), other.getNote()) && Objects.equals(getPosizione(), other.getPosizione()) && Objects.equals(getColliPedana(), other.getColliPedana()) && Objects.equals(getUntMis2(), other.getUntMis2()) && Objects.equals(getRapConv2(), other.getRapConv2()) && Objects.equals(getFlagInclListino(), other.getFlagInclListino()) && Objects.equals(getUntMis3(), other.getUntMis3()) && Objects.equals(getRapConv3(), other.getRapConv3()) && Objects.equals(getCodMartStat(), other.getCodMartStat()) && Objects.equals(getCodMcon(), other.getCodMcon()) && Objects.equals(getCodMgrp(), other.getCodMgrp()) && Objects.equals(getCodMsfa(), other.getCodMsfa()) && Objects.equals(getCodMsgr(), other.getCodMsgr()) && Objects.equals(getCodMstp(), other.getCodMstp()) && Objects.equals(getCodMtip(), other.getCodMtip()) && Objects.equals(getDescrizioneStat(), other.getDescrizioneStat()) && Objects.equals(getFlagStato(), other.getFlagStato()) && Objects.equals(getCambioDiviCar(), other.getCambioDiviCar()) && Objects.equals(getCambioDiviScar(), other.getCambioDiviScar()) && Objects.equals(getGgScadPartita(), other.getGgScadPartita()) && Objects.equals(getVolumeMc(), other.getVolumeMc()) && Objects.equals(getFlagEsponiPrz(), other.getFlagEsponiPrz()) && Objects.equals(getDataUltVar(), other.getDataUltVar()) && Objects.equals(getPercSfrido(), other.getPercSfrido()) && Objects.equals(getCodBarreImb(), other.getCodBarreImb()) && Objects.equals(getFlagCalcPrz(), other.getFlagCalcPrz()) && Objects.equals(getEsposizioneCompAcq(), other.getEsposizioneCompAcq()) && Objects.equals(getFlagCalcPrzAcq(), other.getFlagCalcPrzAcq()) && Objects.equals(getDiacod(), other.getDiacod()) && Objects.equals(getPlu(), other.getPlu()) && Objects.equals(getPartIvaProd(), other.getPartIvaProd()) && Objects.equals(getRagSocProd(), other.getRagSocProd()) && Objects.equals(getFlagRapConvVariabile(), other.getFlagRapConvVariabile()) && Objects.equals(getFlagMovArtMag(), other.getFlagMovArtMag()) && Objects.equals(getFlagTracciabilita(), other.getFlagTracciabilita()) && Objects.equals(getTaraKg(), other.getTaraKg()) && Objects.equals(getColliStrato(), other.getColliStrato()) && Objects.equals(getFlagQtaCnfFissa(), other.getFlagQtaCnfFissa()) && Objects.equals(getFlagColliPedanaFisso(), other.getFlagColliPedanaFisso()) && Objects.equals(getCodCconCosti(), other.getCodCconCosti()) && Objects.equals(getCodCconRicavi(), other.getCodCconRicavi()) && Objects.equals(getCodDgrpArt(), other.getCodDgrpArt()) && Objects.equals(getCodDiviCar(), other.getCodDiviCar()) && Objects.equals(getCodDiviScar(), other.getCodDiviScar()) && Objects.equals(getCodEcrCat(), other.getCodEcrCat()) && Objects.equals(getCodEcrMcat(), other.getCodEcrMcat()) && Objects.equals(getCodEcrRep(), other.getCodEcrRep()) && Objects.equals(getCodEcrStipo(), other.getCodEcrStipo()) && Objects.equals(getCodEcrTipo(), other.getCodEcrTipo()) && Objects.equals(getCodGrpBolla(), other.getCodGrpBolla()) && Objects.equals(getIngredienti(), other.getIngredienti()) && Objects.equals(getIdArtEqui(), other.getIdArtEqui()) && Objects.equals(getDescrCassa(), other.getDescrCassa()) && Objects.equals(getCodNcIntracee(), other.getCodNcIntracee()) && Objects.equals(getMarchio(), other.getMarchio()) && Objects.equals(getSezione(), other.getSezione()) && Objects.equals(getTipoReg(), other.getTipoReg()) && Objects.equals(getTipoStock(), other.getTipoStock()) && Objects.equals(getQtaMultiplaOrd(), other.getQtaMultiplaOrd()) && Objects.equals(getFlagKit(), other.getFlagKit()) && Objects.equals(getCodFornCv(), other.getCodFornCv()) && Objects.equals(getCpa(), other.getCpa()) && Objects.equals(getTaric(), other.getTaric()) && Objects.equals(getSezioneDogana(), other.getSezioneDogana()) && Objects.equals(getFlagPesoEgalizzato(), other.getFlagPesoEgalizzato()) && Objects.equals(getCodJfasCosti(), other.getCodJfasCosti()) && Objects.equals(getCodJfasRicavi(), other.getCodJfasRicavi()) && Objects.equals(getFlagArrPrzVendIva(), other.getFlagArrPrzVendIva()) && Objects.equals(getClassificazioneAbc(), other.getClassificazioneAbc()) && Objects.equals(getTipoCodiceImballo(), other.getTipoCodiceImballo());
+    public int hashCodeKey() {
+        return Objects.hash(getCodMart());
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof MtbAart)) return false;
+        MtbAart mtbAart = (MtbAart) o;
+        return Objects.equals(getCodMart(), mtbAart.getCodMart()) && Objects.equals(getDescrizione(), mtbAart.getDescrizione()) && Objects.equals(getUntMis(), mtbAart.getUntMis()) && Objects.equals(getBarCode(), mtbAart.getBarCode()) && Objects.equals(getPesoKg(), mtbAart.getPesoKg()) && Objects.equals(getQtaCnf(), mtbAart.getQtaCnf()) && Objects.equals(getCodAliq(), mtbAart.getCodAliq()) && Objects.equals(getCodScoArt(), mtbAart.getCodScoArt()) && Objects.equals(getCodTcolUi(), mtbAart.getCodTcolUi()) && Objects.equals(getCodTcolUl(), mtbAart.getCodTcolUl()) && Objects.equals(getArticoloComposto(), mtbAart.getArticoloComposto()) && Objects.equals(getEsposizioneComp(), mtbAart.getEsposizioneComp()) && Objects.equals(getDescrizioneEstesa(), mtbAart.getDescrizioneEstesa()) && Objects.equals(getCodUltForn(), mtbAart.getCodUltForn()) && Objects.equals(getDataUltCar(), mtbAart.getDataUltCar()) && Objects.equals(getValUltCar(), mtbAart.getValUltCar()) && Objects.equals(getCodUltClie(), mtbAart.getCodUltClie()) && Objects.equals(getDataUltScar(), mtbAart.getDataUltScar()) && Objects.equals(getValUltScar(), mtbAart.getValUltScar()) && Objects.equals(getTipoCodice(), mtbAart.getTipoCodice()) && Objects.equals(getNote(), mtbAart.getNote()) && Objects.equals(getPosizione(), mtbAart.getPosizione()) && Objects.equals(getColliPedana(), mtbAart.getColliPedana()) && Objects.equals(getUntMis2(), mtbAart.getUntMis2()) && Objects.equals(getRapConv2(), mtbAart.getRapConv2()) && Objects.equals(getFlagInclListino(), mtbAart.getFlagInclListino()) && Objects.equals(getUntMis3(), mtbAart.getUntMis3()) && Objects.equals(getRapConv3(), mtbAart.getRapConv3()) && Objects.equals(getCodMartStat(), mtbAart.getCodMartStat()) && Objects.equals(getCodMcon(), mtbAart.getCodMcon()) && Objects.equals(getCodMgrp(), mtbAart.getCodMgrp()) && Objects.equals(getCodMsfa(), mtbAart.getCodMsfa()) && Objects.equals(getCodMsgr(), mtbAart.getCodMsgr()) && Objects.equals(getCodMstp(), mtbAart.getCodMstp()) && Objects.equals(getCodMtip(), mtbAart.getCodMtip()) && Objects.equals(getDescrizioneStat(), mtbAart.getDescrizioneStat()) && Objects.equals(getFlagStato(), mtbAart.getFlagStato()) && Objects.equals(getCambioDiviCar(), mtbAart.getCambioDiviCar()) && Objects.equals(getCambioDiviScar(), mtbAart.getCambioDiviScar()) && Objects.equals(getGgScadPartita(), mtbAart.getGgScadPartita()) && Objects.equals(getVolumeMc(), mtbAart.getVolumeMc()) && Objects.equals(getFlagEsponiPrz(), mtbAart.getFlagEsponiPrz()) && Objects.equals(getDataUltVar(), mtbAart.getDataUltVar()) && Objects.equals(getPercSfrido(), mtbAart.getPercSfrido()) && Objects.equals(getCodBarreImb(), mtbAart.getCodBarreImb()) && Objects.equals(getFlagCalcPrz(), mtbAart.getFlagCalcPrz()) && Objects.equals(getEsposizioneCompAcq(), mtbAart.getEsposizioneCompAcq()) && Objects.equals(getFlagCalcPrzAcq(), mtbAart.getFlagCalcPrzAcq()) && Objects.equals(getDiacod(), mtbAart.getDiacod()) && Objects.equals(getPlu(), mtbAart.getPlu()) && Objects.equals(getPartIvaProd(), mtbAart.getPartIvaProd()) && Objects.equals(getRagSocProd(), mtbAart.getRagSocProd()) && Objects.equals(getFlagRapConvVariabile(), mtbAart.getFlagRapConvVariabile()) && Objects.equals(getFlagMovArtMag(), mtbAart.getFlagMovArtMag()) && Objects.equals(getFlagTracciabilita(), mtbAart.getFlagTracciabilita()) && Objects.equals(getTaraKg(), mtbAart.getTaraKg()) && Objects.equals(getColliStrato(), mtbAart.getColliStrato()) && Objects.equals(getFlagQtaCnfFissa(), mtbAart.getFlagQtaCnfFissa()) && Objects.equals(getFlagColliPedanaFisso(), mtbAart.getFlagColliPedanaFisso()) && Objects.equals(getCodCconCosti(), mtbAart.getCodCconCosti()) && Objects.equals(getCodCconRicavi(), mtbAart.getCodCconRicavi()) && Objects.equals(getCodDgrpArt(), mtbAart.getCodDgrpArt()) && Objects.equals(getCodDiviCar(), mtbAart.getCodDiviCar()) && Objects.equals(getCodDiviScar(), mtbAart.getCodDiviScar()) && Objects.equals(getCodEcrCat(), mtbAart.getCodEcrCat()) && Objects.equals(getCodEcrMcat(), mtbAart.getCodEcrMcat()) && Objects.equals(getCodEcrRep(), mtbAart.getCodEcrRep()) && Objects.equals(getCodEcrStipo(), mtbAart.getCodEcrStipo()) && Objects.equals(getCodEcrTipo(), mtbAart.getCodEcrTipo()) && Objects.equals(getCodGrpBolla(), mtbAart.getCodGrpBolla()) && Objects.equals(getIngredienti(), mtbAart.getIngredienti()) && Objects.equals(getIdArtEqui(), mtbAart.getIdArtEqui()) && Objects.equals(getDescrCassa(), mtbAart.getDescrCassa()) && Objects.equals(getCodNcIntracee(), mtbAart.getCodNcIntracee()) && Objects.equals(getMarchio(), mtbAart.getMarchio()) && Objects.equals(getSezione(), mtbAart.getSezione()) && Objects.equals(getTipoReg(), mtbAart.getTipoReg()) && Objects.equals(getTipoStock(), mtbAart.getTipoStock()) && Objects.equals(getQtaMultiplaOrd(), mtbAart.getQtaMultiplaOrd()) && Objects.equals(getFlagKit(), mtbAart.getFlagKit()) && Objects.equals(getCodFornCv(), mtbAart.getCodFornCv()) && Objects.equals(getCpa(), mtbAart.getCpa()) && Objects.equals(getTaric(), mtbAart.getTaric()) && Objects.equals(getSezioneDogana(), mtbAart.getSezioneDogana()) && Objects.equals(getFlagPesoEgalizzato(), mtbAart.getFlagPesoEgalizzato()) && Objects.equals(getCodJfasCosti(), mtbAart.getCodJfasCosti()) && Objects.equals(getCodJfasRicavi(), mtbAart.getCodJfasRicavi()) && Objects.equals(getMtbAartEqui_descrizione(), mtbAart.getMtbAartEqui_descrizione()) && Objects.equals(getFlagArrPrzVendIva(), mtbAart.getFlagArrPrzVendIva()) && Objects.equals(getClassificazioneAbc(), mtbAart.getClassificazioneAbc()) && Objects.equals(getTipoCodiceImballo(), mtbAart.getTipoCodiceImballo());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getCodMart(), getDescrizione(), getUntMis(), getBarCode(), getPesoKg(), getQtaCnf(), getCodAliq(), getCodScoArt(), getCodTcolUi(), getCodTcolUl(), getArticoloComposto(), getEsposizioneComp(), getDescrizioneEstesa(), getCodUltForn(), getDataUltCar(), getValUltCar(), getCodUltClie(), getDataUltScar(), getValUltScar(), getTipoCodice(), getNote(), getPosizione(), getColliPedana(), getUntMis2(), getRapConv2(), getFlagInclListino(), getUntMis3(), getRapConv3(), getCodMartStat(), getCodMcon(), getCodMgrp(), getCodMsfa(), getCodMsgr(), getCodMstp(), getCodMtip(), getDescrizioneStat(), getFlagStato(), getCambioDiviCar(), getCambioDiviScar(), getGgScadPartita(), getVolumeMc(), getFlagEsponiPrz(), getDataUltVar(), getPercSfrido(), getCodBarreImb(), getFlagCalcPrz(), getEsposizioneCompAcq(), getFlagCalcPrzAcq(), getDiacod(), getPlu(), getPartIvaProd(), getRagSocProd(), getFlagRapConvVariabile(), getFlagMovArtMag(), getFlagTracciabilita(), getTaraKg(), getColliStrato(), getFlagQtaCnfFissa(), getFlagColliPedanaFisso(), getCodCconCosti(), getCodCconRicavi(), getCodDgrpArt(), getCodDiviCar(), getCodDiviScar(), getCodEcrCat(), getCodEcrMcat(), getCodEcrRep(), getCodEcrStipo(), getCodEcrTipo(), getCodGrpBolla(), getIngredienti(), getIdArtEqui(), getDescrCassa(), getCodNcIntracee(), getMarchio(), getSezione(), getTipoReg(), getTipoStock(), getQtaMultiplaOrd(), getFlagKit(), getCodFornCv(), getCpa(), getTaric(), getSezioneDogana(), getFlagPesoEgalizzato(), getCodJfasCosti(), getCodJfasRicavi(), getMtbAartEqui_descrizione(), getFlagArrPrzVendIva(), getClassificazioneAbc(), getTipoCodiceImballo());
     }
 }
diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/MtbAartMarchio.java b/ems-core/src/main/java/it/integry/ems_model/entity/MtbAartMarchio.java
index 6a517f61d5..be27e3c147 100644
--- a/ems-core/src/main/java/it/integry/ems_model/entity/MtbAartMarchio.java
+++ b/ems-core/src/main/java/it/integry/ems_model/entity/MtbAartMarchio.java
@@ -7,12 +7,11 @@ import it.integry.ems_model.annotation.SqlField;
 import it.integry.ems_model.annotation.Table;
 import it.integry.ems_model.base.EntityBase;
 import it.integry.ems_model.base.EquatableEntityInterface;
-import org.kie.api.definition.type.PropertyReactive;
-import java.util.Objects;
-import java.util.ArrayList;
-import it.integry.ems_model.annotation.FK;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.kie.api.definition.type.PropertyReactive;
+
+import java.util.Objects;
 
 @Master
 @PropertyReactive
@@ -47,14 +46,16 @@ public class MtbAartMarchio extends EntityBase implements EquatableEntityInterfa
     public boolean equalsKey(MtbAartMarchio other) {
         if (this == other)
             return true;
+
+        if(hashCodeKey() != other.hashCodeKey())
+            return false;
+
         return Objects.equals(getMarchio(), other.getMarchio());
     }
 
     @Override
-    public boolean equalsContent(MtbAartMarchio other) {
-        if (this == other)
-            return true;
-        return Objects.equals(getMarchio(), other.getMarchio());
+    public int hashCodeKey() {
+        return Objects.hashCode(getMarchio());
     }
 
     @Override
diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/MtbColr.java b/ems-core/src/main/java/it/integry/ems_model/entity/MtbColr.java
index f5bb21b687..84350d58a2 100644
--- a/ems-core/src/main/java/it/integry/ems_model/entity/MtbColr.java
+++ b/ems-core/src/main/java/it/integry/ems_model/entity/MtbColr.java
@@ -12,11 +12,11 @@ import it.integry.ems_model.utility.UtilityString;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.kie.api.definition.type.PropertyReactive;
+
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.Date;
 import java.util.Objects;
-import java.util.ArrayList;
 
 @PropertyReactive
 @Table(MtbColr.ENTITY)
@@ -581,29 +581,29 @@ public class MtbColr extends EntityBase implements EquatableEntityInterface<MtbC
     public boolean equalsKey(MtbColr other) {
         if (this == other)
             return true;
+
+        if(hashCodeKey() != other.hashCodeKey())
+            return false;
+
         return Objects.equals(getDataCollo(), other.getDataCollo()) && Objects.equals(getGestione(), other.getGestione()) && Objects.equals(getSerCollo(), other.getSerCollo()) && Objects.equals(getNumCollo(), other.getNumCollo()) && Objects.equals(getRiga(), other.getRiga());
     }
 
     @Override
-    public boolean equalsContent(MtbColr other) {
-        if (this == other)
-            return true;
-        return Objects.equals(getDataCollo(), other.getDataCollo()) && Objects.equals(getGestione(), other.getGestione()) && Objects.equals(getSerCollo(), other.getSerCollo()) && Objects.equals(getNumCollo(), other.getNumCollo()) && Objects.equals(getRiga(), other.getRiga()) && Objects.equals(getRigaOrd(), other.getRigaOrd()) && Objects.equals(getCodMart(), other.getCodMart()) && Objects.equals(getCodBarre(), other.getCodBarre()) && Objects.equals(getCodCol(), other.getCodCol()) && Objects.equals(getCodTagl(), other.getCodTagl()) && Objects.equals(getPartitaMag(), other.getPartitaMag()) && Objects.equals(getGestioneRif(), other.getGestioneRif()) && Objects.equals(getSerColloRif(), other.getSerColloRif()) && Objects.equals(getNote(), other.getNote()) && Objects.equals(getDataOrd(), other.getDataOrd()) && Objects.equals(getDataColloRif(), other.getDataColloRif()) && Objects.equals(getQtaCnf(), other.getQtaCnf()) && Objects.equals(getQtaCol(), other.getQtaCol()) && Objects.equals(getNumOrd(), other.getNumOrd()) && Objects.equals(getNumEtich(), other.getNumEtich()) && Objects.equals(getNumColloRif(), other.getNumColloRif()) && Objects.equals(getDatetimeRow(), other.getDatetimeRow()) && Objects.equals(getCodJcom(), other.getCodJcom()) && Objects.equals(getNumCnf(), other.getNumCnf()) && getCausale() == other.getCausale() && Objects.equals(getUtente(), other.getUtente()) && Objects.equals(getCodAnagDoc(), other.getCodAnagDoc()) && Objects.equals(getCodDtipDoc(), other.getCodDtipDoc()) && Objects.equals(getDataDoc(), other.getDataDoc()) && Objects.equals(getSerDoc(), other.getSerDoc()) && Objects.equals(getNumDoc(), other.getNumDoc()) && Objects.equals(getIdRigaDoc(), other.getIdRigaDoc()) && Objects.equals(getPesoNettoKg(), other.getPesoNettoKg()) && Objects.equals(getPesoLordoKg(), other.getPesoLordoKg()) && Objects.equals(getMtbColrInfoProd(), other.getMtbColrInfoProd()) && Objects.equals(getInsPartitaMag(), other.getInsPartitaMag()) && Objects.equals(getMtbPartitaMag_descrizione(), other.getMtbPartitaMag_descrizione()) && Objects.equals(getDataScadPartita(), other.getDataScadPartita()) && Objects.equals(getDescrizione(), other.getDescrizione()) && Objects.equals(getFlagQtaCnfFissa(), other.getFlagQtaCnfFissa());
+    public int hashCodeKey() {
+        return Objects.hash(getDataCollo(), getGestione(), getSerCollo(), getNumCollo(), getRiga());
     }
 
     @Override
-    public boolean equals(Object object) {
-        if (this == object)
-            return true;
-        if (!(object instanceof MtbColr))
-            return false;
-        MtbColr mtbColr = (MtbColr) object;
-        return Objects.equals(getDataCollo(), mtbColr.getDataCollo()) && Objects.equals(getGestione(), mtbColr.getGestione()) && Objects.equals(getSerCollo(), mtbColr.getSerCollo()) && Objects.equals(getNumCollo(), mtbColr.getNumCollo()) && Objects.equals(getRiga(), mtbColr.getRiga()) && Objects.equals(getRigaOrd(), mtbColr.getRigaOrd()) && Objects.equals(getCodMart(), mtbColr.getCodMart()) && Objects.equals(getCodBarre(), mtbColr.getCodBarre()) && Objects.equals(getCodCol(), mtbColr.getCodCol()) && Objects.equals(getCodTagl(), mtbColr.getCodTagl()) && Objects.equals(getPartitaMag(), mtbColr.getPartitaMag()) && Objects.equals(getGestioneRif(), mtbColr.getGestioneRif()) && Objects.equals(getSerColloRif(), mtbColr.getSerColloRif()) && Objects.equals(getNote(), mtbColr.getNote()) && Objects.equals(getDataOrd(), mtbColr.getDataOrd()) && Objects.equals(getDataColloRif(), mtbColr.getDataColloRif()) && Objects.equals(getQtaCnf(), mtbColr.getQtaCnf()) && Objects.equals(getQtaCol(), mtbColr.getQtaCol()) && Objects.equals(getNumOrd(), mtbColr.getNumOrd()) && Objects.equals(getNumEtich(), mtbColr.getNumEtich()) && Objects.equals(getNumColloRif(), mtbColr.getNumColloRif()) && Objects.equals(getDatetimeRow(), mtbColr.getDatetimeRow()) && Objects.equals(getCodJcom(), mtbColr.getCodJcom()) && Objects.equals(getNumCnf(), mtbColr.getNumCnf()) && getCausale() == mtbColr.getCausale() && Objects.equals(getUtente(), mtbColr.getUtente()) && Objects.equals(getCodAnagDoc(), mtbColr.getCodAnagDoc()) && Objects.equals(getCodDtipDoc(), mtbColr.getCodDtipDoc()) && Objects.equals(getDataDoc(), mtbColr.getDataDoc()) && Objects.equals(getSerDoc(), mtbColr.getSerDoc()) && Objects.equals(getNumDoc(), mtbColr.getNumDoc()) && Objects.equals(getIdRigaDoc(), mtbColr.getIdRigaDoc()) && Objects.equals(getPesoNettoKg(), mtbColr.getPesoNettoKg()) && Objects.equals(getPesoLordoKg(), mtbColr.getPesoLordoKg()) && Objects.equals(getMtbColrInfoProd(), mtbColr.getMtbColrInfoProd()) && Objects.equals(getInsPartitaMag(), mtbColr.getInsPartitaMag()) && Objects.equals(getMtbPartitaMag_descrizione(), mtbColr.getMtbPartitaMag_descrizione()) && Objects.equals(getDataScadPartita(), mtbColr.getDataScadPartita()) && Objects.equals(getDescrizione(), mtbColr.getDescrizione()) && Objects.equals(getFlagQtaCnfFissa(), mtbColr.getFlagQtaCnfFissa());
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof MtbColr)) return false;
+        MtbColr mtbColr = (MtbColr) o;
+        return Objects.equals(getDataCollo(), mtbColr.getDataCollo()) && Objects.equals(getGestione(), mtbColr.getGestione()) && Objects.equals(getSerCollo(), mtbColr.getSerCollo()) && Objects.equals(getNumCollo(), mtbColr.getNumCollo()) && Objects.equals(getRiga(), mtbColr.getRiga()) && Objects.equals(getRigaOrd(), mtbColr.getRigaOrd()) && Objects.equals(getCodMart(), mtbColr.getCodMart()) && Objects.equals(getCodBarre(), mtbColr.getCodBarre()) && Objects.equals(getCodCol(), mtbColr.getCodCol()) && Objects.equals(getCodTagl(), mtbColr.getCodTagl()) && Objects.equals(getPartitaMag(), mtbColr.getPartitaMag()) && Objects.equals(getGestioneRif(), mtbColr.getGestioneRif()) && Objects.equals(getSerColloRif(), mtbColr.getSerColloRif()) && Objects.equals(getNote(), mtbColr.getNote()) && Objects.equals(getDataOrd(), mtbColr.getDataOrd()) && Objects.equals(getDataColloRif(), mtbColr.getDataColloRif()) && Objects.equals(getQtaCnf(), mtbColr.getQtaCnf()) && Objects.equals(getQtaCol(), mtbColr.getQtaCol()) && Objects.equals(getNumOrd(), mtbColr.getNumOrd()) && Objects.equals(getNumEtich(), mtbColr.getNumEtich()) && Objects.equals(getNumColloRif(), mtbColr.getNumColloRif()) && Objects.equals(getDatetimeRow(), mtbColr.getDatetimeRow()) && Objects.equals(getCodJcom(), mtbColr.getCodJcom()) && Objects.equals(getNumCnf(), mtbColr.getNumCnf()) && getCausale() == mtbColr.getCausale() && Objects.equals(getUtente(), mtbColr.getUtente()) && Objects.equals(getCodAnagDoc(), mtbColr.getCodAnagDoc()) && Objects.equals(getCodDtipDoc(), mtbColr.getCodDtipDoc()) && Objects.equals(getDataDoc(), mtbColr.getDataDoc()) && Objects.equals(getSerDoc(), mtbColr.getSerDoc()) && Objects.equals(getNumDoc(), mtbColr.getNumDoc()) && Objects.equals(getIdRigaDoc(), mtbColr.getIdRigaDoc()) && Objects.equals(getPesoNettoKg(), mtbColr.getPesoNettoKg()) && Objects.equals(getPesoLordoKg(), mtbColr.getPesoLordoKg()) && Objects.equals(getInsPartitaMag(), mtbColr.getInsPartitaMag()) && Objects.equals(getMtbPartitaMag_descrizione(), mtbColr.getMtbPartitaMag_descrizione()) && Objects.equals(getDataScadPartita(), mtbColr.getDataScadPartita()) && Objects.equals(getDescrizione(), mtbColr.getDescrizione()) && Objects.equals(getFlagQtaCnfFissa(), mtbColr.getFlagQtaCnfFissa()) && Objects.equals(getArtAPeso(), mtbColr.getArtAPeso());
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(getDataCollo(), getGestione(), getSerCollo(), getNumCollo(), getRiga(), getRigaOrd(), getCodMart(), getCodBarre(), getCodCol(), getCodTagl(), getPartitaMag(), getGestioneRif(), getSerColloRif(), getNote(), getDataOrd(), getDataColloRif(), getQtaCnf(), getQtaCol(), getNumOrd(), getNumEtich(), getNumColloRif(), getDatetimeRow(), getCodJcom(), getNumCnf(), getCausale(), getUtente(), getCodAnagDoc(), getCodDtipDoc(), getDataDoc(), getSerDoc(), getNumDoc(), getIdRigaDoc(), getPesoNettoKg(), getPesoLordoKg(), getMtbColrInfoProd(), getInsPartitaMag(), getMtbPartitaMag_descrizione(), getDataScadPartita(), getDescrizione(), getFlagQtaCnfFissa(), getArtAPeso());
+        return Objects.hash(getDataCollo(), getGestione(), getSerCollo(), getNumCollo(), getRiga(), getRigaOrd(), getCodMart(), getCodBarre(), getCodCol(), getCodTagl(), getPartitaMag(), getGestioneRif(), getSerColloRif(), getNote(), getDataOrd(), getDataColloRif(), getQtaCnf(), getQtaCol(), getNumOrd(), getNumEtich(), getNumColloRif(), getDatetimeRow(), getCodJcom(), getNumCnf(), getCausale(), getUtente(), getCodAnagDoc(), getCodDtipDoc(), getDataDoc(), getSerDoc(), getNumDoc(), getIdRigaDoc(), getPesoNettoKg(), getPesoLordoKg(), getInsPartitaMag(), getMtbPartitaMag_descrizione(), getDataScadPartita(), getDescrizione(), getFlagQtaCnfFissa(), getArtAPeso());
     }
 
     public enum Causale implements IBaseEnum<Causale> {
diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/MtbColt.java b/ems-core/src/main/java/it/integry/ems_model/entity/MtbColt.java
index cc4d062b7f..bffec87c99 100644
--- a/ems-core/src/main/java/it/integry/ems_model/entity/MtbColt.java
+++ b/ems-core/src/main/java/it/integry/ems_model/entity/MtbColt.java
@@ -708,32 +708,33 @@ public class MtbColt extends EntityBase implements EquatableEntityInterface<MtbC
         return this;
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (!(o instanceof MtbColt))
-            return false;
-        MtbColt mtbColt = (MtbColt) o;
-        return equalsContent(mtbColt);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(getGestione(), getDataCollo(), getSerCollo(), getNumCollo(), getRifOrd(), getCodAnag(), getCodVdes(), getCodMdep(), getCodVlis(), getCodDtip(), getCodTcol(), getSerDoc(), getFiltroOrdini(), getPreparatoDa(), getAnnotazioni(), getPosizione(), getCodDtipProvv(), getSerDocProvv(), getCodJfas(), getDataOrd(), getDataDoc(), getOraInizPrep(), getOraFinePrep(), getDataDocProvv(), getDataVers(), getSegno(), getNumOrd(), getNumDoc(), getNumDocProvv(), getPesoKg(), getLunghezzaCm(), getLarghezzaCm(), getAltezzaCm(), getPesoNettoKg(), getDataDistribuzione(), getFlagColloAnonimo(), getFlagStampato(), getActivityId(), getTrackNumber(), getDataIns(), getModificatoDa(), getDataUltMod(), getIdLotto(), getBarcodeUl(), getIdPesata());
-    }
 
     @Override
     public boolean equalsKey(MtbColt other) {
         if (this == other)
             return true;
+
+        if(hashCodeKey() != other.hashCodeKey())
+            return false;
+
         return Objects.equals(getGestione(), other.getGestione()) && Objects.equals(getDataCollo(), other.getDataCollo()) && Objects.equals(getSerCollo(), other.getSerCollo()) && Objects.equals(getNumCollo(), other.getNumCollo());
     }
 
     @Override
-    public boolean equalsContent(MtbColt other) {
-        if (this == other)
-            return true;
-        return Objects.equals(getGestione(), other.getGestione()) && Objects.equals(getDataCollo(), other.getDataCollo()) && Objects.equals(getSerCollo(), other.getSerCollo()) && Objects.equals(getNumCollo(), other.getNumCollo()) && Objects.equals(getRifOrd(), other.getRifOrd()) && Objects.equals(getCodAnag(), other.getCodAnag()) && Objects.equals(getCodVdes(), other.getCodVdes()) && Objects.equals(getCodMdep(), other.getCodMdep()) && Objects.equals(getCodVlis(), other.getCodVlis()) && Objects.equals(getCodDtip(), other.getCodDtip()) && Objects.equals(getCodTcol(), other.getCodTcol()) && Objects.equals(getSerDoc(), other.getSerDoc()) && Objects.equals(getFiltroOrdini(), other.getFiltroOrdini()) && Objects.equals(getPreparatoDa(), other.getPreparatoDa()) && Objects.equals(getAnnotazioni(), other.getAnnotazioni()) && Objects.equals(getPosizione(), other.getPosizione()) && Objects.equals(getCodDtipProvv(), other.getCodDtipProvv()) && Objects.equals(getSerDocProvv(), other.getSerDocProvv()) && Objects.equals(getCodJfas(), other.getCodJfas()) && Objects.equals(getDataOrd(), other.getDataOrd()) && Objects.equals(getDataDoc(), other.getDataDoc()) && Objects.equals(getOraInizPrep(), other.getOraInizPrep()) && Objects.equals(getOraFinePrep(), other.getOraFinePrep()) && Objects.equals(getDataDocProvv(), other.getDataDocProvv()) && Objects.equals(getDataVers(), other.getDataVers()) && Objects.equals(getSegno(), other.getSegno()) && Objects.equals(getNumOrd(), other.getNumOrd()) && Objects.equals(getNumDoc(), other.getNumDoc()) && Objects.equals(getNumDocProvv(), other.getNumDocProvv()) && Objects.equals(getPesoKg(), other.getPesoKg()) && Objects.equals(getLunghezzaCm(), other.getLunghezzaCm()) && Objects.equals(getLarghezzaCm(), other.getLarghezzaCm()) && Objects.equals(getAltezzaCm(), other.getAltezzaCm()) && Objects.equals(getPesoNettoKg(), other.getPesoNettoKg()) && Objects.equals(getDataDistribuzione(), other.getDataDistribuzione()) && Objects.equals(getFlagColloAnonimo(), other.getFlagColloAnonimo()) && Objects.equals(getFlagStampato(), other.getFlagStampato()) && Objects.equals(getActivityId(), other.getActivityId()) && Objects.equals(getTrackNumber(), other.getTrackNumber()) && Objects.equals(getDataIns(), other.getDataIns()) && Objects.equals(getModificatoDa(), other.getModificatoDa()) && Objects.equals(getDataUltMod(), other.getDataUltMod()) && Objects.equals(getIdLotto(), other.getIdLotto()) && Objects.equals(getBarcodeUl(), other.getBarcodeUl()) && Objects.equals(getIdPesata(), other.getIdPesata());
+    public int hashCodeKey() {
+        return Objects.hash(getGestione(), getDataCollo(), getSerCollo(), getNumCollo());
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof MtbColt)) return false;
+        MtbColt mtbColt = (MtbColt) o;
+        return Objects.equals(getGestione(), mtbColt.getGestione()) && Objects.equals(getDataCollo(), mtbColt.getDataCollo()) && Objects.equals(getSerCollo(), mtbColt.getSerCollo()) && Objects.equals(getNumCollo(), mtbColt.getNumCollo()) && Objects.equals(getRifOrd(), mtbColt.getRifOrd()) && Objects.equals(getCodAnag(), mtbColt.getCodAnag()) && Objects.equals(getCodVdes(), mtbColt.getCodVdes()) && Objects.equals(getCodMdep(), mtbColt.getCodMdep()) && Objects.equals(getCodVlis(), mtbColt.getCodVlis()) && Objects.equals(getCodDtip(), mtbColt.getCodDtip()) && Objects.equals(getCodTcol(), mtbColt.getCodTcol()) && Objects.equals(getSerDoc(), mtbColt.getSerDoc()) && Objects.equals(getFiltroOrdini(), mtbColt.getFiltroOrdini()) && Objects.equals(getPreparatoDa(), mtbColt.getPreparatoDa()) && Objects.equals(getAnnotazioni(), mtbColt.getAnnotazioni()) && Objects.equals(getPosizione(), mtbColt.getPosizione()) && Objects.equals(getCodDtipProvv(), mtbColt.getCodDtipProvv()) && Objects.equals(getSerDocProvv(), mtbColt.getSerDocProvv()) && Objects.equals(getCodJfas(), mtbColt.getCodJfas()) && Objects.equals(getDataOrd(), mtbColt.getDataOrd()) && Objects.equals(getDataDoc(), mtbColt.getDataDoc()) && Objects.equals(getOraInizPrep(), mtbColt.getOraInizPrep()) && Objects.equals(getOraFinePrep(), mtbColt.getOraFinePrep()) && Objects.equals(getDataDocProvv(), mtbColt.getDataDocProvv()) && Objects.equals(getDataVers(), mtbColt.getDataVers()) && Objects.equals(getSegno(), mtbColt.getSegno()) && Objects.equals(getNumOrd(), mtbColt.getNumOrd()) && Objects.equals(getNumDoc(), mtbColt.getNumDoc()) && Objects.equals(getNumDocProvv(), mtbColt.getNumDocProvv()) && Objects.equals(getPesoKg(), mtbColt.getPesoKg()) && Objects.equals(getLunghezzaCm(), mtbColt.getLunghezzaCm()) && Objects.equals(getLarghezzaCm(), mtbColt.getLarghezzaCm()) && Objects.equals(getAltezzaCm(), mtbColt.getAltezzaCm()) && Objects.equals(getPesoNettoKg(), mtbColt.getPesoNettoKg()) && Objects.equals(getDataDistribuzione(), mtbColt.getDataDistribuzione()) && Objects.equals(getFlagColloAnonimo(), mtbColt.getFlagColloAnonimo()) && Objects.equals(getFlagStampato(), mtbColt.getFlagStampato()) && Objects.equals(getActivityId(), mtbColt.getActivityId()) && Objects.equals(getTrackNumber(), mtbColt.getTrackNumber()) && Objects.equals(getDataIns(), mtbColt.getDataIns()) && Objects.equals(getModificatoDa(), mtbColt.getModificatoDa()) && Objects.equals(getDataUltMod(), mtbColt.getDataUltMod()) && Objects.equals(getIdLotto(), mtbColt.getIdLotto()) && Objects.equals(getBarcodeUl(), mtbColt.getBarcodeUl()) && Objects.equals(getIdPesata(), mtbColt.getIdPesata()) && Objects.equals(getInsPartitaMag(), mtbColt.getInsPartitaMag()) && Objects.equals(getStpPrz(), mtbColt.getStpPrz()) && Objects.equals(getCalcPeso(), mtbColt.getCalcPeso());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getGestione(), getDataCollo(), getSerCollo(), getNumCollo(), getRifOrd(), getCodAnag(), getCodVdes(), getCodMdep(), getCodVlis(), getCodDtip(), getCodTcol(), getSerDoc(), getFiltroOrdini(), getPreparatoDa(), getAnnotazioni(), getPosizione(), getCodDtipProvv(), getSerDocProvv(), getCodJfas(), getDataOrd(), getDataDoc(), getOraInizPrep(), getOraFinePrep(), getDataDocProvv(), getDataVers(), getSegno(), getNumOrd(), getNumDoc(), getNumDocProvv(), getPesoKg(), getLunghezzaCm(), getLarghezzaCm(), getAltezzaCm(), getPesoNettoKg(), getDataDistribuzione(), getFlagColloAnonimo(), getFlagStampato(), getActivityId(), getTrackNumber(), getDataIns(), getModificatoDa(), getDataUltMod(), getIdLotto(), getBarcodeUl(), getIdPesata(), getInsPartitaMag(), getStpPrz(), getCalcPeso());
     }
 }
diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/MtbGrup.java b/ems-core/src/main/java/it/integry/ems_model/entity/MtbGrup.java
index e10c977c07..73366ac76f 100644
--- a/ems-core/src/main/java/it/integry/ems_model/entity/MtbGrup.java
+++ b/ems-core/src/main/java/it/integry/ems_model/entity/MtbGrup.java
@@ -4,12 +4,13 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import it.integry.ems_model.annotation.*;
 import it.integry.ems_model.base.EntityBase;
 import it.integry.ems_model.base.EquatableEntityInterface;
-import org.kie.api.definition.type.PropertyReactive;
-import java.util.List;
-import java.util.Objects;
-import java.util.ArrayList;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.kie.api.definition.type.PropertyReactive;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 @Master
 @PropertyReactive
@@ -158,13 +159,29 @@ public class MtbGrup extends EntityBase implements EquatableEntityInterface<MtbG
     public boolean equalsKey(MtbGrup other) {
         if (this == other)
             return true;
+
+        if(hashCodeKey() != other.hashCodeKey())
+            return false;
+
         return Objects.equals(getCodMgrp(), other.getCodMgrp());
+
     }
 
     @Override
-    public boolean equalsContent(MtbGrup other) {
-        if (this == other)
-            return true;
-        return Objects.equals(getCodMgrp(), other.getCodMgrp()) && Objects.equals(getDescrizione(), other.getDescrizione()) && Objects.equals(getFlagValMag(), other.getFlagValMag()) && Objects.equals(getLogoWeb(), other.getLogoWeb()) && Objects.equals(getCriterioVal(), other.getCriterioVal()) && Objects.equals(getTipoMgrp(), other.getTipoMgrp());
+    public int hashCodeKey() {
+        return Objects.hash(getCodMgrp());
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof MtbGrup)) return false;
+        MtbGrup mtbGrup = (MtbGrup) o;
+        return Objects.equals(getCodMgrp(), mtbGrup.getCodMgrp()) && Objects.equals(getDescrizione(), mtbGrup.getDescrizione()) && Objects.equals(getFlagValMag(), mtbGrup.getFlagValMag()) && Objects.equals(getLogoWeb(), mtbGrup.getLogoWeb()) && Objects.equals(getCriterioVal(), mtbGrup.getCriterioVal()) && Objects.equals(getTipoMgrp(), mtbGrup.getTipoMgrp()) && Objects.equals(getFlagAttivo(), mtbGrup.getFlagAttivo()) && Objects.equals(getFlagTracciabilita(), mtbGrup.getFlagTracciabilita());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getCodMgrp(), getDescrizione(), getFlagValMag(), getLogoWeb(), getCriterioVal(), getTipoMgrp(), getFlagAttivo(), getFlagTracciabilita());
     }
 }
diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/MtbPartitaMag.java b/ems-core/src/main/java/it/integry/ems_model/entity/MtbPartitaMag.java
index 516bf8630c..7c61b0bc06 100644
--- a/ems-core/src/main/java/it/integry/ems_model/entity/MtbPartitaMag.java
+++ b/ems-core/src/main/java/it/integry/ems_model/entity/MtbPartitaMag.java
@@ -5,14 +5,15 @@ import it.integry.common.var.CommonConstants;
 import it.integry.ems_model.annotation.*;
 import it.integry.ems_model.base.EntityBase;
 import it.integry.ems_model.base.EquatableEntityInterface;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.kie.api.definition.type.PropertyReactive;
+
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
-import java.util.ArrayList;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 @Master
 @PropertyReactive
@@ -341,12 +342,26 @@ public class MtbPartitaMag extends EntityBase implements EquatableEntityInterfac
     }
 
     @Override
-    public boolean equals(Object object) {
-        if (this == object)
+    public boolean equalsKey(MtbPartitaMag other) {
+        if (this == other)
             return true;
-        if (!(object instanceof MtbPartitaMag))
+
+        if(hashCodeKey() != other.hashCodeKey())
             return false;
-        MtbPartitaMag that = (MtbPartitaMag) object;
+
+        return Objects.equals(getCodMart(), other.getCodMart()) && Objects.equals(getPartitaMag(), other.getPartitaMag());
+    }
+
+    @Override
+    public int hashCodeKey() {
+        return Objects.hash(getCodMart(), getPartitaMag());
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof MtbPartitaMag)) return false;
+        MtbPartitaMag that = (MtbPartitaMag) o;
         return Objects.equals(getCodMart(), that.getCodMart()) && Objects.equals(getPartitaMag(), that.getPartitaMag()) && Objects.equals(getDescrizione(), that.getDescrizione()) && Objects.equals(getDataIns(), that.getDataIns()) && Objects.equals(getDataScad(), that.getDataScad()) && Objects.equals(getScelta(), that.getScelta()) && Objects.equals(getCostoUntUmMag(), that.getCostoUntUmMag()) && Objects.equals(getValUntUmMag(), that.getValUntUmMag()) && Objects.equals(getTaraCnfKg(), that.getTaraCnfKg()) && Objects.equals(getQtaCnf(), that.getQtaCnf()) && Objects.equals(getFlagImballoArendere(), that.getFlagImballoArendere()) && Objects.equals(getFlagStato(), that.getFlagStato()) && Objects.equals(getCodDiviCont(), that.getCodDiviCont()) && Objects.equals(getCambioDiviCont(), that.getCambioDiviCont()) && Objects.equals(getBarcode(), that.getBarcode()) && Objects.equals(getNote(), that.getNote()) && Objects.equals(getRapConv2(), that.getRapConv2()) && Objects.equals(getRapConv3(), that.getRapConv3()) && Objects.equals(getPosizione(), that.getPosizione()) && Objects.equals(getDataAggPrz(), that.getDataAggPrz()) && Objects.equals(getPartitaMagSec(), that.getPartitaMagSec()) && Objects.equals(getQtaAttesa(), that.getQtaAttesa()) && Objects.equals(getNazioneProv(), that.getNazioneProv());
     }
 
@@ -354,18 +369,4 @@ public class MtbPartitaMag extends EntityBase implements EquatableEntityInterfac
     public int hashCode() {
         return Objects.hash(getCodMart(), getPartitaMag(), getDescrizione(), getDataIns(), getDataScad(), getScelta(), getCostoUntUmMag(), getValUntUmMag(), getTaraCnfKg(), getQtaCnf(), getFlagImballoArendere(), getFlagStato(), getCodDiviCont(), getCambioDiviCont(), getBarcode(), getNote(), getRapConv2(), getRapConv3(), getPosizione(), getDataAggPrz(), getPartitaMagSec(), getQtaAttesa(), getNazioneProv());
     }
-
-    @Override
-    public boolean equalsKey(MtbPartitaMag other) {
-        if (this == other)
-            return true;
-        return Objects.equals(getCodMart(), other.getCodMart()) && Objects.equals(getPartitaMag(), other.getPartitaMag());
-    }
-
-    @Override
-    public boolean equalsContent(MtbPartitaMag other) {
-        if (this == other)
-            return true;
-        return Objects.equals(getCodMart(), other.getCodMart()) && Objects.equals(getPartitaMag(), other.getPartitaMag()) && Objects.equals(getDescrizione(), other.getDescrizione()) && Objects.equals(getDataIns(), other.getDataIns()) && Objects.equals(getDataScad(), other.getDataScad()) && Objects.equals(getScelta(), other.getScelta()) && Objects.equals(getCostoUntUmMag(), other.getCostoUntUmMag()) && Objects.equals(getValUntUmMag(), other.getValUntUmMag()) && Objects.equals(getTaraCnfKg(), other.getTaraCnfKg()) && Objects.equals(getQtaCnf(), other.getQtaCnf()) && Objects.equals(getFlagImballoArendere(), other.getFlagImballoArendere()) && Objects.equals(getFlagStato(), other.getFlagStato()) && Objects.equals(getCodDiviCont(), other.getCodDiviCont()) && Objects.equals(getCambioDiviCont(), other.getCambioDiviCont()) && Objects.equals(getBarcode(), other.getBarcode()) && Objects.equals(getNote(), other.getNote()) && Objects.equals(getRapConv2(), other.getRapConv2()) && Objects.equals(getRapConv3(), other.getRapConv3()) && Objects.equals(getPosizione(), other.getPosizione()) && Objects.equals(getDataAggPrz(), other.getDataAggPrz()) && Objects.equals(getPartitaMagSec(), other.getPartitaMagSec()) && Objects.equals(getQtaAttesa(), other.getQtaAttesa()) && Objects.equals(getNazioneProv(), other.getNazioneProv());
-    }
 }
diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/MtbSfam.java b/ems-core/src/main/java/it/integry/ems_model/entity/MtbSfam.java
index 56e92b6dbb..e01de4cd50 100644
--- a/ems-core/src/main/java/it/integry/ems_model/entity/MtbSfam.java
+++ b/ems-core/src/main/java/it/integry/ems_model/entity/MtbSfam.java
@@ -6,12 +6,11 @@ import it.integry.ems_model.annotation.SqlField;
 import it.integry.ems_model.annotation.Table;
 import it.integry.ems_model.base.EntityBase;
 import it.integry.ems_model.base.EquatableEntityInterface;
-import org.kie.api.definition.type.PropertyReactive;
-import java.util.Objects;
-import java.util.ArrayList;
-import it.integry.ems_model.annotation.FK;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.kie.api.definition.type.PropertyReactive;
+
+import java.util.Objects;
 
 @PropertyReactive
 @Table(MtbSfam.ENTITY)
@@ -79,13 +78,28 @@ public class MtbSfam extends EntityBase implements EquatableEntityInterface<MtbS
     public boolean equalsKey(MtbSfam other) {
         if (this == other)
             return true;
+        
+        if(hashCodeKey() != other.hashCodeKey())
+            return false;
+
         return Objects.equals(getCodMgrp(), other.getCodMgrp()) && Objects.equals(getCodMsgr(), other.getCodMsgr()) && Objects.equals(getCodMsfa(), other.getCodMsfa());
     }
 
     @Override
-    public boolean equalsContent(MtbSfam other) {
-        if (this == other)
-            return true;
-        return Objects.equals(getCodMgrp(), other.getCodMgrp()) && Objects.equals(getCodMsgr(), other.getCodMsgr()) && Objects.equals(getCodMsfa(), other.getCodMsfa()) && Objects.equals(getDescrizione(), other.getDescrizione());
+    public int hashCodeKey() {
+        return Objects.hash(getCodMgrp(), getCodMsgr(), getCodMsfa());
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof MtbSfam)) return false;
+        MtbSfam mtbSfam = (MtbSfam) o;
+        return Objects.equals(getCodMgrp(), mtbSfam.getCodMgrp()) && Objects.equals(getCodMsgr(), mtbSfam.getCodMsgr()) && Objects.equals(getCodMsfa(), mtbSfam.getCodMsfa()) && Objects.equals(getDescrizione(), mtbSfam.getDescrizione());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getCodMgrp(), getCodMsgr(), getCodMsfa(), getDescrizione());
     }
 }
diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/MtbSgrp.java b/ems-core/src/main/java/it/integry/ems_model/entity/MtbSgrp.java
index 166c35aae6..6cb94e6b09 100644
--- a/ems-core/src/main/java/it/integry/ems_model/entity/MtbSgrp.java
+++ b/ems-core/src/main/java/it/integry/ems_model/entity/MtbSgrp.java
@@ -4,12 +4,13 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import it.integry.ems_model.annotation.*;
 import it.integry.ems_model.base.EntityBase;
 import it.integry.ems_model.base.EquatableEntityInterface;
-import org.kie.api.definition.type.PropertyReactive;
-import java.util.List;
-import java.util.Objects;
-import java.util.ArrayList;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.kie.api.definition.type.PropertyReactive;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 @PropertyReactive
 @Table(MtbSgrp.ENTITY)
@@ -146,13 +147,28 @@ public class MtbSgrp extends EntityBase implements EquatableEntityInterface<MtbS
     public boolean equalsKey(MtbSgrp other) {
         if (this == other)
             return true;
+
+        if(hashCodeKey() != other.hashCodeKey())
+            return false;
+
         return Objects.equals(getCodMgrp(), other.getCodMgrp()) && Objects.equals(getCodMsgr(), other.getCodMsgr());
     }
 
     @Override
-    public boolean equalsContent(MtbSgrp other) {
-        if (this == other)
-            return true;
-        return Objects.equals(getCodMgrp(), other.getCodMgrp()) && Objects.equals(getCodMsgr(), other.getCodMsgr()) && Objects.equals(getDescrizione(), other.getDescrizione()) && Objects.equals(getInclInStat(), other.getInclInStat()) && Objects.equals(getContoRimFin(), other.getContoRimFin()) && Objects.equals(getOrdinamento(), other.getOrdinamento()) && Objects.equals(getChkGiacenzaNeg(), other.getChkGiacenzaNeg()) && Objects.equals(getFlagReso(), other.getFlagReso());
+    public int hashCodeKey() {
+        return Objects.hash(getCodMgrp(), getCodMsgr());
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof MtbSgrp)) return false;
+        MtbSgrp mtbSgrp = (MtbSgrp) o;
+        return Objects.equals(getCodMgrp(), mtbSgrp.getCodMgrp()) && Objects.equals(getCodMsgr(), mtbSgrp.getCodMsgr()) && Objects.equals(getDescrizione(), mtbSgrp.getDescrizione()) && Objects.equals(getInclInStat(), mtbSgrp.getInclInStat()) && Objects.equals(getContoRimFin(), mtbSgrp.getContoRimFin()) && Objects.equals(getOrdinamento(), mtbSgrp.getOrdinamento()) && Objects.equals(getChkGiacenzaNeg(), mtbSgrp.getChkGiacenzaNeg()) && Objects.equals(getFlagReso(), mtbSgrp.getFlagReso());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getCodMgrp(), getCodMsgr(), getDescrizione(), getInclInStat(), getContoRimFin(), getOrdinamento(), getChkGiacenzaNeg(), getFlagReso());
     }
 }
diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/MtbTipi.java b/ems-core/src/main/java/it/integry/ems_model/entity/MtbTipi.java
index 93aade75ad..2a3e6513bf 100644
--- a/ems-core/src/main/java/it/integry/ems_model/entity/MtbTipi.java
+++ b/ems-core/src/main/java/it/integry/ems_model/entity/MtbTipi.java
@@ -4,12 +4,13 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import it.integry.ems_model.annotation.*;
 import it.integry.ems_model.base.EntityBase;
 import it.integry.ems_model.base.EquatableEntityInterface;
-import org.kie.api.definition.type.PropertyReactive;
-import java.util.List;
-import java.util.Objects;
-import java.util.ArrayList;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.kie.api.definition.type.PropertyReactive;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 @Master
 @PropertyReactive
@@ -95,13 +96,28 @@ public class MtbTipi extends EntityBase implements EquatableEntityInterface<MtbT
     public boolean equalsKey(MtbTipi other) {
         if (this == other)
             return true;
+
+        if(hashCodeKey() != other.hashCodeKey())
+            return false;
+
         return Objects.equals(getCodMtip(), other.getCodMtip());
     }
 
     @Override
-    public boolean equalsContent(MtbTipi other) {
-        if (this == other)
-            return true;
-        return Objects.equals(getCodMtip(), other.getCodMtip()) && Objects.equals(getDescrizione(), other.getDescrizione());
+    public int hashCodeKey() {
+        return Objects.hash(getCodMtip());
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof MtbTipi)) return false;
+        MtbTipi mtbTipi = (MtbTipi) o;
+        return Objects.equals(getCodMtip(), mtbTipi.getCodMtip()) && Objects.equals(getDescrizione(), mtbTipi.getDescrizione()) && Objects.equals(getFlagAttivo(), mtbTipi.getFlagAttivo());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getCodMtip(), getDescrizione(), getFlagAttivo());
     }
 }
diff --git a/ems-engine/src/main/java/it/integry/ems/system/exchange/dto/ExchangeCampiRaccoltaDTO.java b/ems-engine/src/main/java/it/integry/ems/system/exchange/dto/ExchangeCampiRaccoltaDTO.java
index 71209661c9..4e57289207 100644
--- a/ems-engine/src/main/java/it/integry/ems/system/exchange/dto/ExchangeCampiRaccoltaDTO.java
+++ b/ems-engine/src/main/java/it/integry/ems/system/exchange/dto/ExchangeCampiRaccoltaDTO.java
@@ -8,8 +8,6 @@ import it.integry.ems_model.base.EquatableEntityInterface;
 import it.integry.ems_model.exception.EntityException;
 import it.integry.ems_model.rulescompleting.DroolsDataCompleting;
 import it.integry.ems_model.types.OperationType;
-import it.integry.ems_model.utility.UtilityBigDecimal;
-import it.integry.ems_model.utility.UtilityString;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -17,6 +15,7 @@ import java.sql.Connection;
 import java.time.LocalDate;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 public class ExchangeCampiRaccoltaDTO implements EquatableEntityInterface<ExchangeCampiRaccoltaDTO> {
     private OperationType operation;
@@ -300,41 +299,34 @@ public class ExchangeCampiRaccoltaDTO implements EquatableEntityInterface<Exchan
 
     @Override
     public boolean equalsKey(ExchangeCampiRaccoltaDTO other) {
+        if (this == other)
+            return true;
 
-        return codAnag.equalsIgnoreCase(other.getCodAnag()) &&
-                (UtilityString.isNull(codVdes,"").equalsIgnoreCase(UtilityString.isNull(other.getCodVdes(),""))) &&
-                codMartMp.equalsIgnoreCase(other.getCodMartMp()) &&
-                lottoFornitore.equalsIgnoreCase(other.getLottoFornitore());
+        if (hashCodeKey() != other.hashCodeKey())
+            return false;
+
+        return Objects.equals(getCodAnag(), other.getCodAnag()) &&
+                Objects.equals(getCodVdes(), other.getCodVdes()) &&
+                Objects.equals(getCodMartMp(), other.getCodMartMp()) &&
+                Objects.equals(getLottoFornitore(), other.getLottoFornitore());
     }
 
     @Override
-    public boolean equalsContent(ExchangeCampiRaccoltaDTO other) {
-        return
-                codAnag.equalsIgnoreCase(other.getCodAnag()) &&
-                        (UtilityString.isNull(ragSoc,"").equalsIgnoreCase(UtilityString.isNull(other.getRagSoc(),""))) &&
-                        (UtilityString.isNull(codVdes,"").equalsIgnoreCase(UtilityString.isNull(other.getCodVdes(),""))) &&
-                        UtilityString.isNull(produttore,"").equalsIgnoreCase(UtilityString.isNull(other.getProduttore(),"")) &&
-                        UtilityString.isNull(cooperativa,"").equalsIgnoreCase(UtilityString.isNull(other.getCooperativa(),"")) &&
-                        UtilityString.isNull(indirizzoCoop,"").equalsIgnoreCase(UtilityString.isNull(other.getIndirizzoCoop(),"")) &&
-                        UtilityString.isNull(cittaCoop,"").equalsIgnoreCase(UtilityString.isNull(other.getCittaCoop(),"")) &&
-                        UtilityString.isNull(capCoop,"").equalsIgnoreCase(UtilityString.isNull(other.getCapCoop(),"")) &&
-                        UtilityString.isNull(provCoop,"").equalsIgnoreCase(UtilityString.isNull(other.getProvCoop(),"")) &&
-                        UtilityString.isNull(partIvaCoop,"").equalsIgnoreCase(UtilityString.isNull(other.getPartIvaCoop(),"")) &&
-                        UtilityString.isNull(op,"").equalsIgnoreCase(UtilityString.isNull(other.getOp(),"")) &&
-                        UtilityString.isNull(codAnagProd,"").equalsIgnoreCase(UtilityString.isNull(other.getCodAnagProd(),"")) &&
-                        UtilityString.isNull(ragSocProd,"").equalsIgnoreCase(UtilityString.isNull(other.getRagSocProd(),"")) &&
-                        UtilityString.isNull(indirizzoProd,"").equalsIgnoreCase(UtilityString.isNull(other.getIndirizzoProd(),"")) &&
-                        UtilityString.isNull(cittaProd,"").equalsIgnoreCase(UtilityString.isNull(other.getCittaProd(),"")) &&
-                        UtilityString.isNull(capProd,"").equalsIgnoreCase(UtilityString.isNull(other.getCapProd(),"")) &&
-                        UtilityString.isNull(provProd,"").equalsIgnoreCase(UtilityString.isNull(other.getProvProd(),"")) &&
-                        UtilityString.isNull(partIvaProd,"").equalsIgnoreCase(UtilityString.isNull(other.getPartIvaProd(),"")) &&
-                        UtilityString.isNull(codMartMp,"").equalsIgnoreCase(UtilityString.isNull(other.getCodMartMp(),"")) &&
-                        UtilityString.isNull(codMartMg,"").equalsIgnoreCase(UtilityString.isNull(other.getCodMartMg(),"")) &&
-                        UtilityString.isNull(varieta,"").equalsIgnoreCase(UtilityString.isNull(other.getVarieta(),"")) &&
-                        UtilityString.isNull(lottoFornitore,"").equalsIgnoreCase(UtilityString.isNull(other.getLottoFornitore(),"")) &&
-                        UtilityBigDecimal.isNull(valUnt,BigDecimal.ZERO).equals(UtilityBigDecimal.isNull(other.getValUnt(),BigDecimal.ZERO)) &&
-                        UtilityBigDecimal.isNull(qtaAttesa,BigDecimal.ZERO).equals(UtilityBigDecimal.isNull(other.getQtaAttesa(),BigDecimal.ZERO))
-                ;
+    public int hashCodeKey() {
+        return Objects.hash(getCodAnag(), getCodVdes(), getCodMartMp(), getLottoFornitore());
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof ExchangeCampiRaccoltaDTO)) return false;
+        ExchangeCampiRaccoltaDTO that = (ExchangeCampiRaccoltaDTO) o;
+        return isNewDest() == that.isNewDest() && isNewPartita() == that.isNewPartita() && getOperation() == that.getOperation() && Objects.equals(getPartitaMag(), that.getPartitaMag()) && Objects.equals(getCodAnag(), that.getCodAnag()) && Objects.equals(getRagSoc(), that.getRagSoc()) && Objects.equals(getCodVdes(), that.getCodVdes()) && Objects.equals(getProduttore(), that.getProduttore()) && Objects.equals(getCooperativa(), that.getCooperativa()) && Objects.equals(getIndirizzoCoop(), that.getIndirizzoCoop()) && Objects.equals(getCittaCoop(), that.getCittaCoop()) && Objects.equals(getCapCoop(), that.getCapCoop()) && Objects.equals(getProvCoop(), that.getProvCoop()) && Objects.equals(getPartIvaCoop(), that.getPartIvaCoop()) && Objects.equals(getOp(), that.getOp()) && Objects.equals(getCodAnagProd(), that.getCodAnagProd()) && Objects.equals(getRagSocProd(), that.getRagSocProd()) && Objects.equals(getIndirizzoProd(), that.getIndirizzoProd()) && Objects.equals(getCittaProd(), that.getCittaProd()) && Objects.equals(getCapProd(), that.getCapProd()) && Objects.equals(getProvProd(), that.getProvProd()) && Objects.equals(getPartIvaProd(), that.getPartIvaProd()) && Objects.equals(getCodMartMp(), that.getCodMartMp()) && Objects.equals(getCodMartMg(), that.getCodMartMg()) && Objects.equals(getVarieta(), that.getVarieta()) && Objects.equals(getLottoFornitore(), that.getLottoFornitore()) && Objects.equals(getValUnt(), that.getValUnt()) && Objects.equals(getUntMis(), that.getUntMis()) && Objects.equals(getQtaAttesa(), that.getQtaAttesa()) && Objects.equals(getDataInizProd(), that.getDataInizProd()) && Objects.equals(getNote(), that.getNote());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getOperation(), getPartitaMag(), getCodAnag(), getRagSoc(), getCodVdes(), getProduttore(), getCooperativa(), getIndirizzoCoop(), getCittaCoop(), getCapCoop(), getProvCoop(), getPartIvaCoop(), getOp(), getCodAnagProd(), getRagSocProd(), getIndirizzoProd(), getCittaProd(), getCapProd(), getProvProd(), getPartIvaProd(), getCodMartMp(), getCodMartMg(), getVarieta(), getLottoFornitore(), getValUnt(), getUntMis(), getQtaAttesa(), getDataInizProd(), isNewDest(), isNewPartita(), getNote());
     }
 
     @Override
diff --git a/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeColliImportService.java b/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeColliImportService.java
index 0d9334e338..e5ed09398d 100644
--- a/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeColliImportService.java
+++ b/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeColliImportService.java
@@ -97,7 +97,7 @@ public class ExchangeColliImportService {
 
             List<MtbColt> exchangeUpdatedMtbColts = importColliLavorazione(
                     exchangeMultiDb.getPrimaryConnection(),
-                    UtilityLocalDate.getNow().minusWeeks(1),
+                    UtilityLocalDate.getNow().minusWeeks(3),
                     UtilityLocalDate.getNow(),
                     false, useTempTable, testataTableName, righeTableName);
 
@@ -192,8 +192,13 @@ public class ExchangeColliImportService {
         mtbColtLav
                 .parallelStream()
                 .forEach(x -> {
-                    int hashCurrent = Objects.hash(x.getGestione(), x.getNumCollo(), x.getDataCollo(), x.getSerCollo());
-                    x.getMtbColr().addAll(testGroupBy.get(hashCurrent));
+                    x.setMtbColr(mtbColrLav.parallelStream()
+                            .filter(y -> Objects.hash(x.getGestione(), x.getNumCollo(), x.getDataCollo(), x.getSerCollo()) ==
+                                    Objects.hash(y.getGestione(), y.getNumCollo(), y.getDataCollo(), y.getSerCollo()) &&
+
+                                    (Objects.equals(x.getGestione(), y.getGestione()) && Objects.equals(x.getDataCollo(), y.getDataCollo()) &&
+                                            Objects.equals(x.getNumCollo(), y.getNumCollo()) && Objects.equals(x.getSerCollo(), y.getSerCollo())))
+                            .collect(Collectors.toList()));
                 });
 
         return mtbColtLav;
diff --git a/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeDocumentImportService.java b/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeDocumentImportService.java
index 94cb9b4b77..288b33cbbe 100644
--- a/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeDocumentImportService.java
+++ b/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeDocumentImportService.java
@@ -8,6 +8,7 @@ import it.integry.ems_model.base.EquatableEntityInterface;
 import it.integry.ems_model.entity.DtbDocr;
 import it.integry.ems_model.entity.DtbDoct;
 import it.integry.ems_model.types.OperationType;
+import it.integry.ems_model.utility.Query;
 import it.integry.ems_model.utility.UtilityDB;
 import it.integry.ems_model.utility.UtilityLocalDate;
 import org.apache.logging.log4j.LogManager;
@@ -52,13 +53,13 @@ public class ExchangeDocumentImportService {
 
             final List<DtbDoct> exchangeImportedTestateData = importTestateDocumentiLavorazione(
                     exchangeMultiDb.getPrimaryConnection(),
-                    UtilityLocalDate.getNow().minusWeeks(1),
+                    UtilityLocalDate.getNow().minusMonths(1),
                     UtilityLocalDate.getNow(),
                     true, false);
 
             final List<DtbDoct> exchangeUpdatedTestateData = importTestateDocumentiLavorazione(
                     exchangeMultiDb.getPrimaryConnection(),
-                    UtilityLocalDate.getNow().minusWeeks(1),
+                    UtilityLocalDate.getNow().minusMonths(1),
                     UtilityLocalDate.getNow(),
                     false, useTempTable);
 
@@ -81,29 +82,36 @@ public class ExchangeDocumentImportService {
             List<EquatableEntityInterface> allRigheData = exchangeImportDataManagerService
                     .runSync(DtbDocr.class, exchangeImportedRigheData, exchangeUpdatedRigheData);
 
-            allTestateData.forEach(x -> ((DtbDoct) x).setUpdProgMaga(false));
+            allTestateData.parallelStream().forEach(x -> ((DtbDoct) x).setUpdProgMaga(false));
 
-            allTestateData.stream()
+            allTestateData.parallelStream()
                     .map(x -> (DtbDoct) x)
                     .forEach(x ->
                             x.setDtbDocr(allRigheData.stream()
                                     .map(y -> (DtbDocr) y)
-                                    .filter(y -> y.getDataDoc().equals(x.getDataDoc()) &&
-                                            y.getNumDoc().equals(x.getNumDoc()) &&
-                                            y.getSerDoc().equalsIgnoreCase(x.getSerDoc()) &&
-                                            y.getCodAnag().equalsIgnoreCase(x.getCodAnag()) &&
-                                            y.getCodDtip().equalsIgnoreCase(x.getCodDtip()))
+                                    .filter(y ->
+                                            Objects.hash(x.getDataDoc(), x.getNumDoc(), x.getSerDoc(), x.getCodAnag(), x.getCodDtip()) ==
+                                                    Objects.hash(y.getDataDoc(), y.getNumDoc(), y.getSerDoc(), y.getCodAnag(), y.getCodDtip()) &&
+
+                                                    (Objects.equals(x.getCodAnag(), y.getCodAnag()) &&
+                                                            Objects.equals(x.getCodDtip(), y.getCodDtip()) &&
+                                                            Objects.equals(x.getDataDoc(), y.getDataDoc()) &&
+                                                            Objects.equals(x.getNumDoc(), y.getNumDoc()) &&
+                                                            Objects.equals(x.getSerDoc(), y.getSerDoc())))
                                     .collect(Collectors.toList())));
 
             allRigheData.stream()
                     .map(x -> (DtbDocr) x)
                     .filter(x -> allTestateData.stream()
                             .map(y -> (DtbDoct) y)
-                            .noneMatch(y -> x.getCodDtip().equalsIgnoreCase(y.getCodDtip()) &&
-                                    x.getDataDoc().equals(y.getDataDoc()) &&
-                                    Objects.equals(x.getNumDoc(), y.getNumDoc()) &&
-                                    x.getCodAnag().equalsIgnoreCase(y.getCodAnag()) &&
-                                    x.getSerDoc().equalsIgnoreCase(y.getSerDoc())))
+                            .noneMatch(y -> Objects.hash(x.getDataDoc(), x.getNumDoc(), x.getSerDoc(), x.getCodAnag(), x.getCodDtip()) ==
+                                    Objects.hash(y.getDataDoc(), y.getNumDoc(), y.getSerDoc(), y.getCodAnag(), y.getCodDtip()) &&
+
+                                    (Objects.equals(x.getCodAnag(), y.getCodAnag()) &&
+                                            Objects.equals(x.getCodDtip(), y.getCodDtip()) &&
+                                            Objects.equals(x.getDataDoc(), y.getDataDoc()) &&
+                                            Objects.equals(x.getNumDoc(), y.getNumDoc()) &&
+                                            Objects.equals(x.getSerDoc(), y.getSerDoc()))))
                     .forEach(x -> {
                         DtbDoct testata = new DtbDoct()
                                 .setSerDoc(x.getSerDoc())
@@ -137,7 +145,7 @@ public class ExchangeDocumentImportService {
                     entityProcessor.processEntity(cloneDocument, true, true, ROSSOGARGANO_EXCHANGE_USER, internalMultiDb, requestDataDTO);
                     singleUpdateImported(exchangeMultiDb.getPrimaryConnection(), (DtbDoct) dataToSave, useTempTable);
 
-                    if(!document.getDtbDocr().isEmpty()) {
+                    if (!document.getDtbDocr().isEmpty()) {
                         document.setOperation(OperationType.NO_OP);
                         entityProcessor.processEntity(document, true, true, ROSSOGARGANO_EXCHANGE_USER, internalMultiDb, requestDataDTO);
                         singleUpdateImported(exchangeMultiDb.getPrimaryConnection(), document.getDtbDocr(), useTempTable);
@@ -185,7 +193,7 @@ public class ExchangeDocumentImportService {
         }
 
         final List<DtbDoct> dtbDoctLav = exchangeImportDataManagerService.retrieveDataFromExchange(connection, DtbDoct.class,
-                dtbDoctLavTableName, null, retrieveAlreadyImported);
+                dtbDoctLavTableName, Query.format("data_doc BETWEEN {} AND {}", minDate, maxDate), retrieveAlreadyImported);
 
 
         dtbDoctLav
@@ -214,7 +222,7 @@ public class ExchangeDocumentImportService {
 
 
         return exchangeImportDataManagerService.retrieveDataFromExchange(connection, DtbDocr.class,
-                dtbDocrLavTableName, null, retrieveAlreadyImported);
+                dtbDocrLavTableName, Query.format("data_doc BETWEEN {} AND {}", minDate, maxDate), retrieveAlreadyImported);
     }
 
 
diff --git a/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeImportDataManagerService.java b/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeImportDataManagerService.java
index 72deab8a5e..b93584850c 100644
--- a/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeImportDataManagerService.java
+++ b/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeImportDataManagerService.java
@@ -67,7 +67,7 @@ public class ExchangeImportDataManagerService {
     private List<EquatableEntityInterface> calcItemsToAdd(Class<? extends EquatableEntityInterface> clazz,
                                                           List<? extends EquatableEntityInterface> alreadyImportedData,
                                                           List<? extends EquatableEntityInterface> updatedData) throws IllegalAccessException {
-        final List<EquatableEntityInterface> itemsToAdd = updatedData.stream()
+        final List<EquatableEntityInterface> itemsToAdd = updatedData.parallelStream()
                 .filter(x -> alreadyImportedData.stream().noneMatch(y -> y.equalsKey(x)))
                 .peek(x -> x.setOperation(OperationType.INSERT))
                 .collect(Collectors.toList());
@@ -98,7 +98,7 @@ public class ExchangeImportDataManagerService {
     private List<EquatableEntityInterface> calcItemsToDelete(Class<? extends EquatableEntityInterface> clazz,
                                                              List<? extends EquatableEntityInterface> importedMtbColts,
                                                              List<? extends EquatableEntityInterface> updatedMtbColts) throws IllegalAccessException {
-        final List<EquatableEntityInterface> itemsToDelete = importedMtbColts.stream()
+        final List<EquatableEntityInterface> itemsToDelete = importedMtbColts.parallelStream()
                 .filter(x -> updatedMtbColts.stream().noneMatch(y -> y.equalsKey(x)))
                 .peek(x -> x.setOperation(OperationType.DELETE))
                 .collect(Collectors.toList());
@@ -128,7 +128,7 @@ public class ExchangeImportDataManagerService {
     private List<EquatableEntityInterface> calcItemsToUpdate(Class<? extends EquatableEntityInterface> clazz,
                                                              List<? extends EquatableEntityInterface> importedMtbColts,
                                                              List<? extends EquatableEntityInterface> updatedMtbColts) throws IllegalAccessException {
-        List<EquatableEntityInterface> itemsToUpdate = updatedMtbColts.stream()
+        List<EquatableEntityInterface> itemsToUpdate = updatedMtbColts.parallelStream()
                 .filter(x -> importedMtbColts.stream().anyMatch(y -> y.equalsKey(x)))
                 .collect(Collectors.toList());
 
@@ -164,7 +164,7 @@ public class ExchangeImportDataManagerService {
 
             itemToUpdate.setOperation(OperationType.UPDATE);
         }
-        return itemsToUpdate.stream()
+        return itemsToUpdate.parallelStream()
                 .filter(x -> {
                     boolean anyChildToUpdate = false;
 
@@ -186,7 +186,7 @@ public class ExchangeImportDataManagerService {
                     }
 
 
-                    return anyChildToUpdate || importedMtbColts.stream().anyMatch(y -> y.equalsKey(x) && !y.equalsContent(x));
+                    return anyChildToUpdate || importedMtbColts.stream().anyMatch(y -> y.equalsKey(x) && !y.equals(x));
                 })
                 .collect(Collectors.toList());
     }
diff --git a/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeOrdiniImportService.java b/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeOrdiniImportService.java
index 91f04d02ec..3f0f4a5c63 100644
--- a/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeOrdiniImportService.java
+++ b/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeOrdiniImportService.java
@@ -23,10 +23,7 @@ import org.springframework.stereotype.Service;
 
 import java.sql.Connection;
 import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
@@ -158,10 +155,10 @@ public class ExchangeOrdiniImportService {
         }
 
         List<DtbOrdt> dtbOrdtLav = exchangeImportDataManagerService.retrieveDataFromExchange(connection, DtbOrdt.class,
-                dtbOrdtTableName, null, retrieveAlreadyImported);
+                dtbOrdtTableName, Query.format("data_ord BETWEEN {} AND {}", minDate, maxDate), retrieveAlreadyImported);
 
         List<DtbOrdr> dtbOrdrLav = exchangeImportDataManagerService.retrieveDataFromExchange(connection, DtbOrdr.class,
-                dtbOrdrTableName, null, retrieveAlreadyImported);
+                dtbOrdrTableName, Query.format("data_ord BETWEEN {} AND {}", minDate, maxDate), retrieveAlreadyImported);
 
         dtbOrdtLav = dtbOrdtLav.stream()
 //                .filter(x -> x.getGestione().equalsIgnoreCase("A"))
@@ -183,9 +180,11 @@ public class ExchangeOrdiniImportService {
                     x.setGeneraOrdLavDaProd(false);
 
                     x.setDtbOrdr(finalDtbOrdrLav.stream()
-                            .filter(y -> y.getDataOrd().equals(x.getDataOrd()) &&
-                                    y.getGestione().equalsIgnoreCase(x.getGestione()) &&
-                                    y.getNumOrd().equals(x.getNumOrd()))
+                            .filter(y ->
+                                    Objects.hash(x.getDataOrd(), x.getGestione(), x.getNumOrd()) ==
+                                                Objects.hash(y.getDataOrd(), y.getGestione(), y.getNumOrd()) &&
+                                            (Objects.equals(x.getDataOrd(), y.getDataOrd()) && Objects.equals(x.getNumOrd(), y.getNumOrd()) &&
+                                                    Objects.equals(x.getGestione(), y.getGestione())))
                             .collect(Collectors.toList()));
                 });