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

bug #6817 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@54605 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2016-04-04 20:01:55 +00:00
parent 0756b2db79
commit 0f119c95c1
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java
View File

@ -741,8 +741,9 @@ public class FiscalServiceImpl implements FiscalService {
String coo = StringHelper.preencherStringEspacoDireita(fiscal.getCoo(), 9); String coo = StringHelper.preencherStringEspacoDireita(fiscal.getCoo(), 9);
BigDecimal valorTotal = valorTotalItensECF(item); BigDecimal valorTotal = valorTotalItensECF(item);
String valorTotalDocumanto = StringHelper.preencherStringEspacoDireita(valorTotal.toString(), 14); valorTotal = UtileriasFiscal.arredondar(valorTotal);
String valorItens = StringHelper.preencherStringEspacoDireita(valorTotal.toString(), 14); String valorTotalDocumanto = UtileriasFiscal.formataZeroDecimal(valorTotal, 14);
String valorItens = valorTotalDocumanto;
HashMap<String, String> aliquotaBaseCalculo = getAliquotaBaseCalculo(fiscal); HashMap<String, String> aliquotaBaseCalculo = getAliquotaBaseCalculo(fiscal);
String aliquota = aliquotaBaseCalculo.get("aliquota"); String aliquota = aliquotaBaseCalculo.get("aliquota");
@ -822,8 +823,8 @@ public class FiscalServiceImpl implements FiscalService {
} }
private BigDecimal valorTotalItensECF(ItemFiscalVO item) { private BigDecimal valorTotalItensECF(ItemFiscalVO item) {
BigDecimal valorTotal = item.getValorTotal() == null ? BigDecimal.ZERO : item.getValorTotal(); BigDecimal valorTotal = BigDecimal.ZERO;
if (valorTotal.equals(BigDecimal.ZERO)) {
BigDecimal valorTarifa = item.getValorTarifa() == null ? BigDecimal.ZERO : item.getValorTarifa(); BigDecimal valorTarifa = item.getValorTarifa() == null ? BigDecimal.ZERO : item.getValorTarifa();
if (valorTarifa.equals(BigDecimal.ZERO)) if (valorTarifa.equals(BigDecimal.ZERO))
valorTarifa = BigDecimal.ONE; valorTarifa = BigDecimal.ONE;
@ -831,7 +832,7 @@ public class FiscalServiceImpl implements FiscalService {
BigDecimal valorPedagio = item.getValorPedagio() == null ? BigDecimal.ZERO : item.getValorPedagio(); BigDecimal valorPedagio = item.getValorPedagio() == null ? BigDecimal.ZERO : item.getValorPedagio();
BigDecimal valorEmbarque = item.getValorEmbarque() == null ? BigDecimal.ZERO : item.getValorEmbarque(); BigDecimal valorEmbarque = item.getValorEmbarque() == null ? BigDecimal.ZERO : item.getValorEmbarque();
valorTotal = valorTotal.add(valorTarifa).add(valorPedagio).add(valorEmbarque); valorTotal = valorTotal.add(valorTarifa).add(valorPedagio).add(valorEmbarque);
}
return valorTotal; return valorTotal;
} }