From 5a8935675c1be6906c02b997a0194d8376b7fe5e Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 11 Oct 2021 19:08:11 +0200
Subject: [PATCH 1/2] Riduzione caratteri usati nel filtro_ordini

---
 .../it/integry/integrywmsnative/core/model/MtbColt.java     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java
index 84ec9cb1..bab4b01c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java
@@ -540,13 +540,13 @@ public class MtbColt extends EntityBase {
 
                 try {
                     whereCond.append("(");
-                    whereCond.append(String.format("dtb_ordt.gestione = %s AND dtb_ordt.data_ord = %s and dtb_ordt.num_ord = %s",
+                    whereCond.append(String.format("d.g = %s AND d.d = %s and d.n = %s",
                             UtilityDB.valueToString(x.getGestioneOrd()),
                             UtilityDB.valueToString(UtilityDate.formatDate(x.getDataOrdD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH)),
                             UtilityDB.valueToString(x.getNumOrd())));
 
                     if(!UtilityString.isNullOrEmpty(x.getDataConsS())) {
-                        whereCond.append(String.format(" AND dtb_ordr.data_cons = %s",
+                        whereCond.append(String.format(" AND dr.dc = %s",
                                 UtilityDB.valueToString(UtilityDate.formatDate(x.getDataConsD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH))));
                     }
 
@@ -554,8 +554,6 @@ public class MtbColt extends EntityBase {
                     if(i < filtroOrdineDtos.size()-1) {
                         whereCond.append(" OR ");
                     }
-
-                    //whereCond.append("<DTB_ORDT COND=\"OR\"><GESTIONE type=\"V\">" + x.getGestioneOrd() + "</GESTIONE><DATA_ORD type=\"D\">" + UtilityDate.formatDate(x.getDataOrdD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH) + "</DATA_ORD><NUM_ORD type=\"N\">" + x.getNumOrd() + "</NUM_ORD></DTB_ORDT>");
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

From 7605c4d70a746d564f3d0fcecbd4dbe88314f9eb Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 11 Oct 2021 19:09:11 +0200
Subject: [PATCH 2/2] -> v1.18.7 (237)

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

diff --git a/app/build.gradle b/app/build.gradle
index 90e67942..9bca1c53 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 236
-    def appVersionName = '1.18.6'
+    def appVersionCode = 237
+    def appVersionName = '1.18.7'
 
     signingConfigs {
         release {