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

bug#11600 

dev: julio
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@85212 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2018-09-11 13:45:10 +00:00
parent 7be0b17ac4
commit d3db9ad190
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3214,6 +3214,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
cancelaFolioConsumoRmd(connection, empresaId, estado.getEstadoId(), aidf.getAidfId(), folioInicial, folioFinal, inicio, fim); cancelaFolioConsumoRmd(connection, empresaId, estado.getEstadoId(), aidf.getAidfId(), folioInicial, folioFinal, inicio, fim);
} else { } else {
inativarFolioConsumoRmd(connection, empresaId, estado.getEstadoId(), aidf.getAidfId(), folioInicial, folioFinal, inicio, fim); inativarFolioConsumoRmd(connection, empresaId, estado.getEstadoId(), aidf.getAidfId(), folioInicial, folioFinal, inicio, fim);
}
for (DetalhadoRMD brp : buscarRegistroImpressaoBPR(connection, inicio, fim, empresaId, estado.getCveestado(), aidf.getAidfId(), for (DetalhadoRMD brp : buscarRegistroImpressaoBPR(connection, inicio, fim, empresaId, estado.getCveestado(), aidf.getAidfId(),
folioInicial, folioFinal, isBPR, isECF, true)) { folioInicial, folioFinal, isBPR, isECF, true)) {
@ -3236,14 +3237,15 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
} }
boletos.add(boletoAgr); boletos.add(boletoAgr);
if (isInativa) {
for (String folio : foliosRmd) { for (String folio : foliosRmd) {
insereConsulmoFolioRMD(connection, inicio, empresaId, estado.getEstadoId(), aidf, folio, insereConsulmoFolioRMD(connection, inicio, empresaId, estado.getEstadoId(), aidf, folio,
isCancela, isInativa, false, isECF, isBPR, null, null, null, null, null, null); 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, private void cancelaFolioConsumoRmd(Connection connection, Integer empresaId, Integer estadoId,
Long rmdId, String folioInicial, String folioFinal, Date inicio, Date fim) { Long rmdId, String folioInicial, String folioFinal, Date inicio, Date fim) {
@ -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 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 coalesce(ae.cveestado, e_ag.cveestado, eos.cveestado, eo.cveestado) = :CVEESTADO ");
sql.append(" and b.rmd_id is null "); sql.append(" and b.rmd_id is null ");
sql.append(" and c.num_bpe is null ");
sql.append("order by estadoId, fechorVenta, nombPuntoVenta, numPuntoVenta "); sql.append("order by estadoId, fechorVenta, nombPuntoVenta, numPuntoVenta ");
return sql.toString(); 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 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 ((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.rmd_id is null ");
sql.append(" and c.num_bpe is null ");
sql.append(" order by estadoId, datamov, ecf, coo "); sql.append(" order by estadoId, datamov, ecf, coo ");
return sql.toString(); return sql.toString();
@ -3908,7 +3912,6 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
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.rmd_id as rmd_id, ");
sql.append(" c.foliormd as foliormd "); sql.append(" c.foliormd as foliormd ");
sql.append(" ");
sql.append(" from caja c "); sql.append(" from caja c ");
sql.append(" where c.empresacorrida_id = :EMPRESA_ID "); sql.append(" where c.empresacorrida_id = :EMPRESA_ID ");
sql.append(" and c.feccreacion >= :DATE_INICIO and c.feccreacion <= :DATE_FIM "); 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 (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.feccreacion >= :DATE_INICIO and c.feccreacion <= :DATE_FIM ");
sql.append(" and c.empresacorrida_id = :EMPRESA_ID "); 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(" and ((case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) in ( ").append(ufs).append(" )) ");
sql.append(" "); sql.append(" ");
sql.append("union all "); 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.indcancelacion = 0 ");
sql.append(" and c.empresacorrida_id = :EMPRESA_ID "); sql.append(" and c.empresacorrida_id = :EMPRESA_ID ");
sql.append(" and c.feccreacion between :DATE_INICIO and :DATE_FIM "); 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(" ) "); sql.append(" and coalesce(ae.cveestado, eos.cveestado) in ( ").append(ufs).append(" ) ");
return sql.toString(); 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.fechorventa <= :DATE_FIM ");
sql.append(" and b.categoria_id not in (select valorconstante from constante where nombconstante = 'GRATUIDADE_CRIANCA') "); 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 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 "); sql.append("order by estadoId, isInterEstadual ");
return sql.toString(); return sql.toString();