From e4da81b7c42717799cd59b049930dbcfa12d76e9 Mon Sep 17 00:00:00 2001 From: alberto Date: Wed, 2 Aug 2017 18:55:33 +0000 Subject: [PATCH] =?UTF-8?q?Exporta=C3=A7=C3=A3o=20Fiscal=20:=20ECF=20e=20R?= =?UTF-8?q?MD=20(issue=208120)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@72198 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../dao/hibernate/FiscalHibernateDAO.java | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java index 41de69873..abcf3cd92 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java @@ -1500,17 +1500,17 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sb.append(" select ecf, numserie, datamov, cooinicial, coofinal, crz, cro, coo, codestabelecimento, codestabelecimentoimpressora, numeroidentificacao, estadoorigem, sum(totalisenta) as totalisenta, sum(vendabrutadiaria) as vendabrutadiaria, sum(totgeral) as totgeral, sum(totalvenda) as totalvenda"); sb.append(" from ("); sb.append(" select distinct"); - sb.append(" 'BE000000000000000001' as ecf,"); - sb.append(" '000001' as numserie,"); + sb.append(" imp.numserie20 as ecf,"); + sb.append(" imp.numserie as numserie,"); sb.append(" to_char(c.feccreacion, 'YYYYMMDD') as datamov,"); - sb.append(" '000000' as cooinicial,"); - sb.append(" '000000' as coofinal,"); + sb.append(" '000001' as cooinicial,"); + sb.append(" '000001' as coofinal,"); sb.append(" '0000' as crz,"); sb.append(" '0000' as cro,"); sb.append(" '000000' as coo,"); sb.append(" CASE WHEN s.aliasorigen_id IS NULL THEN ei.codestabelecimento ELSE eis.codestabelecimento END as codestabelecimento,"); sb.append(" CASE WHEN s.aliasorigen_id IS NULL THEN eo.codestabelecimento ELSE eos.codestabelecimento END as codestabelecimentoimpressora,"); - sb.append(" '001' as numeroidentificacao,"); + sb.append(" imp.numeroidentificacao as numeroidentificacao,"); sb.append(" CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END as estadoorigem,"); sb.append(" ("); sb.append(" select nvl(sum(c.preciopagado), 0)"); @@ -1539,6 +1539,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sb.append(" join ciudad co on co.ciudad_id = po.ciudad_id"); sb.append(" join estado eo on eo.estado_id = co.estado_id"); sb.append(" join empresa_imposto ei on ei.empresa_id = c.empresacorrida_id and ei.estado_id = co.estado_id"); + sb.append(" join fiscal_impressora imp on imp.numserie = c.serieimpfiscal"); sb.append(" left join alias_servico s on s.origen_id = c.origen_id and s.destino_id = c.destino_id and (s.corrida_id = c.corrida_id or s.corrida_id is null) and s.ruta_id = c.ruta_id"); sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); @@ -1761,9 +1762,9 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO StringBuilder sb = new StringBuilder(); sb.append(" select distinct"); - sb.append(" 'BE000000000000000001' as ecf,"); + sb.append(" imp.numserie20 as ecf,"); sb.append(" to_char(c.feccreacion, 'YYYYMMDD') as datamov,"); - sb.append(" '000000' as coo,"); + sb.append(" '000001' as coo,"); sb.append(" c.preciopagado as valortarifa,"); sb.append(" c.preciopagado as preciopagado,"); sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN co.codibge ELSE cos.codibge END) as municipio_origem,"); @@ -1785,6 +1786,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sb.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id"); sb.append(" join estado ed on ed.estado_id = cd.estado_id"); sb.append(" join empresa_imposto ei on ei.empresa_id = c.empresacorrida_id and ei.estado_id = eo.estado_id"); + sb.append(" join fiscal_impressora imp on imp.numserie = c.serieimpfiscal"); sb.append(" left join alias_servico s on s.origen_id = c.origen_id and s.destino_id = c.destino_id and (s.corrida_id = c.corrida_id or s.corrida_id is null) and s.ruta_id = c.ruta_id"); sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); @@ -2108,9 +2110,9 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO StringBuilder sb = new StringBuilder(); sb.append(" select distinct"); - sb.append(" 'BE000000000000000001' as ecf,"); + sb.append(" imp.numserie20 as ecf,"); sb.append(" to_char(c.feccreacion, 'YYYYMMDD') as datamov,"); - sb.append(" '000000' as coo,"); + sb.append(" '000001' as coo,"); sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN co.codibge ELSE cos.codibge END) as municipio_origem,"); sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) as estado_origem,"); sb.append(" (CASE WHEN s.aliasdestino_id IS NULL THEN cd.codibge ELSE cds.codibge END) as municipio_destino,"); @@ -2129,6 +2131,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sb.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id"); sb.append(" join estado ed on ed.estado_id = cd.estado_id"); sb.append(" join empresa_imposto ei on ei.empresa_id = c.empresacorrida_id and ei.estado_id = eo.estado_id"); + sb.append(" join fiscal_impressora imp on imp.numserie = c.serieimpfiscal"); sb.append(" left join alias_servico s on s.origen_id = c.origen_id and s.destino_id = c.destino_id and (s.corrida_id = c.corrida_id or s.corrida_id is null) and s.ruta_id = c.ruta_id"); sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); @@ -2456,8 +2459,8 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sb.append(" select ecf, datamov, municipio_origem, estado_origem, estado_destino, red_base_calc_icms, porc_red_municipal, porc_red_estadual, tributacao_importacao, SUM(valortotal) as valortotal"); sb.append(" from ("); sb.append(" select distinct"); - sb.append(" '000000' as coo,"); - sb.append(" 'BE000000000000000001' as ecf,"); + sb.append(" '000001' as coo,"); + sb.append(" imp.numserie20 as ecf,"); sb.append(" to_char(c.feccreacion, 'YYYYMMDD') as datamov,"); sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN co.codibge ELSE cos.codibge END) as municipio_origem,"); sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) as estado_origem,"); @@ -2475,6 +2478,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sb.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id"); sb.append(" join estado ed on ed.estado_id = cd.estado_id"); sb.append(" join empresa_imposto ei on ei.empresa_id = c.empresacorrida_id and ei.estado_id = eo.estado_id"); + sb.append(" join fiscal_impressora imp on imp.numserie = c.serieimpfiscal"); sb.append(" left join alias_servico s on s.origen_id = c.origen_id and s.destino_id = c.destino_id and (s.corrida_id = c.corrida_id or s.corrida_id is null) and s.ruta_id = c.ruta_id"); sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id");