From f75c2c7fc9c99b8a044a7b056fbb951da9a1cb6e Mon Sep 17 00:00:00 2001
From: FabioN <f.narracci@integry.it>
Date: Wed, 15 May 2024 16:11:00 +0200
Subject: [PATCH] Aggiunta campo flag_calc_peso_intra su tipi documento e
 flag_sezione su dtb_docr

---
 .../migration/model/Migration_20240515151737.java  | 14 +++++++++-----
 .../java/it/integry/ems_model/entity/DtbDocr.java  | 11 +++++++++++
 .../java/it/integry/ems_model/entity/DtbTipi.java  | 12 ++++++------
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240515151737.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240515151737.java
index 5e99a0de13..628039d037 100644
--- a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240515151737.java
+++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240515151737.java
@@ -1,16 +1,20 @@
-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_20240515151737 extends BaseMigration implements MigrationModelInterface{
+public class Migration_20240515151737 extends BaseMigration implements MigrationModelInterface {
 
     @Override
-    public void up()throws Exception {
-        if(isHistoryDB())
+    public void up() throws Exception {
+        if (isHistoryDB())
             return;
+        executeStatement("ALTER TABLE dtb_docr ADD flag_sezione integer;");
+        executeStatement("ALTER TABLE dtb_difr ADD flag_sezione integer;");
     }
 
     @Override
-    public void down()throws Exception{
+    public void down() throws Exception {
 
     }
 
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 932787556a..3382a77312 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
@@ -187,6 +187,9 @@ public class DtbDocr extends DtbBaseDocR {
     @SqlField(value = "id_contratto")
     private Long idContratto;
 
+    /*Flag_sezione vale 1 per le righe dei riepilogo INTRa, mentre per tutte le altre righe vale null */
+    @SqlField(value = "flag_sezione")
+    private Integer flagSezione;
     @JsonProperty(value = "pesoNetto")
     private BigDecimal pesoNetto;
     private int rigaKit;
@@ -1053,6 +1056,14 @@ public class DtbDocr extends DtbBaseDocR {
         return this;
     }
 
+    public Integer getFlagSezione() {
+        return flagSezione;
+    }
+
+    public void setFlagSezione(Integer flagSezione) {
+        this.flagSezione = flagSezione;
+    }
+
     public String getReso() {
         return reso;
     }
diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/DtbTipi.java b/ems-core/src/main/java/it/integry/ems_model/entity/DtbTipi.java
index c3e4dd6410..ff5a9f8b47 100644
--- a/ems-core/src/main/java/it/integry/ems_model/entity/DtbTipi.java
+++ b/ems-core/src/main/java/it/integry/ems_model/entity/DtbTipi.java
@@ -203,8 +203,8 @@ public class DtbTipi extends EntityBase {
     @SqlField(value = "flag_cons_consumi", nullable = false, defaultObjectValue = "0")
     private Boolean flagConsConsumi;
 
-    @SqlField(value = "flag_sezione", nullable = false)
-    private String flagSezione;
+    @SqlField(value = "flag_calc_peso_intra", nullable = false, defaultObjectValue = "N")
+    private String flagCalcPesoIntra;
 
     @EntityChild
     private List<DtbTipiAnag> dtbTipiAnag;
@@ -715,12 +715,12 @@ public class DtbTipi extends EntityBase {
         return this;
     }
 
-    public String getFlagSezione() {
-        return flagSezione;
+    public String getFlagCalcPesoIntra() {
+        return flagCalcPesoIntra;
     }
 
-    public DtbTipi setFlagSezione(String flagSezione) {
-        this.flagSezione = flagSezione;
+    public DtbTipi setFlagCalcPesoIntra(String flagCalcPesoIntra) {
+        this.flagCalcPesoIntra = flagCalcPesoIntra;
         return this;
     }