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

fixes bug#15483 

dev: julio
qua: 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@96957 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2019-08-23 23:36:20 +00:00
parent d835126a72
commit f6dad15ebb
1 changed files with 76 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -400,7 +400,7 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
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(" 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, tipoevento desc ");
return sql.toString(); return sql.toString();
} }
@ -937,42 +937,42 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
sql.append(" to_char(trunc(bori.feccreacion), 'yyyymmdd') as datamov, "); sql.append(" to_char(trunc(bori.feccreacion), 'yyyymmdd') as datamov, ");
sql.append(" bpeori.chbpe, "); sql.append(" bpeori.chbpe, ");
sql.append(" bpe.codstat as codstatus, "); sql.append(" bpe.codstat as codstatus, ");
sql.append(" bpeori.cmunini, "); sql.append(" coalesce(bpeori.cmunini, bpe.cmunini) as cmunini, ");
sql.append(" bpeori.cmunfim, "); sql.append(" coalesce(bpeori.cmunfim, bpe.cmunfim) as cmunfim, ");
sql.append(" bpeori.ufini, "); sql.append(" coalesce(bpeori.ufini, bpe.ufini) as ufini, ");
sql.append(" bpeori.uffim, "); sql.append(" coalesce(bpeori.uffim, bpe.uffim) as uffim, ");
sql.append(" bpeori.nbp, "); sql.append(" coalesce(bpeori.nbp, bpe.nbp) as nbp, ");
sql.append(" bpeori.dhemb, "); sql.append(" coalesce(bpeori.dhemb, bpe.dhemb) as dhemb, ");
sql.append(" bpeori.cst00, "); sql.append(" coalesce(bpeori.cst00, bpe.cst00) as cst00, ");
sql.append(" bpeori.cst20, "); sql.append(" coalesce(bpeori.cst20, bpe.cst20) as cst20, ");
sql.append(" bpeori.cst45, "); sql.append(" coalesce(bpeori.cst45, bpe.cst45) as cst45, ");
sql.append(" bpeori.cst90, "); sql.append(" coalesce(bpeori.cst90, bpe.cst90) as cst90, ");
sql.append(" bpeori.cstoutrauf, "); sql.append(" coalesce(bpeori.cstoutrauf, bpe.cstoutrauf) as cstoutrauf, ");
sql.append(" bpeori.cstsn, "); sql.append(" coalesce(bpeori.cstsn, bpe.cstsn) as cstsn, ");
sql.append(" coalesce(bpeori.vbc00, bpe.vbc00) as vbc00, "); sql.append(" coalesce(bpeori.vbc00, bpe.vbc00) as vbc00, ");
sql.append(" coalesce(bpeori.picms00, bpe.picms00) as picms00, "); sql.append(" coalesce(bpeori.picms00, bpe.picms00) as picms00, ");
sql.append(" bpeori.vicms00, "); sql.append(" coalesce(bpeori.vicms00, bpe.vicms00) as vicms00, ");
sql.append(" coalesce(bpeori.vbc20, bpe.vbc20) as vbc20, "); sql.append(" coalesce(bpeori.vbc20, bpe.vbc20) as vbc20, ");
sql.append(" coalesce(bpeori.picms20, bpe.picms20) as picms20, "); sql.append(" coalesce(bpeori.picms20, bpe.picms20) as picms20, ");
sql.append(" bpeori.vicms20, "); sql.append(" coalesce(bpeori.vicms20, bpe.vicms20) as vicms20, ");
sql.append(" coalesce(bpeori.vbp, bpe.vbp) as vbp, "); sql.append(" coalesce(bpeori.vbp, bpe.vbp) as vbp, ");
sql.append(" bpeori.vdesconto, "); sql.append(" coalesce(bpeori.vdesconto, bpe.vdesconto) as vdesconto, ");
sql.append(" coalesce(bpeori.vpgto, bpe.vpgto) as vpgto, "); sql.append(" coalesce(bpeori.vpgto, bpe.vpgto) as vpgto, ");
sql.append(" coalesce(bpeori.tpcomp01, bpe.tpcomp01) as tpcomp01, "); sql.append(" coalesce(bpeori.tpcomp01, bpe.tpcomp01) as tpcomp01, ");
sql.append(" coalesce(bpeori.tpcomp02, bpe.tpcomp02) as tpcomp02, "); sql.append(" coalesce(bpeori.tpcomp02, bpe.tpcomp02) as tpcomp02, ");
sql.append(" coalesce(bpeori.tpcomp03, bpe.tpcomp03) as tpcomp03, "); sql.append(" coalesce(bpeori.tpcomp03, bpe.tpcomp03) as tpcomp03, ");
sql.append(" coalesce(bpeori.tpcomp04, bpe.tpcomp04) as tpcomp04, "); sql.append(" coalesce(bpeori.tpcomp04, bpe.tpcomp04) as tpcomp04, ");
sql.append(" coalesce(bpeori.tpcomp05, bpe.tpcomp05) as tpcomp05, "); sql.append(" coalesce(bpeori.tpcomp05, bpe.tpcomp05) as tpcomp05, ");
sql.append(" coalesce(bpeori.tpcomp06, bpe.tpcomp06) as tpcomp06, "); sql.append(" coalesce(bpeori.tpcomp06, bpe.tpcomp06) as tpcomp06, ");
sql.append(" coalesce(bpeori.tpcomp99, bpe.tpcomp99) as tpcomp99, "); sql.append(" coalesce(bpeori.tpcomp99, bpe.tpcomp99) as tpcomp99, ");
sql.append(" coalesce(bpeori.vcomp01, bpe.vcomp01) as vcomp01, "); sql.append(" coalesce(bpeori.vcomp01, bpe.vcomp01) as vcomp01, ");
sql.append(" coalesce(bpeori.vcomp02, bpe.vcomp02) as vcomp02, "); sql.append(" coalesce(bpeori.vcomp02, bpe.vcomp02) as vcomp02, ");
sql.append(" coalesce(bpeori.vcomp03, bpe.vcomp03) as vcomp03, "); sql.append(" coalesce(bpeori.vcomp03, bpe.vcomp03) as vcomp03, ");
sql.append(" coalesce(bpeori.vcomp04, bpe.vcomp04) as vcomp04, "); sql.append(" coalesce(bpeori.vcomp04, bpe.vcomp04) as vcomp04, ");
sql.append(" coalesce(bpeori.vcomp05, bpe.vcomp05) as vcomp05, "); sql.append(" coalesce(bpeori.vcomp05, bpe.vcomp05) as vcomp05, ");
sql.append(" coalesce(bpeori.vcomp06, bpe.vcomp06) as vcomp06, "); sql.append(" coalesce(bpeori.vcomp06, bpe.vcomp06) as vcomp06, ");
sql.append(" coalesce(bpeori.vcomp99, bpe.vcomp99) as vcomp99, "); sql.append(" coalesce(bpeori.vcomp99, bpe.vcomp99) as vcomp99, ");
sql.append(" bpeori.pRedBC "); sql.append(" coalesce(bpeori.pRedBC, bpe.pRedBC) as pRedBC ");
sql.append("from boleto bori "); 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 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 "); 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(" to_char(trunc(bori.feccreacion), 'yyyymmdd') as datamov, ");
sql.append(" bpe.chbpe, "); sql.append(" bpe.chbpe, ");
sql.append(" bpe.codstat as codstatus, "); sql.append(" bpe.codstat as codstatus, ");
sql.append(" bpe.cmunini, "); sql.append(" coalesce(bpeori.cmunini, bpe.cmunini) as cmunini, ");
sql.append(" bpe.cmunfim, "); sql.append(" coalesce(bpeori.cmunfim, bpe.cmunfim) as cmunfim, ");
sql.append(" bpe.ufini, "); sql.append(" coalesce(bpeori.ufini, bpe.ufini) as ufini, ");
sql.append(" bpe.uffim, "); sql.append(" coalesce(bpeori.uffim, bpe.uffim) as uffim, ");
sql.append(" bpe.nbp, "); sql.append(" coalesce(bpeori.nbp, bpe.nbp) as nbp, ");
sql.append(" bpe.dhemb, "); sql.append(" coalesce(bpeori.dhemb, bpe.dhemb) as dhemb, ");
sql.append(" bpe.cst00, "); sql.append(" coalesce(bpeori.cst00, bpe.cst00) as cst00, ");
sql.append(" bpe.cst20, "); sql.append(" coalesce(bpeori.cst20, bpe.cst20) as cst20, ");
sql.append(" bpe.cst45, "); sql.append(" coalesce(bpeori.cst45, bpe.cst45) as cst45, ");
sql.append(" bpe.cst90, "); sql.append(" coalesce(bpeori.cst90, bpe.cst90) as cst90, ");
sql.append(" bpe.cstoutrauf, "); sql.append(" coalesce(bpeori.cstoutrauf, bpe.cstoutrauf) as cstoutrauf, ");
sql.append(" bpe.cstsn, "); sql.append(" coalesce(bpeori.cstsn, bpe.cstsn) as cstsn, ");
sql.append(" coalesce(bpeori.vbc00, bpe.vbc00) as vbc00, "); sql.append(" coalesce(bpeori.vbc00, bpe.vbc00) as vbc00, ");
sql.append(" coalesce(bpeori.picms00, bpe.picms00) as picms00, "); sql.append(" coalesce(bpeori.picms00, bpe.picms00) as picms00, ");
sql.append(" bpe.vicms00, "); sql.append(" coalesce(bpeori.vicms00, bpe.vicms00) as vicms00, ");
sql.append(" coalesce(bpeori.vbc20, bpe.vbc20) as vbc20, "); sql.append(" coalesce(bpeori.vbc20, bpe.vbc20) as vbc20, ");
sql.append(" coalesce(bpeori.picms20, bpe.picms20) as picms20, "); sql.append(" coalesce(bpeori.picms20, bpe.picms20) as picms20, ");
sql.append(" bpe.vicms20, "); sql.append(" coalesce(bpeori.vicms20, bpe.vicms20) as vicms20, ");
sql.append(" coalesce(bpeori.vbp, bpe.vbp) as vbp, "); sql.append(" coalesce(bpeori.vbp, bpe.vbp) as vbp, ");
sql.append(" bpe.vdesconto, "); sql.append(" coalesce(bpeori.vdesconto, bpe.vdesconto) as vdesconto, ");
sql.append(" coalesce(bpeori.vpgto, bpe.vpgto) as vpgto, "); sql.append(" coalesce(bpeori.vpgto, bpe.vpgto) as vpgto, ");
sql.append(" coalesce(bpeori.tpcomp01, bpe.tpcomp01) as tpcomp01, "); sql.append(" coalesce(bpeori.tpcomp01, bpe.tpcomp01) as tpcomp01, ");
sql.append(" coalesce(bpeori.tpcomp02, bpe.tpcomp02) as tpcomp02, "); sql.append(" coalesce(bpeori.tpcomp02, bpe.tpcomp02) as tpcomp02, ");
sql.append(" coalesce(bpeori.tpcomp03, bpe.tpcomp03) as tpcomp03, "); sql.append(" coalesce(bpeori.tpcomp03, bpe.tpcomp03) as tpcomp03, ");
sql.append(" coalesce(bpeori.tpcomp04, bpe.tpcomp04) as tpcomp04, "); sql.append(" coalesce(bpeori.tpcomp04, bpe.tpcomp04) as tpcomp04, ");
sql.append(" coalesce(bpeori.tpcomp05, bpe.tpcomp05) as tpcomp05, "); sql.append(" coalesce(bpeori.tpcomp05, bpe.tpcomp05) as tpcomp05, ");
sql.append(" coalesce(bpeori.tpcomp06, bpe.tpcomp06) as tpcomp06, "); sql.append(" coalesce(bpeori.tpcomp06, bpe.tpcomp06) as tpcomp06, ");
sql.append(" coalesce(bpeori.tpcomp99, bpe.tpcomp99) as tpcomp99, "); sql.append(" coalesce(bpeori.tpcomp99, bpe.tpcomp99) as tpcomp99, ");
sql.append(" coalesce(bpeori.vcomp01, bpe.vcomp01) as vcomp01, "); sql.append(" coalesce(bpeori.vcomp01, bpe.vcomp01) as vcomp01, ");
sql.append(" coalesce(bpeori.vcomp02, bpe.vcomp02) as vcomp02, "); sql.append(" coalesce(bpeori.vcomp02, bpe.vcomp02) as vcomp02, ");
sql.append(" coalesce(bpeori.vcomp03, bpe.vcomp03) as vcomp03, "); sql.append(" coalesce(bpeori.vcomp03, bpe.vcomp03) as vcomp03, ");
sql.append(" coalesce(bpeori.vcomp04, bpe.vcomp04) as vcomp04, "); sql.append(" coalesce(bpeori.vcomp04, bpe.vcomp04) as vcomp04, ");
sql.append(" coalesce(bpeori.vcomp05, bpe.vcomp05) as vcomp05, "); sql.append(" coalesce(bpeori.vcomp05, bpe.vcomp05) as vcomp05, ");
sql.append(" coalesce(bpeori.vcomp06, bpe.vcomp06) as vcomp06, "); sql.append(" coalesce(bpeori.vcomp06, bpe.vcomp06) as vcomp06, ");
sql.append(" coalesce(bpeori.vcomp99, bpe.vcomp99) as vcomp99, "); sql.append(" coalesce(bpeori.vcomp99, bpe.vcomp99) as vcomp99, ");
sql.append(" bpe.pRedBC "); sql.append(" coalesce(bpeori.pRedBC, bpe.pRedBC) as pRedBC ");
sql.append("from boleto bori "); 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 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 "); sql.append(" inner join empresa e on e.empresa_id = m.empresa_id ");
@ -1081,16 +1081,14 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
sql.append(" and bpe.activo = (case when TO_CHAR(bori.feccreacion, 'yyyymmdd') <> "); sql.append(" and bpe.activo = (case when TO_CHAR(bori.feccreacion, 'yyyymmdd') <> ");
sql.append(" to_char(to_date(substr(bpe.dhrecbto,0,10), 'YYYY-MM-DD'), 'yyyymmdd') then 0 else 1 end) "); sql.append(" to_char(to_date(substr(bpe.dhrecbto,0,10), 'YYYY-MM-DD'), 'yyyymmdd') then 0 else 1 end) ");
sql.append(" inner join estado est_bpe on bpe.uf = est_bpe.codibge "); sql.append(" inner join estado est_bpe on bpe.uf = est_bpe.codibge ");
sql.append(" left join boleto b on b.boleto_id = (case when bori.motivocancelacion_id = 99 then bori.boletoanterior_id else bori.boletooriginal_id end) "); sql.append(" left join boleto b on b.boleto_id = coalesce(bori.boletoanterior_id, bori.boletooriginal_id) ");
sql.append(" left join bpe bpeori on b.boleto_id = bpeori.boleto_id and bpeori.activo = 1 "); sql.append(" left join bpe bpeori on b.boleto_id = bpeori.boleto_id and bpeori.activo = 1 ");
sql.append(" inner join punto_venta ptv on ptv.puntoventa_id = bori.puntoventa_id "); sql.append(" inner join punto_venta ptv on ptv.puntoventa_id = bori.puntoventa_id ");
sql.append("join inscricao_estadual ie on e.empresa_id = ie.empresa_id and ie.estado_id = est_bpe.estado_id and ie.activo = 1 "); sql.append("join inscricao_estadual ie on e.empresa_id = ie.empresa_id and ie.estado_id = est_bpe.estado_id and ie.activo = 1 ");
sql.append("join empresa_imposto ei on ei.empresa_id = e.empresa_id and ei.estado_id = est_bpe.estado_id and ei.activo = 1 "); sql.append("join empresa_imposto ei on ei.empresa_id = e.empresa_id and ei.estado_id = est_bpe.estado_id and ei.activo = 1 ");
sql.append("left join aidf aidf on aidf.aidf_id = b.aidf_id and b.tipoventa_id = 3 "); sql.append("left join aidf aidf on aidf.aidf_id = b.aidf_id and b.tipoventa_id = 3 ");
sql.append("left join estado esaidf on esaidf.estado_id = aidf.estado_id "); sql.append("left join estado esaidf on esaidf.estado_id = aidf.estado_id ");
sql.append("left join boleto bant on bant.boleto_id = (case when bpeori.tipoevento is not null then coalesce(b.boletoanterior_id, b.boletooriginal_id) else null end) "); sql.append("left join punto_venta ptvo on ptvo.puntoventa_id = coalesce(b.ptovtaventa_id, bori.puntoventa_id) ");
sql.append("left join bpe bpeant on bpeant.boleto_id = bant.boleto_id and bpeant.activo = 1 ");
sql.append("left join punto_venta ptvo on ptvo.puntoventa_id = coalesce(bant.puntoventa_id, bori.puntoventa_id,b.ptovtaventa_id) ");
sql.append("where "); sql.append("where ");
sql.append(" (bpe.codstat in ('101','135') and to_char(b.feccreacion, 'mm/yyyy') < to_char(bori.feccreacion, 'mm/yyyy')) "); sql.append(" (bpe.codstat in ('101','135') and to_char(b.feccreacion, 'mm/yyyy') < to_char(bori.feccreacion, 'mm/yyyy')) ");
sql.append(" and (bpe.codstat in ('-1','100','101','102','135','150') and bpe.tipoevento not in ('110115','110116') or bpe.tipoevento is null) "); sql.append(" and (bpe.codstat in ('-1','100','101','102','135','150') and bpe.tipoevento not in ('110115','110116') or bpe.tipoevento is null) ");