From d43f90ea123bf9b5f15946f69fd3059bc98e978e Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 17 Dec 2024 13:22:50 +0100 Subject: [PATCH] Fix su exchange --- .../integry/ems/migration/model/Migration_20241213163759.java | 3 ++- .../exchange/service/ExchangeDestinatariImportService.java | 2 +- .../system/exchange/service/ExchangeSystemManagerService.java | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241213163759.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241213163759.java index 42e2bd5b5a..732a51f719 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241213163759.java +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241213163759.java @@ -382,7 +382,8 @@ public class Migration_20241213163759 extends BaseMigration implements Migration " v.cod_mart = t.cod_mart AND v.cod_mdep = t.cod_mdep AND\n" + " ISNULL(v.partita_mag, '') = ISNULL(t.partita_mag, '') AND\n" + " ISNULL(v.posizione, '') = ISNULL(t.posizione, '') AND\n" + - " ISNULL(v.cod_jcom, '') = ISNULL(t.cod_jcom, '')", + " ISNULL(v.cod_jcom, '') = ISNULL(t.cod_jcom, '')" + + " WHERE qta_col > 0", mtbColt.getGestione(), mtbColt.getSerCollo(), mtbColt.getNumCollo(), mtbColt.getDataCollo())); diff --git a/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeDestinatariImportService.java b/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeDestinatariImportService.java index 300e50e5ce..f9d5368b54 100644 --- a/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeDestinatariImportService.java +++ b/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeDestinatariImportService.java @@ -74,7 +74,7 @@ public class ExchangeDestinatariImportService { x.getVtbDest().parallelStream() .filter(y -> y.getOperation() == OperationType.INSERT || y.getOperation() == OperationType.INSERT_OR_UPDATE || y.getOperation() == OperationType.UPDATE) .forEach(y -> y.setFlagAttivo("A") - .setOperation(OperationType.UPDATE)); + .setOperation(OperationType.INSERT)); } }); diff --git a/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeSystemManagerService.java b/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeSystemManagerService.java index 6c28512c97..3c31c42f43 100644 --- a/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeSystemManagerService.java +++ b/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeSystemManagerService.java @@ -109,6 +109,7 @@ public class ExchangeSystemManagerService { stbExchangeConfig.setLastExecution(LocalDateTime.now()) .setOperation(OperationType.UPDATE); stbExchangeConfig.manageWithParentConnection(internalDb.getPrimaryConnection()); + internalDb.commitAll(); for (StbExchangeConfigDetail stbExchangeConfigDetail : stbExchangeConfigs) { executingStbExchangeConfigDetail = stbExchangeConfigDetail; @@ -224,6 +225,7 @@ public class ExchangeSystemManagerService { .setOperation(OperationType.UPDATE); try { stbExchangeConfig.manageWithParentConnection(internalDb.getPrimaryConnection()); + internalDb.commitAll(); } catch (Exception e) { logger.error("Errore durante l'aggiornamento dello stato dell'exchange", e); }