From 30b5053a2276e1cd597766916f38268b5c75e1b2 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 27 Sep 2021 10:53:06 +0200 Subject: [PATCH 1/2] Risolto controllo su UL e CodArt in AddExtraItems --- .../view/dialogs/scan_art/DialogScanArtViewModel.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 From e21946fe234daaf93a7cdf373e19a63d3a2939e6 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 27 Sep 2021 10:53:51 +0200 Subject: [PATCH 2/2] -> v1.18.2 (232) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 {