From c533ffe0bfccd272951f525a3142b90747a75d2a Mon Sep 17 00:00:00 2001 From: wilian Date: Wed, 6 Apr 2016 21:10:28 +0000 Subject: [PATCH] bug #6817 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@54705 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioAnaliticoVoucher.java | 19 ++ .../RelatorioAnaliticoVoucher.jasper | Bin 29420 -> 43700 bytes .../templates/RelatorioAnaliticoVoucher.jrxml | 297 ++++++++++++------ .../ItemMenuImportacionFiscalEcf.java | 2 +- ...temMenuImportacionFiscalEcfCancelados.java | 2 +- .../ItemMenuImportacionFiscalManual.java | 2 +- .../ItemMenuImportacionFiscalReducaoZ.java | 2 +- .../ItemMenuImportacionNaoFiscal.java | 2 +- .../ItemMenuFiscalRelatorioFinanceiro.java | 2 +- .../ItemMenuFiscalRelatorioVoucher.java | 2 +- web/WEB-INF/i3-label_es_MX.label | 11 +- web/WEB-INF/i3-label_pt_BR.label | 11 +- 12 files changed, 244 insertions(+), 108 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucher.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucher.java index 2bde21711..693c78400 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucher.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucher.java @@ -1,11 +1,13 @@ package com.rjconsultores.ventaboletos.relatorios.impl; +import java.math.BigDecimal; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -16,6 +18,7 @@ import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.utilerias.DateUtil; import com.rjconsultores.ventaboletos.vo.impressaofiscal.ItemRelatorioVoucher; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.TotalRelatorioVoucher; import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; @@ -86,6 +89,7 @@ public class RelatorioAnaliticoVoucher extends Relatorio { ResultSet rset = stmt.executeQuery(); List list = new ArrayList(); + Map totais = new HashMap(); while (rset.next()) { ItemRelatorioVoucher item = new ItemRelatorioVoucher(); @@ -101,9 +105,24 @@ public class RelatorioAnaliticoVoucher extends Relatorio { item.setPedagio(rset.getBigDecimal("pedagio")); item.setEmbarque(rset.getBigDecimal("embarque")); item.setStatus(rset.getString("status")); + + TotalRelatorioVoucher total = null; + if(totais.containsKey(item.getStatus())) { + total = totais.get(item.getStatus()); + } else { + total = new TotalRelatorioVoucher(); + } + + total.setStatus(item.getStatus()); + total.setTarifa(total.getTarifa().add(item.getTarifa().intValue() < 0 ? item.getTarifa().multiply(new BigDecimal(-1)) : item.getTarifa())); + total.setPedagio(total.getPedagio().add(item.getPedagio().intValue() < 0 ? item.getPedagio().multiply(new BigDecimal(-1)) : item.getPedagio())); + total.setEmbarque(total.getEmbarque().add(item.getEmbarque().intValue() < 0 ? item.getEmbarque().multiply(new BigDecimal(-1)) : item.getEmbarque())); + totais.put(item.getStatus(), total); list.add(item); } + + parametros.put("totais", totais.values()); if (!getConexao().isClosed()) getConexao().close(); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAnaliticoVoucher.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAnaliticoVoucher.jasper index 889547fb4daeee7e0bf2d59ac9c50c56b4fc9929..3710343c93b7ff4b9e3d6a02125c45291ca1ca52 100644 GIT binary patch literal 43700 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 literal 29420 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 z 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 R>Nt~7YZ2}mP*X*@{|93BVL|`^ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAnaliticoVoucher.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAnaliticoVoucher.jrxml index 8b88d6531..10ea2b7dd 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAnaliticoVoucher.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAnaliticoVoucher.jrxml @@ -1,10 +1,18 @@ - + + + + + + + + + @@ -33,7 +41,7 @@ - + @@ -70,146 +78,146 @@ - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - - - + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - - - + + + + - - - - + + + + - - - - + + + + @@ -222,6 +230,97 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuImportacionFiscalEcf.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuImportacionFiscalEcf.java index 7c53694dd..94f3fdfc0 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuImportacionFiscalEcf.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuImportacionFiscalEcf.java @@ -26,7 +26,7 @@ public class ItemMenuImportacionFiscalEcf extends DefaultItemMenuSistema { HashMap map = TipoImportacaoFiscal.selecionaTipoImportacao(TipoImportacao.ECF, (HashMap) getArgs()); PantallaUtileria.openWindow("/gui/impressaofiscal/busquedaImportacionFiscal.zul", - Labels.getLabel("busquedaImportacionFiscalController.window.title"), map, desktop); + Labels.getLabel("busquedaImportacionFiscalEcfController.window.title"), map, desktop); } diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuImportacionFiscalEcfCancelados.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuImportacionFiscalEcfCancelados.java index fa9b97505..f7b439a0f 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuImportacionFiscalEcfCancelados.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuImportacionFiscalEcfCancelados.java @@ -26,7 +26,7 @@ public class ItemMenuImportacionFiscalEcfCancelados extends DefaultItemMenuSiste HashMap map = TipoImportacaoFiscal.selecionaTipoImportacao(TipoImportacao.ECF_CANCELADOS, (HashMap) getArgs()); PantallaUtileria.openWindow("/gui/impressaofiscal/busquedaImportacionFiscal.zul", - Labels.getLabel("busquedaImportacionFiscalController.window.title"), map, desktop); + Labels.getLabel("busquedaImportacionFiscalEcfCanceladosController.window.title"), map, desktop); } } diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuImportacionFiscalManual.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuImportacionFiscalManual.java index 22663ff31..c74371276 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuImportacionFiscalManual.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuImportacionFiscalManual.java @@ -26,7 +26,7 @@ public class ItemMenuImportacionFiscalManual extends DefaultItemMenuSistema { HashMap map = TipoImportacaoFiscal.selecionaTipoImportacao(TipoImportacao.MANUAL, (HashMap) getArgs()); PantallaUtileria.openWindow("/gui/impressaofiscal/busquedaImportacionFiscal.zul", - Labels.getLabel("busquedaImportacionFiscalController.window.title"), map, desktop); + Labels.getLabel("busquedaImportacionFiscalManualController.window.title"), map, desktop); } } diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuImportacionFiscalReducaoZ.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuImportacionFiscalReducaoZ.java index 6e2ce39c5..a4cf26332 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuImportacionFiscalReducaoZ.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuImportacionFiscalReducaoZ.java @@ -26,7 +26,7 @@ public class ItemMenuImportacionFiscalReducaoZ extends DefaultItemMenuSistema { HashMap map = TipoImportacaoFiscal.selecionaTipoImportacao(TipoImportacao.REDUCAO_Z, (HashMap) getArgs()); PantallaUtileria.openWindow("/gui/impressaofiscal/busquedaImportacionFiscal.zul", - Labels.getLabel("busquedaImportacionFiscalController.window.title"), map, desktop); + Labels.getLabel("busquedaImportacionFiscalReducaoZController.window.title"), map, desktop); } diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuImportacionNaoFiscal.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuImportacionNaoFiscal.java index 4eb3d883f..eabe0350c 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuImportacionNaoFiscal.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuImportacionNaoFiscal.java @@ -26,7 +26,7 @@ public class ItemMenuImportacionNaoFiscal extends DefaultItemMenuSistema { HashMap map = TipoImportacaoFiscal.selecionaTipoImportacao(TipoImportacao.NAO_FISCAL, (HashMap) getArgs()); PantallaUtileria.openWindow("/gui/impressaofiscal/busquedaImportacionFiscal.zul", - Labels.getLabel("busquedaImportacionFiscalController.window.title"), map, desktop); + Labels.getLabel("busquedaImportacionFiscalNaoFiscalController.window.title"), map, desktop); } } diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/relatorios/ItemMenuFiscalRelatorioFinanceiro.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/relatorios/ItemMenuFiscalRelatorioFinanceiro.java index b2c6f5b1d..9876b5c20 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/relatorios/ItemMenuFiscalRelatorioFinanceiro.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/relatorios/ItemMenuFiscalRelatorioFinanceiro.java @@ -27,7 +27,7 @@ public class ItemMenuFiscalRelatorioFinanceiro extends DefaultItemMenuSistema { HashMap map = TipoImportacaoFiscal.selecionaTipoImportacao(TipoImportacao.RELATORIO_FINANCEIRO, (HashMap) getArgs()); PantallaUtileria.openWindow("/gui/impressaofiscal/busquedaImportacionFiscal.zul", - Labels.getLabel("busquedaImportacionFiscalController.window.title"), map, desktop); + Labels.getLabel("busquedaImportacionFiscalRelatorioFinanceiroController.window.title"), map, desktop); } } diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/relatorios/ItemMenuFiscalRelatorioVoucher.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/relatorios/ItemMenuFiscalRelatorioVoucher.java index 26ebc926e..d3f4bbc13 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/relatorios/ItemMenuFiscalRelatorioVoucher.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/relatorios/ItemMenuFiscalRelatorioVoucher.java @@ -27,7 +27,7 @@ public class ItemMenuFiscalRelatorioVoucher extends DefaultItemMenuSistema { HashMap map = TipoImportacaoFiscal.selecionaTipoImportacao(TipoImportacao.RELATORIO_VOUCHER, (HashMap) getArgs()); PantallaUtileria.openWindow("/gui/impressaofiscal/busquedaImportacionFiscal.zul", - Labels.getLabel("busquedaImportacionFiscalController.window.title"), map, desktop); + Labels.getLabel("busquedaImportacionFiscalRelatorioVoucherController.window.title"), map, desktop); } diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 72038f9bb..78ac73372 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -6308,4 +6308,13 @@ editarConexionExcepcionRutaController.btnFechar.tooltiptext=Fechar editarConexionExcepcionRutaController.lbRuta.label=Linha editarConexionExcepcionRutaController.btnPesquisa.label=Pesquisa editarConexionExcepcionRutaController.lbRuta.label=Linha -editarConexionExcepcionRutaController.rutaId.label=Linha ID \ No newline at end of file +editarConexionExcepcionRutaController.rutaId.label=Linha ID + +# Importacion Fiscal +busquedaImportacionFiscalEcfController.window.title=Impressão Fiscal :: ECF +busquedaImportacionFiscalEcfCanceladosController.window.title=Impressão Fiscal :: ECF Cancelados +busquedaImportacionFiscalManualController.window.title=Impressão Fiscal :: Manual +busquedaImportacionFiscalReducaoZController.window.title=Impressão Fiscal :: Redução Z +busquedaImportacionFiscalNaoFiscalController.window.title=Impressão Fiscal :: Não Fiscal +busquedaImportacionFiscalRelatorioFinanceiroController.window.title=Impressão Fiscal :: Relatório Financeiro +busquedaImportacionFiscalRelatorioVoucherController.window.title=Impressão Fiscal :: Relatório Voucher \ No newline at end of file diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 22cfdbf11..0fa0cafde 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -6454,4 +6454,13 @@ editarConexionExcepcionRutaController.btnFechar.tooltiptext=Fechar editarConexionExcepcionRutaController.lbRuta.label=Linha editarConexionExcepcionRutaController.btnPesquisa.label=Pesquisa editarConexionExcepcionRutaController.lbRuta.label=Linha -editarConexionExcepcionRutaController.rutaId.label=Linha ID \ No newline at end of file +editarConexionExcepcionRutaController.rutaId.label=Linha ID + +# Importacion Fiscal +busquedaImportacionFiscalEcfController.window.title=Impressão Fiscal :: ECF +busquedaImportacionFiscalEcfCanceladosController.window.title=Impressão Fiscal :: ECF Cancelados +busquedaImportacionFiscalManualController.window.title=Impressão Fiscal :: Manual +busquedaImportacionFiscalReducaoZController.window.title=Impressão Fiscal :: Redução Z +busquedaImportacionFiscalNaoFiscalController.window.title=Impressão Fiscal :: Não Fiscal +busquedaImportacionFiscalRelatorioFinanceiroController.window.title=Impressão Fiscal :: Relatório Financeiro +busquedaImportacionFiscalRelatorioVoucherController.window.title=Impressão Fiscal :: Relatório Voucher \ No newline at end of file