From ca8c27968196d5f27eb078336bf8fa44b9a1ccd0 Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 22 Nov 2017 19:27:52 +0000
Subject: [PATCH] fixes bug #10242

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@76683 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/hibernate/ConferenciaComissaoHibernateDAO.java        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
index 863e08c1b..ee7708245 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
@@ -269,7 +269,8 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 					.append("FROM CAJA C ")
 					.append("INNER JOIN PUNTO_VENTA PV ON C.PUNTOVENTA_ID = PV.PUNTOVENTA_ID ")
 					.append("INNER JOIN MARCA M ON C.MARCA_ID = M.MARCA_ID ")
-					.append("WHERE PV.ACTIVO = 1  AND C.INDREIMPRESION = 0 ")
+					.append("WHERE PV.ACTIVO = 1 ")
+					.append("AND ((C.INDSTATUSBOLETO = 'E' AND C.INDREIMPRESION = 1) OR C.INDREIMPRESION = 0 OR C.MOTIVOCANCELACION_ID = ?) ")
 					.append("AND C.FECCORTE BETWEEN TO_DATE(?, 'DD/MM/YYYY HH24:MI') AND TO_DATE(?, 'DD/MM/YYYY HH24:MI') ");
 
 			if (parametros.containsKey("empresaId")) {
@@ -285,6 +286,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 			stmt = con.prepareStatement(sQuery.toString());
 			String dataIncial = (String) parametros.get("dataInicial");
 			String dataFinal = (String) parametros.get("dataFinal");
+			stmt.setInt(idxParametro++, Constantes.MVO_CANCEL_GERACAO_OCD.intValue());
 			stmt.setString(idxParametro++, dataIncial);
 			stmt.setString(idxParametro++, dataFinal);
 			if (parametros.containsKey("empresaId")) {