From 0591b60fad6f8f4257a4b0bd15688097bf327240 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 19 Mar 2025 18:18:42 +0100 Subject: [PATCH 1/4] Rimossa randomizzazione dati Verifica Giacenze --- .../pv_verifica_giacenze/VerificaGiacenzeFragment.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeFragment.java index 5b2c6f19..0a1562ec 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeFragment.java @@ -141,13 +141,6 @@ public class VerificaGiacenzeFragment extends BaseFragment implements ITitledFra this.initRecyclerView(); this.initBarcodeReader(); - - - this.onLoadingStarted(); - executorService.execute(() -> { - mViewModel.randomizeElements(2000); - this.onLoadingEnded(); - }); }); } From d44b6f00c6b371f394bb0caf7557de96ea7b0048 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 19 Mar 2025 18:22:03 +0100 Subject: [PATCH 2/4] -> v1.45.04 (486) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 29328a32..de4568cb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 485 - def appVersionName = '1.45.03' + def appVersionCode = 486 + def appVersionName = '1.45.04' signingConfigs { release { From 645b2cfe5d3f8f27ad36d763762340292409575f Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 27 Mar 2025 10:32:41 +0100 Subject: [PATCH 3/4] Cambiato servizio di retrieve giacenza in VerificaGiacenze --- .../InvalidCodMdepBarcodeException.java | 2 +- .../GiacenzaPvRESTConsumerService.java | 2 +- .../DialogAskDepositoViewModel.java | 20 ++++++++++--------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/exception/InvalidCodMdepBarcodeException.java b/app/src/main/java/it/integry/integrywmsnative/core/exception/InvalidCodMdepBarcodeException.java index 8ea4be96..2fabfb53 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/exception/InvalidCodMdepBarcodeException.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/exception/InvalidCodMdepBarcodeException.java @@ -3,6 +3,6 @@ package it.integry.integrywmsnative.core.exception; public class InvalidCodMdepBarcodeException extends RuntimeException { public InvalidCodMdepBarcodeException(String message) { - super(message); + super("Il deposito scansionato non รจ valido: " + message); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaPvRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaPvRESTConsumerService.java index 4bb86b7c..c4ef0149 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaPvRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaPvRESTConsumerService.java @@ -13,7 +13,7 @@ import retrofit2.http.Query; public interface GiacenzaPvRESTConsumerService { - @GET("giacenza/retrieve") + @GET("wms/pv/verifica_giacenze/retrieve") Call>> retrieve(@Query("codMdep") String codMdep); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_deposito/DialogAskDepositoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_deposito/DialogAskDepositoViewModel.java index 79e79f35..9f06c527 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_deposito/DialogAskDepositoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_deposito/DialogAskDepositoViewModel.java @@ -9,6 +9,8 @@ import it.integry.barcode_base_android_library.model.BarcodeScanDTO; import it.integry.integrywmsnative.core.exception.InvalidCodMdepBarcodeException; import it.integry.integrywmsnative.core.exception.NoResultFromBarcodeException; import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO; +import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityBarcode; import it.integry.integrywmsnative.core.utility.UtilityString; @@ -17,7 +19,7 @@ public class DialogAskDepositoViewModel { Handler handler; BarcodeRESTConsumer barcodeRESTConsumer; - private MutableLiveData codMdep = new MutableLiveData<>(); + private final MutableLiveData codMdep = new MutableLiveData<>(); private Listener listener; public DialogAskDepositoViewModel(Handler handler, BarcodeRESTConsumer barcodeRESTConsumer) { @@ -45,14 +47,14 @@ public class DialogAskDepositoViewModel { throw new InvalidCodMdepBarcodeException(barcodeScanDTO.getStringValue()); } -// AvailableCodMdepsDTO availableCodMdepsDTO = SettingsManager.iDB().getAvailableCodMdep().stream() -// .filter(x -> x.getCodMdep().equalsIgnoreCase(ean128Model.Internal4)) -// .findFirst() -// .orElse(null); -// -// if (availableCodMdepsDTO == null) { -// throw new InvalidCodMdepBarcodeException(barcodeScanDTO.getStringValue()); -// } + AvailableCodMdepsDTO availableCodMdepsDTO = SettingsManager.iDB().getAvailableCodMdep().stream() + .filter(x -> x.getCodMdep().equalsIgnoreCase(ean128Model.Internal4)) + .findFirst() + .orElse(null); + + if (availableCodMdepsDTO == null) { + throw new InvalidCodMdepBarcodeException(ean128Model.Internal4); + } handler.post(() -> { this.codMdep.setValue(ean128Model.Internal4); From 722094bc3ebb9eeb5f5acdfaff1bb50396e71c17 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 27 Mar 2025 10:34:47 +0100 Subject: [PATCH 4/4] -> v1.45.05 (487) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index de4568cb..dce3420a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 486 - def appVersionName = '1.45.04' + def appVersionCode = 487 + def appVersionName = '1.45.05' signingConfigs { release {