From d0f6999dd8da2c6cf1f25c2fa92538a93880106d Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 1 Mar 2022 11:59:20 +0100 Subject: [PATCH 1/2] Aggiunto barcode nel messaggio di errore --- .../core/exception/NoResultFromBarcodeException.java | 4 ++-- .../accettazione_picking/AccettazionePickingViewModel.java | 3 ++- .../gest/picking_libero/PickingLiberoViewModel.java | 5 +++-- .../gest/rettifica_giacenze/RettificaGiacenzeViewModel.java | 3 ++- .../gest/spedizione/SpedizioneViewModel.java | 3 ++- .../view/dialogs/scan_art/DialogScanArtViewModel.java | 5 +++-- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/exception/NoResultFromBarcodeException.java b/app/src/main/java/it/integry/integrywmsnative/core/exception/NoResultFromBarcodeException.java index 05ae8894..a8352d61 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/exception/NoResultFromBarcodeException.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/exception/NoResultFromBarcodeException.java @@ -4,7 +4,7 @@ import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.utility.UtilityResources; public final class NoResultFromBarcodeException extends Exception { - public NoResultFromBarcodeException() { - super(UtilityResources.getString(R.string.no_result_from_barcode)); + public NoResultFromBarcodeException(String barcode) { + super(UtilityResources.getString(R.string.no_result_from_barcode) + " (" + barcode + ")"); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java index f6c23f56..6a81e57f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java @@ -317,12 +317,13 @@ public class AccettazionePickingViewModel { barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd); } + String finalBarcodeProd = barcodeProd; this.mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> { if (mtbAartList != null && mtbAartList.size() > 0) { this.searchArtFromAnag(mtbAartList.get(0), pickData, onComplete); } else { - this.sendError(new NoResultFromBarcodeException()); + this.sendError(new NoResultFromBarcodeException(finalBarcodeProd)); } }, this::sendError); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java index 9224d462..6477b7bd 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java @@ -205,6 +205,7 @@ public class PickingLiberoViewModel { barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd); } + String finalBarcodeProd = barcodeProd; mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> { if (mtbAartList != null && mtbAartList.size() > 0) { MtbAart articolo = mtbAartList.get(0); @@ -216,11 +217,11 @@ public class PickingLiberoViewModel { this.dispatchArt(articolo, ean128Model); onComplete.run(); } else { - this.sendError(new NoResultFromBarcodeException()); + this.sendError(new NoResultFromBarcodeException(finalBarcodeProd)); } } else { - this.sendError(new NoResultFromBarcodeException()); + this.sendError(new NoResultFromBarcodeException(finalBarcodeProd)); } }, this::sendError); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java index a1d17c82..aa1fabf9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java @@ -150,13 +150,14 @@ public class RettificaGiacenzeViewModel { barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd); } + String finalBarcodeProd = barcodeProd; this.mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> { if (onComplete != null) onComplete.run(); if (mtbAartList != null && mtbAartList.size() > 0) { this.dispatchArt(mtbAartList.get(0), pickData); } else { - this.sendError(new NoResultFromBarcodeException()); + this.sendError(new NoResultFromBarcodeException(finalBarcodeProd)); } }, this::sendError); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java index 99bcd674..fbdb7d48 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java @@ -626,12 +626,13 @@ public class SpedizioneViewModel { barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd); } + String finalBarcodeProd = barcodeProd; this.mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> { if (mtbAartList != null && mtbAartList.size() > 0) { this.searchArtFromAnag(mtbAartList.get(0), pickData, onComplete); } else { - this.sendError(new NoResultFromBarcodeException()); + this.sendError(new NoResultFromBarcodeException(finalBarcodeProd)); } }, this::sendError); 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 2d81432d..3a8752a6 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 @@ -86,7 +86,7 @@ public class DialogScanArtViewModel { } } else { //EAN 128 non completo o comunque mancano i riferimenti al prodotto - this.sendError(new NoResultFromBarcodeException()); + this.sendError(new NoResultFromBarcodeException(barcodeProd)); } }, this::sendError); } @@ -124,11 +124,12 @@ public class DialogScanArtViewModel { barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd); } + String finalBarcodeProd = barcodeProd; this.mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> { if(mtbAartList != null && mtbAartList.size() > 0) { onComplete.run(DialogConsts.Results.YES, mtbAartList.get(0), ean128Model, null); } else { - this.sendError(new NoResultFromBarcodeException()); + this.sendError(new NoResultFromBarcodeException(finalBarcodeProd)); } }, this::sendError); } From 767088f1d0a8b472e034229ebca60f37578bbec5 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 1 Mar 2022 11:59:54 +0100 Subject: [PATCH 2/2] -> v1.23.11 (266) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 143e59d1..a34d8852 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 265 - def appVersionName = '1.23.10' + def appVersionCode = 266 + def appVersionName = '1.23.11' signingConfigs { release {