From c8cd794cfcb4c245daca2990bf38519f7325a4b5 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 17 Nov 2020 10:39:37 +0100 Subject: [PATCH 1/2] Risolto problema di refMtbColt nulla in alcuni casi particolari della spedizione --- .../gest/spedizione/SpedizioneViewModel.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) 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 c782144b..1a972e80 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 @@ -648,7 +648,23 @@ public class SpedizioneViewModel { if (matchedRows == null || matchedRows.size() == 0) { this.sendError(new NoArtsFoundException()); } else if (matchedRows.size() == 1) { - this.dispatchOrdineRow(matchedRows.get(0), matchedRows.get(0).getRefMtbColt()); + PickingObjectDTO matchedItem = matchedRows.get(0); + + + if (matchedItem.getMtbColts() != null && matchedItem.getMtbColts().size() > 1) { + + List pickingList = mPickingList.getValue(); + + Stream.of(pickingList) + .filter(x -> x != matchedItem) + .forEach(x -> x.setHidden(true)); + + this.sendFilterApplied(null); + this.getPickingList().postValue(pickingList); + } else { + this.dispatchOrdineRow(matchedItem, matchedItem.getRefMtbColt()); + } + } else { List pickingList = mPickingList.getValue(); From 88fe4d82cd92eee51a82ac80de45c5c55b05563d Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 17 Nov 2020 10:40:16 +0100 Subject: [PATCH 2/2] -> v1.13.23 (169) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6b551d39..88db3976 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 168 - def appVersionName = '1.13.22' + def appVersionCode = 169 + def appVersionName = '1.13.23' signingConfigs { release {