From cce8ea5ca09e59cb650caa7074328c3ff9aa0d17 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 5 Mar 2021 12:01:38 +0100 Subject: [PATCH 1/4] Sistemato actionDone su soft keyboard --- app/src/main/res/layout/dialog_input_quantity_v2.xml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/layout/dialog_input_quantity_v2.xml b/app/src/main/res/layout/dialog_input_quantity_v2.xml index e40820d4..8fd30127 100644 --- a/app/src/main/res/layout/dialog_input_quantity_v2.xml +++ b/app/src/main/res/layout/dialog_input_quantity_v2.xml @@ -393,7 +393,8 @@ android:layout_height="wrap_content" android:hint="@string/batch_lot" android:inputType="text" - app:binding="@{view.currentPartitaMag}" /> + app:binding="@{view.currentPartitaMag}" + android:imeOptions="actionDone" /> @@ -446,7 +447,8 @@ android:layout_height="wrap_content" android:hint="@string/num_pcks" android:inputType="number" - app:binding="@{view.currentNumCnf}" /> + app:binding="@{view.currentNumCnf}" + android:imeOptions="actionDone" /> @@ -468,7 +470,8 @@ android:layout_height="wrap_content" android:hint="@string/qty_x_pck" android:inputType="numberDecimal" - app:binding="@{view.currentQtaCnf}" /> + app:binding="@{view.currentQtaCnf}" + android:imeOptions="actionDone" /> @@ -480,7 +483,8 @@ android:layout_weight="@{!viewmodel.mtbAart.flagQtaCnfFissaBoolean ? 1f : 1.5f}" android:enabled="@{view.enabledQtaTot}" android:focusableInTouchMode="false" - tools:layout_weight="1"> + tools:layout_weight="1" + android:imeOptions="actionDone"> Date: Fri, 5 Mar 2021 12:12:44 +0100 Subject: [PATCH 2/4] =?UTF-8?q?Risolto=20problema=20di=20confezioni=200=20?= =?UTF-8?q?quando=20scansiono=20un=20codice=20ean=20peso=20e=20il=20peso?= =?UTF-8?q?=20=C3=A8=20sotto=20il=20peso=20medio.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gest/spedizione/SpedizioneViewModel.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 2a4fd6c5..1daf144a 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 @@ -1002,6 +1002,12 @@ public class SpedizioneViewModel { if (qtaColDaPrelevare != null && numCnfDaPrelevare == null) { numCnfDaPrelevare = UtilityBigDecimal.divideToInteger(qtaColDaPrelevare, mtbAart.getQtaCnf()); qtaCnfDaPrelevare = UtilityBigDecimal.divide(qtaColDaPrelevare, numCnfDaPrelevare); + + if (!mtbAart.isFlagQtaCnfFissaBoolean()) { + if (UtilityBigDecimal.equalsTo(numCnfDaPrelevare, BigDecimal.ZERO)) + numCnfDaPrelevare = BigDecimal.ONE; + qtaCnfDaPrelevare = UtilityBigDecimal.divide(qtaColDaPrelevare, numCnfDaPrelevare); + } } else if (numCnfDaPrelevare != null && qtaColDaPrelevare == null) { qtaCnfDaPrelevare = mtbAart.getQtaCnf(); qtaColDaPrelevare = UtilityBigDecimal.multiply(numCnfDaPrelevare, qtaCnfDaPrelevare); From e633dcbc4dc708b22821c8ac78d3f00f1bf68db1 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 5 Mar 2021 15:35:42 +0100 Subject: [PATCH 3/4] Fix su where cond flag_evaso_prod --- .../rest/ProdFabbisognoLineeProdRESTConsumer.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumer.java index 29f16240..28c67ca9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumer.java @@ -76,6 +76,7 @@ public class ProdFabbisognoLineeProdRESTConsumer extends _BaseRESTConsumer { " CROSS APPLY input_values " + " WHERE dtb_ordt.gestione = 'L' " + " AND flag_evaso = 'I' " + + " AND flag_evaso_prod = 'I' " + " AND dtb_ordr.flag_evaso_forzato = 'N' " + " AND flag_annulla = 'N' " + " AND dtb_ordt.cod_mdep = input_values.cod_mdep " + From 594a6fc9d2effa9ca300a8aa7f54372d5d279866 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 5 Mar 2021 15:36:23 +0100 Subject: [PATCH 4/4] -> v1.16.14 (196) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d8664d4c..de87003d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 195 - def appVersionName = '1.16.13' + def appVersionCode = 196 + def appVersionName = '1.16.14' signingConfigs { release {