From 5103a53c113dc8002dd5fa394e135f0ab337c734 Mon Sep 17 00:00:00 2001 From: ValerioC Date: Wed, 26 Apr 2023 17:16:39 +0200 Subject: [PATCH 1/3] =?UTF-8?q?[CARELLI=20-=20ORDINI=20ACQUISTO]=20Risolto?= =?UTF-8?q?=20bug=20quantit=C3=A0=20raddoppiate=20in=20primo=20inserimento?= =?UTF-8?q?=20articolo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java index df9ce635..5a0d48ed 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java @@ -216,6 +216,7 @@ public class PVOrdineAcquistoEditViewModel { saveAction.run(); } } else { + articolo.setQtaOrd(articolo.getQtaOrd() > 0f ? articolo.getQtaOrd() : articolo.getQtaCnf()); this.sendOnItemDispatched(articolo, onSuccess); } @@ -249,7 +250,6 @@ public class PVOrdineAcquistoEditViewModel { articolo.setNewNoPromo(art.isNewNoPromo()); articolo.setSystemNote(art.generateSystemNote()); articolo.setQtaCnf(art.getQtaCnf() > 0f ? art.getQtaCnf() : 1); - articolo.setQtaOrd(art.getQtaOrd() > 0f ? art.getQtaOrd() : art.getQtaCnf()); articolo.setCodAlis(art.getCodAlis()); articolo.setCtMaxOrd(BigDecimal.valueOf(art.getCtMaxOrd())); From 4a8a21b9708b341db5911dd0715f745c9e168e34 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 28 Apr 2023 12:55:20 +0200 Subject: [PATCH 2/3] Fix su ricerca articoli per posizione in Picking Libero --- .../DialogChooseArtsFromMtbColrList.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_mtbcolr_list/DialogChooseArtsFromMtbColrList.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_mtbcolr_list/DialogChooseArtsFromMtbColrList.java index 6bf86844..1036456a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_mtbcolr_list/DialogChooseArtsFromMtbColrList.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_mtbcolr_list/DialogChooseArtsFromMtbColrList.java @@ -158,8 +158,11 @@ public class DialogChooseArtsFromMtbColrList extends BaseDialogFragment implemen mBindings.listaArts.setHasFixedSize(true); this.mtbColrItemModels = Stream.of(this.inputMtbColrList) - .map(x -> new DialogChooseArtsFromMtbColrListItemModel() - .setMtbColr(x)) + .map(x -> { + x.setUntMis(x.getMtbAart() != null && x.getMtbAart().getFirstUntMis() != null ? x.getMtbAart().getFirstUntMis().getUntMis() : null); + return new DialogChooseArtsFromMtbColrListItemModel() + .setMtbColr(x); + }) .toList(); this.hiddenMtbColrItemModels.setValue(this.mtbColrItemModels); @@ -294,12 +297,12 @@ public class DialogChooseArtsFromMtbColrList extends BaseDialogFragment implemen this.articoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> { if (mtbAartList != null && mtbAartList.size() > 0) { - this.mBindings.mainSearch.setQuery(barcodeProd, false); + MtbAart articolo = mtbAartList.get(0); + this.mBindings.mainSearch.setQuery(articolo.getCodMart(), false); this.searchArtInList(mtbAartList.get(0), ean128Model); onLoadingEnded(); - } else { DialogCommon.showNoArtFoundDialog(mContext, this::onLoadingEnded); From e0cc802b620ab664a53d89a9f33322cd43a85b98 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 28 Apr 2023 12:56:32 +0200 Subject: [PATCH 3/3] -> v1.33.01 (372) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e5eaeba7..b4399985 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 371 - def appVersionName = '1.33.00' + def appVersionCode = 372 + def appVersionName = '1.33.01' signingConfigs { release {