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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Mina Ruggiero
2024-02-20 17:23:15 +01:00
parent 9a390dd6f1 75446207a5
commit 0cb3aee12e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ems-engine/src/main/java/it/integry/ems/retail/ReportVariazioni/service/VariazioniPVService.java
View File

@@ -123,7 +123,7 @@ public class VariazioniPVService {
String query = getQueryVariazioni(variazioniPvDTO, setup, codVlis, getSetupSectionDepo.get("SELEZIONA_GRIGLIE")); String query = getQueryVariazioni(variazioniPvDTO, setup, codVlis, getSetupSectionDepo.get("SELEZIONA_GRIGLIE"));
List<HashMap<String, Object>> elencoVar = UtilityDB.executeSimpleQuery(multiDBTransactionManager.getPrimaryConnection(), query); List<HashMap<String, Object>> elencoVar = UtilityDB.executeSimpleQuery(multiDBTransactionManager.getPrimaryConnection(), query);
if (getSetupSectionDepo.get("SELEZIONA_GRIGLIE").equalsIgnoreCase("S")) { if (getSetupSectionDepo.get("SELEZIONA_GRIGLIE") != null && getSetupSectionDepo.get("SELEZIONA_GRIGLIE").equalsIgnoreCase("S")) {
grigliaAcquisto = grigliaAcquistoHandlerService.getGrigliaAcquisto(); grigliaAcquisto = grigliaAcquistoHandlerService.getGrigliaAcquisto();
grigliaAcquisto = Stream.of(grigliaAcquisto) grigliaAcquisto = Stream.of(grigliaAcquisto)
.filter(x -> x.getDataValidita().equals(variazioniPvDTO.getDataValidita()) && .filter(x -> x.getDataValidita().equals(variazioniPvDTO.getDataValidita()) &&

4
ems-engine/src/main/java/it/integry/ems/retail/service/GrigliaAcquistoHandlerService.java
View File

@@ -170,8 +170,8 @@ public class GrigliaAcquistoHandlerService {
setupList = grigliaAcquistoCachedData.get(dbName.toUpperCase()); setupList = grigliaAcquistoCachedData.get(dbName.toUpperCase());
} }
if (setupList == null) // if (setupList == null)
return getGrigliaAcquisto(multiDBTransactionManager); // return getGrigliaAcquisto(multiDBTransactionManager);
return setupList; return setupList;
} }
} }