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);