diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java index c90ad8d2b..cd6df16cc 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java @@ -2411,8 +2411,6 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO brp.getFechorVenta(), rmd, "SERVIÇO DE TRANSPORTE", "DVB", "", brp.getSerie()); serie = brp.getSerie(); data = brp.getFechorVenta(); - // primeiroFolio = brp.getFolio(); - } else { if (serie.equals(brp.getSerie()) && data.equals(brp.getFechorVenta())) { @@ -2425,7 +2423,6 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO brp.getFechorVenta(), rmd, "SERVIÇO DE TRANSPORTE", "DVB", "", brp.getSerie()); serie = brp.getSerie(); data = brp.getFechorVenta(); - // primeiroFolio = brp.getFolio(); } } else { @@ -2435,7 +2432,6 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO brp.getFechorVenta(), rmd, "SERVIÇO DE TRANSPORTE", "DVB", "", brp.getSerie()); serie = brp.getSerie(); data = brp.getFechorVenta(); - // primeiroFolio = brp.getFolio(); } } @@ -2455,10 +2451,13 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO impRmd.setIcms(icms); impRmd.setIsentos(isentos); impRmd.setOutros(outros); - + impRmd.setNumero(brp.getFolio() == null ? "" : brp.getFolio().toString()); impRmd.getDetalhada().add(brp); - anteriorFolio = brp.getFolio(); + if (anteriorFolio == 0) + list.add(impRmd); + + anteriorFolio = brp.getFolio(); } return list; @@ -2593,8 +2592,6 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO ps.setLong(1, Long.valueOf(empresaId)); ps.setTimestamp(2, new java.sql.Timestamp(DateUtil.inicioFecha(inicio).getTime())); ps.setTimestamp(3, new java.sql.Timestamp(DateUtil.fimFecha(fim).getTime())); -// ps.setDate(2, new java.sql.Date(inicio.getTime())); -// ps.setDate(3, new java.sql.Date(fim.getTime())); ps.setString(4, cveestado); ResultSet rs = ps.executeQuery();