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
master
rafael.henrique 2018-07-05 20:39:12 +00:00
parent 73a0b33acd
commit 6820172e02
1 changed files with 3 additions and 5 deletions

View File

@ -601,12 +601,12 @@ public class RemessaCNABBancosHibernateDAO extends GenericHibernateDAO<Fechament
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("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());