Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrette logiche di ricerca cod_mart / barcode nei documenti interni

Browse Source
This commit is contained in:
Giuseppe Scorrano 2023-03-29 10:49:39 +02:00
parent 6f2be2b459
commit 8de54a504b
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java
View File

@ -186,7 +186,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
"Ricerca articolo", "Ricerca articolo",
null, null,
"Cod articolo / Barcode", "Cod articolo / Barcode",
barcodeProd -> this.viewModel.loadArticoloByCodMart(barcodeProd), BarcodeManager::enable).show(); barcodeProd -> this.viewModel.loadArticoloByCodMartOrBarcode(barcodeProd), BarcodeManager::enable).show();
} }

10
app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
View File

@ -129,9 +129,10 @@ public class DocInterniEditFormViewModel {
this.listener.onDocumentHoldRequest(); this.listener.onDocumentHoldRequest();
} }
public void loadArticoloByCodMart(String codMart) { public void loadArticoloByCodMartOrBarcode(String codMart) {
var matchedArt = Stream.of(productsList) var matchedArt = Stream.of(productsList)
.filter(x -> x.getCodMart().equalsIgnoreCase(codMart)) .filter(x -> x.getCodMart().equalsIgnoreCase(codMart) ||
x.getBarcode().contains(codMart))
.findFirst() .findFirst()
.orElse(null); .orElse(null);
@ -312,10 +313,7 @@ public class DocInterniEditFormViewModel {
} }
public void processBarcodeDTO(BarcodeScanDTO barcodeScanDTO) { public void processBarcodeDTO(BarcodeScanDTO barcodeScanDTO) {
if(UtilityBarcode.isCode128(barcodeScanDTO)) { if (UtilityBarcode.isEanPeso(barcodeScanDTO)) {
this.loadArticoloByCodMart(barcodeScanDTO.getStringValue());
} else if (UtilityBarcode.isEanPeso(barcodeScanDTO)) {
//Cerco tramite etichetta ean peso //Cerco tramite etichetta ean peso
this.executeEtichettaEanPeso(barcodeScanDTO); this.executeEtichettaEanPeso(barcodeScanDTO);