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

fixes bug #6817 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@50306 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2015-11-19 16:43:55 +00:00
parent 8f8fea748d
commit 40e776de51
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,8 +42,8 @@ public class FiscalHibernateDAO extends GenericHibernateDAO<String, String> impl
sql.append(" e.nombempresa as empresa, ");
sql.append(" to_char(b.fechorventa, 'yyyyMMdd') as dataEmissao, ");
sql.append(" b.preciopagado as valorTotal, ");
sql.append(" origen.codibge as origenId, ");
sql.append(" destino.codibge as destinoId, ");
sql.append(" co.codibge as origenId, ");
sql.append(" cd.codibge as destinoId, ");
sql.append(" r5.totparcial as repTributado, ");
sql.append(" b.preciopagado as valorItem, ");
sql.append(" r5.tipopassagem as tipoPassagem, ");
@ -68,10 +68,6 @@ public class FiscalHibernateDAO extends GenericHibernateDAO<String, String> impl
sql.append(" case b.importeseguro when 0 then null else b.importeseguro ");
sql.append(" end as importeseguro ");
sql.append("from boleto b ");
sql.append(" inner join parada op on b.origen_id = op.parada_id ");
sql.append(" inner join ciudad origen on op.ciudad_id = origen.ciudad_id ");
sql.append(" inner join parada od on b.destino_id = od.parada_id ");
sql.append(" inner join ciudad destino on od.ciudad_id = destino.ciudad_id ");
sql.append(" left join fiscal_r4 r4 on b.boleto_id = r4.boleto_id ");
sql.append(" left outer join fiscal_r5 r5 on r4.numserie20 = r5.numserie20 ");
sql.append(" and r4.coo = r5.coo ");
@ -101,8 +97,8 @@ public class FiscalHibernateDAO extends GenericHibernateDAO<String, String> impl
sql.append(" e.nombempresa, ");
sql.append(" TO_CHAR(b.fechorventa, 'yyyyMMdd'), ");
sql.append(" b.preciopagado, ");
sql.append(" origen.codibge, ");
sql.append(" destino.codibge, ");
sql.append(" co.codibge, ");
sql.append(" cd.codibge, ");
sql.append(" r5.totparcial, ");
sql.append(" b.preciopagado, ");
sql.append(" r5.tipopassagem, ");
@ -261,8 +257,8 @@ public class FiscalHibernateDAO extends GenericHibernateDAO<String, String> impl
sql.append(" r4.cpfcnpjcliente as cnpjCliente, ");
sql.append(" b.boleto_id as boletoId, ");
sql.append(" b.marca_id as empresaId, ");
sql.append(" origen.codibge as origenId, ");
sql.append(" destino.codibge as destinoId, ");
sql.append(" co.codibge as origenId, ");
sql.append(" cd.codibge as destinoId, ");
sql.append(" fi.numcnpj as cnpjImpressora, ");
sql.append(" fi.numserie as numpdv, ");
sql.append(" r5.totparcial as repTributado, ");
@ -278,10 +274,12 @@ public class FiscalHibernateDAO extends GenericHibernateDAO<String, String> impl
sql.append(" INNER JOIN fiscal_impressora fi ON fi.numserie20 = r4.numserie20 ");
sql.append(" AND fi.fiscalimpressora_id = r5.fiscalimpressora_id ");
sql.append(" INNER JOIN boleto b ON b.boleto_id = r4.boleto_id AND r4.empresa_id = b.marca_id ");
sql.append(" INNER JOIN parada op ON b.origen_id = op.parada_id ");
sql.append(" INNER JOIN ciudad origen ON op.ciudad_id = origen.ciudad_id ");
sql.append(" INNER JOIN parada od ON b.destino_id = od.parada_id ");
sql.append(" INNER JOIN ciudad destino ON od.ciudad_id = destino.ciudad_id ");
sql.append(" INNER JOIN alias_servico ase ON ase.origen_id = b.origen_id ");
sql.append(" and ase.destino_id = b.destino_id ");
sql.append(" INNER JOIN parada o ON coalesce(ase.aliasorigen_id, b.origen_id) = o.parada_id ");
sql.append(" INNER JOIN ciudad co ON o.ciudad_id = co.ciudad_id ");
sql.append(" INNER JOIN parada d ON coalesce(ase.aliasdestino_id, b.destino_id) = d.parada_id ");
sql.append(" INNER JOIN ciudad cd ON d.ciudad_id = cd.ciudad_id ");
sql.append(" WHERE r4.datamov BETWEEN ? AND ? ");
sql.append(" AND b.marca_id = ? ");
sql.append(" GROUP BY r4.numserie20, ");
@ -291,8 +289,8 @@ public class FiscalHibernateDAO extends GenericHibernateDAO<String, String> impl
sql.append(" r4.imptotalliquido, ");
sql.append(" b.boleto_id, ");
sql.append(" b.marca_id, ");
sql.append(" origen.codibge, ");
sql.append(" destino.codibge, ");
sql.append(" co.codibge, ");
sql.append(" cd.codibge, ");
sql.append(" fi.numcnpj, ");
sql.append(" fi.numserie, ");
sql.append(" r5.impdesconto, ");