From 7da729205c7ce68a7d72188498479abd3076ae2f Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 16 Mar 2023 12:22:45 +0100
Subject: [PATCH] Fix su loadArticolo in picking per inventario

---
 .../picking/PickingInventarioViewModel.java   | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java
index 4d6552b2..3bf83309 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java
@@ -93,24 +93,24 @@ public class PickingInventarioViewModel extends ViewModel {
         var barcodeList = new ArrayList<String>();
         barcodeList.add(itemToUpdate.getScanCodBarre());
 
-        var matchedArtOpt = availableInventarioArts.stream()
+        var matchedArt = availableInventarioArts.stream()
                 .filter(x -> itemToUpdate.getCodMart() != null && x.getCodMart().contains(itemToUpdate.getCodMart()))
-                .findFirst();
+                .findFirst()
+                .orElse(null);
 
-        MtbAart articolo = null;
+        MtbAart articolo;
 
-        if (canAddUnknownItems) {
-            var matchedArt = matchedArtOpt.orElse(new InventarioArtDTO()
+        if (canAddUnknownItems && matchedArt == null) {
+            matchedArt = new InventarioArtDTO()
                     .setBarcode(barcodeList)
                     .setFlagQtaCnfFissa(true)
                     .setPlu(false)
                     .setUntMis(itemToUpdate.getUntMis())
-                    .setQtaCnf(itemToUpdate.getQtaConf()));
-
+                    .setQtaCnf(itemToUpdate.getQtaConf());
+        }
+        if (matchedArt != null) {
             articolo = matchedArt.toMtbAart()
                     .setFlagTracciabilita("N");
-        }
-        if (articolo != null) {
             dispatchRowEdit(articolo, itemToUpdate);
         } else
             this.sendError(new NoResultFromBarcodeException(itemToUpdate.getScanCodBarre()));
@@ -151,19 +151,19 @@ public class PickingInventarioViewModel extends ViewModel {
         var barcodeList = new ArrayList<String>();
         barcodeList.add(barcodeProd);
 
-        var matchedArtOpt = availableInventarioArts.stream()
+        var matchedArt = availableInventarioArts.stream()
                 .filter(x -> x.getBarcode().contains(barcodeProd))
-                .findFirst();
+                .findFirst()
+                .orElse(null);
 
-        InventarioArtDTO matchedArt = null;
 
-        if (canAddUnknownItems) {
-            matchedArt = matchedArtOpt.orElse(new InventarioArtDTO()
+        if (canAddUnknownItems && matchedArt == null) {
+            matchedArt = new InventarioArtDTO()
                         .setBarcode(barcodeList)
                         .setFlagQtaCnfFissa(true)
                         .setPlu(false)
                         .setUntMis("PZ")
-                        .setQtaCnf(BigDecimal.ONE));
+                        .setQtaCnf(BigDecimal.ONE);
 
         }