From e999ec492b0f5f733c8f8102860d4afe83fc96c1 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 4 Apr 2019 13:17:05 +0200
Subject: [PATCH] Risolti bug

---
 .../viewmodel/RettificaGiacenzeViewModel.java    |  6 +++++-
 .../gest/vendita/core/VenditaHelper.java         | 16 +++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java
index 622d9f7c..6a781998 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java
@@ -528,9 +528,13 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked<MtbColr>
                         if (!mtbColt.get().getDisablePrint()) {
                             printCollo(progress);
                         } else {
+                            progress.dismiss();
                             resetMtbColt(openNewOne);
                         }
-                    }, progress::dismiss, ex -> UtilityExceptions.defaultException(mContext, ex, progress));
+                    }, () -> {
+                        progress.dismiss();
+                        resetMtbColt(openNewOne);
+                    }, ex -> UtilityExceptions.defaultException(mContext, ex, progress));
                 }
             } else {
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java
index fb624437..55221a9e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java
@@ -142,13 +142,15 @@ public class VenditaHelper {
     public void getBancaliVenditaGiaRegistrati(List<OrdineVenditaGroupedInevasoDTO> orders, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
 
         String baseSql = "SELECT DISTINCT mtb_colt.* " +
-                "FROM mtb_colt, mtb_colr " +
-                "WHERE mtb_colt.gestione = mtb_colr.gestione AND " +
-                "mtb_colt.ser_collo = mtb_colr.ser_collo AND " +
-                "mtb_colt.data_collo = mtb_colr.data_collo AND " +
-                "mtb_colt.num_collo = mtb_colr.num_collo AND " +
-                "mtb_colt.gestione IN ('V', 'L') AND " +
-                "mtb_colt.data_doc is null AND ";
+                "FROM mtb_colt, " +
+                "     mtb_colr " +
+                "WHERE mtb_colt.gestione = mtb_colr.gestione " +
+                "  AND mtb_colt.ser_collo = mtb_colr.ser_collo " +
+                "  AND mtb_colt.data_collo = mtb_colr.data_collo " +
+                "  AND mtb_colt.num_collo = mtb_colr.num_collo " +
+                "  AND (mtb_colt.gestione = 'V' OR mtb_colt.gestione = 'L') " +
+                "  AND mtb_colt.ser_collo = '/' " +
+                "  AND mtb_colt.data_doc IS NULL AND ";
 
         StringBuilder whereCond = new StringBuilder();