From 7163d91c531454fb8f0ba4568bb9f02ba5430c24 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 7 Oct 2022 15:22:43 +0200 Subject: [PATCH] Revert "Rimossa troncatura dell'ITF-14" This reverts commit 7555e3d90f0bcfb70e1e68c7ed00bd98f187868c. --- .../AccettazionePickingViewModel.java | 7 ++++++- .../gest/picking_libero/PickingLiberoViewModel.java | 10 ++++++++-- .../rettifica_giacenze/RettificaGiacenzeViewModel.java | 7 ++++++- .../gest/spedizione/SpedizioneViewModel.java | 7 ++++++- .../DialogChooseArtsFromListaArts.java | 7 ++++++- .../view/dialogs/scan_art/DialogScanArtViewModel.java | 9 +++++++-- 6 files changed, 39 insertions(+), 8 deletions(-) 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 d566b264..9d5f19df 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 @@ -319,12 +319,17 @@ public class AccettazionePickingViewModel { } private void loadArticolo(String barcodeProd, PickDataDTO pickData, Runnable onComplete) { + if (barcodeProd.length() == 14) { + 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(barcodeProd)); + 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 9f09c888..99e069a2 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 @@ -200,6 +200,12 @@ public class PickingLiberoViewModel { } private void loadArticolo(String barcodeProd, Ean128Model ean128Model, Runnable onComplete) { + if (barcodeProd.length() == 14) { +// barcodeProd = UtilityBarcode.convertITF14toNeutral(barcodeProd); + barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd); + } + + String finalBarcodeProd = barcodeProd; mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> { if (mtbAartList != null && mtbAartList.size() > 0) { MtbAart articolo = mtbAartList.get(0); @@ -211,11 +217,11 @@ public class PickingLiberoViewModel { this.dispatchArt(articolo, ean128Model); onComplete.run(); } else { - this.sendError(new NoResultFromBarcodeException(barcodeProd)); + this.sendError(new NoResultFromBarcodeException(finalBarcodeProd)); } } else { - this.sendError(new NoResultFromBarcodeException(barcodeProd)); + 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 d8b8d4f3..b5d74961 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 @@ -149,13 +149,18 @@ public class RettificaGiacenzeViewModel { } private void loadArticolo(String barcodeProd, PickDataDTO pickData, Runnable onComplete) { + if (barcodeProd.length() == 14) { + 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(barcodeProd)); + 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 5e71cc88..5d7af861 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 @@ -564,6 +564,11 @@ public class SpedizioneViewModel { } private void loadArticolo(String barcodeProd, PickDataDTO pickData, Runnable onComplete) { + if (barcodeProd.length() == 14) { + barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd); + } + + String finalBarcodeProd = barcodeProd; this.mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> { if (mtbAartList != null && mtbAartList.size() > 0) { @@ -573,7 +578,7 @@ public class SpedizioneViewModel { mListener.onChooseArtRequest(mtbAartList, art -> this.searchArtFromAnag(art, pickData, onComplete)); } } else { - this.sendError(new NoResultFromBarcodeException(barcodeProd)); + this.sendError(new NoResultFromBarcodeException(finalBarcodeProd)); } }, this::sendError); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java index 660c3a81..d42fe92a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java @@ -308,10 +308,15 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment { private void loadArticolo(String barcodeProd, Ean128Model ean128Model) { + if (barcodeProd.length() == 14) { + barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd); + } + + String finalBarcodeProd = barcodeProd; this.articoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> { if (mtbAartList != null && mtbAartList.size() > 0) { - this.mBindings.mainSearch.setQuery(barcodeProd, false); + this.mBindings.mainSearch.setQuery(finalBarcodeProd, false); this.searchArtInList(mtbAartList.get(0), ean128Model); 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 b0da913a..e36b8f0a 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 @@ -149,6 +149,11 @@ public class DialogScanArtViewModel { private void loadArticolo(@NotNull String barcodeProd, Ean128Model ean128Model, RunnableArgssss> onComplete) { + if (barcodeProd.length() == 14) { + barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd); + } + + String finalBarcodeProd = barcodeProd; this.mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> { if (mtbAartList != null && mtbAartList.size() > 0) { @@ -160,11 +165,11 @@ public class DialogScanArtViewModel { } else if (!mForceOnlyUL) { onComplete.run(DialogConsts.Results.YES, mtbAartList.get(0), ean128Model, null); } else { - this.sendError(new NoResultFromBarcodeException(barcodeProd)); + this.sendError(new NoResultFromBarcodeException(finalBarcodeProd)); } } else { - this.sendError(new NoResultFromBarcodeException(barcodeProd)); + this.sendError(new NoResultFromBarcodeException(finalBarcodeProd)); } }, this::sendError); }