From bdaf4a5ac69e5872e2ecc80c88f2bc27b35817d3 Mon Sep 17 00:00:00 2001 From: MinaR Date: Mon, 10 Nov 2025 11:19:41 +0100 Subject: [PATCH 1/4] aggiunta setup per selezionare il tipo calcolo prezzo base --- .../model/Migration_20251110111625.java | 27 +++++++++++++++++++ .../importaz/service/Lisv4LisaService.java | 7 ++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 ems-core/src/main/java/it/integry/ems/migration/model/Migration_20251110111625.java diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20251110111625.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20251110111625.java new file mode 100644 index 0000000000..9463c13040 --- /dev/null +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20251110111625.java @@ -0,0 +1,27 @@ +package it.integry.ems.migration.model; + +import it.integry.ems.migration._base.BaseMigration; +import it.integry.ems.migration._base.IntegryCustomer; +import it.integry.ems.migration._base.MigrationModelInterface; + +public class Migration_20251110111625 extends BaseMigration implements MigrationModelInterface { + + @Override + public void up() throws Exception { + if (isHistoryDB()) + return; + + createSetupQuery(null, null, "SELECT '1|Prezzo netto d''acquisto e ricalcola il prezzo di vendita (Ricarica fissa)' UNION SELECT '2|Prezzo netto d''acquisto e ricalcola ricarica (Prezzo di vendita fisso)' UNION SELECT '3|Prezzo netto d''acquisto e prezzo di vendita da prezzo lordo d''acquisto (Ricalcola ricarica)' UNION SELECT '4|Prezzo netto d''acquisto e ricalcola il prezzo di vendita (Ricarica fissa da Testata listino)' UNION SELECT '5|Prezzo netto d''acquisto, prezzo di vendita e ricarica fissa (Non ricalcolare prezzo)' UNION SELECT '6|Prezzo netto d''acquisto, prezzo di vendita = Prezzo Vendita Suggerito' UNION SELECT '7|Non ricalcolare il prezzo' "); + createSetup("VTB_LIST", "LISV4LISA", "CALC_PRZ_BASE", null, +"SELEZIONARE IL CRITERIO DI CALCOLO DEL PREZZO BASE", false, null, false, false, +false, false, false, null, false, "SELECT '1|Prezzo netto d''acquisto e ricalcola il prezzo di vendita (Ricarica fissa)' UNION SELECT '2|Prezzo netto d''acquisto e ricalcola ricarica (Prezzo di vendita fisso)' UNION SELECT '3|Prezzo netto d''acquisto e prezzo di vendita da prezzo lordo d''acquisto (Ricalcola ricarica)' UNION SELECT '4|Prezzo netto d''acquisto e ricalcola il prezzo di vendita (Ricarica fissa da Testata listino)' UNION SELECT '5|Prezzo netto d''acquisto, prezzo di vendita e ricarica fissa (Non ricalcolare prezzo)' UNION SELECT '6|Prezzo netto d''acquisto, prezzo di vendita = Prezzo Vendita Suggerito' UNION SELECT '7|Non ricalcolare il prezzo' "); + if (isCustomer(IntegryCustomer.Carelli)) + updateSetupValue("VTB_LIST", "LISV4LISA", "CALC_PRZ_BASE","1"); + } + + @Override + public void down() throws Exception { + + } + +} diff --git a/ems-engine/src/main/java/it/integry/ems/product/importaz/service/Lisv4LisaService.java b/ems-engine/src/main/java/it/integry/ems/product/importaz/service/Lisv4LisaService.java index 72e8dd8925..1b809e402a 100644 --- a/ems-engine/src/main/java/it/integry/ems/product/importaz/service/Lisv4LisaService.java +++ b/ems-engine/src/main/java/it/integry/ems/product/importaz/service/Lisv4LisaService.java @@ -57,7 +57,12 @@ public class Lisv4LisaService { HashMap setupSection = setupGest.getSetupSection(multiDBTransactionManager.getPrimaryConnection(), type, format); String emailForLog = setupSection.get("EMAIL_FOR_LOG"); try { - + if (lisv4LisaDTO.getCalcPrzBase() == null) { + if (setupSection.get("CALC_PRZ_BASE") != null) { + lisv4LisaDTO.setCalcPrzBase(setupSection.get("CALC_PRZ_BASE")); + } else + throw new Exception("Non รจ stato definito il criterio di attribuzione del prezzo base"); + } if (lisv4LisaDTO.getDataValidita() == null) { LocalDate today = UtilityLocalDate.getNow(); Integer versione = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), From 349d983b7fafa06b6ee59d323f728df60e0a9b61 Mon Sep 17 00:00:00 2001 From: FabioN Date: Mon, 10 Nov 2025 18:35:14 +0100 Subject: [PATCH 2/4] Impostata truncate a 40 su ragione sociale in import Made In Masseria --- .../it/integry/ems/order/service/OrderImportService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ems-engine/src/main/java/it/integry/ems/order/service/OrderImportService.java b/ems-engine/src/main/java/it/integry/ems/order/service/OrderImportService.java index effee1d5fa..7407f5b0f4 100644 --- a/ems-engine/src/main/java/it/integry/ems/order/service/OrderImportService.java +++ b/ems-engine/src/main/java/it/integry/ems/order/service/OrderImportService.java @@ -1223,10 +1223,10 @@ public class OrderImportService { List listClie = new ArrayList(); findCodificaNazione(data.getCountryCode()); anag.setPrecode(codAnagPrecode); - anag.setRagSoc(data.getCompanyName().toUpperCase()); - anag.setIndirizzo(data.getAddress().toUpperCase()); - anag.setCap(data.getPostalCode().toUpperCase()); - anag.setCitta(data.getCity().toUpperCase()); + anag.setRagSoc(UtilityString.left(data.getCompanyName().toUpperCase(), 40)); + anag.setIndirizzo(UtilityString.left(data.getAddress().toUpperCase(), 255)); + anag.setCap(UtilityString.left(data.getPostalCode().toUpperCase(), 10)); + anag.setCitta(UtilityString.left(data.getCity().toUpperCase(), 30)); anag.setNazione(mapNazioni.get(data.getCountryCode())); anag.setOperation(OperationType.INSERT); VtbClie clie = new VtbClie(); From 785ae254ee93e3638ad1d41259ec9db3b46e99fd Mon Sep 17 00:00:00 2001 From: AnthonyS Date: Tue, 11 Nov 2025 11:35:37 +0100 Subject: [PATCH 3/4] Creazione stb_gest_setup presenti solo in wtb_gest_setup_user --- .../model/Migration_20251110184508.java | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 ems-core/src/main/java/it/integry/ems/migration/model/Migration_20251110184508.java diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20251110184508.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20251110184508.java new file mode 100644 index 0000000000..73c55ef363 --- /dev/null +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20251110184508.java @@ -0,0 +1,45 @@ +package it.integry.ems.migration.model; + +import it.integry.ems.migration._base.BaseMigration; +import it.integry.ems.migration._base.MigrationModelInterface; +import it.integry.ems_model.entity.StbGestSetup; +import it.integry.ems_model.types.OperationType; +import it.integry.ems_model.utility.UtilityDB; +import it.integry.ems_model.utility.UtilityList; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +public class Migration_20251110184508 extends BaseMigration implements MigrationModelInterface { + + @Override + public void up() throws Exception { + if (isHistoryDB()) + return; + + String sql = "SELECT DISTINCT wgsu.gest_name, wgsu.section, wgsu.key_section, 'S' AS flag_setup_user_web\n" + + "FROM wtb_gest_setup_user wgsu\n" + + "WHERE NOT EXISTS(SELECT sgs.gest_name, sgs.section, sgs.key_section\n" + + " FROM stb_gest_setup sgs\n" + + " WHERE wgsu.gest_name = sgs.gest_name\n" + + " AND wgsu.section = sgs.section\n" + + " AND wgsu.key_section = sgs.key_section)"; + + List stbGestSetupsToCreate = UtilityDB.executeSimpleQueryDTO(connection, sql, StbGestSetup.class); + + if (UtilityList.isNullOrEmpty(stbGestSetupsToCreate)) { + return; + } + + for (StbGestSetup stbGestSetup : stbGestSetupsToCreate) { + stbGestSetup.setOperation(OperationType.INSERT); + + stbGestSetup.manageWithParentConnection(connection); + } + } + + @Override + public void down() throws Exception { + } +} \ No newline at end of file From 086bd574d5d8fad604de9baf854cb7add28e68b9 Mon Sep 17 00:00:00 2001 From: Valerio Castellana Date: Tue, 11 Nov 2025 15:13:47 +0100 Subject: [PATCH 4/4] Aggiunta pezza in login per disallineamento profileDb != dbName --- .../main/java/it/integry/ems/system/service/SystemService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ems-engine/src/main/java/it/integry/ems/system/service/SystemService.java b/ems-engine/src/main/java/it/integry/ems/system/service/SystemService.java index d49e94a879..ce74cf06ee 100644 --- a/ems-engine/src/main/java/it/integry/ems/system/service/SystemService.java +++ b/ems-engine/src/main/java/it/integry/ems/system/service/SystemService.java @@ -313,6 +313,8 @@ public class SystemService { } else { foundUser = userCacheService.retrieveUser(dbName, username, password, requestDataDTO.getApplication()); } + if (foundUser != null && !profileDB.equalsIgnoreCase(foundUser.getProfileDb())) + foundUser.setProfileDb(profileDB); } else { List profiles = userCacheService.retrieveProfilesOfUser(username, password, requestDataDTO.getApplication());