fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug #8977 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@68740 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2017-05-11 13:41:47 +00:00
parent 1d0427148f
commit f23f261b7f
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java
View File

@ -2411,8 +2411,6 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
brp.getFechorVenta(), rmd, "SERVIÇO DE TRANSPORTE", "DVB", "", brp.getSerie()); brp.getFechorVenta(), rmd, "SERVIÇO DE TRANSPORTE", "DVB", "", brp.getSerie());
serie = brp.getSerie(); serie = brp.getSerie();
data = brp.getFechorVenta(); data = brp.getFechorVenta();
// primeiroFolio = brp.getFolio();
} else { } else {
if (serie.equals(brp.getSerie()) && data.equals(brp.getFechorVenta())) { 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()); brp.getFechorVenta(), rmd, "SERVIÇO DE TRANSPORTE", "DVB", "", brp.getSerie());
serie = brp.getSerie(); serie = brp.getSerie();
data = brp.getFechorVenta(); data = brp.getFechorVenta();
// primeiroFolio = brp.getFolio();
} }
} else { } else {
@ -2435,7 +2432,6 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
brp.getFechorVenta(), rmd, "SERVIÇO DE TRANSPORTE", "DVB", "", brp.getSerie()); brp.getFechorVenta(), rmd, "SERVIÇO DE TRANSPORTE", "DVB", "", brp.getSerie());
serie = brp.getSerie(); serie = brp.getSerie();
data = brp.getFechorVenta(); data = brp.getFechorVenta();
// primeiroFolio = brp.getFolio();
} }
} }
@ -2455,10 +2451,13 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
impRmd.setIcms(icms); impRmd.setIcms(icms);
impRmd.setIsentos(isentos); impRmd.setIsentos(isentos);
impRmd.setOutros(outros); impRmd.setOutros(outros);
impRmd.setNumero(brp.getFolio() == null ? "" : brp.getFolio().toString());
impRmd.getDetalhada().add(brp); impRmd.getDetalhada().add(brp);
anteriorFolio = brp.getFolio();
if (anteriorFolio == 0)
list.add(impRmd);
anteriorFolio = brp.getFolio();
} }
return list; return list;
@ -2593,8 +2592,6 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
ps.setLong(1, Long.valueOf(empresaId)); ps.setLong(1, Long.valueOf(empresaId));
ps.setTimestamp(2, new java.sql.Timestamp(DateUtil.inicioFecha(inicio).getTime())); ps.setTimestamp(2, new java.sql.Timestamp(DateUtil.inicioFecha(inicio).getTime()));
ps.setTimestamp(3, new java.sql.Timestamp(DateUtil.fimFecha(fim).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); ps.setString(4, cveestado);
ResultSet rs = ps.executeQuery(); ResultSet rs = ps.executeQuery();