From 6820172e02f970e9cd4e76974fa6ae2baf97c363 Mon Sep 17 00:00:00 2001
From: "rafael.henrique" <rafael.henrique@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 5 Jul 2018 20:39:12 +0000
Subject: [PATCH] Remessa Bradesco

bug#10881
bug#9803
bug#9100

dev:Rafael Henrique

qua:Marcelo

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

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RemessaCNABBancosHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/RemessaCNABBancosHibernateDAO.java
index 597e3894f..8b2fdef47 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RemessaCNABBancosHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/RemessaCNABBancosHibernateDAO.java
@@ -600,13 +600,13 @@ public class RemessaCNABBancosHibernateDAO extends GenericHibernateDAO<Fechament
 		sb.append("LEFT JOIN PLAZA pl on pl.PLAZA_ID = ci.PLAZA_ID AND pl.ACTIVO = 1 "); 
 		sb.append("LEFT JOIN ESTADO es on es.ESTADO_ID = ci.ESTADO_ID AND es.ACTIVO = 1 "); 
 		sb.append("WHERE ");
-		sb.append("fb.STATUS = 'I' "); 
+		sb.append("fb.STATUS = 'I' ");
+		sb.append("AND fb.activo = 1 ");
 		sb.append("AND fb.REMESSA_ID IS NULL ");
 		sb.append("AND fp.EMPRESA_ID = :empresaId ");
 		if(hasDate){
 			sb.append("AND fb.FECDOCUMENTO BETWEEN :dataDe AND :dataAte ");
 		}
-		//sb.append("AND fb.NOSSONUMERO like '3088490000010000%' ");
 		sb.append("ORDER BY ");
 		sb.append("fb.FECMODIF, fb.FECDOCUMENTO ");
 		
@@ -620,13 +620,11 @@ public class RemessaCNABBancosHibernateDAO extends GenericHibernateDAO<Fechament
 		sb.append("SELECT fb ");
 		sb.append("FROM FechamentoBoleto fb ");
 		sb.append("JOIN FETCH fb.fechamentoCntcorrente fc ");
-		//sb.append("JOIN FETCH fc.puntoventa pv ");
-		//sb.append("JOIN FETCH pv.empresa emp ");
 		sb.append("JOIN FETCH fc.empresa emp ");
 		sb.append("WHERE fb.activo = 1 ");
 		sb.append("AND fc.activo = 1 ");
 		sb.append("AND emp.activo = 1");
-		sb.append("AND fb.remessaId IS NULL ");
+		//sb.append("AND fb.remessaId IS NULL ");
 		sb.append("AND fb.status = 'I' ");
 		if (empresa != null && empresa.getEmpresaId() != null) {
 			sb.append("AND emp.empresaId = " + empresa.getEmpresaId());