From 2553b1bd857196e51cf06be9d0731272f7059087 Mon Sep 17 00:00:00 2001 From: MarcoE Date: Fri, 26 Jan 2024 10:24:02 +0100 Subject: [PATCH 1/2] Calcolata data consegna richiesta e valorizzato il campo decorrenza --- .../service/OrdiniWebImportService.java | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/ems-engine/src/main/java/it/integry/ems/order/Import/service/OrdiniWebImportService.java b/ems-engine/src/main/java/it/integry/ems/order/Import/service/OrdiniWebImportService.java index 30ebbcf0d5..6c7f6270f4 100644 --- a/ems-engine/src/main/java/it/integry/ems/order/Import/service/OrdiniWebImportService.java +++ b/ems-engine/src/main/java/it/integry/ems/order/Import/service/OrdiniWebImportService.java @@ -24,10 +24,7 @@ import it.integry.ems_model.exception.EntityException; import it.integry.ems_model.service.SetupGest; import it.integry.ems_model.types.ApplicationName; import it.integry.ems_model.types.OperationType; -import it.integry.ems_model.utility.UtilityDB; -import it.integry.ems_model.utility.UtilityHashMap; -import it.integry.ems_model.utility.UtilityStream; -import it.integry.ems_model.utility.UtilityString; +import it.integry.ems_model.utility.*; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -723,6 +720,24 @@ public class OrdiniWebImportService { } if (countRow == 1) { + String sql = "select gg_cons\n" + + "from vtb_dest\n" + + "where cod_anag = " + UtilityDB.valueToString(codAnag) + + " and cod_vdes = " + UtilityDB.valueToString(codVdes); + + String calcDataCons = importSetupSection.get("CALC_DATA_CONS"); + String setDecorrenza = importSetupSection.get("SET_DECORRENZA"); + + int ggCons = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql); + + if (dataConsRich == null && calcDataCons != null && calcDataCons.equalsIgnoreCase("S")) { + dataConsRich = UtilityDate.dateAdd(dataCons, ggCons); + } + + if (dataConsRich != null && setDecorrenza != null && setDecorrenza.equalsIgnoreCase("S")){ + dtbOrdt.setDataRifScad(dataConsRich); + } + dtbOrdt.setGestione("V"); dtbOrdt.setFlagAnnulla(flagAnnulla); dtbOrdt.setEanFidelity(eanFidelity); From 01ad4b1d12e635ed43ab18446eb6a09439075644 Mon Sep 17 00:00:00 2001 From: MarcoE Date: Fri, 26 Jan 2024 13:20:57 +0100 Subject: [PATCH 2/2] Aggiunta pIva in export iscc --- .../src/main/java/it/integry/ems/service/EmsServices.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ems-core/src/main/java/it/integry/ems/service/EmsServices.java b/ems-core/src/main/java/it/integry/ems/service/EmsServices.java index 9f0c193cea..49d2d125a8 100644 --- a/ems-core/src/main/java/it/integry/ems/service/EmsServices.java +++ b/ems-core/src/main/java/it/integry/ems/service/EmsServices.java @@ -44,6 +44,7 @@ import it.integry.ems_model.annotation.SqlField; import it.integry.ems_model.base.EntityBase; import it.integry.ems_model.base.EntityPropertyHolder; import it.integry.ems_model.config.EmsRestConstants; +import it.integry.ems_model.entity.Azienda; import it.integry.ems_model.entity.MrlPartitaMagAttached; import it.integry.ems_model.entity.StbFilesAttached; import it.integry.ems_model.entity.WtbUsersInfo; @@ -720,10 +721,13 @@ public class EmsServices { Gson gson = new Gson(); - if (arguments.containsKey("nomeAzienda")) arguments.remove("nomeAzienda"); + final Azienda defaultAzienda = Azienda.getDefaultAzienda(multiDBTransactionManager.getPrimaryConnection()); + if (arguments.containsKey("nomeAzienda")) arguments.remove("nomeAzienda"); arguments.put("nomeAzienda", settingsModel.getDefaultProfile()); + arguments.put("partitaIva", defaultAzienda.getPartIva()); + String jsonBody = gson.toJson(arguments); StringBuilder srb = new StringBuilder();