From 84b2d18236093e31e178786b63fa8a00eb4c8d78 Mon Sep 17 00:00:00 2001 From: wilian Date: Thu, 8 Jun 2017 21:47:49 +0000 Subject: [PATCH] fixes bug #9167 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@69799 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioDevolucaoBilhetes.java | 54 +-- ...RelatorioDevolucaoBilhetesConsolidado.java | 152 ++++++ ...DevolucaoBilhetesConsolidado_es.properties | 21 + ...olucaoBilhetesConsolidado_pt_BR.properties | 21 + .../RelatorioDevolucaoBilhetes_es.properties | 7 +- ...elatorioDevolucaoBilhetes_pt_BR.properties | 7 +- .../RelatorioDevolucaoBilhetes.jasper | Bin 55300 -> 52248 bytes .../RelatorioDevolucaoBilhetes.jrxml | 137 ++---- ...latorioDevolucaoBilhetesConsolidado.jasper | Bin 0 -> 49214 bytes ...elatorioDevolucaoBilhetesConsolidado.jrxml | 442 ++++++++++++++++++ .../utilitarios/DevolucaoBilhetes.java | 27 ++ .../RelatorioDevolucaoBilhetesController.java | 18 +- web/WEB-INF/i3-label_es_MX.label | 25 + web/WEB-INF/i3-label_pt_BR.label | 4 +- .../filtroRelatorioDevolucaoBilhetes.zul | 14 +- 15 files changed, 784 insertions(+), 145 deletions(-) create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetesConsolidado.java create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDevolucaoBilhetesConsolidado_es.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDevolucaoBilhetesConsolidado_pt_BR.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetesConsolidado.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetesConsolidado.jrxml diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java index f5eaf303c..9371c9933 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java @@ -72,40 +72,24 @@ public class RelatorioDevolucaoBilhetes extends Relatorio { while (rset.next()) { DevolucaoBilhetes db = new DevolucaoBilhetes(); - db.setEstado((String) rset.getObject("ESTADO")); db.setAidf((String) rset.getObject("AIDF")); db.setNumFolioSistema((String) rset.getObject("NUMFOLIOSISTEMA")); db.setSerieSubSerie((String) rset.getObject("SERIE_SUBSERIE")); db.setFolio((String) rset.getObject("FOLIO")); db.setUf((String) rset.getObject("UF")); db.setFechorVenta((String) rset.getObject("FECHOR_VENTA")); - db.setEstadoId(rset.getObject("ESTADO_ID") == null ? null : ((BigDecimal) rset.getObject("ESTADO_ID")).intValue()); db.setIcms((BigDecimal) rset.getObject("ICMS")); db.setPrecioBase((BigDecimal) rset.getObject("PRECIOBASE")); db.setPrecioPagado((BigDecimal) rset.getObject("PRECIOPAGADO")); db.setEmpresaId(rset.getObject("EMPRESA_ID") == null ? null : ((BigDecimal) rset.getObject("EMPRESA_ID")).intValue()); db.setEmpresa((String) rset.getObject("NOMB_EMPRESA")); + db.setNumpuntoventa((String) rset.getObject("NUMPUNTOVENTA")); db.setTotalBilhete(rset.getBigDecimal("TOTAL")); BigDecimal valorIcms = BigDecimal.ZERO; valorIcms = db.getPrecioPagado().multiply(db.getIcms().divide(BigDecimal.valueOf(100))); db.setValorIcms(valorIcms); - db.setPorcMunicipal(rset.getObject("PORC_MUNICIPAL") == null ? BigDecimal.ZERO : (BigDecimal) rset.getObject("PORC_MUNICIPAL")); - db.setPorcEstadual(rset.getObject("PORC_ESTADUAL") == null ? BigDecimal.ZERO : (BigDecimal) rset.getObject("PORC_ESTADUAL")); - - boolean isEstadual = ((BigDecimal) rset.getObject("IS_ESTADUAL")).equals(BigDecimal.ZERO) ? false : true; - - BigDecimal estornoMunicipal = BigDecimal.ZERO; - BigDecimal estornoEstadual = BigDecimal.ZERO; - if (isEstadual) { - estornoEstadual = valorIcms.multiply(db.getPorcEstadual().divide(BigDecimal.valueOf(100))); - } else { - estornoMunicipal = valorIcms.multiply(db.getPorcMunicipal().divide(BigDecimal.valueOf(100))); - } - db.setEstornoMunicipal(estornoMunicipal); - db.setEstornoEstadual(estornoEstadual); - lsDev.add(db); } @@ -130,17 +114,14 @@ public class RelatorioDevolucaoBilhetes extends Relatorio { sql.append(" B.PRECIOBASE AS PRECIOBASE, "); sql.append(" E.NOMBEMPRESA AS NOMB_EMPRESA, "); sql.append(" E.EMPRESA_ID AS EMPRESA_ID, "); - sql.append(" EST.ESTADO_ID AS ESTADO_ID, "); - sql.append(" EST.NOMBESTADO AS ESTADO, "); + sql.append(" PTV.NUMPUNTOVENTA AS NUMPUNTOVENTA, "); sql.append(" EST.CVEESTADO AS UF, "); - sql.append(" EI.ICMS AS ICMS, "); + sql.append(" NVL(EI.ICMS,0) AS ICMS, "); sql.append(" TO_CHAR(B.FECHORVENTA, 'DD/MM/YYYY') AS FECHOR_VENTA, "); - sql.append(" CASE WHEN CO.ESTADO_ID <> CD.ESTADO_ID THEN 1 ELSE 0 END IS_ESTADUAL, "); - sql.append(" EI.PORCREDMUNICIPAL AS PORC_MUNICIPAL, "); - sql.append(" EI.PORCREDESTADUAL AS PORC_ESTADUAL, "); sql.append(" NVL(B.PRECIOPAGADO,0) + NVL(B.IMPORTEOUTROS,0) + NVL(B.IMPORTEPEDAGIO,0) + NVL(B.IMPORTESEGURO,0) + NVL(B.IMPORTETAXAEMBARQUE,0) AS TOTAL "); sql.append("FROM BOLETO B "); - sql.append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = B.MARCA_ID "); + sql.append("INNER JOIN MARCA M ON M.MARCA_ID = B.MARCA_ID AND M.ACTIVO = 1 "); + sql.append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID "); sql.append("INNER JOIN PUNTO_VENTA PTV ON PTV.PUNTOVENTA_ID = B.PUNTOVENTA_ID "); sql.append("INNER JOIN PARADA ORIGEM ON (B.ORIGEN_ID = ORIGEM.PARADA_ID ) "); sql.append("INNER JOIN PARADA DESTINO ON (B.DESTINO_ID = DESTINO.PARADA_ID ) "); @@ -149,11 +130,9 @@ public class RelatorioDevolucaoBilhetes extends Relatorio { sql.append("INNER JOIN ESTADO EST ON EST.ESTADO_ID = CO.ESTADO_ID "); sql.append("LEFT JOIN FISCAL_R4 R4 ON R4.BOLETO_ID = B.BOLETOORIGINAL_ID "); sql.append("LEFT JOIN EMPRESA_IMPOSTO EI ON EST.ESTADO_ID = EI.ESTADO_ID "); - sql.append(" AND EI.EMPRESA_ID = B.MARCA_ID "); + sql.append(" AND EI.EMPRESA_ID = M.EMPRESA_ID "); sql.append(" AND EI.ACTIVO = 1 "); - sql.append("LEFT JOIN AIDF AIDF ON ((AIDF.SERIE = B.NUMSERIEPREIMPRESA OR "); - sql.append(" AIDF.SERIE = SUBSTR(B.NUMSERIEPREIMPRESA,1,INSTR(B.NUMSERIEPREIMPRESA,'-',1)-1)) "); - sql.append(" AND (B.NUMFOLIOPREIMPRESO BETWEEN AIDF.FORMINICIAL AND AIDF.FORMFINAL)) "); + sql.append("LEFT JOIN AIDF AIDF ON AIDF.AIDF_ID = B.AIDF_ID "); sql.append("WHERE B.MOTIVOCANCELACION_ID IN (32,10,99) "); sql.append("AND B.INDSTATUSBOLETO = 'C' "); sql.append("AND B.FECHORVENTA BETWEEN TO_DATE(:DATA_INICIO,'DD/MM/YYYY HH24:MI:SS') AND TO_DATE(:DATA_FINAL,'DD/MM/YYYY HH24:MI:SS') "); @@ -161,24 +140,7 @@ public class RelatorioDevolucaoBilhetes extends Relatorio { sql.append(estados == null ? "" : "AND EST.ESTADO_ID IN (" + estados + ") "); sql.append(puntoVentas == null ? "" : "AND PTV.PUNTOVENTA_ID IN (" + puntoVentas + ") "); sql.append(empresaId == null ? "" : "AND E.EMPRESA_ID IN (" + empresaId + ") "); - sql.append("GROUP BY COALESCE(AIDF.ACFISCAL,SUBSTR(R4.NUMSERIE20, -6, 7)), "); - sql.append(" COALESCE(B.NUMFOLIOSISTEMA, B.NUMOPERACION), "); - sql.append(" CASE WHEN R4.NUMSERIE20 IS NULL THEN B.NUMSERIEPREIMPRESA ELSE NULL END, "); - sql.append(" B.NUMFOLIOPREIMPRESO, "); - sql.append(" B.PRECIOPAGADO, "); - sql.append(" B.PRECIOBASE, "); - sql.append(" E.NOMBEMPRESA, "); - sql.append(" E.EMPRESA_ID, "); - sql.append(" EST.ESTADO_ID, "); - sql.append(" EST.NOMBESTADO, "); - sql.append(" EST.CVEESTADO, "); - sql.append(" EI.ICMS, "); - sql.append(" TO_CHAR(B.FECHORVENTA, 'DD/MM/YYYY'), "); - sql.append(" (CASE WHEN CO.ESTADO_ID <> CD.ESTADO_ID THEN 1 ELSE 0 END), "); - sql.append(" EI.PORCREDMUNICIPAL, "); - sql.append(" EI.PORCREDESTADUAL, "); - sql.append(" NVL(B.PRECIOPAGADO,0) + NVL(B.IMPORTEOUTROS,0) + NVL(B.IMPORTEPEDAGIO,0) + NVL(B.IMPORTESEGURO,0) + NVL(B.IMPORTETAXAEMBARQUE,0) "); - sql.append("ORDER BY NOMB_EMPRESA, ESTADO, FECHOR_VENTA "); + sql.append("ORDER BY NOMB_EMPRESA, FECHOR_VENTA, UF"); return sql.toString(); } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetesConsolidado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetesConsolidado.java new file mode 100644 index 000000000..6e04c1a7c --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetesConsolidado.java @@ -0,0 +1,152 @@ +package com.rjconsultores.ventaboletos.relatorios.impl; + +import java.math.BigDecimal; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.apache.log4j.Logger; + +import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.DevolucaoBilhetes; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; + +import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; + +public class RelatorioDevolucaoBilhetesConsolidado extends Relatorio { + + private static Logger log = Logger.getLogger(RelatorioDevolucaoBilhetesConsolidado.class); + + public RelatorioDevolucaoBilhetesConsolidado(Map parametros, Connection conexao) throws Exception { + super(parametros, conexao); + + this.setCustomDataSource(new DataSource(this) { + @SuppressWarnings("unchecked") + @Override + public void initDados() throws Exception { + + Connection conexao = this.relatorio.getConexao(); + Map parametros = this.relatorio.getParametros(); + + List lsPuntoVenta = parametros.get("PUNTOVENTAS") == null ? new ArrayList() : (ArrayList) parametros.get("PUNTOVENTAS"); + List lsEstado = parametros.get("ESTADOS") == null ? new ArrayList() : (ArrayList) parametros.get("ESTADOS"); + Integer empresaId = parametros.get("EMPRESA_ID") == null ? null : (Integer) parametros.get("EMPRESA_ID"); + + String puntoVentas = null; + for (PuntoVenta pv : lsPuntoVenta) { + if (lsPuntoVenta.indexOf(pv) == 0) { + puntoVentas = "" + pv.getPuntoventaId(); + } else { + puntoVentas += ", " + pv.getPuntoventaId(); + } + } + + String estados = null; + for (Estado e : lsEstado) { + if (lsEstado.indexOf(e) == 0) { + estados = "" + e.getEstadoId(); + } else { + estados += ", " + e.getEstadoId(); + } + } + + String sql = getSql(empresaId, puntoVentas, estados); + log.debug(sql); + + NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql); + ResultSet rset = null; + + stmt.setString("DATA_INICIO", DateUtil.getStringDate(((Timestamp) parametros.get("DATA_INICIO")), "dd/MM/yyyy HH:mm:ss")); + stmt.setString("DATA_FINAL", DateUtil.getStringDate(((Timestamp) parametros.get("DATA_FINAL")), "dd/MM/yyyy HH:mm:ss")); + + rset = stmt.executeQuery(); + + List lsDev = new ArrayList(); + while (rset.next()) { + + DevolucaoBilhetes db = new DevolucaoBilhetes(); + db.setFechorVenta((String) rset.getObject("FECHOR_VENTA")); + db.setIcms((BigDecimal) rset.getObject("ICMS")); + db.setEmpresaId(rset.getObject("EMPRESA_ID") == null ? null : ((BigDecimal) rset.getObject("EMPRESA_ID")).intValue()); + db.setEmpresa((String) rset.getObject("NOMB_EMPRESA")); + db.setNumpuntoventa((String) rset.getObject("NUMPUNTOVENTA")); + db.setNombpuntoventa((String) rset.getObject("NOMBPUNTOVENTA")); + db.setTotalBilhete(rset.getBigDecimal("TOTAL")); + db.setTotalQtdeBilhetes(rset.getInt("TOTAL_QTDE_BILHETE")); + db.setPrecioBase((BigDecimal) rset.getObject("PRECIOBASE")); + db.setPrecioPagado((BigDecimal) rset.getObject("PRECIOPAGADO")); + + BigDecimal valorIcms = BigDecimal.ZERO; + valorIcms = db.getPrecioPagado().multiply(db.getIcms().divide(BigDecimal.valueOf(100))); + db.setValorIcms(valorIcms); + + lsDev.add(db); + } + + setLsDadosRelatorio(lsDev); + } + }); + + } + + public void setLsDadosRelatorio(List lsDev) { + this.setCollectionDataSource(new JRBeanCollectionDataSource(lsDev)); + } + + private String getSql(Integer empresaId, String puntoVentas, String estados) { + + StringBuilder sql = new StringBuilder(); + sql.append("SELECT E.NOMBEMPRESA AS NOMB_EMPRESA, "); + sql.append(" E.EMPRESA_ID AS EMPRESA_ID, "); + sql.append(" PTV.NUMPUNTOVENTA AS NUMPUNTOVENTA, "); + sql.append(" PTV.NOMBPUNTOVENTA AS NOMBPUNTOVENTA, "); + sql.append(" NVL(EI.ICMS,0) AS ICMS, "); + sql.append(" TO_CHAR(B.FECHORVENTA, 'DD/MM/YYYY') AS FECHOR_VENTA, "); + sql.append(" SUM(NVL(B.PRECIOBASE,0)) AS PRECIOBASE, "); + sql.append(" SUM(NVL(B.PRECIOPAGADO,0)) AS PRECIOPAGADO, "); + sql.append(" SUM(NVL(B.PRECIOPAGADO,0) + NVL(B.IMPORTEOUTROS,0) + NVL(B.IMPORTEPEDAGIO,0) + NVL(B.IMPORTESEGURO,0) + NVL(B.IMPORTETAXAEMBARQUE,0)) AS TOTAL, "); + sql.append(" COUNT(COALESCE(B.NUMFOLIOSISTEMA, B.NUMOPERACION)) AS TOTAL_QTDE_BILHETE "); + sql.append("FROM BOLETO B "); + sql.append("INNER JOIN MARCA M ON M.MARCA_ID = B.MARCA_ID AND M.ACTIVO = 1 "); + sql.append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID "); + sql.append("INNER JOIN PUNTO_VENTA PTV ON PTV.PUNTOVENTA_ID = B.PUNTOVENTA_ID "); + sql.append("INNER JOIN PARADA ORIGEM ON (B.ORIGEN_ID = ORIGEM.PARADA_ID ) "); + sql.append("INNER JOIN PARADA DESTINO ON (B.DESTINO_ID = DESTINO.PARADA_ID ) "); + sql.append("INNER JOIN CIUDAD CO ON (CO.CIUDAD_ID = ORIGEM.CIUDAD_ID ) "); + sql.append("INNER JOIN CIUDAD CD ON (CD.CIUDAD_ID = DESTINO.CIUDAD_ID ) "); + sql.append("INNER JOIN ESTADO EST ON EST.ESTADO_ID = CO.ESTADO_ID "); + sql.append("LEFT JOIN FISCAL_R4 R4 ON R4.BOLETO_ID = B.BOLETOORIGINAL_ID "); + sql.append("LEFT JOIN EMPRESA_IMPOSTO EI ON EST.ESTADO_ID = EI.ESTADO_ID "); + sql.append(" AND EI.EMPRESA_ID = M.EMPRESA_ID "); + sql.append(" AND EI.ACTIVO = 1 "); + sql.append("LEFT JOIN AIDF AIDF ON AIDF.AIDF_ID = B.AIDF_ID "); + sql.append("WHERE B.MOTIVOCANCELACION_ID IN (32,10,99) "); + sql.append("AND B.INDSTATUSBOLETO = 'C' "); + sql.append("AND B.FECHORVENTA BETWEEN TO_DATE(:DATA_INICIO,'DD/MM/YYYY HH24:MI:SS') AND TO_DATE(:DATA_FINAL,'DD/MM/YYYY HH24:MI:SS') "); + sql.append("AND B.CATEGORIA_ID NOT IN (SELECT VALORCONSTANTE FROM CONSTANTE WHERE NOMBCONSTANTE = 'GRATUIDADE_CRIANCA') "); + sql.append(estados == null ? "" : "AND EST.ESTADO_ID IN (" + estados + ") "); + sql.append(puntoVentas == null ? "" : "AND PTV.PUNTOVENTA_ID IN (" + puntoVentas + ") "); + sql.append(empresaId == null ? "" : "AND E.EMPRESA_ID IN (" + empresaId + ") "); + sql.append("GROUP BY E.NOMBEMPRESA, "); + sql.append(" E.EMPRESA_ID, "); + sql.append(" PTV.NUMPUNTOVENTA, "); + sql.append(" PTV.NOMBPUNTOVENTA, "); + sql.append(" NVL(EI.ICMS,0), "); + sql.append(" TO_CHAR(B.FECHORVENTA, 'DD/MM/YYYY') "); + sql.append("ORDER BY NOMB_EMPRESA, FECHOR_VENTA "); + + return sql.toString(); + } + + @Override + protected void processaParametros() throws Exception { + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDevolucaoBilhetesConsolidado_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDevolucaoBilhetesConsolidado_es.properties new file mode 100644 index 000000000..e0124ec2b --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDevolucaoBilhetesConsolidado_es.properties @@ -0,0 +1,21 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. + +#labels +label.titulo=Relatório de Devolução de Bilhetes Consolidado +label.periodo=Período: +label.ate=até +label.filtros=Fitros: +label.aidf=AIDF(Bilhetes Manuais) +label.serieSubs=Série/Subs.(ECF) +label.numero=Número +label.vrContabil=Vr. Contábil +label.baseCalc=Base Calc. +label.aliquota=Alíquota +label.icms=ICMS +label.pagina=Página: +label.total=Total +label.qtdeBilhetes=Quantidade de Bilhetes +label.totalBilhete=Total Bilhete +label.numpuntoventa=Nº Agência +label.nombpuntoventa=Agência \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDevolucaoBilhetesConsolidado_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDevolucaoBilhetesConsolidado_pt_BR.properties new file mode 100644 index 000000000..e0124ec2b --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDevolucaoBilhetesConsolidado_pt_BR.properties @@ -0,0 +1,21 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. + +#labels +label.titulo=Relatório de Devolução de Bilhetes Consolidado +label.periodo=Período: +label.ate=até +label.filtros=Fitros: +label.aidf=AIDF(Bilhetes Manuais) +label.serieSubs=Série/Subs.(ECF) +label.numero=Número +label.vrContabil=Vr. Contábil +label.baseCalc=Base Calc. +label.aliquota=Alíquota +label.icms=ICMS +label.pagina=Página: +label.total=Total +label.qtdeBilhetes=Quantidade de Bilhetes +label.totalBilhete=Total Bilhete +label.numpuntoventa=Nº Agência +label.nombpuntoventa=Agência \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDevolucaoBilhetes_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDevolucaoBilhetes_es.properties index e51922a63..20e688f11 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDevolucaoBilhetes_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDevolucaoBilhetes_es.properties @@ -2,6 +2,7 @@ msg.noData=Não foi possivel obter dados com os parâmetros informados. #labels +label.titulo=Relatório de Devolução de Bilhetes label.periodo=Período: label.ate=até label.filtros=Fitros: @@ -14,6 +15,8 @@ label.aliquota=Al label.icms=ICMS label.pagina=Página: label.total=Total -label.qtdeBilhetes=Quantidade de Bilhetes: +label.qtdeBilhetes=Quantidade de Bilhetes label.totalBilhete=Total Bilhete -label.numeroBilhete=Nº Bilhete \ No newline at end of file +label.numeroBilhete=Nº Bilhete +label.numpuntoventa=Nº Agência +label.uf=UF \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDevolucaoBilhetes_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDevolucaoBilhetes_pt_BR.properties index e51922a63..20e688f11 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDevolucaoBilhetes_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDevolucaoBilhetes_pt_BR.properties @@ -2,6 +2,7 @@ msg.noData=Não foi possivel obter dados com os parâmetros informados. #labels +label.titulo=Relatório de Devolução de Bilhetes label.periodo=Período: label.ate=até label.filtros=Fitros: @@ -14,6 +15,8 @@ label.aliquota=Al label.icms=ICMS label.pagina=Página: label.total=Total -label.qtdeBilhetes=Quantidade de Bilhetes: +label.qtdeBilhetes=Quantidade de Bilhetes label.totalBilhete=Total Bilhete -label.numeroBilhete=Nº Bilhete \ No newline at end of file +label.numeroBilhete=Nº Bilhete +label.numpuntoventa=Nº Agência +label.uf=UF \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jasper index fe7d01e219193e859bc40beb3fba7945bfcb5496..3e9d30dc7088cda2cbf11da12d30bcbba90b854b 100644 GIT binary patch literal 52248 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
  • z{p`N#h!^#3RHxACV8p|9SQ(8rr5^c74Aef6eP-oK z^`?ZrdQ(ClZ{RIV!V00U-ZF(gVKq?bOWL?XU%e@zuili92XT2kud^2NvVhP9lZYpvkxtP}Zq>m+`q zbqe2Xoyu>p*6`b{Gx=8Q9KHi0_(AJ@{)DxTKW$yaU$8FbFGC!^X#S8?1cmMyr?gOKXsIi#6D~!y0bgX^phDTjQ;}t%=rsR*AL4DzhH4j<;$mtF1F6(WCzGJ;& zy>ESGePDfS{oM{*AKUrXXZ8T=b9<2WFMF8vZ+p1)tv$~A&K_@D_GH_(OYH7;l^wQc z+7Ww!-P5kO``AnDzIKZ}z&^_!Xs@;Rv@fv-+w1Ki_9lB@dyBol{e*ph{j@#Oe#stX zziJoS@7QDPzuJe|pCH%I?8EJ^?IY~(?4zA-_AyQmyTs{lPjLp?)0}5R0i zoP+HeXS`kOOtj}XlkFclCH4a6So=7q%8oj-?S;-(H?CV0z-Wam&Eunn-hEOm2=FlMfm!ZM-?V(}z9iid& zw$M0xduY6UZ)mc8U#P@>FjQqf6q;#28d_lgCRA@f8Cqmxl9~VZe?tF%LfoXbp|9SQ&{uCt=wq^k6cQ!$)teIfDy9

    P-oK`Iag4DTj2Suj1w=^bz_09icDr z=?Z=I_J6|CC#(hveMuWv=&Ls+^wpaZ`s%Gyp>My&EcFeGA$}!n*3AyKmpHxn z?M`pL)xo3+Y}f~#-C?s1;!it!@fV!EVW$q|Z#w(&x1HhqV`l_x(S!K6&cU!h$HLwm zXZ3O>Sc9CytijGCYq)cyHPV@EjdzNyiB73i;*?os&UEW|=U6N1R9nr?3@hQ(S*x8{ z*2&IX>nvxUwbnV_y2Pos);kT>Ca2Nb;w-lAaN^coPK))T(`voqB(1NUcI#V+$gs20 z&Ua3-2RJ9&gPc?CVGx(Yoipum&QI;}&RTo2^D~I#br8W9*fX7rA$BjZ>z&K(CC(Lg zi*t>AmUFGW*4boV;%tVvywTp|{KDSi++sfg(fYJ=r~Q(%)qd5v+kVISmHk(U*-xDN z?a!QF+h02m+uu2lIo+JcogU89PJidO&OqlmXCLSH&QRw?XQcCzbFlN8Gv4{5Gtqg& zne4pjlsNA=$2#viRn7;_Z0B#zT<2pa>U`ofI-fhu&KFL?`M0ye`N~=CeCM3zeDACY z+0MF<<6IaDJ6DH#I2%Geots0woLfVEoqIz4oE@Qo&f}roou@*BofkuUIj@BFb>0pQ zb>0gd;Cvby?tBp%6=I=-LUw3OC_gkd)GIVTG$=G7G&pobXjo`cXn5$D5Nv#ePJvq* zDhZW`szTF4GvO`>Rfp - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/DevolucaoBilhetes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/DevolucaoBilhetes.java index 2e0450546..e5fdb896c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/DevolucaoBilhetes.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/DevolucaoBilhetes.java @@ -18,12 +18,15 @@ public class DevolucaoBilhetes { private BigDecimal icms; private BigDecimal valorIcms; private String fechorVenta; + private String numpuntoventa; + private String nombpuntoventa; BigDecimal porcMunicipal; BigDecimal porcEstadual; BigDecimal estornoMunicipal; BigDecimal estornoEstadual; private BigDecimal totalBilhete; + private Integer totalQtdeBilhetes; public String getAidf() { return aidf; @@ -177,4 +180,28 @@ public class DevolucaoBilhetes { this.totalBilhete = totalBilhete; } + public String getNumpuntoventa() { + return numpuntoventa; + } + + public void setNumpuntoventa(String numpuntoventa) { + this.numpuntoventa = numpuntoventa; + } + + public Integer getTotalQtdeBilhetes() { + return totalQtdeBilhetes; + } + + public void setTotalQtdeBilhetes(Integer totalQtdeBilhetes) { + this.totalQtdeBilhetes = totalQtdeBilhetes; + } + + public String getNombpuntoventa() { + return nombpuntoventa; + } + + public void setNombpuntoventa(String nombpuntoventa) { + this.nombpuntoventa = nombpuntoventa; + } + } diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDevolucaoBilhetesController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDevolucaoBilhetesController.java index 21f1c287d..3db3f0c01 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDevolucaoBilhetesController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDevolucaoBilhetesController.java @@ -24,14 +24,15 @@ import org.zkoss.zul.Combobox; import org.zkoss.zul.Comboitem; import org.zkoss.zul.Datebox; import org.zkoss.zul.Paging; +import org.zkoss.zul.Radio; import org.zkoss.zul.Textbox; import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.Estado; import com.rjconsultores.ventaboletos.entidad.PuntoVenta; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioDevolucaoBilhetes; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioDevolucaoBilhetesConsolidado; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; -import com.rjconsultores.ventaboletos.service.EmpresaService; import com.rjconsultores.ventaboletos.service.EstadoService; import com.rjconsultores.ventaboletos.utilerias.DateUtil; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; @@ -56,8 +57,6 @@ public class RelatorioDevolucaoBilhetesController extends MyGenericForwardCompos @Autowired private EstadoService estadoService; @Autowired - private EmpresaService empresaService; - @Autowired private DataSource dataSourceRead; @Autowired private transient PagedListWrapper plwPuntoVenta; @@ -76,6 +75,9 @@ public class RelatorioDevolucaoBilhetesController extends MyGenericForwardCompos private Combobox cmbPuntoVenta; private Datebox datInicial; private Datebox datFinal; + + private Radio rAnalitico; + private Radio rConsolidado; private void executarPesquisa() { HibernateSearchObject puntoVentaBusqueda = new HibernateSearchObject(PuntoVenta.class, @@ -106,7 +108,6 @@ public class RelatorioDevolucaoBilhetesController extends MyGenericForwardCompos parametros.put("DATA_INICIO", new Timestamp((DateUtil.inicioFecha((java.util.Date) this.datInicial.getValue()).getTime()))); parametros.put("DATA_FINAL", new Timestamp((DateUtil.fimFecha((java.util.Date) this.datFinal.getValue()).getTime()))); - parametros.put("NOME_RELATORIO", Labels.getLabel("relatorioDevolucaoBilhetesAgenciaController.window.title")); parametros.put("USUARIO", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString()); filtro.append("Agência(s): "); @@ -143,7 +144,12 @@ public class RelatorioDevolucaoBilhetesController extends MyGenericForwardCompos parametros.put("FILTROS", filtro.toString()); - Relatorio relatorio = new RelatorioDevolucaoBilhetes(parametros, dataSourceRead.getConnection()); + Relatorio relatorio = null; + if(rAnalitico.isChecked()) { + relatorio = new RelatorioDevolucaoBilhetes(parametros, dataSourceRead.getConnection()); + } else if(rConsolidado.isChecked()) { + relatorio = new RelatorioDevolucaoBilhetesConsolidado(parametros, dataSourceRead.getConnection()); + } Map args = new HashMap(); args.put("relatorio", relatorio); @@ -155,7 +161,7 @@ public class RelatorioDevolucaoBilhetesController extends MyGenericForwardCompos @Override public void doAfterCompose(Component comp) throws Exception { lsEstado = estadoService.obtenerTodos(); - lsEmpresa = empresaService.obtenerTodos(); + lsEmpresa = UsuarioLogado.getUsuarioLogado().getEmpresa(); super.doAfterCompose(comp); diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 51fbb59c4..089e43ef8 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -512,6 +512,31 @@ busquedaImpressaoRMDController.labelRadio.radECF = ECF busquedaImpressaoRMDController.select.RMD = É necessario selecionar um RMD busquedaImpressaoRMDController.MSG.gravarRMDPergunta = Deseja gravar nos registros de vendas, o vínculo com o numero de RMD selecionado? +#Devolução de Bilhetes +relatorioDevolucaoBilhetesAgenciaController.window.title = Relatório de Devolução de Bilhetes +relatorioDevolucaoBilhetesAgenciaController.lbDataIni.value = Data Inicial +relatorioDevolucaoBilhetesAgenciaController.lbDataFin.value = Data Final +relatorioDevolucaoBilhetesAgenciaController.lbEstado.value = Estado +relatorioDevolucaoBilhetesAgenciaController.lbPuntoVenta.value = Agência +relatorioDevolucaoBilhetesAgenciaController.btnPesquisa.label = Pesquisar +relatorioDevolucaoBilhetesAgenciaController.btnLimpar.label = Limpar Seleção +relatorioDevolucaoBilhetesAgenciaController.puntoVentaSelList.codigo = Código +relatorioDevolucaoBilhetesAgenciaController.puntoVentaSelList.nome = Nome +relatorioDevolucaoBilhetesAgenciaController.lbEmpresa.value = Empresa +relatorioDevolucaoBilhetesAgenciaController.chkDesconsideraMes.label = Desconsiderar devoluções no mês/ano da emissão +relatorioDevolucaoBilhetesAgenciaController.rdIndDataBase.label = Periodo com base na data de: +relatorioDevolucaoBilhetesAgenciaController.rdIndDataBase.cmbItemEmissao = Emissão +relatorioDevolucaoBilhetesAgenciaController.rdIndDataBase.cmbItemDevolucao = Devolução +relatorioDevolucaoBilhetesAgenciaController.rdIndAgrupamento.label = Agrupado por: +relatorioDevolucaoBilhetesAgenciaController.rdIndAgrupamento.cmbItemData = Data +relatorioDevolucaoBilhetesAgenciaController.rdIndAgrupamento.cmbItemLocalidade = Localidade +relatorioDevolucaoBilhetesAgenciaController.rdIndTpoRelatorio.label = Tipo de Relatório: +relatorioDevolucaoBilhetesAgenciaController.rdIndTpoRelatorio.cmbItemData = Bilhetes Devolvidos +relatorioDevolucaoBilhetesAgenciaController.rdIndTpoRelatorio.cmbItemLocalidade = GAPs Devolvidos +relatorioDevolucaoBilhetesAgenciaController.tipo.lbTipo = Tipo +relatorioDevolucaoBilhetesAgenciaController.tipo.lbAnalitico = Analítico +relatorioDevolucaoBilhetesAgenciaController.tipo.lbConsolidado = Consolidado + #Reporte Acompanhamento Equivalentes relatorioAcompanhamentoEquivalentesController.window.title = Reporte de acompañamiento de equivalentes relatorioAcompanhamentoEquivalentesController.lbMes.value = Mes/Ano diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index bd7378c87..38bc172bd 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -564,7 +564,9 @@ relatorioDevolucaoBilhetesAgenciaController.rdIndAgrupamento.cmbItemLocalidade = relatorioDevolucaoBilhetesAgenciaController.rdIndTpoRelatorio.label = Tipo de Relatório: relatorioDevolucaoBilhetesAgenciaController.rdIndTpoRelatorio.cmbItemData = Bilhetes Devolvidos relatorioDevolucaoBilhetesAgenciaController.rdIndTpoRelatorio.cmbItemLocalidade = GAPs Devolvidos - +relatorioDevolucaoBilhetesAgenciaController.tipo.lbTipo = Tipo +relatorioDevolucaoBilhetesAgenciaController.tipo.lbAnalitico = Analítico +relatorioDevolucaoBilhetesAgenciaController.tipo.lbConsolidado = Consolidado #Relatório Acompanhamento Equivalentes relatorioAcompanhamentoEquivalentesController.window.title = Relatório de Acompanhamento de Equivalentes diff --git a/web/gui/relatorios/filtroRelatorioDevolucaoBilhetes.zul b/web/gui/relatorios/filtroRelatorioDevolucaoBilhetes.zul index 9bac455da..9306e5f71 100644 --- a/web/gui/relatorios/filtroRelatorioDevolucaoBilhetes.zul +++ b/web/gui/relatorios/filtroRelatorioDevolucaoBilhetes.zul @@ -84,7 +84,7 @@ - +
    + + +