From 692a350128b296e06c5a64c5d53f3f912c38ad83 Mon Sep 17 00:00:00 2001
From: ValerioC <v.castellana@integry.it>
Date: Mon, 14 Feb 2022 15:44:50 +0100
Subject: [PATCH] Aggiunta ricerca barcode articolo con conversione da 8 a 13
 caratteri

---
 .../DocInterniEditFormViewModel.java          | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
index b4580b87..6be6f11a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
@@ -4,6 +4,8 @@ import androidx.lifecycle.MutableLiveData;
 
 import com.annimon.stream.Stream;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
@@ -68,8 +70,8 @@ public class DocInterniEditFormViewModel {
 
     }
 
-    public void editRow(SqlMtbColr row,boolean flagTracciabilita) {
-        this.listener.onEditRowRequest(row,flagTracciabilita);
+    public void editRow(SqlMtbColr row, boolean flagTracciabilita) {
+        this.listener.onEditRowRequest(row, flagTracciabilita);
     }
 
     private Integer getNextIdRiga() {
@@ -91,7 +93,8 @@ public class DocInterniEditFormViewModel {
             }, this::sendError);
         }, this::sendError);
     }
-public void deleteDocument() {
+
+    public void deleteDocument() {
         this.sendOnLoadingStarted();
         docInterniRESTConsumer.saveDoc(this.getSaveDto(), obj -> {
             SqlMtbColt document = this.getDocument();
@@ -117,7 +120,7 @@ public void deleteDocument() {
         }
         SqlMtbColr row = this.getRowForArticolo(articolo);
         this.sendOnLoadingEnded();
-        this.editRow(row,articolo.getFlagTracciabilita().equalsIgnoreCase("S"));
+        this.editRow(row, articolo.getFlagTracciabilita().equalsIgnoreCase("S"));
 
     }
 
@@ -148,7 +151,12 @@ public void deleteDocument() {
     }
 
     private GrigliaAcquistiChildDTO searchArticolo(String filter) {
-        return Stream.of(this.productsList).filter(dto -> filter.equalsIgnoreCase(dto.getCodMart()) || filter.equalsIgnoreCase(dto.getBarcode())).findFirstOrElse(null);
+        return Stream.of(this.productsList).filter(dto ->
+                filter.equalsIgnoreCase(dto.getCodMart())
+                        || filter.equalsIgnoreCase(dto.getBarcode())
+                        || StringUtils.leftPad(filter, 13, '0').equalsIgnoreCase(dto.getCodMart())
+                        || StringUtils.leftPad(filter, 13, '0').equalsIgnoreCase(dto.getBarcode())
+        ).findFirstOrElse(null);
     }
 
     private SaveDTO getSaveDto() {
@@ -251,7 +259,7 @@ public void deleteDocument() {
     }
 
     public GrigliaAcquistiChildDTO getArticoloByCodMart(String codMart) {
-        return Stream.of(productsList).filter(prod->prod.codMart.equalsIgnoreCase(codMart)).findFirstOrElse(null);
+        return Stream.of(productsList).filter(prod -> prod.codMart.equalsIgnoreCase(codMart)).findFirstOrElse(null);
     }
 
     public interface Listener extends ILoadingListener {
@@ -260,7 +268,7 @@ public void deleteDocument() {
 
         void onRowsChanged(List<SqlMtbColr> rows);
 
-        void onEditRowRequest(SqlMtbColr row,boolean flagTracciabilita);
+        void onEditRowRequest(SqlMtbColr row, boolean flagTracciabilita);
 
         void onDocumentHoldRequest();