diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241203165546.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241203165546.java new file mode 100644 index 0000000000..e4bb2727df --- /dev/null +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241203165546.java @@ -0,0 +1,25 @@ +package it.integry.ems.migration.model; + +import it.integry.ems.migration._base.BaseMigration; +import it.integry.ems.migration._base.MigrationModelInterface; + +public class Migration_20241203165546 extends BaseMigration implements MigrationModelInterface { + + @Override + public void up() throws Exception { + if (isHistoryDB()) + return; + + executeStatement( + "alter table vtb_viaggi add container varchar(20)", + "alter table vtb_viaggi add sigillo varchar(20)", + "alter table vtb_viaggi add nave varchar(20)", + "alter table vtb_viaggi add porto_carico varchar(20)", + "alter table vtb_viaggi add destinazione varchar(20)" + ); + } + + @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/VtbViaggi.java b/ems-core/src/main/java/it/integry/ems_model/entity/VtbViaggi.java index 06d541f89f..15f8cf330e 100644 --- a/ems-core/src/main/java/it/integry/ems_model/entity/VtbViaggi.java +++ b/ems-core/src/main/java/it/integry/ems_model/entity/VtbViaggi.java @@ -62,6 +62,21 @@ public class VtbViaggi extends EntityBase { @SqlField(value = "stato", nullable = false, defaultObjectValue = "0") private Stato stato; + @SqlField(value = "container") + private String container; + + @SqlField(value = "sigillo") + private String sigillo; + + @SqlField(value = "nave") + private String nave; + + @SqlField(value = "porto_carico") + private String portoCarico; + + @SqlField(value = "destinazione") + private String destinazione; + @Priority(value = 101, copyPk = false) private List vtbViaggiList; @@ -191,6 +206,51 @@ public class VtbViaggi extends EntityBase { return this; } + public String getContainer() { + return container; + } + + public VtbViaggi setContainer(String container) { + this.container = container; + return this; + } + + public String getSigillo() { + return sigillo; + } + + public VtbViaggi setSigillo(String sigillo) { + this.sigillo = sigillo; + return this; + } + + public String getNave() { + return nave; + } + + public VtbViaggi setNave(String nave) { + this.nave = nave; + return this; + } + + public String getPortoCarico() { + return portoCarico; + } + + public VtbViaggi setPortoCarico(String portoCarico) { + this.portoCarico = portoCarico; + return this; + } + + public String getDestinazione() { + return destinazione; + } + + public VtbViaggi setDestinazione(String destinazione) { + this.destinazione = destinazione; + return this; + } + public enum Mezzo implements IBaseEnum { VETTORE((short) 0), MITTENTE((short) 1), DESTINATARIO((short) 2); diff --git a/ems-engine/src/main/java/it/integry/ems/contabil/service/RossoGarganoSyncService.java b/ems-engine/src/main/java/it/integry/ems/contabil/service/RossoGarganoSyncService.java index 8673dd1cb8..0d7daf77f3 100644 --- a/ems-engine/src/main/java/it/integry/ems/contabil/service/RossoGarganoSyncService.java +++ b/ems-engine/src/main/java/it/integry/ems/contabil/service/RossoGarganoSyncService.java @@ -280,6 +280,9 @@ public class RossoGarganoSyncService { } Object pnCodAnag = UtilityHashMap.getValueIfExists(c, "PN_COD_ANAG"); + if (UtilityString.isNullOrEmpty(pnCodAnag)) + throw new Exception(String.format("Nessun conto/codice anagrafico trovato sul movimento del %s n. %s)", pnDataCompetenza, pnNroReg)); + sql = Query.format( "SELECT ctb_cont.cod_ccon\n" + "FROM ctb_cont\n" + @@ -306,10 +309,10 @@ public class RossoGarganoSyncService { codCcon = UtilityHashMap.getValueIfExists(datiAnag, "cod_ccon"); tipoAnag = UtilityHashMap.getValueIfExists(datiAnag, "tipo_anag"); if (UtilityString.isNullOrEmpty(codAnag)) - throw new Exception(String.format("Codice cliente\fornitore non codificato (diacod: %s)", pnCodAnag)); + throw new Exception(String.format("Codice cliente/fornitore non codificato (diacod: %s)", pnCodAnag)); if (UtilityString.isNullOrEmpty(codCcon)) - throw new Exception(String.format("Codice conto non agganciato al cliente\fornitore %s (diacod: %s)", codAnag, pnCodAnag)); + throw new Exception(String.format("Codice conto non agganciato al cliente/fornitore %s (diacod: %s)", codAnag, pnCodAnag)); } String sezionaleIva = UtilityHashMap.getValueIfExists(c, "PN_SEZIONALE_IVA");