diff --git a/app/build.gradle b/app/build.gradle index 2f662b11..dd99d395 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 231 - def appVersionName = '1.18.1' + def appVersionCode = 232 + def appVersionName = '1.18.2' signingConfigs { release { diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtViewModel.java index da167cb4..2d81432d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtViewModel.java @@ -75,12 +75,14 @@ public class DialogScanArtViewModel { if(!UtilityString.isNullOrEmpty(barcodeProd)) { if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) { this.executeEtichettaLU(ean128Model.Sscc, onComplete); - } else { + } else if(!mForceOnlyUL) { if (barcodeProd.startsWith("0") || barcodeProd.startsWith("9")) { barcodeProd = barcodeProd.substring(1); } this.loadArticolo(barcodeProd, ean128Model, onComplete); + } else { + this.sendError(new Exception("Barcode non valido")); } } else { //EAN 128 non completo o comunque mancano i riferimenti al prodotto