From 7555e3d90f0bcfb70e1e68c7ed00bd98f187868c Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 7 Oct 2022 10:53:35 +0200 Subject: [PATCH] Rimossa troncatura dell'ITF-14 --- .../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, 8 insertions(+), 39 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 9d5f19df..d566b264 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,17 +319,12 @@ 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(finalBarcodeProd)); + this.sendError(new NoResultFromBarcodeException(barcodeProd)); } }, 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 99e069a2..9f09c888 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,12 +200,6 @@ 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); @@ -217,11 +211,11 @@ public class PickingLiberoViewModel { this.dispatchArt(articolo, ean128Model); onComplete.run(); } else { - this.sendError(new NoResultFromBarcodeException(finalBarcodeProd)); + this.sendError(new NoResultFromBarcodeException(barcodeProd)); } } else { - this.sendError(new NoResultFromBarcodeException(finalBarcodeProd)); + this.sendError(new NoResultFromBarcodeException(barcodeProd)); } }, 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 b5d74961..d8b8d4f3 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,18 +149,13 @@ 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(finalBarcodeProd)); + this.sendError(new NoResultFromBarcodeException(barcodeProd)); } }, 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 5d7af861..5e71cc88 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,11 +564,6 @@ 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) { @@ -578,7 +573,7 @@ public class SpedizioneViewModel { mListener.onChooseArtRequest(mtbAartList, art -> this.searchArtFromAnag(art, pickData, onComplete)); } } else { - this.sendError(new NoResultFromBarcodeException(finalBarcodeProd)); + this.sendError(new NoResultFromBarcodeException(barcodeProd)); } }, 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 d42fe92a..660c3a81 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,15 +308,10 @@ 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(finalBarcodeProd, false); + this.mBindings.mainSearch.setQuery(barcodeProd, 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 e36b8f0a..b0da913a 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,11 +149,6 @@ 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) { @@ -165,11 +160,11 @@ public class DialogScanArtViewModel { } else if (!mForceOnlyUL) { onComplete.run(DialogConsts.Results.YES, mtbAartList.get(0), ean128Model, null); } else { - this.sendError(new NoResultFromBarcodeException(finalBarcodeProd)); + this.sendError(new NoResultFromBarcodeException(barcodeProd)); } } else { - this.sendError(new NoResultFromBarcodeException(finalBarcodeProd)); + this.sendError(new NoResultFromBarcodeException(barcodeProd)); } }, this::sendError); }