From 01d39fd652708c92bf2fdbb670419ddc69bee00d Mon Sep 17 00:00:00 2001
From: MinaR <m.ruggiero@integry.it>
Date: Fri, 26 Jul 2024 11:49:26 +0200
Subject: [PATCH] sistemato dato giornaliero su mrp

---
 .../service/MrpDailyMaterialReqService.java   | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/ems-engine/src/main/java/it/integry/ems/production/service/MrpDailyMaterialReqService.java b/ems-engine/src/main/java/it/integry/ems/production/service/MrpDailyMaterialReqService.java
index 8c7068894d..e2b314b590 100644
--- a/ems-engine/src/main/java/it/integry/ems/production/service/MrpDailyMaterialReqService.java
+++ b/ems-engine/src/main/java/it/integry/ems/production/service/MrpDailyMaterialReqService.java
@@ -8,10 +8,7 @@ import it.integry.ems.production.dto.MRP.*;
 import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
 import it.integry.ems_model.entity.CtbScad;
 import it.integry.ems_model.service.SetupGest;
-import it.integry.ems_model.utility.UtilityBigDecimal;
-import it.integry.ems_model.utility.UtilityDB;
-import it.integry.ems_model.utility.UtilityHashMap;
-import it.integry.ems_model.utility.UtilityString;
+import it.integry.ems_model.utility.*;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -188,10 +185,16 @@ public class MrpDailyMaterialReqService {
                     .toList();
 
             for (Map.Entry<HashMap<String, Object>, List<MrpDailyMaterialReqDetDTO>> gg : listGG) {
-                MrpDailyMaterialReqDTO.DatiGg mrpGiorno =
-                        new MrpDailyMaterialReqDTO.DatiGg()
-                                .setDataMrp((Date) gg.getKey().get("data"));
-//                                .setCodMdep((String) gg.getKey().get("codMdep"))
+                MrpDailyMaterialReqDTO.DatiGg mrpGiorno;
+                java.util.Optional<MrpDailyMaterialReqDTO.DatiGg> data = datiGg.stream().filter(x ->x. getDataMrp().compareTo(UtilityHashMap.getValueIfExists(gg.getKey(), "data"))==0).findFirst();
+                if (data.isPresent()) {
+                    mrpGiorno = data.get();
+                    datiGg.remove(mrpGiorno);
+                } else {
+                    mrpGiorno =
+                            new MrpDailyMaterialReqDTO.DatiGg()
+                                    .setDataMrp((Date) gg.getKey().get("data"));
+                }
 
                 for (MrpDailyMaterialReqDetDTO x : gg.getValue()) {
                     giacenza = giacenza.add(x.getGiacenza());