From add58e8787769ba9ef6d148c614eb9e8360b192e Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 13 Apr 2018 19:35:09 +0000
Subject: [PATCH] fixes bug#10915 dev:gleimar qua:wallysson

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

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
index f6a234246..d82864dd9 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
@@ -846,7 +846,10 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 					.append("CASE WHEN LOG.CONFERENCIA_ID IS NOT NULL OR ")
 					.append("		   (C.INDSTATUSBOLETO = 'E' ")
 					.append("		   AND LOG.LOGCONFERENCIA_ID IS NULL ")
-					.append("		   AND (SELECT LC.LOGCONFERENCIA_ID FROM  LOG_CONFERENCIA LC  WHERE LC.ACTIVO = 1  AND LC.TRANSACAOORIGINAL_ID = C.TRANSACAOORIGINAL_ID) IS NOT NULL) ")
+					.append("		   AND (SELECT LC.LOGCONFERENCIA_ID FROM LOG_CONFERENCIA LC ")
+					.append("		   		WHERE LC.ACTIVO = 1 ")
+					.append("		   		AND LC.TRANSACAOORIGINAL_ID = C.TRANSACAOORIGINAL_ID ")
+					.append("		   		AND LC.LOGCONFERENCIA_ID <> LOG.LOGCONFERENCIA_ID) IS NOT NULL) ")
 					.append("		   THEN 1 ELSE 0 END AS \"conferidoEntrega\" ")
 					.append("FROM CAJA C ")
 					.append("LEFT JOIN PARADA ORI ON ORI.PARADA_ID = C.ORIGEN_ID ")