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

Exportação Fiscal : ECF e RMD (issue 8120) 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@71692 d1611594-4594-4d17-8e1d-87c2c4800839
master
alberto 2017-07-20 20:20:12 +00:00
parent 9b8372a9a1
commit 06fd8c671b
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java
View File

@ -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") + ")"); log.info("Tarifa nao encontrada na R5. (ECF: " + rs.getString("ecf") + " / DATAMOV: " + rs.getString("datamov") + " / COO: " + rs.getString("coo") + ")");
} }
registro = new ExportacaoECFTipoCCF(); registro = new ExportacaoECFTipoCCF();
registro.setEcf(rs.getString("ecf")); registro.setEcf(rs.getString("ecf"));
registro.setDataEmissao(rs.getString("datamov")); registro.setDataEmissao(rs.getString("datamov"));
@ -1878,7 +1878,9 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
registro.setValorBaseCalculoICMS(valorBaseCalculoICMS); registro.setValorBaseCalculoICMS(valorBaseCalculoICMS);
registro.setAliquotaICMS(tributacao_importacao); registro.setAliquotaICMS(tributacao_importacao);
retorno.add(registro); if (valorTotal.doubleValue() != 0) {
retorno.add(registro);
}
} }
rs.close(); rs.close();
@ -2136,6 +2138,10 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
while (rs.next()) { while (rs.next()) {
BigDecimal valorTotal = MoneyHelper.instanciar(rs.getString("valortotal")); 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 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_municipal = MoneyHelper.instanciar(rs.getBigDecimal("porc_red_municipal"));
BigDecimal porc_red_estadual = MoneyHelper.instanciar(rs.getBigDecimal("porc_red_estadual")); 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()) { while (rs.next()) {
BigDecimal valorTotal = MoneyHelper.instanciar(rs.getString("valortotal")); 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 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_municipal = MoneyHelper.instanciar(rs.getBigDecimal("porc_red_municipal"));
BigDecimal porc_red_estadual = MoneyHelper.instanciar(rs.getBigDecimal("porc_red_estadual")); BigDecimal porc_red_estadual = MoneyHelper.instanciar(rs.getBigDecimal("porc_red_estadual"));