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

fixes bug#15168 

qua:julio
dev:julio

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@96514 d1611594-4594-4d17-8e1d-87c2c4800839
master
walace 2019-08-08 19:09:48 +00:00
parent 512e3d8e2f
commit 6d073e519a
1 changed files with 45 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java
View File

@ -948,29 +948,29 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
sql.append(" bpeori.cst90, ");
sql.append(" bpeori.cstoutrauf, ");
sql.append(" bpeori.cstsn, ");
sql.append(" bpeori.vbc00, ");
sql.append(" bpeori.picms00, ");
sql.append(" coalesce(bpeori.vbc00, bpe.vbc00) as vbc00, ");
sql.append(" coalesce(bpeori.picms00, bpe.picms00) as picms00, ");
sql.append(" bpeori.vicms00, ");
sql.append(" bpeori.vbc20, ");
sql.append(" bpeori.picms20, ");
sql.append(" coalesce(bpeori.vbc20, bpe.vbc20) as vbc20, ");
sql.append(" coalesce(bpeori.picms20, bpe.picms20) as picms20, ");
sql.append(" bpeori.vicms20, ");
sql.append(" bpeori.vbp, ");
sql.append(" coalesce(bpeori.vbp, bpe.vbp) as vbp, ");
sql.append(" bpeori.vdesconto, ");
sql.append(" bpeori.vpgto, ");
sql.append(" bpeori.tpcomp01, ");
sql.append(" bpeori.tpcomp02, ");
sql.append(" bpeori.tpcomp03, ");
sql.append(" bpeori.tpcomp04, ");
sql.append(" bpeori.tpcomp05, ");
sql.append(" bpeori.tpcomp06, ");
sql.append(" bpeori.tpcomp99, ");
sql.append(" bpeori.vcomp01, ");
sql.append(" bpeori.vcomp02, ");
sql.append(" bpeori.vcomp03, ");
sql.append(" bpeori.vcomp04, ");
sql.append(" bpeori.vcomp05, ");
sql.append(" bpeori.vcomp06, ");
sql.append(" bpeori.vcomp99, ");
sql.append(" coalesce(bpeori.vpgto, bpe.vpgto) as vpgto, ");
sql.append(" coalesce(bpeori.tpcomp01, bpe.tpcomp01) as tpcomp01, ");
sql.append(" coalesce(bpeori.tpcomp02, bpe.tpcomp02) as tpcomp02, ");
sql.append(" coalesce(bpeori.tpcomp03, bpe.tpcomp03) as tpcomp03, ");
sql.append(" coalesce(bpeori.tpcomp04, bpe.tpcomp04) as tpcomp04, ");
sql.append(" coalesce(bpeori.tpcomp05, bpe.tpcomp05) as tpcomp05, ");
sql.append(" coalesce(bpeori.tpcomp06, bpe.tpcomp06) as tpcomp06, ");
sql.append(" coalesce(bpeori.tpcomp99, bpe.tpcomp99) as tpcomp99, ");
sql.append(" coalesce(bpeori.vcomp01, bpe.vcomp01) as vcomp01, ");
sql.append(" coalesce(bpeori.vcomp02, bpe.vcomp02) as vcomp02, ");
sql.append(" coalesce(bpeori.vcomp03, bpe.vcomp03) as vcomp03, ");
sql.append(" coalesce(bpeori.vcomp04, bpe.vcomp04) as vcomp04, ");
sql.append(" coalesce(bpeori.vcomp05, bpe.vcomp05) as vcomp05, ");
sql.append(" coalesce(bpeori.vcomp06, bpe.vcomp06) as vcomp06, ");
sql.append(" coalesce(bpeori.vcomp99, bpe.vcomp99) as vcomp99, ");
sql.append(" bpeori.pRedBC ");
sql.append("from boleto bori ");
sql.append(" inner join marca m on m.marca_id = bori.marca_id and m.activo = 1 ");
@ -997,6 +997,7 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
sql.append(" and bori.feccreacion <= to_date(:DATE_FIM,'DD/MM/YYYY HH24:MI:SS') ");
sql.append(" and est_bpe.cveestado in ( ").append(ufs).append(" ) ");
sql.append(" and e.empresa_id = :EMPRESA_ID ");
sql.append(" and (bpe.xmlregular is not null or bpe.xmlcontingencia is not null) ");
return sql.toString();
}
@ -1048,29 +1049,29 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
sql.append(" bpe.cst90, ");
sql.append(" bpe.cstoutrauf, ");
sql.append(" bpe.cstsn, ");
sql.append(" bpe.vbc00, ");
sql.append(" bpe.picms00, ");
sql.append(" coalesce(bpeori.vbc00, bpe.vbc00) as vbc00, ");
sql.append(" coalesce(bpeori.picms00, bpe.picms00) as picms00, ");
sql.append(" bpe.vicms00, ");
sql.append(" bpe.vbc20, ");
sql.append(" bpe.picms20, ");
sql.append(" coalesce(bpeori.vbc20, bpe.vbc20) as vbc20, ");
sql.append(" coalesce(bpeori.picms20, bpe.picms20) as picms20, ");
sql.append(" bpe.vicms20, ");
sql.append(" bpe.vbp, ");
sql.append(" coalesce(bpeori.vbp, bpe.vbp) as vbp, ");
sql.append(" bpe.vdesconto, ");
sql.append(" bpe.vpgto, ");
sql.append(" bpe.tpcomp01, ");
sql.append(" bpe.tpcomp02, ");
sql.append(" bpe.tpcomp03, ");
sql.append(" bpe.tpcomp04, ");
sql.append(" bpe.tpcomp05, ");
sql.append(" bpe.tpcomp06, ");
sql.append(" bpe.tpcomp99, ");
sql.append(" bpe.vcomp01, ");
sql.append(" bpe.vcomp02, ");
sql.append(" bpe.vcomp03, ");
sql.append(" bpe.vcomp04, ");
sql.append(" bpe.vcomp05, ");
sql.append(" bpe.vcomp06, ");
sql.append(" bpe.vcomp99, ");
sql.append(" coalesce(bpeori.vpgto, bpe.vpgto) as vpgto, ");
sql.append(" coalesce(bpeori.tpcomp01, bpe.tpcomp01) as tpcomp01, ");
sql.append(" coalesce(bpeori.tpcomp02, bpe.tpcomp02) as tpcomp02, ");
sql.append(" coalesce(bpeori.tpcomp03, bpe.tpcomp03) as tpcomp03, ");
sql.append(" coalesce(bpeori.tpcomp04, bpe.tpcomp04) as tpcomp04, ");
sql.append(" coalesce(bpeori.tpcomp05, bpe.tpcomp05) as tpcomp05, ");
sql.append(" coalesce(bpeori.tpcomp06, bpe.tpcomp06) as tpcomp06, ");
sql.append(" coalesce(bpeori.tpcomp99, bpe.tpcomp99) as tpcomp99, ");
sql.append(" coalesce(bpeori.vcomp01, bpe.vcomp01) as vcomp01, ");
sql.append(" coalesce(bpeori.vcomp02, bpe.vcomp02) as vcomp02, ");
sql.append(" coalesce(bpeori.vcomp03, bpe.vcomp03) as vcomp03, ");
sql.append(" coalesce(bpeori.vcomp04, bpe.vcomp04) as vcomp04, ");
sql.append(" coalesce(bpeori.vcomp05, bpe.vcomp05) as vcomp05, ");
sql.append(" coalesce(bpeori.vcomp06, bpe.vcomp06) as vcomp06, ");
sql.append(" coalesce(bpeori.vcomp99, bpe.vcomp99) as vcomp99, ");
sql.append(" bpe.pRedBC ");
sql.append("from boleto bori ");
sql.append(" inner join marca m on m.marca_id = bori.marca_id and m.activo = 1 ");
@ -1097,7 +1098,11 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
sql.append(" and bori.feccreacion <= to_date(:DATE_FIM,'DD/MM/YYYY HH24:MI:SS') ");
sql.append(" and est_bpe.cveestado in ( ").append(ufs).append(" ) ");
sql.append(" and e.empresa_id = :EMPRESA_ID ");
sql.append(" and (bpe.xmlregular is not null or bpe.xmlcontingencia is not null) ");
sql.append("order by numfoliosistema, num_bpe, datamov ");
System.out.println(sql.toString());
return sql.toString();
}