From 21338fa5ac161717a4484b9897561200c3358556 Mon Sep 17 00:00:00 2001 From: julio Date: Mon, 4 Jul 2016 12:57:22 +0000 Subject: [PATCH] fixes bug #7629 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@57515 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioAnaliticoVoucher.java | 147 +++++---- .../RelatorioAnaliticoVoucherCancelados.java | 118 ++++++++ ...ioAnaliticoVoucherCancelados_es.properties | 2 + ...naliticoVoucherCancelados_pt_BR.properties | 2 + ...RelatorioAnaliticoVoucherCancelados.jasper | Bin 0 -> 35250 bytes .../RelatorioAnaliticoVoucherCancelados.jrxml | 285 ++++++++++++++++++ .../BusquedaImportacionFiscalController.java | 52 ++++ .../impressaofiscal/TipoImportacaoFiscal.java | 8 +- ...mMenuFiscalRelatorioVoucherCancelados.java | 35 +++ web/WEB-INF/i3-label_es_MX.label | 2 + web/WEB-INF/i3-label_pt_BR.label | 2 + .../busquedaImportacionFiscal.zul | 3 + 12 files changed, 581 insertions(+), 75 deletions(-) create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucherCancelados.java create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAnaliticoVoucherCancelados_es.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAnaliticoVoucherCancelados_pt_BR.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAnaliticoVoucherCancelados.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAnaliticoVoucherCancelados.jrxml create mode 100644 src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/relatorios/ItemMenuFiscalRelatorioVoucherCancelados.java diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucher.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucher.java index f277695ac..1f50abd5c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucher.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucher.java @@ -55,7 +55,7 @@ public class RelatorioAnaliticoVoucher extends Relatorio { fim = DateUtil.fimFecha(fim); NamedParameterStatement stmt = new NamedParameterStatement(getConexao(), getSql()); - + stmt.setTimestamp("dataInicial", new java.sql.Timestamp(inicio.getTime())); stmt.setTimestamp("dataFinal", new java.sql.Timestamp(fim.getTime())); stmt.setInt("empresaId", empresaId); @@ -73,10 +73,10 @@ public class RelatorioAnaliticoVoucher extends Relatorio { item.setEmbarque(rset.getBigDecimal("TAXA_EMBARQUE")); item.setSeguro(rset.getBigDecimal("SEGURO")); item.setQtde(rset.getInt("QTDE")); - + list.add(item); } - + if (!getConexao().isClosed()) getConexao().close(); @@ -85,84 +85,83 @@ public class RelatorioAnaliticoVoucher extends Relatorio { private String getSql() { StringBuilder sQuery = new StringBuilder(); - + /* VENDIDO E IMPRESSO NA MESMA COMPETENCIA */ sQuery.append("SELECT 'VENDIDO E ENTREGUE MESMA COMPETÊNCIA' AS SITUACAO, ") - .append("TO_CHAR(BE.FECHORVENTA,'MM/YYYY') AS COMPETENCIA_ENTREGA, ") - .append("TO_CHAR(B.FECHORVENTA,'MM/YYYY') AS COMPETENCIA_VENDA, ") - .append("SUM(B.PRECIOPAGADO) AS TARIFA, ") - .append("SUM(B.IMPORTEPEDAGIO) AS PEDAGIO, ") - .append("SUM(B.IMPORTESEGURO) AS SEGURO, ") - .append("SUM(B.IMPORTETAXAEMBARQUE) AS TAXA_EMBARQUE, ") - .append("COUNT(B.BOLETO_ID) AS QTDE ") - .append("FROM BOLETO B ") - .append("JOIN BOLETO BE ON B.BOLETO_ID = BE.BOLETOORIGINAL_ID ") - .append(" AND BE.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ") - .append("JOIN FISCAL_R4 R4 ON BE.BOLETO_ID = R4.BOLETO_ID ") - .append("WHERE B.TIPOVENTA_ID IN (5,12,18) ") - .append("AND B.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ") - .append("AND B.EMPRESACORRIDA_ID = :empresaId ") - .append("AND B.INDSTATUSBOLETO = 'V' ") - .append("AND B.MOTIVOCANCELACION_ID = 16 ") - .append("AND BE.INDSTATUSBOLETO = 'E' ") - .append("AND TO_DATE(TO_CHAR(B.FECHORVENTA,'MM/YYYY'),'MM/YYYY') = TO_DATE(TO_CHAR(BE.FECHORVENTA,'MM/YYYY'),'MM/YYYY') ") - .append("GROUP BY 'VENDIDO E ENTREGUE MESMA COMPETÊNCIA', ") - .append(" TO_CHAR(B.FECHORVENTA,'MM/YYYY'), ") - .append(" TO_CHAR(BE.FECHORVENTA,'MM/YYYY') "); - + .append("TO_CHAR(BE.FECHORVENTA,'MM/YYYY') AS COMPETENCIA_ENTREGA, ") + .append("TO_CHAR(B.FECHORVENTA,'MM/YYYY') AS COMPETENCIA_VENDA, ") + .append("SUM(B.PRECIOPAGADO) AS TARIFA, ") + .append("SUM(B.IMPORTEPEDAGIO) AS PEDAGIO, ") + .append("SUM(B.IMPORTESEGURO) AS SEGURO, ") + .append("SUM(B.IMPORTETAXAEMBARQUE) AS TAXA_EMBARQUE, ") + .append("COUNT(B.BOLETO_ID) AS QTDE ") + .append("FROM BOLETO B ") + .append("JOIN BOLETO BE ON B.BOLETO_ID = BE.BOLETOORIGINAL_ID ") + .append(" AND BE.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ") + .append("JOIN FISCAL_R4 R4 ON BE.BOLETO_ID = R4.BOLETO_ID ") + .append("WHERE B.TIPOVENTA_ID IN (5,12,18) ") + .append("AND B.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ") + .append("AND B.EMPRESACORRIDA_ID = :empresaId ") + .append("AND B.INDSTATUSBOLETO = 'V' ") + .append("AND B.MOTIVOCANCELACION_ID = 16 ") + .append("AND BE.INDSTATUSBOLETO = 'E' ") + .append("AND TO_DATE(TO_CHAR(B.FECHORVENTA,'MM/YYYY'),'MM/YYYY') = TO_DATE(TO_CHAR(BE.FECHORVENTA,'MM/YYYY'),'MM/YYYY') ") + .append("GROUP BY 'VENDIDO E ENTREGUE MESMA COMPETÊNCIA', ") + .append(" TO_CHAR(B.FECHORVENTA,'MM/YYYY'), ") + .append(" TO_CHAR(BE.FECHORVENTA,'MM/YYYY') "); + sQuery.append("UNION "); - - /*VENDIDO EM COMPETÊNCIA ANTERIOR*/ + + /* VENDIDO EM COMPETÊNCIA ANTERIOR */ sQuery.append("SELECT 'VENDIDO EM COMPETÊNCIA ANTERIOR' AS SITUACAO, ") - .append("TO_CHAR(BE.FECHORVENTA,'MM/YYYY') AS COMPETENCIA_ENTREGA, ") - .append("TO_CHAR(B.FECHORVENTA,'MM/YYYY') AS COMPETENCIA_VENDA, ") - .append("SUM(B.PRECIOPAGADO) AS TARIFA, ") - .append("SUM(B.IMPORTEPEDAGIO) AS PEDAGIO, ") - .append("SUM(B.IMPORTESEGURO) AS SEGURO, ") - .append("SUM(B.IMPORTETAXAEMBARQUE) AS TAXA_EMBARQUE, ") - .append("COUNT(B.BOLETO_ID) AS QTDE ") - .append("FROM BOLETO B ") - .append("JOIN BOLETO BE ON B.BOLETO_ID = BE.BOLETOORIGINAL_ID ") - .append("JOIN FISCAL_R4 R4 ON BE.BOLETO_ID = R4.BOLETO_ID ") - .append("WHERE B.TIPOVENTA_ID IN (5,12,18) ") - .append("AND BE.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ") - .append("AND BE.EMPRESACORRIDA_ID = :empresaId ") - .append("AND B.INDSTATUSBOLETO = 'V' ") - .append("AND B.MOTIVOCANCELACION_ID = 16 ") - .append("AND BE.INDSTATUSBOLETO = 'E' ") - .append("AND TO_DATE(TO_CHAR(B.FECHORVENTA,'MM/YYYY'),'MM/YYYY') < TO_DATE(TO_CHAR(BE.FECHORVENTA,'MM/YYYY'),'MM/YYYY') ") - .append("GROUP BY 'VENDIDO EM COMPETÊNCIA ANTERIOR', ") - .append(" TO_CHAR(B.FECHORVENTA,'MM/YYYY'), ") - .append(" TO_CHAR(BE.FECHORVENTA,'MM/YYYY') "); - - + .append("TO_CHAR(BE.FECHORVENTA,'MM/YYYY') AS COMPETENCIA_ENTREGA, ") + .append("TO_CHAR(B.FECHORVENTA,'MM/YYYY') AS COMPETENCIA_VENDA, ") + .append("SUM(B.PRECIOPAGADO) AS TARIFA, ") + .append("SUM(B.IMPORTEPEDAGIO) AS PEDAGIO, ") + .append("SUM(B.IMPORTESEGURO) AS SEGURO, ") + .append("SUM(B.IMPORTETAXAEMBARQUE) AS TAXA_EMBARQUE, ") + .append("COUNT(B.BOLETO_ID) AS QTDE ") + .append("FROM BOLETO B ") + .append("JOIN BOLETO BE ON B.BOLETO_ID = BE.BOLETOORIGINAL_ID ") + .append("JOIN FISCAL_R4 R4 ON BE.BOLETO_ID = R4.BOLETO_ID ") + .append("WHERE B.TIPOVENTA_ID IN (5,12,18) ") + .append("AND BE.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ") + .append("AND BE.EMPRESACORRIDA_ID = :empresaId ") + .append("AND B.INDSTATUSBOLETO = 'V' ") + .append("AND B.MOTIVOCANCELACION_ID = 16 ") + .append("AND BE.INDSTATUSBOLETO = 'E' ") + .append("AND TO_DATE(TO_CHAR(B.FECHORVENTA,'MM/YYYY'),'MM/YYYY') < TO_DATE(TO_CHAR(BE.FECHORVENTA,'MM/YYYY'),'MM/YYYY') ") + .append("GROUP BY 'VENDIDO EM COMPETÊNCIA ANTERIOR', ") + .append(" TO_CHAR(B.FECHORVENTA,'MM/YYYY'), ") + .append(" TO_CHAR(BE.FECHORVENTA,'MM/YYYY') "); + sQuery.append("UNION "); - - /*VENDIDO E NÃO ENTREGUE NA COMPETÊNCIA*/ + + /* VENDIDO E NÃO ENTREGUE NA COMPETÊNCIA */ sQuery.append("SELECT 'VENDIDO E NÃO ENTREGUE NA COMPETÊNCIA' AS SITUACAO, ") - .append("'' AS COMPETENCIA_ENTREGA, ") - .append("TO_CHAR(B.FECHORVENTA,'MM/YYYY') AS COMPETENCIA_VENDA, ") - .append("SUM(B.PRECIOPAGADO) AS TARIFA, ") - .append("SUM(B.IMPORTEPEDAGIO) AS PEDAGIO, ") - .append("SUM(B.IMPORTESEGURO) AS SEGURO, ") - .append("SUM(B.IMPORTETAXAEMBARQUE) AS TAXA_EMBARQUE, ") - .append("COUNT(B.BOLETO_ID) AS QTDE ") - .append("FROM BOLETO B ") - .append("LEFT JOIN BOLETO BE ON B.BOLETO_ID = BE.BOLETOORIGINAL_ID ") - .append("WHERE B.TIPOVENTA_ID IN (5,12,18) ") - .append("AND B.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ") - .append("AND B.EMPRESACORRIDA_ID = :empresaId ") - .append("AND B.INDSTATUSBOLETO = 'V' ") - .append("AND (B.MOTIVOCANCELACION_ID IS NULL OR ") - .append(" (B.MOTIVOCANCELACION_ID = 16 ") - .append(" AND BE.INDSTATUSBOLETO = 'E' ") - .append("AND TO_DATE(TO_CHAR(B.FECHORVENTA,'MM/YYYY'),'MM/YYYY') <> TO_DATE(TO_CHAR(BE.FECHORVENTA,'MM/YYYY'),'MM/YYYY')) ") - .append(" ) ") - .append("GROUP BY 'VENDIDO E NÃO ENTREGUE NA COMPETÊNCIA', ") - .append(" TO_CHAR(B.FECHORVENTA,'MM/YYYY') "); - + .append("'' AS COMPETENCIA_ENTREGA, ") + .append("TO_CHAR(B.FECHORVENTA,'MM/YYYY') AS COMPETENCIA_VENDA, ") + .append("SUM(B.PRECIOPAGADO) AS TARIFA, ") + .append("SUM(B.IMPORTEPEDAGIO) AS PEDAGIO, ") + .append("SUM(B.IMPORTESEGURO) AS SEGURO, ") + .append("SUM(B.IMPORTETAXAEMBARQUE) AS TAXA_EMBARQUE, ") + .append("COUNT(B.BOLETO_ID) AS QTDE ") + .append("FROM BOLETO B ") + .append("LEFT JOIN BOLETO BE ON B.BOLETO_ID = BE.BOLETOORIGINAL_ID ") + .append("WHERE B.TIPOVENTA_ID IN (5,12,18) ") + .append("AND B.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ") + .append("AND B.EMPRESACORRIDA_ID = :empresaId ") + .append("AND B.INDSTATUSBOLETO = 'V' ") + .append("AND (B.MOTIVOCANCELACION_ID IS NULL OR ") + .append(" (B.MOTIVOCANCELACION_ID = 16 ") + .append(" AND BE.INDSTATUSBOLETO = 'E' ") + .append("AND TO_DATE(TO_CHAR(B.FECHORVENTA,'MM/YYYY'),'MM/YYYY') <> TO_DATE(TO_CHAR(BE.FECHORVENTA,'MM/YYYY'),'MM/YYYY')) ") + .append(" ) ") + .append("GROUP BY 'VENDIDO E NÃO ENTREGUE NA COMPETÊNCIA', ") + .append(" TO_CHAR(B.FECHORVENTA,'MM/YYYY') "); + sQuery.append("ORDER BY SITUACAO, COMPETENCIA_ENTREGA, COMPETENCIA_VENDA"); - + return sQuery.toString(); } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucherCancelados.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucherCancelados.java new file mode 100644 index 000000000..07c78fe88 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucherCancelados.java @@ -0,0 +1,118 @@ +package com.rjconsultores.ventaboletos.relatorios.impl; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; + +import org.apache.log4j.Logger; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +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.web.utilerias.NamedParameterStatement; + +import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; + +public class RelatorioAnaliticoVoucherCancelados extends Relatorio { + + private static Logger log = Logger.getLogger(RelatorioAnaliticoVoucherCancelados.class); + + List listdata = null; + + public RelatorioAnaliticoVoucherCancelados(final Map parametros, Connection conexao) throws Exception { + super(parametros, conexao); + + this.setCustomDataSource(new DataSource(this) { + @Override + public void initDados() throws Exception { + + try { + Date inicio = (Date) parametros.get("inicio"); + Date fim = (Date) parametros.get("fim"); + Empresa empresa = (Empresa) parametros.get("empresa"); + + listdata = buscarMovimentosAnaliticos(inicio, fim, empresa.getEmpresaId()); + + } catch (SQLException e) { + log.error("", e); + } + } + + }); + + this.setCollectionDataSource(new JRBeanCollectionDataSource(listdata)); + } + + public List buscarMovimentosAnaliticos(Date inicio, Date fim, Integer empresaId) throws SQLException { + + inicio = DateUtil.inicioFecha(inicio); + fim = DateUtil.fimFecha(fim); + + NamedParameterStatement stmt = new NamedParameterStatement(getConexao(), getSql()); + + stmt.setTimestamp("dataInicial", new java.sql.Timestamp(inicio.getTime())); + stmt.setTimestamp("dataFinal", new java.sql.Timestamp(fim.getTime())); + stmt.setInt("empresaId", empresaId); + + ResultSet rset = stmt.executeQuery(); + List list = new ArrayList(); + while (rset.next()) { + ItemRelatorioVoucher item = new ItemRelatorioVoucher(); + + item.setSituacao(rset.getString("SITUACAO")); + // item.setCompetenciaEntrega(rset.getString("COMPETENCIA_ENTREGA")); + item.setCompetenciaVenda(rset.getString("COMPETENCIA_VENDA")); + item.setCompetenciaCancelamento(rset.getString("COMPETENCIA_CANCELAMENTO")); + item.setTarifa(rset.getBigDecimal("TARIFA")); + item.setPedagio(rset.getBigDecimal("PEDAGIO")); + item.setEmbarque(rset.getBigDecimal("TAXA_EMBARQUE")); + item.setSeguro(rset.getBigDecimal("SEGURO")); + item.setQtde(rset.getInt("QTDE")); + + list.add(item); + } + + if (!getConexao().isClosed()) + getConexao().close(); + + return list; + } + + private String getSql() { + + StringBuilder sQuery = new StringBuilder(); + sQuery.append("SELECT 'CANCELADOS NA COMPETÊNCIA' AS SITUACAO, "); + sQuery.append("TO_CHAR(B.FECHORVENTA,'MM/YYYY') AS COMPETENCIA_VENDA, "); + sQuery.append("TO_CHAR(BE.FECHORVENTA,'MM/YYYY') AS COMPETENCIA_CANCELAMENTO, "); + sQuery.append("SUM(B.PRECIOPAGADO) AS TARIFA, "); + sQuery.append("SUM(B.IMPORTEPEDAGIO) AS PEDAGIO, "); + sQuery.append("SUM(B.IMPORTESEGURO) AS SEGURO, "); + sQuery.append("SUM(B.IMPORTETAXAEMBARQUE) AS TAXA_EMBARQUE, "); + sQuery.append("COUNT(B.BOLETO_ID) AS QTDE "); + sQuery.append("FROM BOLETO B "); + sQuery.append("JOIN BOLETO BE ON B.BOLETO_ID = BE.BOLETOORIGINAL_ID "); + sQuery.append("WHERE B.TIPOVENTA_ID IN (5,12,18) "); + sQuery.append("AND BE.FECHORVENTA BETWEEN :dataInicial AND :dataFinal "); + sQuery.append("AND BE.EMPRESACORRIDA_ID = :empresaId "); + sQuery.append("AND B.MOTIVOCANCELACION_ID IN (31,32,10) "); + sQuery.append("AND BE.INDSTATUSBOLETO = 'C' "); + sQuery.append("AND TO_DATE(TO_CHAR(B.FECHORVENTA,'MM/YYYY'),'MM/YYYY') <= TO_DATE(TO_CHAR(BE.FECHORVENTA,'MM/YYYY'),'MM/YYYY') "); + sQuery.append("GROUP BY 'VENDIDO EM COMPETÊNCIA ANTERIOR', "); + sQuery.append(" TO_CHAR(B.FECHORVENTA,'MM/YYYY'), "); + sQuery.append(" TO_CHAR(BE.FECHORVENTA,'MM/YYYY') "); + sQuery.append("ORDER BY SITUACAO, COMPETENCIA_CANCELAMENTO, COMPETENCIA_VENDA "); + + return sQuery.toString(); + } + + @Override + protected void processaParametros() throws Exception { + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAnaliticoVoucherCancelados_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAnaliticoVoucherCancelados_es.properties new file mode 100644 index 000000000..57daa3700 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAnaliticoVoucherCancelados_es.properties @@ -0,0 +1,2 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAnaliticoVoucherCancelados_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAnaliticoVoucherCancelados_pt_BR.properties new file mode 100644 index 000000000..57daa3700 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAnaliticoVoucherCancelados_pt_BR.properties @@ -0,0 +1,2 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAnaliticoVoucherCancelados.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAnaliticoVoucherCancelados.jasper new file mode 100644 index 0000000000000000000000000000000000000000..bada7fc73e92ee17e862233680d4cac22d2a004e GIT binary patch literal 35250 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 d;wHE{Sl|!pr8@Ly`=K;ov#66+HnEZz{a-l|W + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band height="65" splitType="Stretch"> + <textField> + <reportElement x="84" y="40" width="471" height="23" uuid="63ce47a3-7e94-42a2-8325-eceef777fbe2"/> + <textElement verticalAlignment="Middle"/> + <textFieldExpression><![CDATA[$P{nombempresa}]]></textFieldExpression> + </textField> + <staticText> + <reportElement x="0" y="0" width="522" height="20" uuid="2e2e9caa-4076-4209-bdaf-0017ddf83a56"/> + <textElement verticalAlignment="Middle"> + <font size="14" isBold="true"/> + </textElement> + <text><![CDATA[ANALITICO DE VOUCHERS CANCELADOS]]></text> + </staticText> + <textField pattern="dd/MM/yyyy HH:mm"> + <reportElement x="522" y="0" width="279" height="20" uuid="6b4f1375-4f4b-4b80-83b8-7650e62e107e"/> + <textElement textAlignment="Right" verticalAlignment="Middle"> + <font isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> + </textField> + <textField> + <reportElement x="0" y="20" width="80" height="20" uuid="3f1d0681-30be-4c3a-ae90-cf34dd4ede3c"/> + <textElement verticalAlignment="Middle"> + <font isBold="true"/> + </textElement> + <textFieldExpression><![CDATA["Competência: "]]></textFieldExpression> + </textField> + <staticText> + <reportElement x="0" y="40" width="84" height="23" uuid="cf05ce5a-615b-41ac-b24d-2c45ca1bc60e"/> + <textElement verticalAlignment="Middle"> + <font isBold="true"/> + </textElement> + <text><![CDATA[Empresa:]]></text> + </staticText> + <textField pattern="dd/MM/yyyy"> + <reportElement x="80" y="20" width="205" height="20" uuid="7f5ee01d-f86d-49a4-a2a1-f1c671621ef0"/> + <textElement verticalAlignment="Middle"/> + <textFieldExpression><![CDATA[$P{competencia}]]></textFieldExpression> + </textField> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImportacionFiscalController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImportacionFiscalController.java index d15aced5c..783d5c2de 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImportacionFiscalController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImportacionFiscalController.java @@ -36,6 +36,7 @@ import org.zkoss.zul.Textbox; import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioAnaliticoFinanceiro; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioAnaliticoVoucher; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioAnaliticoVoucherCancelados; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioECFReducaoZ; import com.rjconsultores.ventaboletos.relatorios.utilitarios.SaidaRelatorio; import com.rjconsultores.ventaboletos.service.EmpresaService; @@ -78,6 +79,7 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose private Button btnExeRelatorioVoucher; private Button btnExeRelatorioPendenciaEcf; private Button btnExeRelatorioPendenciaReducaoZ; + private Button btnExeRelatorioVoucherCancelados; private Boolean isExibirTipoGeracaoArquivo; private Boolean isExibirCompetencia; @@ -165,6 +167,13 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose btnExeRelatorioPendenciaReducaoZ.setVisible(false); } + boolean isRelatorioVoucherCancelados = Executions.getCurrent().getArg().get("RELATORIO_VOUCHER_CANCELADOS") == null ? Boolean.FALSE : (Boolean) Executions.getCurrent().getArg().get("RELATORIO_VOUCHER_CANCELADOS"); + if (isRelatorioVoucherCancelados) { + btnExeRelatorioVoucherCancelados.setVisible(true); + } else { + btnExeRelatorioVoucherCancelados.setVisible(false); + } + isExibirTipoGeracaoArquivo = (Boolean) Executions.getCurrent().getArg().get("ExibirTipoGeracaoArquivo"); isExibirCompetencia = (Boolean) Executions.getCurrent().getArg().get("ExibirCompetencia"); isExibirDatas = isExibirCompetencia != null ? !isExibirCompetencia : true; @@ -449,6 +458,49 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose } } + @SuppressWarnings({ "unchecked", "rawtypes" }) + public void onClick$btnExeRelatorioVoucherCancelados(Event ev) throws InterruptedException { + try { + Empresa empresa = null; + Comboitem itemEmpresa = cmbEmpresa.getSelectedItem(); + if (itemEmpresa != null) { + empresa = (Empresa) itemEmpresa.getValue(); + } + + txtCompetencia.getValue(); + if (!DateUtil.isCompetenciaValida(txtCompetencia.getValue())) { + Messagebox.show(Labels.getLabel("MSG.Error.invalida.competencia"), + Labels.getLabel("busquedaImportacionFiscalRelatorioVoucherController.window.title"), + Messagebox.OK, Messagebox.ERROR); + + return; + } + + Date dataInicial = DateUtil.getDataInicialCompetencia(txtCompetencia.getValue()); + Date dataFinal = DateUtil.getDataFinalCompetencia(txtCompetencia.getValue()); + + Map parametros = new HashMap(); + parametros.put("competencia", txtCompetencia.getValue()); + parametros.put("inicio", dataInicial); + parametros.put("fim", dataFinal); + parametros.put("empresa", empresa); + parametros.put("nombempresa", empresa.getNombempresa()); + + RelatorioAnaliticoVoucherCancelados relatorio = new RelatorioAnaliticoVoucherCancelados(parametros, dataSourceRead.getConnection()); + + Map args = new HashMap(); + args.put("relatorio", relatorio); + + openWindow("/component/reportView.zul", + Labels.getLabel("busquedaImportacionFiscalRelatorioVoucherCanceladosController.window.title"), args, MODAL); + + } catch (SQLException e) { + log.error(e.getMessage(), e); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + } + @SuppressWarnings({ "unchecked", "rawtypes" }) public void onClick$btnExeRelatorioVoucher(Event ev) throws InterruptedException { try { diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/TipoImportacaoFiscal.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/TipoImportacaoFiscal.java index 4791881a1..be0a3980a 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/TipoImportacaoFiscal.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/TipoImportacaoFiscal.java @@ -5,7 +5,7 @@ import java.util.HashMap; public class TipoImportacaoFiscal { public enum TipoImportacao { - ECF_RED_Z, ECF, ECF_CANCELADOS, MANUAL, REDUCAO_Z, NAO_FISCAL, RELATORIO_FINANCEIRO, RELATORIO_VOUCHER, PENDENCIA_ECF, PENDENCIA_REDUCAO_Z; + ECF_RED_Z, ECF, ECF_CANCELADOS, MANUAL, REDUCAO_Z, NAO_FISCAL, RELATORIO_FINANCEIRO, RELATORIO_VOUCHER, PENDENCIA_ECF, PENDENCIA_REDUCAO_Z, RELATORIO_VOUCHER_CANCELADOS; } public static HashMap selecionaTipoImportacao(TipoImportacao tipo, HashMap map) { @@ -19,6 +19,8 @@ public class TipoImportacaoFiscal { map.remove(TipoImportacao.RELATORIO_FINANCEIRO.toString()); map.remove(TipoImportacao.RELATORIO_VOUCHER.toString()); map.remove(TipoImportacao.PENDENCIA_ECF.toString()); + map.remove(TipoImportacao.PENDENCIA_REDUCAO_Z.toString()); + map.remove(TipoImportacao.RELATORIO_VOUCHER_CANCELADOS.toString()); if (tipo.equals(TipoImportacao.ECF_RED_Z)) { map.put(TipoImportacao.ECF_RED_Z.toString(), Boolean.TRUE); @@ -60,6 +62,10 @@ public class TipoImportacaoFiscal { map.put(TipoImportacao.PENDENCIA_REDUCAO_Z.toString(), Boolean.TRUE); } + if (tipo.equals(TipoImportacao.RELATORIO_VOUCHER_CANCELADOS)) { + map.put(TipoImportacao.RELATORIO_VOUCHER_CANCELADOS.toString(), Boolean.TRUE); + } + return map; } diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/relatorios/ItemMenuFiscalRelatorioVoucherCancelados.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/relatorios/ItemMenuFiscalRelatorioVoucherCancelados.java new file mode 100644 index 000000000..d8d97f796 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/relatorios/ItemMenuFiscalRelatorioVoucherCancelados.java @@ -0,0 +1,35 @@ +package com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.impressaofiscal.relatorios; + +import java.util.HashMap; + +import org.zkoss.util.resource.Labels; + +import com.rjconsultores.ventaboletos.web.utilerias.PantallaUtileria; +import com.rjconsultores.ventaboletos.web.utilerias.menu.DefaultItemMenuSistema; +import com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.impressaofiscal.TipoImportacaoFiscal; +import com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.impressaofiscal.TipoImportacaoFiscal.TipoImportacao; + +public class ItemMenuFiscalRelatorioVoucherCancelados extends DefaultItemMenuSistema { + + public ItemMenuFiscalRelatorioVoucherCancelados() { + super("indexController.mniRelatorioVoucherCancelados.label"); + } + + @Override + public String getClaveMenu() { + return "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.IMPRESSAOFISCAL.MENU.IMPORTACIONFISCAL"; + } + + @Override + public void ejecutar() { + + @SuppressWarnings("unchecked") + HashMap map = TipoImportacaoFiscal.selecionaTipoImportacao(TipoImportacao.RELATORIO_VOUCHER_CANCELADOS, (HashMap) getArgs()); + map.put("ExibirCompetencia", true); + + PantallaUtileria.openWindow("/gui/impressaofiscal/busquedaImportacionFiscal.zul", + Labels.getLabel("busquedaImportacionFiscalRelatorioVoucherCanceladosController.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 88e0f7453..cbe6774f9 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -286,6 +286,7 @@ indexController.mniRelatorioVoucher.label=Voucher indexController.mniImportacionFiscalPendenciaEcf.label=Pendência ECF indexController.mniImportacionFiscalPendenciaReducaoZ.label=Pendência Redução Z indexController.mniImportacionFiscalEcfReducaoZ.label=ECF Integrado Redução Z +indexController.mniRelatorioVoucherCancelados.label=Voucher Cancelados indexController.mniSubMenuClientePacote.label=Paquete indexController.mniManutencaoPacote.label=Mantenimiento Paquete @@ -6470,6 +6471,7 @@ busquedaImportacionFiscalRelatorioVoucherController.window.title=Impressão Fisc busquedaImportacionFiscalEcfPendenciaController.window.title=Impressão Fiscal :: Pendência ECF busquedaImportacionFiscalEcfPendenciaReducaoZController.window.title=Impressão Fiscal :: Pendência Redução Z busquedaImportacionFiscalEcfReducaoZController.window.title=Impressão Fiscal :: ECF Integrado c/ Redução Z +busquedaImportacionFiscalRelatorioVoucherCanceladosController.window.title=Impressão Fiscal :: Relatório Voucher Cancelados #OCD busquedaOCDParamController.empresa.label=Empresa diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index a617f17f6..fc098090c 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -292,6 +292,7 @@ indexController.mniRelatorioVoucher.label=Voucher indexController.mniImportacionFiscalPendenciaEcf.label=Pendência ECF indexController.mniImportacionFiscalPendenciaReducaoZ.label=Pendência Redução Z indexController.mniImportacionFiscalEcfReducaoZ.label=ECF Integrado Redução Z +indexController.mniRelatorioVoucherCancelados.label=Voucher Cancelados indexController.mniSubMenuClientePacote.label=Pacote indexController.mniManutencaoPacote.label=Manutenção Pacote @@ -6633,6 +6634,7 @@ busquedaImportacionFiscalRelatorioVoucherController.window.title=Impressão Fisc busquedaImportacionFiscalEcfPendenciaController.window.title=Impressão Fiscal :: Pendência ECF busquedaImportacionFiscalEcfPendenciaReducaoZController.window.title=Impressão Fiscal :: Pendência Redução Z busquedaImportacionFiscalEcfReducaoZController.window.title=Impressão Fiscal :: ECF Integrado c/ Redução Z +busquedaImportacionFiscalRelatorioVoucherCanceladosController.window.title=Impressão Fiscal :: Relatório Voucher Cancelados # Relatorio Conferencia Formulario Fisico relatorioConferenciaFormularioFisicoController.lbDataIni.value = Data Inicial diff --git a/web/gui/impressaofiscal/busquedaImportacionFiscal.zul b/web/gui/impressaofiscal/busquedaImportacionFiscal.zul index a5c38e367..8cf7376c4 100644 --- a/web/gui/impressaofiscal/busquedaImportacionFiscal.zul +++ b/web/gui/impressaofiscal/busquedaImportacionFiscal.zul @@ -100,6 +100,9 @@