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

bug#15167 

dev: wallace
qua: 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@96342 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2019-08-02 16:07:00 +00:00
parent 6ad9f4ca1c
commit 34f8ccfad1
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/BpeHibernateDAO.java
View File

@ -329,6 +329,7 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
sql.append(" and c.feccreacion <= to_date(?,'DD/MM/YYYY HH24:MI:SS') "); sql.append(" and c.feccreacion <= to_date(?,'DD/MM/YYYY HH24:MI:SS') ");
sql.append(" and ep.empresa_id = ? "); sql.append(" and ep.empresa_id = ? ");
sql.append(" and e.cveestado = ? "); sql.append(" and e.cveestado = ? ");
sql.append(" and (bpe.xmlregular is not null or bpe.xmlcontingencia is not null) ");
sql.append("order by to_number(c.numfoliosistema), to_number(num_bpe), dh_emisao "); sql.append("order by to_number(c.numfoliosistema), to_number(num_bpe), dh_emisao ");
return sql.toString(); return sql.toString();
} }
@ -365,10 +366,6 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
sql.append(" c.categoria_id, "); sql.append(" c.categoria_id, ");
sql.append(" e.codestabelecimento as cod_estabelecimento, "); sql.append(" e.codestabelecimento as cod_estabelecimento, ");
sql.append(" ep.crtbpe as crt, "); sql.append(" ep.crtbpe as crt, ");
// sql.append(" co.codibge as municipio_origem, ");
// sql.append(" eo.cveestado as estado_origem, ");
// sql.append(" cd.codibge as municipio_destino, ");
// sql.append(" ed.cveestado as estado_destino, ");
sql.append(" ((case when coalesce(r.indtribtarifa,0) = 1 then c.preciopagado else 0 end) + (case when coalesce(r.indtribtaxaembarque,0) = 1 then c.importetaxaembarque else 0 end) + (case when coalesce(r.indtribpedagio,0) = 1 then c.importepedagio else 0 end)) as valortributado, "); sql.append(" ((case when coalesce(r.indtribtarifa,0) = 1 then c.preciopagado else 0 end) + (case when coalesce(r.indtribtaxaembarque,0) = 1 then c.importetaxaembarque else 0 end) + (case when coalesce(r.indtribpedagio,0) = 1 then c.importepedagio else 0 end)) as valortributado, ");
sql.append(" ei.porcredbaseicms as red_base_calc_estadual, "); sql.append(" ei.porcredbaseicms as red_base_calc_estadual, ");
sql.append(" ei.porcredbaseicmsim as red_base_calc_municipal, "); sql.append(" ei.porcredbaseicmsim as red_base_calc_municipal, ");
@ -402,6 +399,7 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
sql.append(" and c.feccreacion <= to_date(?,'DD/MM/YYYY HH24:MI:SS') "); sql.append(" and c.feccreacion <= to_date(?,'DD/MM/YYYY HH24:MI:SS') ");
sql.append(" and ep.empresa_id = ? "); sql.append(" and ep.empresa_id = ? ");
sql.append(" and e.cveestado = ? "); sql.append(" and e.cveestado = ? ");
sql.append(" and (bpe.xmlregular is not null or bpe.xmlcontingencia is not null) ");
sql.append("order by to_number(c.numfoliosistema), to_number(num_bpe), dh_emisao "); sql.append("order by to_number(c.numfoliosistema), to_number(num_bpe), dh_emisao ");
return sql.toString(); return sql.toString();
} }
@ -897,6 +895,7 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
sql.append(" and c.feccreacion <= to_date(:DATE_FIM,'DD/MM/YYYY HH24:MI:SS') "); sql.append(" and c.feccreacion <= to_date(:DATE_FIM,'DD/MM/YYYY HH24:MI:SS') ");
sql.append(" and ep.empresa_id = :EMPRESA_ID "); sql.append(" and ep.empresa_id = :EMPRESA_ID ");
sql.append(" and e.cveestado in ( ").append(ufs).append(" ) "); sql.append(" and e.cveestado in ( ").append(ufs).append(" ) ");
sql.append(" and (bpe.xmlregular is not null or bpe.xmlcontingencia is not null) ");
sql.append("order by numfoliosistema, num_bpe, datamov "); sql.append("order by numfoliosistema, num_bpe, datamov ");
return sql.toString(); return sql.toString();
@ -1357,6 +1356,7 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
sql.append(" and c.feccreacion >= :DATE_INICIO "); sql.append(" and c.feccreacion >= :DATE_INICIO ");
sql.append(" and c.feccreacion <= :DATE_FIM "); sql.append(" and c.feccreacion <= :DATE_FIM ");
sql.append(" and ep.empresa_id = :EMPRESA_ID "); sql.append(" and ep.empresa_id = :EMPRESA_ID ");
sql.append(" and (bpe.xmlregular is not null or bpe.xmlcontingencia is not null) ");
sql.append(" and e.cveestado in ( ").append(ufs).append(" ) "); sql.append(" and e.cveestado in ( ").append(ufs).append(" ) ");
return sql.toString(); return sql.toString();