From 9dd4781d3bddf45b4170ff79a3c6c9cee4b17007 Mon Sep 17 00:00:00 2001 From: MinaR Date: Thu, 9 Jan 2025 17:07:29 +0100 Subject: [PATCH] eliminto campo flag_fatt_vettore --- .../model/Migration_20250109154212.java | 19 +++++++++++++++++++ .../it/integry/ems_model/entity/GtbPorto.java | 12 ------------ .../service/DocumentiDirettiService.java | 13 ++++++++----- 3 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250109154212.java diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250109154212.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250109154212.java new file mode 100644 index 0000000000..949e51ee45 --- /dev/null +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250109154212.java @@ -0,0 +1,19 @@ +package it.integry.ems.migration.model; + +import it.integry.ems.migration._base.BaseMigration; +import it.integry.ems.migration._base.MigrationModelInterface; + +public class Migration_20250109154212 extends BaseMigration implements MigrationModelInterface { + + @Override + public void up() throws Exception { + if (isHistoryDB()) + return; + + dropColumn("gtb_porto", "flag_fattura_vettore"); + } + + @Override + public void down() throws Exception { + } +} \ No newline at end of file diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/GtbPorto.java b/ems-core/src/main/java/it/integry/ems_model/entity/GtbPorto.java index 7448d45877..b270c06e7c 100644 --- a/ems-core/src/main/java/it/integry/ems_model/entity/GtbPorto.java +++ b/ems-core/src/main/java/it/integry/ems_model/entity/GtbPorto.java @@ -44,9 +44,6 @@ public class GtbPorto extends EntityBase { @SqlField(value = "flag_attivo", nullable = false) private Boolean flagAttivo; - @SqlField(value = "flag_fattura_vettore", nullable = false) - private Boolean flagFatturaVettore; - @SqlField(value = "flag_incoterms", nullable = false) private Boolean flagIncoterms; @@ -114,15 +111,6 @@ public class GtbPorto extends EntityBase { return this; } - public Boolean getFlagFatturaVettore() { - return flagFatturaVettore; - } - - public GtbPorto setFlagFatturaVettore(Boolean flagFatturaVettore) { - this.flagFatturaVettore = flagFatturaVettore; - return this; - } - public Boolean getFlagIncoterms() { return flagIncoterms; } diff --git a/ems-engine/src/main/java/it/integry/ems/document/service/DocumentiDirettiService.java b/ems-engine/src/main/java/it/integry/ems/document/service/DocumentiDirettiService.java index fd071edf3b..55b2a2f342 100644 --- a/ems-engine/src/main/java/it/integry/ems/document/service/DocumentiDirettiService.java +++ b/ems-engine/src/main/java/it/integry/ems/document/service/DocumentiDirettiService.java @@ -132,11 +132,14 @@ public class DocumentiDirettiService { boolean fatturaPedaneCliente = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql); - sql = - Query.format( - "SELECT flag_fattura_vettore FROM gtb_porto WHERE porto = %s", - dtbDoct.getIncoterms()); - boolean fatturaVettore = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql); + boolean fatturaVettore = false; + if (!UtilityString.isNullOrEmpty(dtbDoct.getIncoterms())) { + sql = + Query.format( + "SELECT CAST(IIF(costo=2,1,0) as bit) FROM gtb_porto WHERE porto = %s", + dtbDoct.getIncoterms()); + fatturaVettore = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql); + } if ((fatturaPedaneCliente || fatturaVettore) && dtbDoct.getDtbDocImb().stream().anyMatch(x->x.getTipoReso()!= 2 && !x.getNumImbCons().equals(x.getNumImbResi()))