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

Migliorata MES_GetWorkOrders
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-11-27 12:53:54 +01:00
parent 1ac9e6115a
commit 63621ec58c
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ems-engine/src/main/java/it/integry/ems/production/service/ProductionOrderDataHandlerService.java
View File

@@ -227,8 +227,8 @@ public class ProductionOrderDataHandlerService {
if (flagEvaso != null && (!flagEvaso.equalsIgnoreCase("I") && !flagEvaso.equalsIgnoreCase("E"))) {
throw new Exception("Errore durante l'interpretazione del campo \"flagEvaso\"");
}
query = "SELECT * FROM MES_GetWorkOrders(" +
UtilityDB.valueToString((linee != null && linee.size() > 0) ? Stream.of(linee).collect(com.annimon.stream.Collectors.joining("|")) : null) + "," +
query = "SELECT * FROM MES_GetWorkOrders(NULL, " +
UtilityDB.valueToString(startDate) + " , " +
UtilityDB.valueToString(endDate) + "," +
UtilityDB.valueToString(flagEvaso) + "," +
@@ -485,6 +485,15 @@ public class ProductionOrderDataHandlerService {
List<OrdineLavorazioneDTO> ordiniLavorazioneList = UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), query, OrdineLavorazioneDTO.class);
if(ordiniLavorazioneList != null && linee != null) {
linee = linee.stream().map(String::toLowerCase).collect(Collectors.toList());
final List<String> finalLinee = linee;
ordiniLavorazioneList = ordiniLavorazioneList.stream()
.filter(x -> finalLinee.contains(x.getCodJfas().toLowerCase()))
.collect(Collectors.toList());
}
if (ordiniLavorazioneList != null && !ordiniLavorazioneList.isEmpty()) {
for (OrdineLavorazioneDTO ordineDTO : ordiniLavorazioneList) {