From fc7cd94a84d23b6074ea2cdb4cd9b2a64870c178 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 9 Jan 2020 10:34:38 +0100
Subject: [PATCH 1/2] Fix su calcolo qta_cnf in PickingList

---
 .../UltimeConsegneClienteRESTConsumer.java    |  9 +++------
 .../UltimeConsegneClienteViewModel.java       |  2 ++
 .../VenditaOrdineInevasoViewModel.java        | 20 +++++++++++++++----
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java
index 451de68f..96575640 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java
@@ -22,20 +22,17 @@ import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO;
 
 public class UltimeConsegneClienteRESTConsumer {
 
-    public static void getUltimeConsegneClienti(String codMdep, String codAnag, String codMart, RunnableArgs<ArrayList<DocumentoResoDTO>> onComplete, RunnableArgs<Exception> onFailed) {
-
-        int numberOfConsegnePerCli = 100;
-        int numberOfDayToAnalyze = 365;
+    public static void getUltimeConsegneClienti(String codMdep, String codAnag, String codMart, int limitConsegnePerCli, int limitDays, RunnableArgs<ArrayList<DocumentoResoDTO>> onComplete, RunnableArgs<Exception> onFailed) {
 
         String sql = "SELECT consegne.*, " +
                 "       rag_soc," +
                 "       dtb_doct.gestione  " +
                 "FROM WMS_GetUltimeConsegneClienti(" +
-                        UtilityDB.valueToString(numberOfConsegnePerCli) + ", " +
+                        UtilityDB.valueToString(limitConsegnePerCli) + ", " +
                         UtilityDB.valueToString(codAnag) + ", " +
                         UtilityDB.valueToString(codMart) + ", " +
                         UtilityDB.valueToString(codMdep) + ", " +
-                        UtilityDB.valueToString(numberOfDayToAnalyze) + ") consegne " +
+                        UtilityDB.valueToString(limitDays) + ") consegne " +
                 "INNER JOIN dtb_doct ON consegne.num_doc = dtb_doct.num_doc AND consegne.data_doc = dtb_doct.data_doc AND consegne.cod_anag = dtb_doct.cod_anag AND consegne.cod_dtip = dtb_doct.cod_dtip AND consegne.ser_doc = dtb_doct.ser_doc " +
                 "LEFT OUTER JOIN gtb_anag ON consegne.cod_anag = gtb_anag.cod_anag " +
                 "ORDER BY rag_soc, " +
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java
index 265e86ce..c0afc93a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java
@@ -65,6 +65,8 @@ public class UltimeConsegneClienteViewModel {
                 SettingsManager.i().userSession.depo.getCodMdep(),
                 null,
                 null,
+                100,
+                365,
                 consegne -> {
                     this.mItems = consegne;
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
index b4569eeb..38d94d17 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
@@ -1177,13 +1177,25 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
                     }
                 }
 
-
                 dto.setCanPartitaMagBeChanged(false);
                 dto.setCanDataScadBeChanged(false);
-
             } else {
-                dto.setNumCnf(qtaDaEvadere.divide(item.getQtaCnfCollo(), 3, RoundingMode.HALF_EVEN).setScale(0, RoundingMode.UP).intValue());
-                dto.setQtaCnf(item.getQtaCnfCollo());
+
+                BigDecimal qtaCnf = null;
+
+                if(item.getQtaCnfOrd() != null) {
+                    qtaCnf = item.getQtaCnfOrd();
+                } else if(item.getQtaCnfCollo() != null) {
+                    qtaCnf = item.getQtaCnfCollo();
+                } else if(item.getMtbAart() != null){
+                    qtaCnf = item.getMtbAart().getQtaCnf();
+                }
+
+                if(qtaDaEvadere.compareTo(BigDecimal.ZERO) > 0) {
+                    dto.setNumCnf(qtaDaEvadere.divide(qtaCnf, 3, RoundingMode.HALF_EVEN).setScale(0, RoundingMode.UP).intValue());
+                }
+
+                dto.setQtaCnf(qtaCnf);
             }
 
             boolean canOverflowQuantity = SettingsManager.iDB().isFlagCanAddExtraQuantitySpedizione();

From 3601c450cd204c976728f989880aaa65196e6753 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 9 Jan 2020 10:35:03 +0100
Subject: [PATCH 2/2] -> v1.11.2 (121)

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e8c7140c..40f2f587 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 120
-    def appVersionName = '1.11.1'
+    def appVersionCode = 121
+    def appVersionName = '1.11.2'
 
     signingConfigs {
         release {