modifiche per salvataggio variazioni bene da movimento contabile

ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250324103412.java

@@ -1,15 +1,21 @@
-package it.integry.ems.migration.model;import it.integry.ems.migration._base.BaseMigration;
+package it.integry.ems.migration.model;
+
+import it.integry.ems.migration._base.BaseMigration;
 import it.integry.ems.migration._base.MigrationModelInterface;
 
-public class Migration_20250324103412 extends BaseMigration implements MigrationModelInterface{
+public class Migration_20250324103412 extends BaseMigration implements MigrationModelInterface {
 
     @Override
-    public void up()throws Exception {
-        if(isHistoryDB())
+    public void up() throws Exception {
+        if (isHistoryDB())
             return;
+
+        executeStatement("ALTER TABLE ctb_varbeni add num_cmov int",
+                "ALTER TABLE ctb_varbeni ADD CONSTRAINT fk_ctb_varbeni_ctb_movt FOREIGN KEY (num_cmov) REFERENCES ctb_movt (num_cmov)");
+
     }
 
     @Override
-    public void down()throws Exception {
+    public void down() throws Exception {
     }
 }

ems-core/src/main/java/it/integry/ems_model/entity/CtbBeni.java

@@ -141,308 +141,324 @@ public class CtbBeni extends EntityBase {
         return codBene;
     }
 
-    public void setCodBene(String codBene) {
+    public CtbBeni setCodBene(String codBene) {
         this.codBene = codBene;
+        return this;
     }
 
     public String getDescrizione() {
         return descrizione;
     }
 
-    public void setDescrizione(String descrizione) {
+    public CtbBeni setDescrizione(String descrizione) {
         this.descrizione = descrizione;
+        return this;
     }
 
     public Date getDataDocAcq() {
         return dataDocAcq;
     }
 
-    public void setDataDocAcq(Date dataDocAcq) {
+    public CtbBeni setDataDocAcq(Date dataDocAcq) {
         this.dataDocAcq = dataDocAcq;
+        return this;
     }
 
     public String getSerDocAcq() {
         return serDocAcq;
     }
 
-    public void setSerDocAcq(String serDocAcq) {
+    public CtbBeni setSerDocAcq(String serDocAcq) {
         this.serDocAcq = serDocAcq;
+        return this;
     }
 
     public int getNumDocAcq() {
         return numDocAcq;
     }
 
-    public void setNumDocAcq(int numDocAcq) {
+    public CtbBeni setNumDocAcq(int numDocAcq) {
         this.numDocAcq = numDocAcq;
+        return this;
     }
 
     public int getNumProtAcq() {
         return numProtAcq;
     }
 
-    public void setNumProtAcq(int numProtAcq) {
+    public CtbBeni setNumProtAcq(int numProtAcq) {
         this.numProtAcq = numProtAcq;
+        return this;
     }
 
     public BigDecimal getValoreAcq() {
         return valoreAcq;
     }
 
-    public void setValoreAcq(BigDecimal valoreAcq) {
+    public CtbBeni setValoreAcq(BigDecimal valoreAcq) {
         this.valoreAcq = valoreAcq;
+        return this;
     }
 
     public String getFlagNuovoUsa() {
         return flagNuovoUsa;
     }
 
-    public void setFlagNuovoUsa(String flagNuovoUsa) {
+    public CtbBeni setFlagNuovoUsa(String flagNuovoUsa) {
         this.flagNuovoUsa = flagNuovoUsa;
+        return this;
     }
 
     public Date getDataInizAmm() {
         return dataInizAmm;
     }
 
-    public void setDataInizAmm(Date dataInizAmm) {
+    public CtbBeni setDataInizAmm(Date dataInizAmm) {
         this.dataInizAmm = dataInizAmm;
+        return this;
     }
 
     public BigDecimal getAliqAmmNorm() {
         return aliqAmmNorm;
     }
 
-    public void setAliqAmmNorm(BigDecimal aliqAmmNorm) {
+    public CtbBeni setAliqAmmNorm(BigDecimal aliqAmmNorm) {
         this.aliqAmmNorm = aliqAmmNorm;
+        return this;
     }
 
     public BigDecimal getAliqAmmNorm1a() {
         return aliqAmmNorm1a;
     }
 
-    public void setAliqAmmNorm1a(BigDecimal aliqAmmNorm1a) {
+    public CtbBeni setAliqAmmNorm1a(BigDecimal aliqAmmNorm1a) {
         this.aliqAmmNorm1a = aliqAmmNorm1a;
+        return this;
     }
 
     public BigDecimal getAliqAmmAnt() {
         return aliqAmmAnt;
     }
 
-    public void setAliqAmmAnt(BigDecimal aliqAmmAnt) {
+    public CtbBeni setAliqAmmAnt(BigDecimal aliqAmmAnt) {
         this.aliqAmmAnt = aliqAmmAnt;
+        return this;
     }
 
     public BigDecimal getAliqAmmAnt1a() {
         return aliqAmmAnt1a;
     }
 
-    public void setAliqAmmAnt1a(BigDecimal aliqAmmAnt1a) {
+    public CtbBeni setAliqAmmAnt1a(BigDecimal aliqAmmAnt1a) {
         this.aliqAmmAnt1a = aliqAmmAnt1a;
+        return this;
     }
 
     public Integer getAnniAmmAnt() {
         return anniAmmAnt;
     }
 
-    public void setAnniAmmAnt(Integer anniAmmAnt) {
+    public CtbBeni setAnniAmmAnt(Integer anniAmmAnt) {
         this.anniAmmAnt = anniAmmAnt;
+        return this;
     }
 
     public Date getDataDocAlie() {
         return dataDocAlie;
     }
 
-    public void setDataDocAlie(Date dataDocAlie) {
+    public CtbBeni setDataDocAlie(Date dataDocAlie) {
         this.dataDocAlie = dataDocAlie;
+        return this;
     }
 
     public String getCodAgbe() {
         return codAgbe;
     }
 
-    public void setCodAgbe(String codAgbe) {
+    public CtbBeni setCodAgbe(String codAgbe) {
         this.codAgbe = codAgbe;
+        return this;
     }
 
     public String getCodCatbene() {
         return codCatbene;
     }
 
-    public void setCodCatbene(String codCatbene) {
+    public CtbBeni setCodCatbene(String codCatbene) {
         this.codCatbene = codCatbene;
+        return this;
     }
 
     public String getSerDocAlie() {
         return serDocAlie;
     }
 
-    public void setSerDocAlie(String serDocAlie) {
+    public CtbBeni setSerDocAlie(String serDocAlie) {
         this.serDocAlie = serDocAlie;
+        return this;
     }
 
     public Integer getNumDocAlie() {
         return numDocAlie;
     }
 
-    public void setNumDocAlie(Integer numDocAlie) {
+    public CtbBeni setNumDocAlie(Integer numDocAlie) {
         this.numDocAlie = numDocAlie;
+        return this;
     }
 
     public BigDecimal getValoreAlie() {
         return valoreAlie;
     }
 
-    public void setValoreAlie(BigDecimal valoreAlie) {
+    public CtbBeni setValoreAlie(BigDecimal valoreAlie) {
         this.valoreAlie = valoreAlie;
+        return this;
     }
 
     public Integer getNumBeni() {
         return numBeni;
     }
 
-    public void setNumBeni(Integer numBeni) {
+    public CtbBeni setNumBeni(Integer numBeni) {
         this.numBeni = numBeni;
+        return this;
     }
 
     public String getCodBeneRif() {
         return codBeneRif;
     }
 
-    public void setCodBeneRif(String codBeneRif) {
+    public CtbBeni setCodBeneRif(String codBeneRif) {
         this.codBeneRif = codBeneRif;
+        return this;
     }
 
     public String getDescrizioneAlien() {
         return descrizioneAlien;
     }
 
-    public void setDescrizioneAlien(String descrizioneAlien) {
+    public CtbBeni setDescrizioneAlien(String descrizioneAlien) {
         this.descrizioneAlien = descrizioneAlien;
+        return this;
     }
 
     public BigDecimal getPercCostoDeduc() {
         return percCostoDeduc;
     }
 
-    public void setPercCostoDeduc(BigDecimal percCostoDeduc) {
+    public CtbBeni setPercCostoDeduc(BigDecimal percCostoDeduc) {
         this.percCostoDeduc = percCostoDeduc;
+        return this;
     }
 
     public Integer getNumCmovAcq() {
         return numCmovAcq;
     }
 
-    public void setNumCmovAcq(Integer numCmovAcq) {
+    public CtbBeni setNumCmovAcq(Integer numCmovAcq) {
         this.numCmovAcq = numCmovAcq;
+        return this;
     }
 
     public String getCodForn() {
         return codForn;
     }
 
-    public void setCodForn(String codForn) {
+    public CtbBeni setCodForn(String codForn) {
         this.codForn = codForn;
+        return this;
     }
 
     public String getCodJfas() {
         return codJfas;
     }
 
-    public void setCodJfas(String codJfas) {
+    public CtbBeni setCodJfas(String codJfas) {
         this.codJfas = codJfas;
+        return this;
     }
 
     public String getCodDiviAcq() {
         return codDiviAcq;
     }
 
-    public void setCodDiviAcq(String codDiviAcq) {
+    public CtbBeni setCodDiviAcq(String codDiviAcq) {
         this.codDiviAcq = codDiviAcq;
+        return this;
     }
 
     public BigDecimal getCambioDiviAcq() {
         return cambioDiviAcq;
     }
 
-    public void setCambioDiviAcq(BigDecimal cambioDiviAcq) {
+    public CtbBeni setCambioDiviAcq(BigDecimal cambioDiviAcq) {
         this.cambioDiviAcq = cambioDiviAcq;
+        return this;
     }
 
     public String getCodDiviVend() {
         return codDiviVend;
     }
 
-    public void setCodDiviVend(String codDiviVend) {
+    public CtbBeni setCodDiviVend(String codDiviVend) {
         this.codDiviVend = codDiviVend;
+        return this;
     }
 
     public BigDecimal getCambioDiviVend() {
         return cambioDiviVend;
     }
 
-    public void setCambioDiviVend(BigDecimal cambioDiviVend) {
+    public CtbBeni setCambioDiviVend(BigDecimal cambioDiviVend) {
         this.cambioDiviVend = cambioDiviVend;
+        return this;
     }
 
     public String getNote() {
         return note;
     }
 
-    public void setNote(String note) {
+    public CtbBeni setNote(String note) {
         this.note = note;
+        return this;
     }
 
     public Date getDataSospAgbe() {
         return dataSospAgbe;
     }
 
-    public void setDataSospAgbe(Date dataSospAgbe) {
+    public CtbBeni setDataSospAgbe(Date dataSospAgbe) {
         this.dataSospAgbe = dataSospAgbe;
+        return this;
     }
 
     public BigDecimal getResiduoAlien() {
         return residuoAlien;
     }
 
-    public void setResiduoAlien(BigDecimal residuoAlien) {
+    public CtbBeni setResiduoAlien(BigDecimal residuoAlien) {
         this.residuoAlien = residuoAlien;
+        return this;
     }
 
     public List<CtbVarbeni> getCtbVarbeni() {
         return ctbVarbeni;
     }
 
-    public void setCtbVarbeni(List<CtbVarbeni> ctbVarbeni) {
+    public CtbBeni setCtbVarbeni(List<CtbVarbeni> ctbVarbeni) {
         this.ctbVarbeni = ctbVarbeni;
+        return this;
     }
 
     public List<CtbFondi> getCtbFondi() {
         return ctbFondi;
     }
 
-    public void setCtbFondi(List<CtbFondi> ctbFondi) {
+    public CtbBeni setCtbFondi(List<CtbFondi> ctbFondi) {
         this.ctbFondi = ctbFondi;
-    }
-
-    @Override
-    protected void insertChilds() throws Exception {
-        for (CtbVarbeni ctbVarbeni : getCtbVarbeni()) {
-            ctbVarbeni.manageWithParentConnection(connection, ctbVarbeni.getOperation(), dataCompleting, entityHolder);
-        }
-        for (CtbFondi ctbFondi : getCtbFondi()) {
-            ctbFondi.manageWithParentConnection(connection, ctbFondi.getOperation(), dataCompleting, entityHolder);
-        }
-    }
-
-    @Override
-    protected void updateChilds() throws Exception {
-        for (CtbVarbeni ctbVarbeni : getCtbVarbeni()) {
-            ctbVarbeni.manageWithParentConnection(connection, ctbVarbeni.getOperation(), dataCompleting, entityHolder);
-        }
-        for (CtbFondi ctbFondi : getCtbFondi()) {
-            ctbFondi.manageWithParentConnection(connection, ctbFondi.getOperation(), dataCompleting, entityHolder);
-        }
+        return this;
     }
 
     @Override

ems-core/src/main/java/it/integry/ems_model/entity/CtbVarbeni.java

@@ -1,10 +1,7 @@
 package it.integry.ems_model.entity;
 
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import it.integry.ems_model.annotation.Master;
-import it.integry.ems_model.annotation.PK;
-import it.integry.ems_model.annotation.SqlField;
-import it.integry.ems_model.annotation.Table;
+import it.integry.ems_model.annotation.*;
 import it.integry.ems_model.base.EntityBase;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -34,6 +31,7 @@ public class CtbVarbeni extends EntityBase {
     private Date dataVar;
 
     @PK
+    @SqlDetailId
     @SqlField(value = "id_riga", nullable = false)
     private Integer idRiga;
 
@@ -76,6 +74,9 @@ public class CtbVarbeni extends EntityBase {
     @SqlField(value = "residuo_vend_var")
     private BigDecimal residuoVendVar;
 
+    @SqlField(value = "num_cmov")
+    private Integer numCmov;
+
     public CtbVarbeni() {
         super(logger);
     }
@@ -84,127 +85,154 @@ public class CtbVarbeni extends EntityBase {
         return codBene;
     }
 
-    public void setCodBene(String codBene) {
+    public CtbVarbeni setCodBene(String codBene) {
         this.codBene = codBene;
+        return this;
     }
 
     public Date getDataVar() {
         return dataVar;
     }
 
-    public void setDataVar(Date dataVar) {
+    public CtbVarbeni setDataVar(Date dataVar) {
         this.dataVar = dataVar;
+        return this;
     }
 
     public Integer getIdRiga() {
         return idRiga;
     }
 
-    public void setIdRiga(Integer idRiga) {
+    public CtbVarbeni setIdRiga(Integer idRiga) {
         this.idRiga = idRiga;
+        return this;
     }
 
     public String getDescrizioneVar() {
         return descrizioneVar;
     }
 
-    public void setDescrizioneVar(String descrizioneVar) {
+    public CtbVarbeni setDescrizioneVar(String descrizioneVar) {
         this.descrizioneVar = descrizioneVar;
+        return this;
     }
 
     public String getRivalutazione() {
         return rivalutazione;
     }
 
-    public void setRivalutazione(String rivalutazione) {
+    public CtbVarbeni setRivalutazione(String rivalutazione) {
         this.rivalutazione = rivalutazione;
+        return this;
     }
 
     public String getCodAgbe() {
         return codAgbe;
     }
 
-    public void setCodAgbe(String codAgbe) {
+    public CtbVarbeni setCodAgbe(String codAgbe) {
         this.codAgbe = codAgbe;
+        return this;
     }
 
     public BigDecimal getValoreVar() {
         return valoreVar;
     }
 
-    public void setValoreVar(BigDecimal valoreVar) {
+    public CtbVarbeni setValoreVar(BigDecimal valoreVar) {
         this.valoreVar = valoreVar;
+        return this;
     }
 
     public String getFlagStamReg() {
         return flagStamReg;
     }
 
-    public void setFlagStamReg(String flagStamReg) {
+    public CtbVarbeni setFlagStamReg(String flagStamReg) {
         this.flagStamReg = flagStamReg;
+        return this;
     }
 
     public Integer getNumVariazione() {
         return numVariazione;
     }
 
-    public void setNumVariazione(Integer numVariazione) {
+    public CtbVarbeni setNumVariazione(Integer numVariazione) {
         this.numVariazione = numVariazione;
+        return this;
     }
 
     public BigDecimal getVarFondoOrd() {
         return varFondoOrd;
     }
 
-    public void setVarFondoOrd(BigDecimal varFondoOrd) {
+    public CtbVarbeni setVarFondoOrd(BigDecimal varFondoOrd) {
         this.varFondoOrd = varFondoOrd;
+        return this;
     }
 
     public BigDecimal getVarFondoAnt() {
         return varFondoAnt;
     }
 
-    public void setVarFondoAnt(BigDecimal varFondoAnt) {
+    public CtbVarbeni setVarFondoAnt(BigDecimal varFondoAnt) {
         this.varFondoAnt = varFondoAnt;
+        return this;
     }
 
     public String getCodDiviCont() {
         return codDiviCont;
     }
 
-    public void setCodDiviCont(String codDiviCont) {
+    public CtbVarbeni setCodDiviCont(String codDiviCont) {
         this.codDiviCont = codDiviCont;
+        return this;
     }
 
     public BigDecimal getCambioDiviCont() {
         return cambioDiviCont;
     }
 
-    public void setCambioDiviCont(BigDecimal cambioDiviCont) {
+    public CtbVarbeni setCambioDiviCont(BigDecimal cambioDiviCont) {
         this.cambioDiviCont = cambioDiviCont;
+        return this;
     }
 
     public String getFlagAmm1a() {
         return flagAmm1a;
     }
 
-    public void setFlagAmm1a(String flagAmm1a) {
+    public CtbVarbeni setFlagAmm1a(String flagAmm1a) {
         this.flagAmm1a = flagAmm1a;
+        return this;
     }
 
     public BigDecimal getValoreVendVar() {
         return valoreVendVar;
     }
 
-    public void setValoreVendVar(BigDecimal valoreVendVar) {
+    public CtbVarbeni setValoreVendVar(BigDecimal valoreVendVar) {
         this.valoreVendVar = valoreVendVar;
+        return this;
     }
 
     public BigDecimal getResiduoVendVar() {
         return residuoVendVar;
     }
 
-    public void setResiduoVendVar(BigDecimal residuoVendVar) {
+    public CtbVarbeni setResiduoVendVar(BigDecimal residuoVendVar) {
         this.residuoVendVar = residuoVendVar;
+        return this;
     }
+
+    public Integer getNumCmov() {
+        return numCmov;
+    }
+
+    public CtbVarbeni setNumCmov(Integer numCmov) {
+        this.numCmov = numCmov;
+        return this;
+    }
+
+
 }

ems-core/src/main/resources/rules/contabilita.drl

@@ -500,6 +500,17 @@ then
 	modify ( $testata ) { setCodDiviCont(dati.get("cod_divi_contab").toString()) }
 end
 
+rule "completeCodDiviContCtbVarbeni"
+when
+	eval(completeRulesEnabled)
+	$testata : CtbVarbeni(codDiviCont == null)
+then
+	HashMap<String, Object> dati = CommonRules.completeCodDivi(conn);
+	modify ( $testata ) { setCodDiviCont(dati.get("cod_divi_contab").toString()) }
+end
+
+
+
 rule "completeCodDiviContCtbMovr"
 when
 	eval(completeRulesEnabled)
@@ -583,6 +594,15 @@ then
 	modify ( $testata ) { setCambioDiviCont(cambio) }
 end
 
+rule "completeCambioDiviCtbVarbeni"
+when
+	eval(completeRulesEnabled)
+	$testata : CtbVarbeni(cambioDiviCont == null && codDiviCont != null )
+then
+	BigDecimal cambio = CommonRules.completeCambio(conn, $testata.getCodDiviCont());
+	modify ( $testata ) { setCambioDiviCont(cambio) }
+end
+
 rule "completeCambioDiviCtbMovr"
 when
 	eval(completeRulesEnabled)