From b98b22edd172d67b087c6dbbae2474bedf48d2c6 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 7 Oct 2019 16:17:36 +0200
Subject: [PATCH] [FIX] Aggiunta gestione nelle query di UltimeConsegneCliente

---
 .../gest/picking_resi/PickingResiActivity.java        |  1 +
 .../gest/picking_resi/dto/WithdrawableDtbDocr.java    | 11 +++++++++++
 .../rest/UltimeConsegneClienteRESTConsumer.java       |  8 ++++++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java
index 0ae26414..c5e464c9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java
@@ -172,6 +172,7 @@ public class PickingResiActivity extends AppCompatActivity  implements IOnColloC
         List<String> foundGestioni = Stream.of(this.mDocumentiResiList)
                 .map(DocumentoResoDTO::getGestione)
                 .distinct()
+                .withoutNulls()
                 .toList();
 
         if(foundGestioni.size() > 1) {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/dto/WithdrawableDtbDocr.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/dto/WithdrawableDtbDocr.java
index 5b882e25..eb7d8110 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/dto/WithdrawableDtbDocr.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/dto/WithdrawableDtbDocr.java
@@ -8,6 +8,8 @@ import it.integry.integrywmsnative.core.model.MtbColr;
 
 public class WithdrawableDtbDocr extends DtbDocr {
 
+    private String gestione;
+
     private List<MtbColr> withdrawRows = new ArrayList<>();
 
     public WithdrawableDtbDocr() {
@@ -22,4 +24,13 @@ public class WithdrawableDtbDocr extends DtbDocr {
         this.withdrawRows = withdrawRows;
         return this;
     }
+
+    public String getGestione() {
+        return gestione;
+    }
+
+    public WithdrawableDtbDocr setGestione(String gestione) {
+        this.gestione = gestione;
+        return this;
+    }
 }
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 e01e8c4c..012006d7 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
@@ -26,13 +26,15 @@ public class UltimeConsegneClienteRESTConsumer {
         int numberOfDayToAnalyze = 90;
 
         String sql = "SELECT consegne.*, " +
-                "       rag_soc " +
+                "       rag_soc," +
+                "       dtb_doct.gestione  " +
                 "FROM WMS_GetUltimeConsegneClienti(" +
                         UtilityDB.valueToString(numberOfConsegnePerCli) + ", " +
                         UtilityDB.valueToString(codAnag) + ", " +
                         UtilityDB.valueToString(codMart) + ", " +
                         UtilityDB.valueToString(codMdep) + ", " +
                         UtilityDB.valueToString(numberOfDayToAnalyze) + ") 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, " +
                 "         counter_consegna ";
@@ -58,7 +60,7 @@ public class UltimeConsegneClienteRESTConsumer {
         StringBuilder sbWhereCond = new StringBuilder();
 
         for(int i = 0; i < consegne.size(); i++) {
-            sbWhereCond.append(String.format("(data_doc = '%s' AND num_doc = %d AND ser_doc = '%s' AND cod_anag = '%s' AND cod_dtip = '%s')",
+            sbWhereCond.append(String.format("(dtb_docr.data_doc = '%s' AND dtb_docr.num_doc = %d AND dtb_docr.ser_doc = '%s' AND dtb_docr.cod_anag = '%s' AND dtb_docr.cod_dtip = '%s')",
                     UtilityDate.formatDate(consegne.get(i).getDataDocD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH),
                     consegne.get(i).getNumDoc(),
                     consegne.get(i).getSerDoc(),
@@ -133,7 +135,9 @@ public class UltimeConsegneClienteRESTConsumer {
                 "      ,dtb_docr.[cod_alis]" +
                 "      ,dtb_docr.[data_ins_row]" +
                 "      ,dtb_docr.[note] " +
+                "      ,dtb_doct.[gestione] " +
                 "FROM dtb_docr " +
+                "INNER JOIN dtb_doct ON dtb_docr.num_doc = dtb_doct.num_doc AND dtb_docr.data_doc = dtb_doct.data_doc AND dtb_docr.cod_anag = dtb_doct.cod_anag AND dtb_docr.cod_dtip = dtb_doct.cod_dtip AND dtb_docr.ser_doc = dtb_doct.ser_doc " +
                 "INNER JOIN mtb_aart ON dtb_docr.cod_mart = mtb_aart.cod_mart " +
                 "LEFT OUTER JOIN ctb_cont ON mtb_aart.cod_ccon_ricavi = ctb_cont.cod_ccon " +
                 "LEFT OUTER JOIN ctb_grup ON ctb_cont.cod_cgrp = ctb_grup.cod_cgrp " +