From 8de54a504b4cd07e4eed183037df85939b8a5e1e Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 29 Mar 2023 10:49:39 +0200 Subject: [PATCH] Corrette logiche di ricerca cod_mart / barcode nei documenti interni --- .../edit_form/DocInterniEditFormActivity.java | 2 +- .../edit_form/DocInterniEditFormViewModel.java | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java index a1ab5ea4..94400d3d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java @@ -186,7 +186,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter "Ricerca articolo", null, "Cod articolo / Barcode", - barcodeProd -> this.viewModel.loadArticoloByCodMart(barcodeProd), BarcodeManager::enable).show(); + barcodeProd -> this.viewModel.loadArticoloByCodMartOrBarcode(barcodeProd), BarcodeManager::enable).show(); } 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 fea0f8dd..c955f441 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 @@ -129,9 +129,10 @@ public class DocInterniEditFormViewModel { this.listener.onDocumentHoldRequest(); } - public void loadArticoloByCodMart(String codMart) { + public void loadArticoloByCodMartOrBarcode(String codMart) { var matchedArt = Stream.of(productsList) - .filter(x -> x.getCodMart().equalsIgnoreCase(codMart)) + .filter(x -> x.getCodMart().equalsIgnoreCase(codMart) || + x.getBarcode().contains(codMart)) .findFirst() .orElse(null); @@ -312,10 +313,7 @@ public class DocInterniEditFormViewModel { } public void processBarcodeDTO(BarcodeScanDTO barcodeScanDTO) { - if(UtilityBarcode.isCode128(barcodeScanDTO)) { - this.loadArticoloByCodMart(barcodeScanDTO.getStringValue()); - - } else if (UtilityBarcode.isEanPeso(barcodeScanDTO)) { + if (UtilityBarcode.isEanPeso(barcodeScanDTO)) { //Cerco tramite etichetta ean peso this.executeEtichettaEanPeso(barcodeScanDTO);