diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java index 0ebc1256d..f356d4a2e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java @@ -3214,35 +3214,37 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO cancelaFolioConsumoRmd(connection, empresaId, estado.getEstadoId(), aidf.getAidfId(), folioInicial, folioFinal, inicio, fim); } else { inativarFolioConsumoRmd(connection, empresaId, estado.getEstadoId(), aidf.getAidfId(), folioInicial, folioFinal, inicio, fim); + } - for (DetalhadoRMD brp : buscarRegistroImpressaoBPR(connection, inicio, fim, empresaId, estado.getCveestado(), aidf.getAidfId(), - folioInicial, folioFinal, isBPR, isECF, true)) { + for (DetalhadoRMD brp : buscarRegistroImpressaoBPR(connection, inicio, fim, empresaId, estado.getCveestado(), aidf.getAidfId(), + folioInicial, folioFinal, isBPR, isECF, true)) { - if (!foliosRmd.contains(brp.getFoliormd())) - foliosRmd.add(brp.getFoliormd()); + if (!foliosRmd.contains(brp.getFoliormd())) + foliosRmd.add(brp.getFoliormd()); - if (cont == 999) { - boletos.add(boletoAgr); - boletoAgr = null; - cont = 0; - } - - if (boletoAgr == null) - boletoAgr = brp.getCajaId().toString(); - else - boletoAgr = boletoAgr + " ," + brp.getCajaId(); - - cont++; + if (cont == 999) { + boletos.add(boletoAgr); + boletoAgr = null; + cont = 0; } - boletos.add(boletoAgr); + if (boletoAgr == null) + boletoAgr = brp.getCajaId().toString(); + else + boletoAgr = boletoAgr + " ," + brp.getCajaId(); + + cont++; + } + boletos.add(boletoAgr); + + if (isInativa) { for (String folio : foliosRmd) { insereConsulmoFolioRMD(connection, inicio, empresaId, estado.getEstadoId(), aidf, folio, isCancela, isInativa, false, isECF, isBPR, null, null, null, null, null, null); } - - marcarRMDCaja(connection, boletos, null, null); } + + marcarRMDCaja(connection, boletos, null, null); } private void cancelaFolioConsumoRmd(Connection connection, Integer empresaId, Integer estadoId, @@ -3805,6 +3807,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sql.append(" and b.feccreacion between :DATE_INICIO and :DATE_FIM "); sql.append(" and coalesce(ae.cveestado, e_ag.cveestado, eos.cveestado, eo.cveestado) = :CVEESTADO "); sql.append(" and b.rmd_id is null "); + sql.append(" and c.num_bpe is null "); sql.append("order by estadoId, fechorVenta, nombPuntoVenta, numPuntoVenta "); return sql.toString(); @@ -3896,6 +3899,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sql.append(" and c.empresacorrida_id = :EMPRESA_ID "); sql.append(" and ((case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) = :CVEESTADO ) "); sql.append(" and c.rmd_id is null "); + sql.append(" and c.num_bpe is null "); sql.append(" order by estadoId, datamov, ecf, coo "); return sql.toString(); @@ -3905,10 +3909,9 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO StringBuilder sql = new StringBuilder(); sql.append("select distinct "); - sql.append(" c.caja_id as cajaId, "); + sql.append(" c.caja_id as cajaId, "); sql.append(" c.rmd_id as rmd_id, "); sql.append(" c.foliormd as foliormd "); - sql.append(" "); sql.append(" from caja c "); sql.append(" where c.empresacorrida_id = :EMPRESA_ID "); sql.append(" and c.feccreacion >= :DATE_INICIO and c.feccreacion <= :DATE_FIM "); @@ -4247,6 +4250,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sql.append(" and (coalesce(c.preciopagado,0) + coalesce(c.importetaxaembarque,0) + coalesce(c.importeseguro,0) + coalesce(c.importepedagio,0) + coalesce(c.importeoutros,0)) > 0 "); sql.append(" and c.feccreacion >= :DATE_INICIO and c.feccreacion <= :DATE_FIM "); sql.append(" and c.empresacorrida_id = :EMPRESA_ID "); + sql.append(" and c.num_bpe is null "); sql.append(" and ((case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) in ( ").append(ufs).append(" )) "); sql.append(" "); sql.append("union all "); @@ -4320,6 +4324,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sql.append(" and c.indcancelacion = 0 "); sql.append(" and c.empresacorrida_id = :EMPRESA_ID "); sql.append(" and c.feccreacion between :DATE_INICIO and :DATE_FIM "); + sql.append(" and c.num_bpe is null "); sql.append(" and coalesce(ae.cveestado, eos.cveestado) in ( ").append(ufs).append(" ) "); return sql.toString(); } @@ -4393,6 +4398,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sql.append(" and b.fechorventa <= :DATE_FIM "); sql.append(" and b.categoria_id not in (select valorconstante from constante where nombconstante = 'GRATUIDADE_CRIANCA') "); sql.append(" and coalesce(esaidf.cveestado, eos.cveestado, est.cveestado) in ( ").append(ufs).append(" ) "); + sql.append(" and b.num_bpe is null "); sql.append("order by estadoId, isInterEstadual "); return sql.toString();