From 9d3f6f73d9c755468e87871949a3f3ee764c962d Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 15 Dec 2022 16:17:39 +0100 Subject: [PATCH 1/2] =?UTF-8?q?Rimossa=20substring=20del=20codice=20GTIN?= =?UTF-8?q?=20se=20inizia=20con=200=20o=209.=20Se=20ne=20occupa=20gi=C3=A0?= =?UTF-8?q?=20il=20servizio=20di=20decodeEan128.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accettazione_picking/AccettazionePickingViewModel.java | 3 --- .../gest/picking_libero/PickingLiberoViewModel.java | 3 --- .../gest/rettifica_giacenze/RettificaGiacenzeViewModel.java | 3 --- .../integrywmsnative/gest/spedizione/SpedizioneViewModel.java | 3 --- .../view/dialogs/scan_art/DialogScanArtViewModel.java | 3 --- 5 files changed, 15 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..69d18995 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 @@ -294,9 +294,6 @@ public class AccettazionePickingViewModel { if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) { this.sendError(new LUScanNotGrantedException()); } else { - if (barcodeProd.startsWith("0") || barcodeProd.startsWith("9")) { - barcodeProd = barcodeProd.substring(1); - } PickDataDTO pickDataDTO = PickDataDTO.fromEan128(ean128Model); this.loadArticolo(barcodeProd, pickDataDTO, onComplete); 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..7b02c7c9 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 @@ -183,9 +183,6 @@ public class PickingLiberoViewModel { if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) { this.executeEtichettaLU(ean128Model.Sscc, onComplete); } else if (!UtilityString.isNullOrEmpty(barcodeProd)) { - if (barcodeProd.startsWith("0") || barcodeProd.startsWith("9")) { - barcodeProd = barcodeProd.substring(1); - } this.loadArticolo(barcodeProd, ean128Model, onComplete); } else { this.sendError(new NoLUFoundException()); 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 dc697c0c..5311086d 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 @@ -129,9 +129,6 @@ public class RettificaGiacenzeViewModel { 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); 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 e1473094..dabedb89 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 @@ -540,9 +540,6 @@ public class SpedizioneViewModel { if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) { this.executeEtichettaLU(ean128Model.Sscc, onComplete); } else { - if (barcodeProd.startsWith("0") || barcodeProd.startsWith("9")) { - barcodeProd = barcodeProd.substring(1); - } PickDataDTO pickDataDTO = PickDataDTO.fromEan128(ean128Model); this.loadArticolo(barcodeProd, pickDataDTO, onComplete); 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..7bce5330 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 @@ -90,9 +90,6 @@ public class DialogScanArtViewModel { if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) { this.executeEtichettaLU(ean128Model.Sscc, onComplete); } else if (!mForceOnlyUL) { - if (barcodeProd.startsWith("0") || barcodeProd.startsWith("9")) { - barcodeProd = barcodeProd.substring(1); - } this.loadArticolo(barcodeProd, ean128Model, onComplete); } else { From ca448542c380dcf412664cada947eb49fc8b7a98 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 15 Dec 2022 16:20:20 +0100 Subject: [PATCH 2/2] -> v1.30.04 (322) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 84ca8094..e250ab32 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 321 - def appVersionName = '1.30.03' + def appVersionCode = 322 + def appVersionName = '1.30.04' signingConfigs { release {