From 9af5970ec7e32ab820f778cef552c18478444f3c Mon Sep 17 00:00:00 2001 From: ValerioC Date: Wed, 3 May 2023 16:33:49 +0200 Subject: [PATCH 1/4] [Carelli - Inventario] risolto bug in aggiunta articolo --- .../dialogs/input_quantity_v2/DialogInputQuantityV2View.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java index d2ae61cf..2881646d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java @@ -44,6 +44,7 @@ import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.model.MtbUntMis; import it.integry.integrywmsnative.core.model.secondary.StatoPartitaMag; import it.integry.integrywmsnative.core.settings.SettingsManager; +import it.integry.integrywmsnative.core.utility.UtilityBigDecimal; import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityFocus; import it.integry.integrywmsnative.core.utility.UtilityObservable; @@ -513,7 +514,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia BigDecimal taraTot = articolo.getTaraKg() != null ? this.mViewModel.getNumCnf().multiply(articolo.getTaraKg()) : BigDecimal.ZERO; this.currentTaraTot.set(taraTot); - this.currentPesoLordo.set(this.mViewModel.getQtaTot().add(taraTot)); + this.currentPesoLordo.set(UtilityBigDecimal.getGreaterBetween(this.mViewModel.getQtaTot(), BigDecimal.ZERO).add(taraTot)); this.flagShowCnfToTakeLabel.set(false); } From 762c5fd5b5162bcfcd6740622a9b9a48926a880a Mon Sep 17 00:00:00 2001 From: ValerioC Date: Wed, 3 May 2023 16:34:55 +0200 Subject: [PATCH 2/4] -> v1.33.02 (373) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b4399985..a0a35ab4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 372 - def appVersionName = '1.33.01' + def appVersionCode = 373 + def appVersionName = '1.33.02' signingConfigs { release { From 2d4211d3293628a1e6876d5f114f16055c6dc83a Mon Sep 17 00:00:00 2001 From: ValerioC Date: Thu, 4 May 2023 13:09:09 +0200 Subject: [PATCH 3/4] [SMETAR - Spedizione] risolto bug nullPointer in picking da magazzino automatico di articolo senza giacenza --- .../gest/spedizione/SpedizioneViewModel.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 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 acce8871..42e390e3 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 @@ -588,7 +588,9 @@ public class SpedizioneViewModel { private void executeMagazzinoAutomatico(MtbDepoPosizione mtbDepoPosizione, Runnable onComplete) { var magazzinoAutomaticoPickableArts = Stream.of(Objects.requireNonNull(this.mPickingList.getValue())) - .filter(x -> Stream.of(x.getMtbColts()).anyMatch(y -> y.getPosizione() != null && y.getPosizione().equalsIgnoreCase(mtbDepoPosizione.getPosizione()))) + .filter(x -> Stream.of(x.getMtbColts()).anyMatch(y -> y.getPosizione() != null && y.getPosizione().equalsIgnoreCase(mtbDepoPosizione.getPosizione())) && + x.getSitArtOrdDTO() != null && + UtilityBigDecimal.greaterThan(x.getSitArtOrdDTO().getQtaOrd(), BigDecimal.ZERO)) .toList(); var mtbAarts = Stream.of(magazzinoAutomaticoPickableArts) @@ -605,12 +607,14 @@ public class SpedizioneViewModel { final List magazzinoAutomaticoPickItemRequestDTOList = new ArrayList<>(); for (MtbAart selectedArt : selectedArts) { final PickingObjectDTO pickingObjectDTO = Stream.of(magazzinoAutomaticoPickableArts) - .filter(x -> x.getMtbAart().getCodMart().equalsIgnoreCase(selectedArt.getCodMart()) && - x.getSitArtOrdDTO() != null && - UtilityBigDecimal.greaterThan(x.getSitArtOrdDTO().getQtaOrd(), BigDecimal.ZERO)) + .filter(x -> x.getMtbAart().getCodMart().equalsIgnoreCase(selectedArt.getCodMart())) .findFirst() .orElse(null); + if (pickingObjectDTO == null) { + continue; + } + MagazzinoAutomaticoPickItemRequestDTO itemDto = new MagazzinoAutomaticoPickItemRequestDTO(selectedArt.getCodMart()) .setQtaTot(pickingObjectDTO.getSitArtOrdDTO().getQtaOrd()) .setNumCnf(pickingObjectDTO.getSitArtOrdDTO().getNumCnfOrd()) From f1b5a7ec1bd43742128ebfa6bec7e729dbe42271 Mon Sep 17 00:00:00 2001 From: ValerioC Date: Thu, 4 May 2023 13:11:28 +0200 Subject: [PATCH 4/4] -> v1.33.03 (374) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a0a35ab4..5a4a9040 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 373 - def appVersionName = '1.33.02' + def appVersionCode = 374 + def appVersionName = '1.33.03' signingConfigs { release {