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

fixes bug#15326 

dev: julio
qua: 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@97061 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2019-08-28 18:13:57 +00:00
parent 40ffe7c0e1
commit ce70f21722
1 changed files with 72 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -937,42 +937,42 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
sql.append(" to_char(trunc(bori.feccreacion), 'yyyymmdd') as datamov, ");
sql.append(" bpeori.chbpe, ");
sql.append(" bpe.codstat as codstatus, ");
sql.append(" coalesce(bpeori.cmunini, bpe.cmunini) as cmunini, ");
sql.append(" coalesce(bpeori.cmunfim, bpe.cmunfim) as cmunfim, ");
sql.append(" coalesce(bpeori.ufini, bpe.ufini) as ufini, ");
sql.append(" coalesce(bpeori.uffim, bpe.uffim) as uffim, ");
sql.append(" coalesce(bpeori.nbp, bpe.nbp) as nbp, ");
sql.append(" coalesce(bpeori.dhemb, bpe.dhemb) as dhemb, ");
sql.append(" coalesce(bpeori.cst00, bpe.cst00) as cst00, ");
sql.append(" coalesce(bpeori.cst20, bpe.cst20) as cst20, ");
sql.append(" coalesce(bpeori.cst45, bpe.cst45) as cst45, ");
sql.append(" coalesce(bpeori.cst90, bpe.cst90) as cst90, ");
sql.append(" coalesce(bpeori.cstoutrauf, bpe.cstoutrauf) as cstoutrauf, ");
sql.append(" coalesce(bpeori.cstsn, bpe.cstsn) as cstsn, ");
sql.append(" coalesce(bpeori.vbc00, bpe.vbc00) as vbc00, ");
sql.append(" coalesce(bpeori.picms00, bpe.picms00) as picms00, ");
sql.append(" coalesce(bpeori.vicms00, bpe.vicms00) as vicms00, ");
sql.append(" coalesce(bpeori.vbc20, bpe.vbc20) as vbc20, ");
sql.append(" coalesce(bpeori.picms20, bpe.picms20) as picms20, ");
sql.append(" coalesce(bpeori.vicms20, bpe.vicms20) as vicms20, ");
sql.append(" coalesce(bpeori.vbp, bpe.vbp) as vbp, ");
sql.append(" coalesce(bpeori.vdesconto, bpe.vdesconto) as vdesconto, ");
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(" coalesce(bpeori.pRedBC, bpe.pRedBC) as pRedBC ");
sql.append(" case when bpeori.ufini is not null then bpeori.cmunini else bpe.cmunini end as cmunini, ");
sql.append(" case when bpeori.ufini is not null then bpeori.cmunfim else bpe.cmunfim end as cmunfim, ");
sql.append(" case when bpeori.ufini is not null then bpeori.ufini else bpe.ufini end as ufini, ");
sql.append(" case when bpeori.ufini is not null then bpeori.uffim else bpe.uffim end as uffim, ");
sql.append(" case when bpeori.ufini is not null then bpeori.nbp else bpe.nbp end as nbp, ");
sql.append(" case when bpeori.ufini is not null then bpeori.dhemb else bpe.dhemb end as dhemb, ");
sql.append(" case when bpeori.ufini is not null then bpeori.cst00 else bpe.cst00 end as cst00, ");
sql.append(" case when bpeori.ufini is not null then bpeori.cst20 else bpe.cst20 end as cst20, ");
sql.append(" case when bpeori.ufini is not null then bpeori.cst45 else bpe.cst45 end as cst45, ");
sql.append(" case when bpeori.ufini is not null then bpeori.cst90 else bpe.cst90 end as cst90, ");
sql.append(" case when bpeori.ufini is not null then bpeori.cstoutrauf else bpe.cstoutrauf end as cstoutrauf, ");
sql.append(" case when bpeori.ufini is not null then bpeori.cstsn else bpe.cstsn end as cstsn, ");
sql.append(" case when bpeori.ufini is not null then bpeori.vbc00 else bpe.vbc00 end as vbc00, ");
sql.append(" case when bpeori.ufini is not null then bpeori.picms00 else bpe.picms00 end as picms00, ");
sql.append(" case when bpeori.ufini is not null then bpeori.vicms00 else bpe.vicms00 end as vicms00, ");
sql.append(" case when bpeori.ufini is not null then bpeori.vbc20 else bpe.vbc20 end as vbc20, ");
sql.append(" case when bpeori.ufini is not null then bpeori.picms20 else bpe.picms20 end as picms20, ");
sql.append(" case when bpeori.ufini is not null then bpeori.vicms20 else bpe.vicms20 end as vicms20, ");
sql.append(" case when bpeori.ufini is not null then bpeori.vbp else bpe.vbp end as vbp, ");
sql.append(" case when bpeori.ufini is not null then bpeori.vdesconto else bpe.vdesconto end as vdesconto, ");
sql.append(" case when bpeori.ufini is not null then bpeori.vpgto else bpe.vpgto end as vpgto, ");
sql.append(" case when bpeori.ufini is not null then bpeori.tpcomp01 else bpe.tpcomp01 end as tpcomp01, ");
sql.append(" case when bpeori.ufini is not null then bpeori.tpcomp02 else bpe.tpcomp02 end as tpcomp02, ");
sql.append(" case when bpeori.ufini is not null then bpeori.tpcomp03 else bpe.tpcomp03 end as tpcomp03, ");
sql.append(" case when bpeori.ufini is not null then bpeori.tpcomp04 else bpe.tpcomp04 end as tpcomp04, ");
sql.append(" case when bpeori.ufini is not null then bpeori.tpcomp05 else bpe.tpcomp05 end as tpcomp05, ");
sql.append(" case when bpeori.ufini is not null then bpeori.tpcomp06 else bpe.tpcomp06 end as tpcomp06, ");
sql.append(" case when bpeori.ufini is not null then bpeori.tpcomp99 else bpe.tpcomp99 end as tpcomp99, ");
sql.append(" case when bpeori.ufini is not null then bpeori.vcomp01 else bpe.vcomp01 end as vcomp01, ");
sql.append(" case when bpeori.ufini is not null then bpeori.vcomp02 else bpe.vcomp02 end as vcomp02, ");
sql.append(" case when bpeori.ufini is not null then bpeori.vcomp03 else bpe.vcomp03 end as vcomp03, ");
sql.append(" case when bpeori.ufini is not null then bpeori.vcomp04 else bpe.vcomp04 end as vcomp04, ");
sql.append(" case when bpeori.ufini is not null then bpeori.vcomp05 else bpe.vcomp05 end as vcomp05, ");
sql.append(" case when bpeori.ufini is not null then bpeori.vcomp06 else bpe.vcomp06 end as vcomp06, ");
sql.append(" case when bpeori.ufini is not null then bpeori.vcomp99 else bpe.vcomp99 end as vcomp99, ");
sql.append(" case when bpeori.ufini is not null then bpeori.predbc else bpe.predbc end as predbc ");
sql.append("from boleto bori ");
sql.append(" inner join marca m on m.marca_id = bori.marca_id and m.activo = 1 ");
sql.append(" inner join empresa e on e.empresa_id = m.empresa_id ");
@ -1038,42 +1038,42 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
sql.append(" to_char(trunc(bori.feccreacion), 'yyyymmdd') as datamov, ");
sql.append(" bpe.chbpe, ");
sql.append(" bpe.codstat as codstatus, ");
sql.append(" coalesce(bpeori.cmunini, bpe.cmunini) as cmunini, ");
sql.append(" coalesce(bpeori.cmunfim, bpe.cmunfim) as cmunfim, ");
sql.append(" coalesce(bpeori.ufini, bpe.ufini) as ufini, ");
sql.append(" coalesce(bpeori.uffim, bpe.uffim) as uffim, ");
sql.append(" coalesce(bpeori.nbp, bpe.nbp) as nbp, ");
sql.append(" coalesce(bpeori.dhemb, bpe.dhemb) as dhemb, ");
sql.append(" coalesce(bpeori.cst00, bpe.cst00) as cst00, ");
sql.append(" coalesce(bpeori.cst20, bpe.cst20) as cst20, ");
sql.append(" coalesce(bpeori.cst45, bpe.cst45) as cst45, ");
sql.append(" coalesce(bpeori.cst90, bpe.cst90) as cst90, ");
sql.append(" coalesce(bpeori.cstoutrauf, bpe.cstoutrauf) as cstoutrauf, ");
sql.append(" coalesce(bpeori.cstsn, bpe.cstsn) as cstsn, ");
sql.append(" coalesce(bpeori.vbc00, bpe.vbc00) as vbc00, ");
sql.append(" coalesce(bpeori.picms00, bpe.picms00) as picms00, ");
sql.append(" coalesce(bpeori.vicms00, bpe.vicms00) as vicms00, ");
sql.append(" coalesce(bpeori.vbc20, bpe.vbc20) as vbc20, ");
sql.append(" coalesce(bpeori.picms20, bpe.picms20) as picms20, ");
sql.append(" coalesce(bpeori.vicms20, bpe.vicms20) as vicms20, ");
sql.append(" coalesce(bpeori.vbp, bpe.vbp) as vbp, ");
sql.append(" coalesce(bpeori.vdesconto, bpe.vdesconto) as vdesconto, ");
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(" coalesce(bpeori.pRedBC, bpe.pRedBC) as pRedBC ");
sql.append(" case when bpeori.ufini is not null then bpeori.cmunini else bpe.cmunini end as cmunini, ");
sql.append(" case when bpeori.ufini is not null then bpeori.cmunfim else bpe.cmunfim end as cmunfim, ");
sql.append(" case when bpeori.ufini is not null then bpeori.ufini else bpe.ufini end as ufini, ");
sql.append(" case when bpeori.ufini is not null then bpeori.uffim else bpe.uffim end as uffim, ");
sql.append(" case when bpeori.ufini is not null then bpeori.nbp else bpe.nbp end as nbp, ");
sql.append(" case when bpeori.ufini is not null then bpeori.dhemb else bpe.dhemb end as dhemb, ");
sql.append(" case when bpeori.ufini is not null then bpeori.cst00 else bpe.cst00 end as cst00, ");
sql.append(" case when bpeori.ufini is not null then bpeori.cst20 else bpe.cst20 end as cst20, ");
sql.append(" case when bpeori.ufini is not null then bpeori.cst45 else bpe.cst45 end as cst45, ");
sql.append(" case when bpeori.ufini is not null then bpeori.cst90 else bpe.cst90 end as cst90, ");
sql.append(" case when bpeori.ufini is not null then bpeori.cstoutrauf else bpe.cstoutrauf end as cstoutrauf, ");
sql.append(" case when bpeori.ufini is not null then bpeori.cstsn else bpe.cstsn end as cstsn, ");
sql.append(" case when bpeori.ufini is not null then bpeori.vbc00 else bpe.vbc00 end as vbc00, ");
sql.append(" case when bpeori.ufini is not null then bpeori.picms00 else bpe.picms00 end as picms00, ");
sql.append(" case when bpeori.ufini is not null then bpeori.vicms00 else bpe.vicms00 end as vicms00, ");
sql.append(" case when bpeori.ufini is not null then bpeori.vbc20 else bpe.vbc20 end as vbc20, ");
sql.append(" case when bpeori.ufini is not null then bpeori.picms20 else bpe.picms20 end as picms20, ");
sql.append(" case when bpeori.ufini is not null then bpeori.vicms20 else bpe.vicms20 end as vicms20, ");
sql.append(" case when bpeori.ufini is not null then bpeori.vbp else bpe.vbp end as vbp, ");
sql.append(" case when bpeori.ufini is not null then bpeori.vdesconto else bpe.vdesconto end as vdesconto, ");
sql.append(" case when bpeori.ufini is not null then bpeori.vpgto else bpe.vpgto end as vpgto, ");
sql.append(" case when bpeori.ufini is not null then bpeori.tpcomp01 else bpe.tpcomp01 end as tpcomp01, ");
sql.append(" case when bpeori.ufini is not null then bpeori.tpcomp02 else bpe.tpcomp02 end as tpcomp02, ");
sql.append(" case when bpeori.ufini is not null then bpeori.tpcomp03 else bpe.tpcomp03 end as tpcomp03, ");
sql.append(" case when bpeori.ufini is not null then bpeori.tpcomp04 else bpe.tpcomp04 end as tpcomp04, ");
sql.append(" case when bpeori.ufini is not null then bpeori.tpcomp05 else bpe.tpcomp05 end as tpcomp05, ");
sql.append(" case when bpeori.ufini is not null then bpeori.tpcomp06 else bpe.tpcomp06 end as tpcomp06, ");
sql.append(" case when bpeori.ufini is not null then bpeori.tpcomp99 else bpe.tpcomp99 end as tpcomp99, ");
sql.append(" case when bpeori.ufini is not null then bpeori.vcomp01 else bpe.vcomp01 end as vcomp01, ");
sql.append(" case when bpeori.ufini is not null then bpeori.vcomp02 else bpe.vcomp02 end as vcomp02, ");
sql.append(" case when bpeori.ufini is not null then bpeori.vcomp03 else bpe.vcomp03 end as vcomp03, ");
sql.append(" case when bpeori.ufini is not null then bpeori.vcomp04 else bpe.vcomp04 end as vcomp04, ");
sql.append(" case when bpeori.ufini is not null then bpeori.vcomp05 else bpe.vcomp05 end as vcomp05, ");
sql.append(" case when bpeori.ufini is not null then bpeori.vcomp06 else bpe.vcomp06 end as vcomp06, ");
sql.append(" case when bpeori.ufini is not null then bpeori.vcomp99 else bpe.vcomp99 end as vcomp99, ");
sql.append(" case when bpeori.ufini is not null then bpeori.predbc else bpe.predbc end as predbc ");
sql.append("from boleto bori ");
sql.append(" inner join marca m on m.marca_id = bori.marca_id and m.activo = 1 ");
sql.append(" inner join empresa e on e.empresa_id = m.empresa_id ");