From 84597a04237538db91f00ad9b6e381642d58db59 Mon Sep 17 00:00:00 2001 From: wilian Date: Wed, 29 Jul 2015 20:10:34 +0000 Subject: [PATCH] fixes bug #6518 fixes bug #6519 fixes bug #6508 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@46436 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioVendasPacotesBoletos.java | 240 ++++++++++++++---- .../impl/RelatorioVendasPacotesDetalhado.java | 39 ++- ...ndasPacotesBoletosItemTotais_es.properties | 3 + ...sPacotesBoletosItemTotais_pt_BR.properties | 3 + ...elatorioVendasPacotesBoletos_es.properties | 8 +- ...torioVendasPacotesBoletos_pt_BR.properties | 8 +- ...atorioVendasPacotesDetalhado_es.properties | 9 +- ...rioVendasPacotesDetalhado_pt_BR.properties | 9 +- .../RelatorioVendaPacoteVoucher.jasper | Bin 52592 -> 52703 bytes .../RelatorioVendaPacoteVoucher.jrxml | 11 +- .../RelatorioVendasPacotesBoletos.jasper | Bin 25718 -> 32391 bytes .../RelatorioVendasPacotesBoletos.jrxml | 84 +++++- ...torioVendasPacotesBoletosItemTotais.jasper | Bin 0 -> 34584 bytes ...atorioVendasPacotesBoletosItemTotais.jrxml | 156 ++++++++++++ .../RelatorioVendasPacotesDetalhado.jasper | Bin 26180 -> 28891 bytes .../RelatorioVendasPacotesDetalhado.jrxml | 28 +- ...RelatorioVendasPacotesDetalhadoItem.jasper | Bin 37898 -> 37947 bytes .../RelatorioVendasPacotesDetalhadoItem.jrxml | 15 +- .../relatorios/utilitarios/Relatorio.java | 2 +- .../RelatorioVendasPacotesBoletosBean.java | 100 +++++++- .../EditarAutobusController.java | 14 +- ...latorioVendasPacotesBoletosController.java | 129 +++++++++- ...torioVendasPacotesDetalhadoController.java | 94 +++++++ .../web/utilerias/MyComboboxEmpresa.java | 2 +- .../web/utilerias/MyComboboxUsuario.java | 120 +++++++++ web/WEB-INF/i3-label_es_MX.label | 10 + web/WEB-INF/i3-label_pt_BR.label | 10 + web/gui/esquema_operacional/editarAutobus.zul | 6 + .../filtroRelatorioVendasPacotesBoletos.zul | 56 +++- .../filtroRelatorioVendasPacotesDetalhado.zul | 42 +++ 30 files changed, 1110 insertions(+), 88 deletions(-) create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesBoletosItemTotais_es.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesBoletosItemTotais_pt_BR.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletosItemTotais.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletosItemTotais.jrxml create mode 100644 src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxUsuario.java diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesBoletos.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesBoletos.java index c46a73a4b..a78c900b5 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesBoletos.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesBoletos.java @@ -16,6 +16,7 @@ import org.apache.log4j.Logger; import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioVendasPacotesBoletosBean; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioVendasPacotesBoletosBean.RelatorioVendasPacotesBoletosItemBean; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; public class RelatorioVendasPacotesBoletos extends Relatorio { @@ -29,24 +30,37 @@ public class RelatorioVendasPacotesBoletos extends Relatorio { private Date fecInicio; private Date fecFinal; private Integer empresaId; - + private Integer origenId; + private Integer destinoId; + private Integer usuarioId; + private Integer tipoTarifaPacoteId; + public RelatorioVendasPacotesBoletos(Map parametros, Connection conexao, final String... nomeSubReporte) throws Exception { super(parametros, conexao); this.setCustomDataSource(new DataSource(this) { + + @Override public void initDados() throws Exception { Map parametros = this.relatorio.getParametros(); fecInicio = new java.sql.Date(sdf.parse(parametros.get("fecInicio").toString()).getTime()); fecFinal = new java.sql.Date(sdf.parse(parametros.get("fecFinal").toString()).getTime()); empresaId = parametros.get("empresaId") != null && !parametros.get("empresaId").equals("null") ? Integer.valueOf(parametros.get("empresaId").toString()) : null; + origenId = parametros.get("origenId") != null && !parametros.get("origenId").equals("null") ? Integer.valueOf(parametros.get("origenId").toString()) : null; + destinoId = parametros.get("destinoId") != null && !parametros.get("destinoId").equals("null") ? Integer.valueOf(parametros.get("destinoId").toString()) : null; + usuarioId = parametros.get("usuarioId") != null && !parametros.get("usuarioId").equals("null") ? Integer.valueOf(parametros.get("usuarioId").toString()) : null; + tipoTarifaPacoteId = parametros.get("tipoTarifaPacoteId") != null && !parametros.get("tipoTarifaPacoteId").equals("null") ? Integer.valueOf(parametros.get("tipoTarifaPacoteId").toString()) : null; Connection conexao = this.relatorio.getConexao(); processarVendasPacote(conexao); + processarVendasPacoteCancelados(conexao); + processarVendasPacoteTotais(); setNomeSubReporte(nomeSubReporte); setLsDadosRelatorio(lsDadosRelatorio); } + }); } @@ -55,22 +69,7 @@ public class RelatorioVendasPacotesBoletos extends Relatorio { NamedParameterStatement stmt = null; try { - String sql = getSqlPacotes(); - - log.info(sql); - - stmt = new NamedParameterStatement(conexao, sql); - - if(fecInicio != null) { - stmt.setDate("fecInicio", fecInicio); - } - if(fecFinal != null) { - stmt.setDate("fecFinal", fecFinal); - } - if (empresaId != null){ - stmt.setInt("empresaId", empresaId); - } - + stmt = carregarNamedParameterStatement(conexao, false); rset = stmt.executeQuery(); if(lsDadosRelatorio == null) { @@ -78,31 +77,14 @@ public class RelatorioVendasPacotesBoletos extends Relatorio { } while (rset.next()) { - RelatorioVendasPacotesBoletosBean relatorioVendasBoletosBean = new RelatorioVendasPacotesBoletosBean(); - relatorioVendasBoletosBean.setDescdestino(rset.getString("destino")); - relatorioVendasBoletosBean.setDescorigen(rset.getString("origem")); + RelatorioVendasPacotesBoletosBean relatorioVendasBoletosBean = carregarRelatorioVendasBoletosBean(rset); + Integer idx = carregarIndice(relatorioVendasBoletosBean); - Integer idx = null; - if(lsDadosRelatorio.contains(relatorioVendasBoletosBean)) { - idx = lsDadosRelatorio.indexOf(relatorioVendasBoletosBean); - relatorioVendasBoletosBean = lsDadosRelatorio.get(idx); + if(idx != null) { + relatorioVendasBoletosBean = lsDadosRelatorio.get(idx); } - RelatorioVendasPacotesBoletosBean.RelatorioVendasPacotesBoletosItemBean relatorioVendasPacotesBoletosItemBean = new RelatorioVendasPacotesBoletosBean().new RelatorioVendasPacotesBoletosItemBean(); - relatorioVendasPacotesBoletosItemBean.setNomconvenio(rset.getString("nomconvenio")); - relatorioVendasPacotesBoletosItemBean.setDesctipotarifa(rset.getString("desctipotarifa")); - relatorioVendasPacotesBoletosItemBean.setQtde(rset.getLong("qtde")); - relatorioVendasPacotesBoletosItemBean.setSimportetaxaembarque(rset.getBigDecimal("simportetaxaembarque")); - relatorioVendasPacotesBoletosItemBean.setSimportepedagio(rset.getBigDecimal("simportepedagio")); - relatorioVendasPacotesBoletosItemBean.setSimporteoutros(rset.getBigDecimal("simporteoutros")); - relatorioVendasPacotesBoletosItemBean.setSimporteseguro(rset.getBigDecimal("simporteseguro")); - relatorioVendasPacotesBoletosItemBean.setSpreciobase(rset.getBigDecimal("spreciobase")); - relatorioVendasPacotesBoletosItemBean.setDesconto(rset.getBigDecimal("desconto")); - - if(relatorioVendasBoletosBean.getRelatorioVendasPacotesBoletosItemBeans() == null) { - relatorioVendasBoletosBean.setRelatorioVendasPacotesBoletosItemBeans(new ArrayList()); - } - relatorioVendasBoletosBean.getRelatorioVendasPacotesBoletosItemBeans().add(relatorioVendasPacotesBoletosItemBean); + relatorioVendasBoletosBean.setRelatorioVendasPacotesBoletosItemBeans(carregarItens(rset, relatorioVendasBoletosBean, relatorioVendasBoletosBean.getRelatorioVendasPacotesBoletosItemBeans())); if(idx != null) { lsDadosRelatorio.set(idx, relatorioVendasBoletosBean); @@ -128,10 +110,130 @@ public class RelatorioVendasPacotesBoletos extends Relatorio { } - protected String getSqlPacotes() { + private List carregarItens(ResultSet rset, RelatorioVendasPacotesBoletosBean relatorioVendasPacotesBoletosBean, List itens) throws SQLException { + RelatorioVendasPacotesBoletosBean.RelatorioVendasPacotesBoletosItemBean relatorioVendasPacotesBoletosItemBean = relatorioVendasPacotesBoletosBean.new RelatorioVendasPacotesBoletosItemBean(); + relatorioVendasPacotesBoletosItemBean.setNomconvenio(rset.getString("nomconvenio")); + relatorioVendasPacotesBoletosItemBean.setDesctipotarifa(rset.getString("desctipotarifa")); + relatorioVendasPacotesBoletosItemBean.setQtde(rset.getLong("qtde")); + relatorioVendasPacotesBoletosItemBean.setSimportetaxaembarque(rset.getBigDecimal("simportetaxaembarque")); + relatorioVendasPacotesBoletosItemBean.setSimportepedagio(rset.getBigDecimal("simportepedagio")); + relatorioVendasPacotesBoletosItemBean.setSimporteoutros(rset.getBigDecimal("simporteoutros")); + relatorioVendasPacotesBoletosItemBean.setSimporteseguro(rset.getBigDecimal("simporteseguro")); + relatorioVendasPacotesBoletosItemBean.setSpreciobase(rset.getBigDecimal("spreciobase")); + relatorioVendasPacotesBoletosItemBean.setDesconto(rset.getBigDecimal("desconto")); + + if(itens == null) { + itens = new ArrayList(); + } + itens.add(relatorioVendasPacotesBoletosItemBean); + + return itens; + } + + private Integer carregarIndice(RelatorioVendasPacotesBoletosBean relatorioVendasBoletosBean) { + Integer idx = null; + if(lsDadosRelatorio.contains(relatorioVendasBoletosBean)) { + idx = lsDadosRelatorio.indexOf(relatorioVendasBoletosBean); + relatorioVendasBoletosBean = lsDadosRelatorio.get(idx); + } + return idx; + } + + private RelatorioVendasPacotesBoletosBean carregarRelatorioVendasBoletosBean(ResultSet rset) throws SQLException { + RelatorioVendasPacotesBoletosBean relatorioVendasPacotesBoletosBean = new RelatorioVendasPacotesBoletosBean(); + relatorioVendasPacotesBoletosBean.setDescdestino(rset.getString("destino")); + relatorioVendasPacotesBoletosBean.setDescorigen(rset.getString("origem")); + relatorioVendasPacotesBoletosBean.setCvedestino(rset.getString("cvedestino")); + relatorioVendasPacotesBoletosBean.setCveorigen(rset.getString("cveorigem")); + /*relatorioVendasPacotesBoletosBean.setTotais(new ArrayList()); + relatorioVendasPacotesBoletosBean.getTotais().add(relatorioVendasPacotesBoletosBean.new RelatorioVendasPacotesBoletosItemTotaisBean("CWB-MOR","ADULTO",2)); + relatorioVendasPacotesBoletosBean.getTotais().add(relatorioVendasPacotesBoletosBean.new RelatorioVendasPacotesBoletosItemTotaisBean("CWB-MOR","CHD",2)); + relatorioVendasPacotesBoletosBean.getTotais().add(relatorioVendasPacotesBoletosBean.new RelatorioVendasPacotesBoletosItemTotaisBean("MOR-CWB","SEGURO",2));*/ + + return relatorioVendasPacotesBoletosBean; + } + + private void processarVendasPacoteCancelados(Connection conexao) { + ResultSet rset = null; + NamedParameterStatement stmt = null; + + try { + stmt = carregarNamedParameterStatement(conexao, true); + rset = stmt.executeQuery(); + + if(lsDadosRelatorio == null) { + lsDadosRelatorio = new ArrayList(); + } + + while (rset.next()) { + RelatorioVendasPacotesBoletosBean relatorioVendasBoletosBean = carregarRelatorioVendasBoletosBean(rset); + Integer idx = carregarIndice(relatorioVendasBoletosBean); + + if(idx != null) { + relatorioVendasBoletosBean = lsDadosRelatorio.get(idx); + } + + relatorioVendasBoletosBean.setRelatorioVendasPacotesBoletosItemBeansCancelados(carregarItens(rset, relatorioVendasBoletosBean, relatorioVendasBoletosBean.getRelatorioVendasPacotesBoletosItemBeansCancelados())); + + if(idx != null) { + lsDadosRelatorio.set(idx, relatorioVendasBoletosBean); + } else { + lsDadosRelatorio.add(relatorioVendasBoletosBean); + } + } + + } catch (Exception e) { + log.error(e.getMessage(), e); + } finally { + try { + if(rset != null) { + rset.close(); + } + if(stmt != null) { + stmt.close(); + } + } catch (SQLException e) { + log.error(e.getMessage(), e); + } + } + + } + + private NamedParameterStatement carregarNamedParameterStatement(Connection conexao, boolean cancelados) throws SQLException { + String sql = getSqlPacotes(cancelados); + log.info(sql); + + NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql); + + if(fecInicio != null) { + stmt.setDate("fecInicio", fecInicio); + } + if(fecFinal != null) { + stmt.setDate("fecFinal", fecFinal); + } + if (empresaId != null){ + stmt.setInt("empresaId", empresaId); + } + if(origenId != null) { + stmt.setInt("origenId", origenId); + } + if(destinoId != null) { + stmt.setInt("destinoId", destinoId); + } + if(usuarioId != null) { + stmt.setInt("usuarioId", usuarioId); + } + if(tipoTarifaPacoteId != null && tipoTarifaPacoteId > 0) { + stmt.setInt("tipoTarifaPacoteId", tipoTarifaPacoteId); + } + + return stmt; + } + + protected String getSqlPacotes(boolean cancelado) { StringBuilder sQuery = new StringBuilder(); - sQuery.append("SELECT ORI.DESCPARADA AS ORIGEM, DES.DESCPARADA AS DESTINO, TVP.NOMCONVENIO, TTP.DESCTIPOTARIFA, ") + sQuery.append("SELECT DES.CVEPARADA AS CVEDESTINO, ORI.CVEPARADA AS CVEORIGEM, ORI.DESCPARADA AS ORIGEM, DES.DESCPARADA AS DESTINO, TVP.NOMCONVENIO, TTP.DESCTIPOTARIFA, ") .append("COUNT(TVP.TARIFAVENDAPACOTE_ID) AS QTDE, SUM(B.IMPORTETAXAEMBARQUE) AS SIMPORTETAXAEMBARQUE, SUM(B.IMPORTEPEDAGIO) AS SIMPORTEPEDAGIO, ") .append("SUM(B.IMPORTEOUTROS) AS SIMPORTEOUTROS, SUM(B.IMPORTESEGURO) AS SIMPORTESEGURO, SUM(B.PRECIOBASE) AS SPRECIOBASE, SUM(B.PRECIOBASE - B.PRECIOPAGADO) AS DESCONTO ") .append("FROM VENDA_PACOTE VP ") @@ -143,14 +245,35 @@ public class RelatorioVendasPacotesBoletos extends Relatorio { .append("LEFT JOIN PARADA ORI ON ORI.PARADA_ID = B.ORIGEN_ID ") .append("LEFT JOIN PARADA DES ON DES.PARADA_ID = B.DESTINO_ID ") .append("WHERE P.ACTIVO = 1 ") - .append("AND B.ACTIVO = 1 ") - .append("AND B.INDSTATUSBOLETO = 'V' ") - .append("AND B.MOTIVOCANCELACION_ID IS NULL "); + .append("AND B.ACTIVO = 1 "); + + if(!cancelado) { + sQuery.append("AND B.INDSTATUSBOLETO = 'V' ") + .append("AND B.MOTIVOCANCELACION_ID IS NULL "); + } else { + sQuery.append("AND B.MOTIVOCANCELACION_ID IS NOT NULL "); + } if(empresaId != null) { sQuery.append("AND P.EMPRESA_ID = :empresaId "); } + if(origenId != null) { + sQuery.append("AND B.ORIGEN_ID = :origenId "); + } + + if(destinoId != null) { + sQuery.append("AND B.DESTINO_ID = :destinoId "); + } + + if(usuarioId != null) { + sQuery.append("AND VP.USUARIO_ID = :usuarioId "); + } + + if(tipoTarifaPacoteId != null && tipoTarifaPacoteId > 0) { + sQuery.append("AND TTP.TIPOTARIFAPACOTE_ID = :tipoTarifaPacoteId "); + } + if(fecInicio != null) { sQuery.append("AND VP.DATAVENDA >= :fecInicio "); } @@ -159,11 +282,36 @@ public class RelatorioVendasPacotesBoletos extends Relatorio { sQuery.append("AND VP.DATAVENDA <= :fecFinal "); } - sQuery.append("GROUP BY ORI.DESCPARADA,DES.DESCPARADA,TVP.NOMCONVENIO,TTP.DESCTIPOTARIFA ") - .append("ORDER BY ORI.DESCPARADA,DES.DESCPARADA,TVP.NOMCONVENIO,TTP.DESCTIPOTARIFA "); + sQuery.append("GROUP BY DES.CVEPARADA,ORI.CVEPARADA,ORI.DESCPARADA,DES.DESCPARADA,TVP.NOMCONVENIO,TTP.DESCTIPOTARIFA ") + .append("ORDER BY DES.CVEPARADA,ORI.CVEPARADA,ORI.DESCPARADA,DES.DESCPARADA,TVP.NOMCONVENIO,TTP.DESCTIPOTARIFA "); return sQuery.toString(); } + + private void processarVendasPacoteTotais() { + List totais = new ArrayList(); + for (RelatorioVendasPacotesBoletosBean relatorioVendasPacotesBoletosBean : lsDadosRelatorio) { + for (RelatorioVendasPacotesBoletosItemBean item : relatorioVendasPacotesBoletosBean.getRelatorioVendasPacotesBoletosItemBeans()) { + RelatorioVendasPacotesBoletosBean.RelatorioVendasPacotesBoletosItemTotaisBean total = relatorioVendasPacotesBoletosBean.new RelatorioVendasPacotesBoletosItemTotaisBean(); + total.setTrecho(relatorioVendasPacotesBoletosBean.getCveorigen()+"-"+relatorioVendasPacotesBoletosBean.getCvedestino()); + total.setCategoria(item.getDesctipotarifa()); + total.setQtde(0l); + Integer idx = null; + if(totais.contains(total)) { + idx = totais.indexOf(total); + total = totais.get(idx); + } + total.setQtde(total.getQtde() + item.getQtde()); + + if(idx == null) { + totais.add(total); + } else { + totais.set(idx, total); + } + } + } + this.parametros.put("totais", totais); + } @Override protected void processaParametros() throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java index 5724d928e..28c46fd13 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java @@ -32,6 +32,10 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio { private Date fecFinal; private Integer empresaId; private Integer pacoteId; + private Integer origenId; + private Integer destinoId; + private Integer usuarioId; + private Integer tipoTarifaPacoteId; public RelatorioVendasPacotesDetalhado(Map parametros, Connection conexao, final String... nomeSubReporte) throws Exception { super(parametros, conexao); @@ -44,6 +48,10 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio { fecFinal = new java.sql.Date(sdf.parse(parametros.get("fecFinal").toString()).getTime()); empresaId = parametros.get("empresaId") != null && !parametros.get("empresaId").equals("null") ? Integer.valueOf(parametros.get("empresaId").toString()) : null; pacoteId = parametros.get("pacoteId") != null && !parametros.get("pacoteId").equals("null") ? Integer.valueOf(parametros.get("pacoteId").toString()) : null; + origenId = parametros.get("origenId") != null && !parametros.get("origenId").equals("null") ? Integer.valueOf(parametros.get("origenId").toString()) : null; + destinoId = parametros.get("destinoId") != null && !parametros.get("destinoId").equals("null") ? Integer.valueOf(parametros.get("destinoId").toString()) : null; + usuarioId = parametros.get("usuarioId") != null && !parametros.get("usuarioId").equals("null") ? Integer.valueOf(parametros.get("usuarioId").toString()) : null; + tipoTarifaPacoteId = parametros.get("tipoTarifaPacoteId") != null && !parametros.get("tipoTarifaPacoteId").equals("null") ? Integer.valueOf(parametros.get("tipoTarifaPacoteId").toString()) : null; Connection conexao = this.relatorio.getConexao(); processarVendasPacote(conexao); @@ -74,10 +82,21 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio { if (empresaId != null && empresaId > 0){ stmt.setInt("empresaId", empresaId); } - if (pacoteId != null && pacoteId > 0){ stmt.setInt("pacoteId", pacoteId); } + if(origenId != null) { + stmt.setInt("origenId", origenId); + } + if(destinoId != null) { + stmt.setInt("destinoId", destinoId); + } + if(usuarioId != null) { + stmt.setInt("usuarioId", usuarioId); + } + if(tipoTarifaPacoteId != null && tipoTarifaPacoteId > 0) { + stmt.setInt("tipoTarifaPacoteId", tipoTarifaPacoteId); + } rset = stmt.executeQuery(); @@ -151,6 +170,8 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio { .append("LEFT JOIN ENDERECO_APANHE EA ON EA.VENDAPACOTE_ID = VP.VENDAPACOTE_ID AND EA.ACTIVO = 1 ") .append("LEFT JOIN CLIENTE_PACOTE CP ON CP.CLIENTEPACOTE_ID = VP.CLIENTEPACOTE_ID ") .append("LEFT JOIN USUARIO U ON U.USUARIO_ID = VP.USUARIO_ID ") + .append("LEFT JOIN PACOTE_TARIFA PT ON PT.PACOTETARIFA_ID = TVP.PACOTETARIFA_ID ") + .append("LEFT JOIN TIPO_TARIFA_PACOTE TTP ON TTP.TIPOTARIFAPACOTE_ID = PT.TIPOTARIFAPACOTE_ID ") .append("WHERE P.ACTIVO = 1 ") .append("AND (B.BOLETO_ID IS NULL OR (B.ACTIVO = 1 AND B.INDSTATUSBOLETO = 'V' AND B.MOTIVOCANCELACION_ID IS NULL)) "); @@ -170,6 +191,22 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio { sQuery.append("AND VP.DATAPACOTE <= :fecFinal "); } + if(origenId != null) { + sQuery.append("AND B.ORIGEN_ID = :origenId "); + } + + if(destinoId != null) { + sQuery.append("AND B.DESTINO_ID = :destinoId "); + } + + if(usuarioId != null) { + sQuery.append("AND VP.USUARIO_ID = :usuarioId "); + } + + if(tipoTarifaPacoteId != null && tipoTarifaPacoteId > 0) { + sQuery.append("AND TTP.TIPOTARIFAPACOTE_ID = :tipoTarifaPacoteId "); + } + sQuery.append("GROUP BY P.PACOTE_ID, VP.VENDAPACOTE_ID, P.NOMPACOTE, VP.NUMOPERACION, VP.DATAVENDA, VP.DATAPACOTE, EA.DESCHOTEL, EA.LOCAL, CP.RAZAO_SOCIAL, U.NOMBUSUARIO, VP.SUBTOTAL, VP.DESCONTO, VP.TOTAL, VP.SITUACAO ") .append("ORDER BY P.NOMPACOTE, VP.DATAPACOTE, VP.DATAVENDA "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesBoletosItemTotais_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesBoletosItemTotais_es.properties new file mode 100644 index 000000000..bb4a63f42 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesBoletosItemTotais_es.properties @@ -0,0 +1,3 @@ +#Labels +label.total=TOTAL +label.trecho=TRECHOS \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesBoletosItemTotais_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesBoletosItemTotais_pt_BR.properties new file mode 100644 index 000000000..bb4a63f42 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesBoletosItemTotais_pt_BR.properties @@ -0,0 +1,3 @@ +#Labels +label.total=TOTAL +label.trecho=TRECHOS \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesBoletos_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesBoletos_es.properties index 7828250ea..41b496b90 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesBoletos_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesBoletos_es.properties @@ -11,5 +11,11 @@ cabecalho.impressorPor=Impressor por: cabecalho.pagina=Página cabecalho.de=de cabecalho.filtros=Filtros: +cabecalho.origem=Origem: +cabecalho.destino=Destino: +cabecalho.usuario=Usuário: +cabecalho.tipoTarifaPacote=Tipo Tarifa: label.empresa=Empresa: -label.trecho=Trecho: \ No newline at end of file +label.trecho=Trecho: +label.cancelados = - CANCELADOS +label.resumo=RESUMO \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesBoletos_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesBoletos_pt_BR.properties index 7828250ea..5af027d30 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesBoletos_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesBoletos_pt_BR.properties @@ -11,5 +11,11 @@ cabecalho.impressorPor=Impressor por: cabecalho.pagina=Página cabecalho.de=de cabecalho.filtros=Filtros: +cabecalho.origem=Origem: +cabecalho.destino=Destino: +cabecalho.usuario=Usuário: +cabecalho.tipoTarifaPacote=Tipo Tarifa: label.empresa=Empresa: -label.trecho=Trecho: \ No newline at end of file +label.trecho=Trecho: +label.cancelados=- CANCELADOS +label.resumo=RESUMO \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesDetalhado_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesDetalhado_es.properties index 1ecd72247..832addf5a 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesDetalhado_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesDetalhado_es.properties @@ -12,4 +12,11 @@ cabecalho.pagina=P cabecalho.de=de cabecalho.filtros=Filtros: label.empresa=Empresa: -label.pacote=Pacote: \ No newline at end of file +label.pacote=Pacote: +cabecalho.origem=Origem: +cabecalho.destino=Destino: +cabecalho.usuario=Usuário: +cabecalho.tipoTarifaPacote=Tipo Tarifa: +label.empresa=Empresa: +label.trecho=Trecho: +label.resumo=Resumo \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesDetalhado_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesDetalhado_pt_BR.properties index 1ecd72247..832addf5a 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesDetalhado_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesDetalhado_pt_BR.properties @@ -12,4 +12,11 @@ cabecalho.pagina=P cabecalho.de=de cabecalho.filtros=Filtros: label.empresa=Empresa: -label.pacote=Pacote: \ No newline at end of file +label.pacote=Pacote: +cabecalho.origem=Origem: +cabecalho.destino=Destino: +cabecalho.usuario=Usuário: +cabecalho.tipoTarifaPacote=Tipo Tarifa: +label.empresa=Empresa: +label.trecho=Trecho: +label.resumo=Resumo \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendaPacoteVoucher.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendaPacoteVoucher.jasper index feb2a222d9557a48eb80ac575270d495a0174815..46c4b38d2b33f8822d2d622088faab4f69e9ebd8 100644 GIT binary patch delta 429 zcmew`i~0U+<_#M=1Xv7B3=9hy>R1X&7?_Rq3^t$ds9~R+lczShaDtk^rfU(-i=3@i z|2bg$ZtYy>xXJpq;!G@uC!fhsV`TsW#>o#Ss!pCh!6obj$P6%Xte_akW(Z(lIOdOG1nW83i^t9A@aT$%YoXle;E{G4cbQu`}!j$R;px8H*Dj zvRIseEP>(#hy>UPP&F7%xIDQ~N@jAFp5SKB$xV!W(Wn0H+6N34J;vvZ3!l^) z4NZ(K3=GXpP0h_L4dN}0EKMwo*nt6OxI}HU!PM{OlA>6ZlrR`gc4U*89CcO<0I?2} AK>z>% delta 413 zcmcaVoB6{m<_#M=nJpcp93;LX5r)U5yr;A)OSB!Y2Cgkq5Z>Ia(^ z4m0WSWJ3$x$zLaiG4f5mJ3)1F;iM_tS3y>Qi3?z7K=@dkfh>XI3}guuXFw$|oN-}t zp_I(zEIq-^TP8O#@p)6vdK(7c~%Sn4R4A( diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendaPacoteVoucher.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendaPacoteVoucher.jrxml index 24d8aafd4..d915ec06c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendaPacoteVoucher.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendaPacoteVoucher.jrxml @@ -1,8 +1,8 @@ - + - + @@ -299,15 +299,18 @@ + + + - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletos.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletos.jasper index 71415185b6b2febcff5ee128b6e42199d5795e99..068c03708362dabd3a5d4a387362a72f5110746b 100644 GIT binary patch literal 32391 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 - - + + - + + + + + + + + + - <band height="62" splitType="Stretch"> + <band height="122" splitType="Stretch"> <textField> <reportElement x="0" y="0" width="620" height="20" uuid="43b2c28d-4760-4890-b00d-25e931e79c74"/> <textElement markup="none"> @@ -49,6 +57,27 @@ </textElement> <textFieldExpression><![CDATA[$R{cabecalho.periodo} + " " + $P{fecInicio} + " " + $R{cabecalho.periodoA} + " " + $P{fecFinal}]]></textFieldExpression> </textField> + <textField> + <reportElement x="0" y="60" width="802" height="20" uuid="bc1ac781-2bb6-40ef-92dd-d4f07f327d18"/> + <textElement> + <font isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{cabecalho.origem} + " " + $P{origem} + " " + $R{cabecalho.destino} + " " + $P{destino}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="0" y="80" width="802" height="20" uuid="1cfececb-aab4-4ec7-a002-b7a45c567252"/> + <textElement> + <font isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{cabecalho.usuario} + " " + $P{usuario}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="0" y="100" width="802" height="20" uuid="8b436394-0e3c-420e-b2dd-2b62ee7ed988"/> + <textElement> + <font isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{cabecalho.tipoTarifaPacote} + " " + $P{tipoTarifaPacote}]]></textFieldExpression> + </textField> </band> @@ -66,7 +95,7 @@ - + @@ -77,7 +106,7 @@ - + @@ -86,6 +115,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -94,7 +144,27 @@ - + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletosItemTotais.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletosItemTotais.jasper new file mode 100644 index 0000000000000000000000000000000000000000..a0bbf10f5378edd5ee40b5d0b69f7834143c9b91 GIT binary patch literal 34584 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 bq1Azr061+pFqpP7Tw*_dC1y$mHI)7zl*8|w literal 0 HcmV?d00001 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletosItemTotais.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletosItemTotais.jrxml new file mode 100644 index 000000000..c891629b7 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletosItemTotais.jrxml @@ -0,0 +1,156 @@ + + + + + +