diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java index a59801be3..a23f84085 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java @@ -1445,7 +1445,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sb.append(" and c.feccreacion >= to_date(?,'DD/MM/YYYY HH24:MI:SS') and c.feccreacion <= to_date(?,'DD/MM/YYYY HH24:MI:SS')"); sb.append(" and c.empresacorrida_id = ?"); sb.append(" and ((case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) = ?)"); -// sb.append(" and r2.numserie20 = 'BE091410100011238940'"); + sb.append(" and r2.numserie20 = 'BE091410100011220387'"); try { PreparedStatement ps = connection.prepareStatement(sb.toString()); diff --git a/src/com/rjconsultores/ventaboletos/utilerias/MoneyHelper.java b/src/com/rjconsultores/ventaboletos/utilerias/MoneyHelper.java index 22dc4194d..6034e36b3 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/MoneyHelper.java +++ b/src/com/rjconsultores/ventaboletos/utilerias/MoneyHelper.java @@ -44,7 +44,7 @@ public class MoneyHelper { BigDecimal fAmountOne = value == null ? BigDecimal.ZERO:arredondar(value); total = total.add(fAmountOne); } - return total; + return total.setScale(DECIMALS, ROUNDING_MODE); } public static BigDecimal somar(int customScale, BigDecimal ... aAmount) { @@ -53,35 +53,35 @@ public class MoneyHelper { BigDecimal fAmountOne = value == null ? BigDecimal.ZERO:arredondar(value, customScale); total = total.add(fAmountOne); } - return total; + return total.setScale(DECIMALS, ROUNDING_MODE); } public static BigDecimal somar(BigDecimal aAmountOne, BigDecimal aAmountTwo) { BigDecimal fAmountOne = aAmountOne == null ? BigDecimal.ZERO:arredondar(aAmountOne); BigDecimal fAmountTwo =aAmountTwo == null ? BigDecimal.ZERO: arredondar(aAmountTwo); - return fAmountOne.add(fAmountTwo); + return fAmountOne.add(fAmountTwo).setScale(DECIMALS, ROUNDING_MODE); } public static BigDecimal somar(BigDecimal aAmountOne, BigDecimal aAmountTwo, int customScale) { BigDecimal fAmountOne = aAmountOne == null ? BigDecimal.ZERO:arredondar(aAmountOne, customScale); BigDecimal fAmountTwo =aAmountTwo == null ? BigDecimal.ZERO: arredondar(aAmountTwo, customScale); - return fAmountOne.add(fAmountTwo); + return fAmountOne.add(fAmountTwo).setScale(DECIMALS, ROUNDING_MODE); } public static BigDecimal subtrair(BigDecimal aAmountOne, BigDecimal aAmountTwo) { BigDecimal fAmountOne = arredondar(aAmountOne); BigDecimal fAmountTwo = arredondar(aAmountTwo); - return fAmountOne.subtract(fAmountTwo); + return fAmountOne.subtract(fAmountTwo).setScale(DECIMALS, ROUNDING_MODE); } public static BigDecimal subtrair(BigDecimal aAmountOne, BigDecimal aAmountTwo, int customScale) { BigDecimal fAmountOne = arredondar(aAmountOne, customScale); BigDecimal fAmountTwo = arredondar(aAmountTwo, customScale); - return fAmountOne.subtract(fAmountTwo); + return fAmountOne.subtract(fAmountTwo).setScale(DECIMALS, ROUNDING_MODE); } public static BigDecimal dividir(BigDecimal aAmount, BigDecimal aDivisor) { @@ -102,14 +102,14 @@ public class MoneyHelper { BigDecimal fAmount = arredondar(aAmount); BigDecimal fMultiplicand = arredondar(aMultiplicand); - return fAmount.multiply(fMultiplicand, new MathContext(ROUNDING_MODE)); + return fAmount.multiply(fMultiplicand, new MathContext(ROUNDING_MODE)).setScale(DECIMALS, ROUNDING_MODE); } public static BigDecimal multiplicar(BigDecimal aAmount, BigDecimal aMultiplicand, int customScale) { BigDecimal fAmount = arredondar(aAmount, customScale); BigDecimal fMultiplicand = arredondar(aMultiplicand, customScale); - return fAmount.multiply(fMultiplicand, new MathContext(ROUNDING_MODE)); + return fAmount.multiply(fMultiplicand, new MathContext(ROUNDING_MODE)).setScale(DECIMALS, ROUNDING_MODE); } public static BigDecimal arredondar(BigDecimal aNumber) { diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECF.java b/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECF.java index cd7b9a07c..e4e700c5e 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECF.java +++ b/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECF.java @@ -323,6 +323,15 @@ public class ExportacaoECF { } for (Map.Entry entry : group.entrySet()) { + if (entry.getValue().getAliquotaICMS() != null && entry.getValue().getValorBaseCalculoICMS() != null) { + BigDecimal valorICMSDebitado = BigDecimal.ZERO; + + BigDecimal aTributacao_importacao = MoneyHelper.dividir(entry.getValue().getAliquotaICMS(), BigDecimal.valueOf(100d)); + valorICMSDebitado = MoneyHelper.multiplicar(entry.getValue().getValorBaseCalculoICMS(), aTributacao_importacao); + + entry.getValue().setValorICMSDebitado(valorICMSDebitado); + } + listaRegistroECFTipoICF.add(entry.getValue()); }