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

fixes bug #9386 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@74475 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2017-10-04 12:44:22 +00:00
parent 6df59b4641
commit 1348dcf0bc
1 changed files with 90 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4128,8 +4128,8 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
try { try {
StringBuilder sql = new StringBuilder(); StringBuilder sql = new StringBuilder();
sql.append(sqlRelatorioRDIVendidos(ufs)); // sql.append(sqlRelatorioRDIVendidos(ufs));
sql.append(" union "); // sql.append(" union ");
sql.append(sqlRelatorioRDICancelados(ufs)); sql.append(sqlRelatorioRDICancelados(ufs));
NamedParameterStatement ps = new NamedParameterStatement(connection, sql.toString()); NamedParameterStatement ps = new NamedParameterStatement(connection, sql.toString());
@ -4271,14 +4271,13 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sql.append(" 'REC' as tipoReceita, "); sql.append(" 'REC' as tipoReceita, ");
sql.append(" c.numoperacion as numoperacion, "); sql.append(" c.numoperacion as numoperacion, ");
sql.append(" trunc(c.feccreacion) as fechorVenta, "); sql.append(" trunc(c.feccreacion) as fechorVenta, ");
sql.append(" coalesce(eos.estado_id, eo.estado_id) as estadoId, "); sql.append(" coalesce(ae.estado_id, eos.estado_id) as estadoId, ");
sql.append(" ei.icms as icmsInterestadual, "); sql.append(" coalesce(ei.icms, eos.icms) as icmsInterestadual, ");
sql.append(" ei.icmsim as icmsIntermunicipal, "); sql.append(" ei.icmsim as icmsIntermunicipal, ");
sql.append(" coalesce(ae.cveestado, eos.cveestado) as estadoOrigem, "); sql.append(" coalesce(ae.cveestado, eos.cveestado) as estadoOrigem, ");
sql.append(" coalesce(eds.cveestado, ed.cveestado) as estadoDestino, "); sql.append(" ed.cveestado as estadoDestino, ");
sql.append(" coalesce(cos.codibge, co.codibge) as municipioOrigem, "); sql.append(" 0 as municipioOrigem, ");
sql.append(" case when((coalesce(eos.cveestado, eo.cveestado)) = "); sql.append(" case when((coalesce(ae.cveestado, eos.cveestado)) = ed.cveestado) then 0 else 1 end as isInterEstadual, ");
sql.append(" (coalesce(eds.cveestado, ed.cveestado))) then 0 else 1 end as isInterEstadual, ");
sql.append(" ei.porcredbaseicms as redBaseCalcIcms, "); sql.append(" ei.porcredbaseicms as redBaseCalcIcms, ");
sql.append(" ei.porcredmunicipal as porcRedMunicipal, "); sql.append(" ei.porcredmunicipal as porcRedMunicipal, ");
sql.append(" ei.porcredestadual as porcRedEstadual, "); sql.append(" ei.porcredestadual as porcRedEstadual, ");
@ -4292,7 +4291,8 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sql.append(" coalesce(ei.indpedagioestdual, 0) as indpedagioestdual, "); sql.append(" coalesce(ei.indpedagioestdual, 0) as indpedagioestdual, ");
sql.append(" ei.tributacaoimportacao as tributacaoImportacao, "); sql.append(" ei.tributacaoimportacao as tributacaoImportacao, ");
sql.append(" case when (coalesce(pos.regionmetropolitana_id, po.regionmetropolitana_id, -1) = "); sql.append(" case when (coalesce(pos.regionmetropolitana_id, po.regionmetropolitana_id, -1) = ");
sql.append(" coalesce(pds.regionmetropolitana_id, pd.regionmetropolitana_id, -2)) then 1 else 0 end as isenta, "); sql.append(" coalesce(pds.regionmetropolitana_id, pd.regionmetropolitana_id, -2)) ");
sql.append(" then 1 else 0 end as isenta, ");
sql.append(" coalesce(c.preciopagado, 0) as tarifa, "); sql.append(" coalesce(c.preciopagado, 0) as tarifa, ");
sql.append(" coalesce(c.importetaxaembarque, 0) as taxaEmbarque, "); sql.append(" coalesce(c.importetaxaembarque, 0) as taxaEmbarque, ");
sql.append(" coalesce(c.importepedagio, 0) as pedagio, "); sql.append(" coalesce(c.importepedagio, 0) as pedagio, ");
@ -4328,11 +4328,10 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sql.append(" join estado eie on eie.estado_id = cie.estado_id "); sql.append(" join estado eie on eie.estado_id = cie.estado_id ");
sql.append(" join empresa_imposto ei on ei.empresa_id = c.empresacorrida_id "); sql.append(" join empresa_imposto ei on ei.empresa_id = c.empresacorrida_id ");
sql.append(" and ei.estado_id = coalesce(ae.estado_id, eos.estado_id) and ei.activo = 1 "); sql.append(" and ei.estado_id = coalesce(ae.estado_id, eos.estado_id) and ei.activo = 1 ");
sql.append("where "); sql.append("where c.tipoventa_id = 3 ");
sql.append(" c.tipoventa_id = 3 ");
sql.append(" and c.indstatusboleto = 'V' and c.indreimpresion = 0 "); sql.append(" and c.indstatusboleto = 'V' and c.indreimpresion = 0 ");
sql.append(" and c.empresacorrida_id = :EMPRESA_ID "); sql.append(" and c.empresacorrida_id = :EMPRESA_ID ");
sql.append(" and c.feccreacion >= :DATE_INICIO and c.feccreacion <= :DATE_FIM "); sql.append(" and c.feccreacion between :DATE_INICIO and :DATE_FIM ");
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();
} }
@ -4345,49 +4344,44 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sql.append(" 'DEV' as tipoReceita, "); sql.append(" 'DEV' as tipoReceita, ");
sql.append(" b.numoperacion as numoperacion, "); sql.append(" b.numoperacion as numoperacion, ");
sql.append(" trunc(b.feccreacion) as fechorVenta, "); sql.append(" trunc(b.feccreacion) as fechorVenta, ");
sql.append(" coalesce(eos.estado_id, eo.estado_id) as estadoId, "); sql.append(" coalesce(esaidf.estado_id, eos.estado_id, est.estado_id) as estadoId, ");
sql.append(" coalesce(eis.icms, ei.icms) as icmsInterestadual, "); sql.append(" ei.icms as icmsInterestadual, ");
sql.append(" coalesce(eis.icmsim, ei.icmsim) as icmsIntermunicipal, "); sql.append(" ei.icmsim as icmsIntermunicipal, ");
sql.append(" coalesce(esaidf.cveestado, eos.cveestado, eo.cveestado) as estadoOrigem, "); sql.append(" coalesce(esaidf.cveestado, eos.cveestado, est.cveestado) as estadoOrigem, ");
sql.append(" coalesce(eds.cveestado, ed.cveestado) as estadoDestino, "); sql.append(" coalesce(eds.cveestado, est.cveestado) as estadoDestino, ");
sql.append(" coalesce(cos.codibge, co.codibge) as municipioOrigem, "); sql.append(" 0 as municipioOrigem, ");
sql.append(" case when((coalesce(eos.cveestado, eo.cveestado)) = "); sql.append(" case when (coalesce(cos.estado_id,co.estado_id) <> coalesce(cds.estado_id,cd.estado_id)) then 1 else 0 end as isInterEstadual, ");
sql.append(" (coalesce(eds.cveestado, ed.cveestado))) then 0 else 1 end as isInterEstadual, "); sql.append(" ei.porcredbaseicms as redBaseCalcIcms, ");
sql.append(" coalesce(eis.porcredbaseicms, ei.porcredbaseicms) as redBaseCalcIcms, "); sql.append(" ei.porcredmunicipal as porcRedMunicipal, ");
sql.append(" coalesce(eis.porcredmunicipal, ei.porcredmunicipal) as porcRedMunicipal, "); sql.append(" ei.porcredestadual as porcRedEstadual, ");
sql.append(" coalesce(eis.porcredestadual, ei.porcredestadual) as porcRedEstadual, "); sql.append(" coalesce(ei.indtarifamunicipal, 0) as indtarifamunicipal, ");
sql.append(" coalesce(eis.indtarifamunicipal, ei.indtarifamunicipal, 0) as indtarifamunicipal, "); sql.append(" coalesce(ei.indseguromunicipal, 0) as indseguromunicipal, ");
sql.append(" coalesce(eis.indseguromunicipal, ei.indseguromunicipal, 0) as indseguromunicipal, "); sql.append(" coalesce(ei.indtxembarquemunicipal, 0) as indtxembarquemunicipal, ");
sql.append(" coalesce(eis.indtxembarquemunicipal, ei.indtxembarquemunicipal, 0) as indtxembarquemunicipal, "); sql.append(" coalesce(ei.indpedagiomunicipal, 0) as indpedagiomunicipal, ");
sql.append(" coalesce(eis.indpedagiomunicipal, ei.indpedagiomunicipal, 0) as indpedagiomunicipal, "); sql.append(" coalesce(ei.indtarifaestadual, 0) as indtarifaestadual, ");
sql.append(" coalesce(eis.indtarifaestadual, ei.indtarifaestadual, 0) as indtarifaestadual, "); sql.append(" coalesce(ei.indseguroestadual, 0) as indseguroestadual, ");
sql.append(" coalesce(eis.indseguroestadual, ei.indseguroestadual, 0) as indseguroestadual, "); sql.append(" coalesce(ei.indtxembarqueestadual, 0) as indtxembarqueestadual, ");
sql.append(" coalesce(eis.indtxembarqueestadual, ei.indtxembarqueestadual, 0) as indtxembarqueestadual, "); sql.append(" coalesce(ei.indpedagioestdual, 0) as indpedagioestdual, ");
sql.append(" coalesce(eis.indpedagioestdual, ei.indpedagioestdual, 0) as indpedagioestdual, "); sql.append(" ei.tributacaoimportacao as tributacaoImportacao, ");
sql.append(" coalesce(eis.tributacaoimportacao, ei.tributacaoimportacao) as tributacaoImportacao, "); sql.append(" case when (coalesce(pos.regionmetropolitana_id, ori.regionmetropolitana_id, -1) = ");
sql.append(" case when (coalesce(pos.regionmetropolitana_id, po.regionmetropolitana_id, -1) = "); sql.append(" coalesce(pds.regionmetropolitana_id, des.regionmetropolitana_id, -2)) then 1 else 0 end as isenta, ");
sql.append(" coalesce(pds.regionmetropolitana_id, pd.regionmetropolitana_id, -2)) then 1 else 0 end as isenta, ");
sql.append(" coalesce(b.preciopagado, 0) as tarifa, "); sql.append(" coalesce(b.preciopagado, 0) as tarifa, ");
sql.append(" coalesce(b.importetaxaembarque, 0) as taxaEmbarque, "); sql.append(" coalesce(b.importetaxaembarque, 0) as taxaEmbarque, ");
sql.append(" coalesce(b.importepedagio, 0) as pedagio, "); sql.append(" coalesce(b.importepedagio, 0) as pedagio, ");
sql.append(" coalesce(b.importeseguro, 0) as seguro, "); sql.append(" coalesce(b.importeseguro, 0) as seguro, ");
sql.append(" coalesce(b.importeoutros, 0) as outros, "); sql.append(" coalesce(b.importeoutros, 0) as outros, ");
sql.append(" to_char(trunc(b.feccreacion), 'yyyymmdd') as datamov "); sql.append(" to_char(trunc(b.feccreacion), 'yyyymmdd') as datamov ");
sql.append(" ");
sql.append("from boleto b "); sql.append("from boleto b ");
sql.append(" join marca m on b.marca_id = m.marca_id "); sql.append("inner join marca m on m.marca_id = b.marca_id and m.activo = 1 ");
sql.append(" join empresa e on e.empresa_id = m.empresa_id "); sql.append("inner join empresa e on e.empresa_id = m.empresa_id ");
sql.append(" join ciudad ce on ce.ciudad_id = e.ciudad_id "); sql.append("inner join punto_venta ptv on ptv.puntoventa_id = b.puntoventa_id ");
sql.append(" join estado ee on ee.estado_id = ce.estado_id "); sql.append("inner join parada ori on (b.origen_id = ori.parada_id ) ");
sql.append(" join punto_venta pv on pv.puntoventa_id = b.puntoventa_id "); sql.append("inner join parada des on (b.destino_id = des.parada_id ) ");
sql.append(" left join parada ppv on ppv.parada_id = pv.parada_id "); sql.append("inner join ciudad co on (co.ciudad_id = ori.ciudad_id ) ");
sql.append(" left join ciudad cpv on cpv.ciudad_id = ppv.ciudad_id "); sql.append("inner join ciudad cd on (cd.ciudad_id = des.ciudad_id ) ");
sql.append(" left join estado epv on epv.estado_id = cpv.estado_id "); sql.append("inner join estado est on est.estado_id = co.estado_id ");
sql.append(" join parada po on po.parada_id = b.origen_id "); sql.append("left join punto_venta ptvo on ptvo.puntoventa_id = b.ptovtaventa_id ");
sql.append(" join ciudad co on co.ciudad_id = po.ciudad_id ");
sql.append(" join estado eo on eo.estado_id = co.estado_id ");
sql.append(" join parada pd on pd.parada_id = b.destino_id ");
sql.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id ");
sql.append(" join estado ed on ed.estado_id = cd.estado_id ");
sql.append("left join alias_servico s on s.origen_id = b.origen_id "); sql.append("left join alias_servico s on s.origen_id = b.origen_id ");
sql.append(" and s.destino_id = b.destino_id and (s.corrida_id = b.corrida_id or s.corrida_id is null) "); sql.append(" and s.destino_id = b.destino_id and (s.corrida_id = b.corrida_id or s.corrida_id is null) ");
sql.append(" and s.ruta_id = b.ruta_id "); sql.append(" and s.ruta_id = b.ruta_id ");
@ -4397,23 +4391,20 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sql.append("left join parada pds on pds.parada_id = s.aliasdestino_id "); sql.append("left join parada pds on pds.parada_id = s.aliasdestino_id ");
sql.append("left join ciudad cds on cds.ciudad_id = pds.ciudad_id "); sql.append("left join ciudad cds on cds.ciudad_id = pds.ciudad_id ");
sql.append("left join estado eds on eds.estado_id = cds.estado_id "); sql.append("left join estado eds on eds.estado_id = cds.estado_id ");
sql.append(" left join inscricao_estadual ie on e.empresa_id = ie.empresa_id "); sql.append("join inscricao_estadual ie on e.empresa_id = ie.empresa_id ");
sql.append(" and ie.estado_id = coalesce(eos.estado_id, eo.estado_id) and ie.activo = 1 "); sql.append(" and ie.estado_id = coalesce(eos.estado_id, est.estado_id) and ie.activo = 1 ");
sql.append(" join ciudad cie on cie.ciudad_id = ie.ciudad_id "); sql.append("join empresa_imposto ei on ei.empresa_id = e.empresa_id ");
sql.append(" join estado eie on eie.estado_id = cie.estado_id "); sql.append(" and ei.estado_id = coalesce(eos.estado_id, est.estado_id) and ei.activo = 1 ");
sql.append(" left join empresa_imposto eis on eis.empresa_id = b.empresacorrida_id and eis.estado_id = cos.estado_id and eis.activo = 1 ");
sql.append(" left join empresa_imposto ei on ei.empresa_id = e.empresa_id ");
sql.append(" and ei.estado_id = coalesce(eos.estado_id, eo.estado_id) and ei.activo = 1 ");
sql.append("left join aidf aidf on aidf.aidf_id = b.aidf_id and b.tipoventa_id = 3 "); sql.append("left join aidf aidf on aidf.aidf_id = b.aidf_id and b.tipoventa_id = 3 ");
sql.append("left join estado esaidf on esaidf.estado_id = aidf.estado_id "); sql.append("left join estado esaidf on esaidf.estado_id = aidf.estado_id ");
sql.append("where e.empresa_id = :EMPRESA_ID "); sql.append("where b.motivocancelacion_id in (31,32,10,37,99,36) ");
sql.append(" AND B.numfoliopreimpreso is not null "); sql.append(" and b.indstatusboleto = 'C' and b.indcancelacion = 1 ");
sql.append(" AND B.indstatusboleto = 'C' "); sql.append(" and b.numfoliopreimpreso is not null ");
sql.append(" and b.motivocancelacion_id in (31,32,10,37,99,36) "); sql.append(" and e.empresa_id = :EMPRESA_ID ");
sql.append(" and b.feccreacion between :DATE_INICIO and :DATE_FIM "); sql.append(" and b.fechorventa >= :DATE_INICIO ");
sql.append(" and nvl(case when s.aliasorigen_id is null then ei.activo else eis.activo end, 0) = 1 "); sql.append(" and b.fechorventa <= :DATE_FIM ");
sql.append(" and coalesce(esaidf.cveestado, eos.cveestado, eo.cveestado) in ( ").append(ufs).append(" ) "); 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("order by estadoId, isInterEstadual "); sql.append("order by estadoId, isInterEstadual ");
return sql.toString(); return sql.toString();