From 06fd8c671b5eaf6340d15043a5e037f001579652 Mon Sep 17 00:00:00 2001 From: alberto Date: Thu, 20 Jul 2017 20:20:12 +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@71692 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../dao/hibernate/FiscalHibernateDAO.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java index df6543a0c..d055ea651 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java @@ -1798,7 +1798,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO log.info("Tarifa nao encontrada na R5. (ECF: " + rs.getString("ecf") + " / DATAMOV: " + rs.getString("datamov") + " / COO: " + rs.getString("coo") + ")"); } - + registro = new ExportacaoECFTipoCCF(); registro.setEcf(rs.getString("ecf")); registro.setDataEmissao(rs.getString("datamov")); @@ -1878,7 +1878,9 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO registro.setValorBaseCalculoICMS(valorBaseCalculoICMS); registro.setAliquotaICMS(tributacao_importacao); - retorno.add(registro); + if (valorTotal.doubleValue() != 0) { + retorno.add(registro); + } } rs.close(); @@ -2136,6 +2138,10 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO while (rs.next()) { BigDecimal valorTotal = MoneyHelper.instanciar(rs.getString("valortotal")); + if (valorTotal.doubleValue() == 0) { + continue; + } + BigDecimal red_base_calc_icms = MoneyHelper.instanciar(rs.getBigDecimal("red_base_calc_icms")); BigDecimal porc_red_municipal = MoneyHelper.instanciar(rs.getBigDecimal("porc_red_municipal")); BigDecimal porc_red_estadual = MoneyHelper.instanciar(rs.getBigDecimal("porc_red_estadual")); @@ -2485,6 +2491,10 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO while (rs.next()) { BigDecimal valorTotal = MoneyHelper.instanciar(rs.getString("valortotal")); + if (valorTotal.doubleValue() == 0) { + continue; + } + BigDecimal red_base_calc_icms = MoneyHelper.instanciar(rs.getBigDecimal("red_base_calc_icms")); BigDecimal porc_red_municipal = MoneyHelper.instanciar(rs.getBigDecimal("porc_red_municipal")); BigDecimal porc_red_estadual = MoneyHelper.instanciar(rs.getBigDecimal("porc_red_estadual"));