From c616a9d31ab094361acef1f4f706038914109b4b Mon Sep 17 00:00:00 2001 From: MarcoE Date: Tue, 14 May 2024 16:55:45 +0200 Subject: [PATCH 1/2] Fix InputQuantity in rettifica giaccenze --- .../RettificaGiacenzeViewModel.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) 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 d4ccee63..b8266759 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 @@ -167,8 +167,8 @@ public class RettificaGiacenzeViewModel { this.mArticoloRESTConsumer.searchByBarcode(barcodeProd, mtbAartList -> { if (onComplete != null) onComplete.run(); - if (mtbAartList != null && mtbAartList.size() > 0) { - this.dispatchArts(mtbAartList); + if (mtbAartList != null && !mtbAartList.isEmpty()) { + this.dispatchArts(mtbAartList, pickData); } else { this.sendError(new NoResultFromBarcodeException(barcodeProd)); } @@ -189,7 +189,7 @@ public class RettificaGiacenzeViewModel { .map(x -> (MtbAart) x.getMtbAart()) .toList(); - dispatchArts(mtbAarts); + dispatchArts(mtbAarts, null); }, this::sendError); } @@ -199,14 +199,13 @@ public class RettificaGiacenzeViewModel { mRettificaGiacenzeRESTConsumer.searchArtInt(queryText, listaArts -> { this.sendOnLoadingEnded(); - dispatchArts(listaArts); + dispatchArts(listaArts, null); if (onComplete != null) onComplete.run(); }, this::sendError); } - - private void dispatchArts(List artsList) { + private void dispatchArts(List artsList, PickDataDTO pickData) { if (artsList == null || artsList.size() == 0) { this.sendError(new NoArtsFoundException()); return; @@ -219,7 +218,7 @@ public class RettificaGiacenzeViewModel { .toList(); if (matchRows.size() != 1) { - dispatchArt(mtbAart, null); + dispatchArt(mtbAart, pickData); } else { dispatchRowEdit(matchRows.get(0)); } From 9abba0ce823a35bfae2711603218e46ed82e1188 Mon Sep 17 00:00:00 2001 From: MarcoE Date: Tue, 14 May 2024 16:56:58 +0200 Subject: [PATCH 2/2] -> v.1.40.18 (435) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a00464e6..53010628 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 434 - def appVersionName = '1.40.17' + def appVersionCode = 435 + def appVersionName = '1.40.18' signingConfigs { release {