From 5288ad8bb0e41e3afe4ebea921742a9aa2521105 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Wed, 8 Feb 2023 17:15:47 +0100
Subject: [PATCH] Fix su qta inviate al magazzino automatico

---
 .../gest/spedizione/SpedizioneViewModel.java  | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
index b55a8359..b1b73eee 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
@@ -611,15 +611,9 @@ public class SpedizioneViewModel {
                         .findFirst()
                         .orElse(null);
 
-                final List<MtbColr> mtbColrs = Stream.of(pickingObjectDTO.getMtbColts())
-                        .filter(x -> x.getPosizione().equalsIgnoreCase(mtbDepoPosizione.getPosizione()))
-                        .flatMap(x -> Stream.of(x.getMtbColr()))
-                        .filter(x -> x.getCodMart().equalsIgnoreCase(selectedArt.getCodMart()))
-                        .toList();
-
                 MagazzinoAutomaticoPickItemRequestDTO itemDto = new MagazzinoAutomaticoPickItemRequestDTO(selectedArt.getCodMart())
-                        .setQtaTot(Stream.of(mtbColrs).map(MtbColr::getQtaCol).reduce(BigDecimal.ZERO, BigDecimal::add))
-                        .setNumCnf(Stream.of(mtbColrs).map(MtbColr::getNumCnf).reduce(BigDecimal.ZERO, BigDecimal::add))
+                        .setQtaTot(pickingObjectDTO.getSitArtOrdDTO().getQtaOrd())
+                        .setNumCnf(pickingObjectDTO.getSitArtOrdDTO().getNumCnfOrd())
                         .setUntMis(selectedArt.getUntMis());
 
                 magazzinoAutomaticoPickItemRequestDTOList.add(itemDto);
@@ -1200,13 +1194,13 @@ public class SpedizioneViewModel {
     }
 
     public void createNewLU(Integer customNumCollo, String customSerCollo, Runnable onComplete) {
-        final List<CreateUDSRequestOrderDTO> orders = this.mTestateOrdini.stream()
+        final List<CreateUDSRequestOrderDTO> orders = Stream.of(this.mTestateOrdini)
                 .map(x -> new CreateUDSRequestOrderDTO()
                         .setDataCons(UtilityDate.toLocalDate(x.getDataConsD()))
                         .setDataOrd(UtilityDate.toLocalDate(x.getDataOrdD()))
                         .setGestione(x.getGestione())
                         .setNumOrd(x.getNumOrd()))
-                .collect(Collectors.toList());
+                .toList();
 
         final CreateUDSRequestDTO createUDSRequestDTO = new CreateUDSRequestDTO()
                 .setCodMdep(SettingsManager.i().getUserSession().getDepo().getCodMdep())
@@ -1493,7 +1487,7 @@ public class SpedizioneViewModel {
                                     positionedMtbColts -> {
 
                                         this.askPrint(shouldPrint, positionedMtbColts, () -> {
-                                            positionedMtbColts.stream()
+                                            Stream.of(positionedMtbColts)
                                                     .filter(x -> !this.mColliRegistrati.contains(x))
                                                     .forEach(x -> this.mColliRegistrati.add(x));
 
@@ -1728,7 +1722,7 @@ public class SpedizioneViewModel {
     private void postCloseOperations(List<MtbColt> mtbColtList) {
         if (mTestateOrdini != null) {
             for (MtbColt mtbColt : mtbColtList) {
-                mTestateOrdini.stream()
+                Stream.of(mTestateOrdini)
                         .filter(x -> x.getNumOrd().equals(mtbColt.getNumOrd()) && x.getDataOrdD().equals(mtbColt.getDataOrdD()) && x.getGestioneEnum() == mtbColt.getGestioneEnum())
                         .forEach(x -> x.setExistColloBoolean(true));
             }
@@ -1764,6 +1758,8 @@ public class SpedizioneViewModel {
                 pickingObjectDTO.setWithdrawMtbColrs(new ArrayList<>());
             }
         }
+
+        this.mCurrentMtbColt = null;
     }
 
     public void resetMatchedRows() {