Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit
Details

Browse Source
This commit is contained in:
Giuseppe Scorrano
2024-12-17 13:22:57 +01:00
parent 5e557d938a f52db8ff2e
commit 3b17ca48a2
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241213163759.java
View File

@@ -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" + " 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.partita_mag, '') = ISNULL(t.partita_mag, '') AND\n" +
" ISNULL(v.posizione, '') = ISNULL(t.posizione, '') 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())); mtbColt.getGestione(), mtbColt.getSerCollo(), mtbColt.getNumCollo(), mtbColt.getDataCollo()));

2
ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeDestinatariImportService.java
View File

@@ -74,7 +74,7 @@ public class ExchangeDestinatariImportService {
x.getVtbDest().parallelStream() x.getVtbDest().parallelStream()
.filter(y -> y.getOperation() == OperationType.INSERT || y.getOperation() == OperationType.INSERT_OR_UPDATE || y.getOperation() == OperationType.UPDATE) .filter(y -> y.getOperation() == OperationType.INSERT || y.getOperation() == OperationType.INSERT_OR_UPDATE || y.getOperation() == OperationType.UPDATE)
.forEach(y -> y.setFlagAttivo("A") .forEach(y -> y.setFlagAttivo("A")
.setOperation(OperationType.UPDATE)); .setOperation(OperationType.INSERT));
} }
}); });

2
ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeSystemManagerService.java
View File

@@ -109,6 +109,7 @@ public class ExchangeSystemManagerService {
stbExchangeConfig.setLastExecution(LocalDateTime.now()) stbExchangeConfig.setLastExecution(LocalDateTime.now())
.setOperation(OperationType.UPDATE); .setOperation(OperationType.UPDATE);
stbExchangeConfig.manageWithParentConnection(internalDb.getPrimaryConnection()); stbExchangeConfig.manageWithParentConnection(internalDb.getPrimaryConnection());
internalDb.commitAll();
for (StbExchangeConfigDetail stbExchangeConfigDetail : stbExchangeConfigs) { for (StbExchangeConfigDetail stbExchangeConfigDetail : stbExchangeConfigs) {
executingStbExchangeConfigDetail = stbExchangeConfigDetail; executingStbExchangeConfigDetail = stbExchangeConfigDetail;
@@ -224,6 +225,7 @@ public class ExchangeSystemManagerService {
.setOperation(OperationType.UPDATE); .setOperation(OperationType.UPDATE);
try { try {
stbExchangeConfig.manageWithParentConnection(internalDb.getPrimaryConnection()); stbExchangeConfig.manageWithParentConnection(internalDb.getPrimaryConnection());
internalDb.commitAll();
} catch (Exception e) { } catch (Exception e) {
logger.error("Errore durante l'aggiornamento dello stato dell'exchange", e); logger.error("Errore durante l'aggiornamento dello stato dell'exchange", e);
} }