From c5a5bbceb26d8a3d87530ca0d768e80f76639f39 Mon Sep 17 00:00:00 2001 From: julio Date: Tue, 30 Jan 2018 13:40:54 +0000 Subject: [PATCH] fixes bug #10474 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@78448 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../dao/hibernate/FiscalHibernateDAO.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java index 5f2fcfce6..6393bb0ca 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java @@ -97,12 +97,17 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sql.append("select distinct "); sql.append(" (case when r2.numserie20 is null then 'X' else '' end) || imp.numserie20 as numImpressora, "); sql.append(" (case when r4.caja_id is null then '000001' else r4.coo end) as coo, "); - sql.append(" r4.imptotalliquido as valorTotal, "); sql.append(" to_char(b.feccreacion, 'yyyymmdd') as dataEmissao, "); sql.append(" r4.cpfcnpjcliente as cnpjCliente, "); sql.append(" b.caja_id as boletoId, "); + sql.append(" b.empresacorrida_id as empresaId, "); + sql.append(" b.numseriepreimpresa as serie, "); + sql.append(" a.subserie as subSerie, "); + sql.append(" a.docfiscal as aidf, "); + sql.append(" (case when s.aliasorigen_id is null then eo.estado_id else eos.estado_id end) as estadoIdOrigen, "); sql.append(" (case when s.aliasorigen_id is null then co.codibge else cos.codibge end) as origenId, "); sql.append(" (case when s.aliasorigen_id is null then co.codibge else cos.codibge end) as origenUf, "); + sql.append(" (case when s.aliasdestino_id is null then ed.estado_id else eds.estado_id end) as estadoIdDestino, "); sql.append(" (case when s.aliasdestino_id is null then cd.codibge else cds.codibge end) as destinoId, "); sql.append(" (case when s.aliasdestino_id is null then cd.codibge else cds.codibge end) as destinoUf, "); sql.append(" imp.numcnpj as cnpjImpressora, "); @@ -120,9 +125,15 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sql.append(" b.importeseguro as importeseguro, "); sql.append(" cs.descclase AS claseServicio, "); sql.append(" translate(imp.numcnpj, ' / - . ', ' ') as cnpjEcf, "); - sql.append(" coalesce(ei.icms, eos.icms) as impostoEstado, "); + sql.append(" coalesce(ei.icms, eos.icms) as icms, "); + sql.append(" ei.porctributo as porctributo, "); sql.append(" case when b.indstatusboleto = 'V' or b.motivocancelacion_id is null THEN 'N' ELSE 'C' END status, "); - sql.append(" r4.indcancelamento AS indcancelamento "); + sql.append(" r4.indcancelamento AS indcancelamento, "); + sql.append(" b.preciopagado as valorTotal, "); + sql.append(" case b.importetaxaembarque when 0 then null else b.importetaxaembarque end as importetaxaembarque, "); + sql.append(" case b.importepedagio when 0 then null else b.importepedagio end as importepedagio, "); + sql.append(" case b.importeoutros when 0 then null else b.importeoutros end as importeoutros, "); + sql.append(" case b.importeseguro when 0 then null else b.importeseguro end as importeseguro "); if (isBoletoHist) sql.append("from caja_hist b ");