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@50506 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2015-11-24 13:22:10 +00:00
parent 8ea4d05397
commit 45cba8bef5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,8 +73,8 @@ public class FiscalHibernateDAO extends GenericHibernateDAO<String, String> impl
sql.append(" and r4.coo = r5.coo "); sql.append(" and r4.coo = r5.coo ");
sql.append(" left outer join fiscal_impressora fi on fi.numserie20 = r4.numserie20 "); sql.append(" left outer join fiscal_impressora fi on fi.numserie20 = r4.numserie20 ");
sql.append(" inner join empresa e on e.empresa_id = b.marca_id "); sql.append(" inner join empresa e on e.empresa_id = b.marca_id ");
sql.append(" left join alias_servico ase on ase.origen_id = b.origen_id "); sql.append(" left join alias_servico ase ON ase.origen_id = b.origen_id ");
sql.append(" and ase.destino_id = b.destino_id "); sql.append(" and ase.destino_id = b.destino_id and ase.ruta_id = b.ruta_id ");
sql.append(" left join parada o on coalesce(ase.aliasorigen_id, b.origen_id) = o.parada_id "); sql.append(" left join parada o on coalesce(ase.aliasorigen_id, b.origen_id) = o.parada_id ");
sql.append(" left join ciudad co on o.ciudad_id = co.ciudad_id "); sql.append(" left join ciudad co on o.ciudad_id = co.ciudad_id ");
sql.append(" left join estado eo on co.estado_id = eo.estado_id "); sql.append(" left join estado eo on co.estado_id = eo.estado_id ");
@ -274,8 +274,8 @@ public class FiscalHibernateDAO extends GenericHibernateDAO<String, String> impl
sql.append(" INNER JOIN fiscal_impressora fi ON fi.numserie20 = r4.numserie20 "); sql.append(" INNER JOIN fiscal_impressora fi ON fi.numserie20 = r4.numserie20 ");
sql.append(" AND fi.fiscalimpressora_id = r5.fiscalimpressora_id "); 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 boleto b ON b.boleto_id = r4.boleto_id AND r4.empresa_id = b.marca_id ");
sql.append(" INNER JOIN alias_servico ase ON ase.origen_id = b.origen_id "); sql.append(" LEFT JOIN alias_servico ase ON ase.origen_id = b.origen_id ");
sql.append(" and ase.destino_id = b.destino_id "); sql.append(" and ase.destino_id = b.destino_id and ase.ruta_id = b.ruta_id ");
sql.append(" INNER JOIN parada o ON coalesce(ase.aliasorigen_id, b.origen_id) = o.parada_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 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 parada d ON coalesce(ase.aliasdestino_id, b.destino_id) = d.parada_id ");