From 57dd0cef765b64d508c1055175af68b6ec8444b1 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 12 Oct 2022 15:25:25 +0200 Subject: [PATCH] Rimossa troncatura barcode da itf14 a ean13 --- .../AccettazionePickingViewModel.java | 7 +----- .../PickingLiberoViewModel.java | 10 ++------- .../RettificaGiacenzeViewModel.java | 22 ++++++------------- .../gest/spedizione/SpedizioneViewModel.java | 7 +----- .../DialogChooseArtsFromListaArts.java | 7 +----- .../scan_art/DialogScanArtViewModel.java | 9 ++------ 6 files changed, 14 insertions(+), 48 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 8c3f2b8b..2922034e 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 @@ -104,11 +104,6 @@ public class RettificaGiacenzeViewModel { public void processBarcodeDTO(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) { -// if (UtilityBarcode.isEanPeso(barcodeScanDTO)) { -// //Cerco tramite etichetta ean 128 (che può indicarmi un articolo o una UL) -// this.executeEtichettaEanPeso(barcodeScanDTO, onComplete); -// -// } else if (UtilityBarcode.isEtichetta128(barcodeScanDTO)) { //Cerco tramite etichetta ean 128 (che può indicarmi un articolo o una UL) this.executeEtichettaEan128(barcodeScanDTO, onComplete); @@ -125,43 +120,40 @@ public class RettificaGiacenzeViewModel { mBarcodeRESTConsumer.decodeEan128(barcodeScanDTO, ean128Model -> { String barcodeProd = null; + String codMart = null; if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) barcodeProd = ean128Model.Sscc; if (!UtilityString.isNullOrEmpty(ean128Model.Gtin)) barcodeProd = ean128Model.Gtin; if (!UtilityString.isNullOrEmpty(ean128Model.Content)) barcodeProd = ean128Model.Content; + if(!UtilityString.isNullOrEmpty(ean128Model.Internal1)) codMart = ean128Model.Internal1; + if (!UtilityString.isNullOrEmpty(barcodeProd)) { - if (barcodeProd.startsWith("0") || barcodeProd.startsWith("9")) { barcodeProd = barcodeProd.substring(1); } PickDataDTO pickDataDTO = PickDataDTO.fromEan128(ean128Model); this.loadArticolo(barcodeProd, pickDataDTO, onComplete); + } else if(!UtilityString.isNullOrEmpty(codMart)) { + this.searchArtInt(codMart, onComplete); } else { //EAN 128 non completo o comunque mancano i riferimenti al prodotto onComplete.run(); } - }, (e) -> { - this.searchArtInt(barcodeScanDTO.getStringValue(), onComplete); - }); + }, this::sendError); } 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); }