From 2e864655949ec1c069e385364ab86ad91e2aa080 Mon Sep 17 00:00:00 2001 From: leonardo Date: Mon, 27 Jun 2016 17:51:17 +0000 Subject: [PATCH] fixes bug #7473 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@57309 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioReceitaEmbarcadaServico.java | 150 +++++ ...torioReceitaEmbarcadaServico_es.properties | 12 + ...ioReceitaEmbarcadaServico_pt_BR.properties | 12 + .../RelatorioReceitaEmbarcadaServico.jasper | Bin 0 -> 51090 bytes .../RelatorioReceitaEmbarcadaServico.jrxml | 545 ++++++++++++++++++ ...orioReceitaEmbarcadaServicoController.java | 342 +++++++++++ ...mMenuRelatorioReceitaEmbarcadaServico.java | 25 + web/WEB-INF/i3-label_es_MX.label | 13 +- web/WEB-INF/i3-label_pt_BR.label | 13 +- ...filtroRelatorioReceitaEmbarcadaServico.zul | 93 +++ 10 files changed, 1203 insertions(+), 2 deletions(-) create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaEmbarcadaServico.java create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioReceitaEmbarcadaServico_es.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioReceitaEmbarcadaServico_pt_BR.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaEmbarcadaServico.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaEmbarcadaServico.jrxml create mode 100644 src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioReceitaEmbarcadaServicoController.java create mode 100644 src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioReceitaEmbarcadaServico.java create mode 100644 web/gui/relatorios/filtroRelatorioReceitaEmbarcadaServico.zul diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaEmbarcadaServico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaEmbarcadaServico.java new file mode 100644 index 000000000..9c03ad1e6 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaEmbarcadaServico.java @@ -0,0 +1,150 @@ +package com.rjconsultores.ventaboletos.relatorios.impl; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.Timestamp; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; + +public class RelatorioReceitaEmbarcadaServico extends Relatorio { + + public RelatorioReceitaEmbarcadaServico(Map parametros, Connection conexao) throws Exception + { + super(parametros, conexao); + + this.setCustomDataSource(new ArrayDataSource(this) { + + public void initDados() throws Exception { + Connection conexao = this.relatorio.getConexao(); + Map parametros = this.relatorio.getParametros(); + + String sql = getSql( + (parametros.get("ORIGEN_ID") != null && parametros.get("ORIGEN_ID") != ""), + (parametros.get("DESTINO_ID") != null && parametros.get("DESTINO_ID") != ""), + (parametros.get("CORRIDA_ID") != null && parametros.get("CORRIDA_ID") != ""), + (parametros.get("CLASESERVICIO_ID") != null && parametros.get("CLASESERVICIO_ID") != "")); + + NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql); + + stmt.setTimestamp("DATA_INICIAL", new Timestamp(DateUtil.inicioFecha((Date) parametros.get("DATA_INICIAL")).getTime())); + stmt.setTimestamp("DATA_FINAL", new Timestamp(DateUtil.fimFecha((Date) parametros.get("DATA_FINAL")).getTime())); + + if (parametros.get("CORRIDA_ID") != null) + stmt.setString("CORRIDA_ID", (String) parametros.get("CORRIDA_ID")); + + if (parametros.get("ORIGEN_ID") != null) + stmt.setInt("ORIGEN_ID", (Integer) parametros.get("ORIGEN_ID")); + + if (parametros.get("DESTINO_ID") != null) + stmt.setInt("DESTINO_ID", (Integer) parametros.get("DESTINO_ID")); + + if (parametros.get("EMPRESA_ID") != null) + stmt.setInt("EMPRESA_ID", (Integer) parametros.get("EMPRESA_ID")); + else + stmt.setNull("EMPRESA_ID", java.sql.Types.INTEGER); + + if (parametros.get("CLASESERVICIO_ID") != null && (!parametros.get("CLASESERVICIO_ID").equals(""))) + stmt.setInt("CLASESERVICIO_ID", (Integer) parametros.get("CLASESERVICIO_ID")); + + ResultSet rset = stmt.executeQuery(); + + while (rset.next()) { + + Map dataResult = new HashMap(); + dataResult.put("cantasientos", rset.getInt("cantasientos")); + dataResult.put("data", rset.getDate("data")); + dataResult.put("servico", rset.getString("servico")); + dataResult.put("empresa", rset.getString("empresa")); + dataResult.put("origem", rset.getString("origem")); + dataResult.put("destino", rset.getString("destino")); + dataResult.put("classe", rset.getString("classe")); + dataResult.put("preciobase", rset.getBigDecimal("preciobase")); + dataResult.put("tarifa", rset.getBigDecimal("tarifa")); + dataResult.put("tut", rset.getBigDecimal("tut")); + dataResult.put("pedagio", rset.getBigDecimal("pedagio")); + dataResult.put("total", rset.getBigDecimal("total")); + dataResult.put("tipo", rset.getString("tipo")); + dataResult.put("agencia", rset.getString("agencia")); + dataResult.put("dataHoraCompra", rset.getTimestamp("dataHoraCompra")); + dataResult.put("passageiro", !(rset.getString("passageiro") == null) ? rset.getString("passageiro") : ""); + dataResult.put("nrBilhete", !(rset.getString("nrBilhete") == null) ? rset.getString("nrBilhete") : ""); + + this.dados.add(dataResult); + } + + this.resultSet = rset; + } + }); + } + + @Override + protected void processaParametros() throws Exception { + } + + private String getSql(boolean origemSelected, boolean destinoSelected, boolean servicoSelected, boolean claseServicioSelected) { + StringBuilder sql = new StringBuilder(); + + sql.append("SELECT "); + sql.append(" case when dab.cantasientos is null then dab2.cantasientos else dab.cantasientos end as cantasientos, "); + sql.append(" b.feccorrida AS data, "); + sql.append(" b.corrida_id AS servico, "); + sql.append(" mar.descmarca AS empresa, "); + sql.append(" origem.cveparada AS Origem, "); + sql.append(" destino.cveparada AS Destino, "); + sql.append(" cl_ser.descclase AS Classe, "); + sql.append(" COALESCE(b.preciobase,0) AS preciobase, "); + sql.append(" COALESCE(b.preciopagado,0) AS tarifa, "); + sql.append(" COALESCE(b.importetaxaembarque,0) AS tut, "); + sql.append(" COALESCE(b.importepedagio,0) AS pedagio, "); + sql.append(" (COALESCE(b.preciopagado,0) + COALESCE(b.importetaxaembarque,0) + COALESCE(b.importepedagio,0) ) AS total, "); + sql.append(" cat.desccategoria AS tipo, "); + sql.append(" p.nombpuntoventa AS agencia, "); + sql.append(" b.fechorventa AS dataHoraCompra, "); + sql.append(" b.nombpasajero AS passageiro, "); + sql.append(" b.NUMFOLIOSISTEMA AS nrBilhete "); + sql.append("FROM BOLETO b "); + sql.append(" INNER JOIN marca mar ON b.marca_id = mar.marca_id "); + sql.append(" INNER JOIN clase_servicio cl_ser ON cl_ser.claseservicio_id = b.claseservicio_id "); + sql.append(" LEFT JOIN PARADA levante ON levante.parada_id = b.levante_id "); + sql.append(" LEFT OUTER JOIN PUNTO_VENTA p ON b.puntoventa_id = p.puntoventa_id "); + sql.append(" LEFT OUTER JOIN PARADA parada ON p.PARADA_ID = parada.PARADA_ID "); + sql.append(" inner join corrida c on c.corrida_id = b.corrida_id and c.feccorrida = b.feccorrida "); + sql.append(" left join diagrama_autobus dab on dab.diagramaautobus_id = c.diagramaautobus_id "); + sql.append(" left join rol_operativo rop on rop.roloperativo_id = c.roloperativo_id "); + sql.append(" left join diagrama_autobus dab2 on dab2.diagramaautobus_id = rop.diagramaautobus_id, "); + sql.append(" PARADA origem, "); + sql.append(" PARADA destino, "); + sql.append(" CATEGORIA cat "); + sql.append("WHERE b.feccorrida BETWEEN :DATA_INICIAL AND :DATA_FINAL "); + sql.append(" AND b.origen_id = origem.parada_id "); + sql.append(" AND b.destino_id = destino.parada_id "); + if (origemSelected) { + sql.append("AND b.origen_id = (:ORIGEN_ID) "); + } + if (destinoSelected) { + sql.append("AND b.destino_id = (:DESTINO_ID) "); + } + if (servicoSelected) { + sql.append("AND b.corrida_id= :CORRIDA_ID "); + } + if (claseServicioSelected) { + sql.append(" AND cl_ser.CLASESERVICIO_ID = :CLASESERVICIO_ID "); + } + sql.append(" AND b.categoria_id=cat.categoria_id "); + sql.append(" AND b.motivocancelacion_id IS NULL "); + sql.append(" AND mar.EMPRESA_ID = :EMPRESA_ID "); + sql.append(" AND b.NUMFOLIOSISTEMA is not null "); + sql.append("order by "); + sql.append(" b.corrida_id, "); + sql.append(" b.feccorrida "); + + return sql.toString(); + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioReceitaEmbarcadaServico_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioReceitaEmbarcadaServico_es.properties new file mode 100644 index 000000000..2cdde92d3 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioReceitaEmbarcadaServico_es.properties @@ -0,0 +1,12 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. + +#Labels cabeçalho +cabecalho.relatorio=Relatório: +cabecalho.periodo=Período: +cabecalho.periodoA=à +cabecalho.dataHora=Data/Hora: +cabecalho.impressorPor=Impressor por: +cabecalho.pagina=Página +cabecalho.de=de +cabecalho.filtros=Filtros: \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioReceitaEmbarcadaServico_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioReceitaEmbarcadaServico_pt_BR.properties new file mode 100644 index 000000000..2cdde92d3 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioReceitaEmbarcadaServico_pt_BR.properties @@ -0,0 +1,12 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. + +#Labels cabeçalho +cabecalho.relatorio=Relatório: +cabecalho.periodo=Período: +cabecalho.periodoA=à +cabecalho.dataHora=Data/Hora: +cabecalho.impressorPor=Impressor por: +cabecalho.pagina=Página +cabecalho.de=de +cabecalho.filtros=Filtros: \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaEmbarcadaServico.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaEmbarcadaServico.jasper new file mode 100644 index 0000000000000000000000000000000000000000..01b323656d6753bed212c734c5506e70e18f2015 GIT binary patch literal 51090 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 W9AT4^y@ki|_MQ#DqB`ZV9r|yYJusF4 literal 0 HcmV?d00001 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaEmbarcadaServico.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaEmbarcadaServico.jrxml new file mode 100644 index 000000000..c782073f3 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaEmbarcadaServico.jrxml @@ -0,0 +1,545 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioReceitaEmbarcadaServicoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioReceitaEmbarcadaServicoController.java new file mode 100644 index 000000000..74c1281f8 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioReceitaEmbarcadaServicoController.java @@ -0,0 +1,342 @@ +package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios; + +import java.util.Calendar; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.sql.DataSource; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zhtml.Messagebox; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Comboitem; +import org.zkoss.zul.ComboitemRenderer; +import org.zkoss.zul.Datebox; + +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioReceitaEmbarcadaServico; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.service.ClaseServicioService; +import com.rjconsultores.ventaboletos.service.EmpresaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; +import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada; +import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParadaCve; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; + +@Controller("relatorioReceitaEmbarcadaServicoController") +@Scope("prototype") +public class RelatorioReceitaEmbarcadaServicoController extends MyGenericForwardComposer { + + private static final long serialVersionUID = 1L; + + private Datebox datInicial; + private Datebox datFinal; + private MyComboboxParada cmbParadaOrigem; + private MyComboboxParadaCve cmbParadaOrigemCve; + private MyComboboxParada cmbParadaDestino; + private MyComboboxParadaCve cmbParadaDestinoCve; + private List lsEmpresa; + private List lsClase; + private MyTextbox txtCorridaId; + + private MyComboboxEstandar cmbEmpresa; + private MyComboboxEstandar cmbClase; + + @Autowired + private EmpresaService empresaService; + @Autowired + private ClaseServicioService claseService; + @Autowired + private DataSource dataSourceRead; + + @Override + public void doAfterCompose(Component comp) throws Exception { + lsEmpresa = empresaService.obtenerTodos(); + lsClase = claseService.obtenerTodos(); + + super.doAfterCompose(comp); + cmbParadaOrigemCve.setItemRenderer(new ComboitemRenderer() { + @Override + public void render(Comboitem cmbtm, Object o) throws Exception { + Parada parada = (Parada) o; + + cmbtm.setLabel(parada.getCveparada()); + cmbtm.setValue(parada); + } + }); + + cmbParadaDestinoCve.setItemRenderer(new ComboitemRenderer() { + @Override + public void render(Comboitem cmbtm, Object o) throws Exception { + Parada parada = (Parada) o; + + cmbtm.setLabel(parada.getCveparada()); + cmbtm.setValue(parada); + } + }); + + } + + public void onSelect$cmbParadaOrigemCve(Event ev) { + if (cmbParadaOrigemCve.getSelectedItem() != null) { + cmbParadaOrigem.setComboItemByParada((Parada) cmbParadaOrigemCve.getSelectedItem().getValue()); + } + } + + public void onSelect$cmbParadaOrigem(Event ev) { + if (cmbParadaOrigem.getSelectedItem() != null) + cmbParadaOrigemCve.setComboItemByParada((Parada) cmbParadaOrigem.getSelectedItem().getValue()); + } + + public void onSelect$cmbParadaDestinoCve(Event ev) { + if (cmbParadaDestinoCve.getSelectedItem() != null) { + cmbParadaDestino.setComboItemByParada((Parada) cmbParadaDestinoCve.getSelectedItem().getValue()); + } + } + + public void onSelect$cmbParadaDestino(Event ev) { + if (cmbParadaDestino.getSelectedItem() != null) { + cmbParadaDestinoCve.setComboItemByParada((Parada) cmbParadaDestino.getSelectedItem().getValue()); + } + } + + /** + * @throws Exception + * + */ + @SuppressWarnings({ "rawtypes", "unchecked" }) + private void executarRelatorio() throws Exception { + + if (datInicial != null && datFinal != null && datFinal.getValue().compareTo(datInicial.getValue()) < 0) { + try { + Messagebox.show(Labels.getLabel("MSG.ningunRegistro"), + Labels.getLabel("relatorioReceitaServicoController.window.title"), + Messagebox.OK, Messagebox.INFORMATION); + } catch (InterruptedException ex) { + ex.printStackTrace(); + } + } else + { + Relatorio relatorio; + + Map parametros = new HashMap(); + + StringBuilder filtro = new StringBuilder(); + + if (null != txtCorridaId.getValue() && !("".equals(txtCorridaId.getValue()))) + { + filtro.append("Serviço: "); + filtro.append(txtCorridaId.getValue() + "; "); + parametros.put("CORRIDA_ID", txtCorridaId.getValue()); + } else { + filtro.append("Serviço: TODOS; "); + parametros.put("CORRIDA_ID", null); + } + + filtro.append("Início período: "); + Calendar cal = Calendar.getInstance(); + cal.setTime(datInicial.getValue()); + filtro.append(cal.get(Calendar.DATE) + "/"); + filtro.append((cal.get(Calendar.MONTH) + 1) + "/"); + filtro.append(cal.get(Calendar.YEAR) + "; "); + + filtro.append("Fim período: "); + cal.setTime(datFinal.getValue()); + filtro.append(cal.get(Calendar.DATE) + "/"); + filtro.append((cal.get(Calendar.MONTH) + 1) + "/"); + filtro.append(cal.get(Calendar.YEAR) + "; "); + + parametros.put("DATA_INICIAL", (java.util.Date) datInicial.getValue()); + parametros.put("DATA_FINAL", (java.util.Date) datFinal.getValue()); + + Comboitem cbiOrigem = cmbParadaOrigem.getSelectedItem(); + if (cbiOrigem != null) { + Parada origem = (Parada) cbiOrigem.getValue(); + if (origem.getParadaId() != -1) { + parametros.put("ORIGEN_ID", origem.getParadaId()); + filtro.append("Origem: " + origem.getCveparada() + "; "); + } + else { + parametros.put("ORIGEN_ID", null); + filtro.append("Origem: Todas; "); + } + } else { + parametros.put("ORIGEN_ID", null); + filtro.append("Origem: Todas; "); + } + + Comboitem cbiDestino = cmbParadaDestino.getSelectedItem(); + if (cbiDestino != null) { + Parada destino = (Parada) cbiDestino.getValue(); + if (destino.getParadaId() != -1) + { + parametros.put("DESTINO_ID", destino.getParadaId()); + filtro.append("Destino: " + destino.getCveparada() + "; "); + } else { + parametros.put("DESTINO_ID", null); + filtro.append("Destino: Todos; "); + } + + } else { + parametros.put("DESTINO_ID", null); + filtro.append("Destino: Todos; "); + } + + Comboitem itemEmpresa = cmbEmpresa.getSelectedItem(); + if (itemEmpresa != null) { + Empresa empresa = (Empresa) itemEmpresa.getValue(); + parametros.put("EMPRESA_ID", empresa.getEmpresaId()); + filtro.append("Empresa: " + empresa.getNombempresa() + "; "); + } else { + parametros.put("EMPRESA_ID", ""); + } + + Comboitem itemClasse = cmbClase.getSelectedItem(); + if (itemClasse != null) { + ClaseServicio clase = (ClaseServicio) itemClasse.getValue(); + if (clase.getClaseservicioId() == -1) { + parametros.put("CLASESERVICIO_ID", ""); + filtro.append("Classe: " + clase.getDescclase() + "; "); + } + else { + parametros.put("CLASESERVICIO_ID", clase.getClaseservicioId()); + } + filtro.append("Classe: " + clase.getDescclase() + "; "); + } else { + parametros.put("CLASESERVICIO_ID", ""); + filtro.append("Classe: TODAS; "); + } + + parametros.put("FILTROS", filtro.toString()); + + parametros.put("NOME_RELATORIO", Labels.getLabel("relatorioReceitaEmbarcadaServicoController.window.title")); + parametros.put("USUARIO", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString()); + + relatorio = new RelatorioReceitaEmbarcadaServico(parametros, dataSourceRead.getConnection()); + + Map args = new HashMap(); + args.put("relatorio", relatorio); + + openWindow("/component/reportView.zul", + Labels.getLabel("relatorioReceitaEmbarcadaServicoController.window.title"), args, MODAL); + } + } + + public void onClick$btnExecutarRelatorio(Event ev) throws Exception { + executarRelatorio(); + } + + public Datebox getDatInicial() { + return datInicial; + } + + public void setDatInicial(Datebox datInicial) { + this.datInicial = datInicial; + } + + public Datebox getDatFinal() { + return datFinal; + } + + public void setDatFinal(Datebox datFinal) { + this.datFinal = datFinal; + } + + public List getLsEmpresa() { + return lsEmpresa; + } + + public void setLsEmpresa(List lsEmpresa) { + this.lsEmpresa = lsEmpresa; + } + + public EmpresaService getEmpresaService() { + return empresaService; + } + + public void setEmpresaService(EmpresaService empresaService) { + this.empresaService = empresaService; + } + + public List getLsClase() { + return lsClase; + } + + public void setLsClase(List lsClase) { + this.lsClase = lsClase; + } + + public MyComboboxEstandar getCmbEmpresa() { + return cmbEmpresa; + } + + public void setCmbEmpresa(MyComboboxEstandar cmbEmpresa) { + this.cmbEmpresa = cmbEmpresa; + } + + public ClaseServicioService getClaseService() { + return claseService; + } + + public void setClaseService(ClaseServicioService claseService) { + this.claseService = claseService; + } + + public MyComboboxEstandar getCmbClase() { + return cmbClase; + } + + public void setCmbClase(MyComboboxEstandar cmbClase) { + this.cmbClase = cmbClase; + } + + public MyComboboxParada getCmbParadaOrigem() { + return cmbParadaOrigem; + } + + public void setCmbParadaOrigem(MyComboboxParada cmbParadaOrigem) { + this.cmbParadaOrigem = cmbParadaOrigem; + } + + public MyComboboxParadaCve getCmbParadaOrigemCve() { + return cmbParadaOrigemCve; + } + + public void setCmbParadaOrigemCve(MyComboboxParadaCve cmbParadaOrigemCve) { + this.cmbParadaOrigemCve = cmbParadaOrigemCve; + } + + public MyComboboxParada getCmbParadaDestino() { + return cmbParadaDestino; + } + + public void setCmbParadaDestino(MyComboboxParada cmbParadaDestino) { + this.cmbParadaDestino = cmbParadaDestino; + } + + public MyComboboxParadaCve getCmbParadaDestinoCve() { + return cmbParadaDestinoCve; + } + + public void setCmbParadaDestinoCve(MyComboboxParadaCve cmbParadaDestinoCve) { + this.cmbParadaDestinoCve = cmbParadaDestinoCve; + } + + public MyTextbox getTxtCorridaId() { + return txtCorridaId; + } + + public void setTxtCorridaId(MyTextbox txtCorridaId) { + this.txtCorridaId = txtCorridaId; + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioReceitaEmbarcadaServico.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioReceitaEmbarcadaServico.java new file mode 100644 index 000000000..91cd21b5f --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioReceitaEmbarcadaServico.java @@ -0,0 +1,25 @@ +package com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios; + +import org.zkoss.util.resource.Labels; + +import com.rjconsultores.ventaboletos.web.utilerias.PantallaUtileria; +import com.rjconsultores.ventaboletos.web.utilerias.menu.DefaultItemMenuSistema; + +public class ItemMenuRelatorioReceitaEmbarcadaServico extends DefaultItemMenuSistema { + + public ItemMenuRelatorioReceitaEmbarcadaServico() { + super("indexController.mniRelatorioReceitaEmbarcadaServico.label"); + } + + @Override + public String getClaveMenu() { + return "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.MENU.RELATORIORECITAEMBARCADASERVICO"; + } + + @Override + public void ejecutar() { + PantallaUtileria.openWindow("/gui/relatorios/filtroRelatorioReceitaEmbarcadaServico.zul", + Labels.getLabel("relatorioReceitaEmbarcadaServicoController.window.title"), getArgs(), desktop); + + } +} diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 65a8ce661..ebfb23f45 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -251,6 +251,7 @@ indexController.mniFechamentoParamptovta.label = Cierre Cuenta Contábil Punto d indexController.mniRelatorioCorridas.label = Reporte de Corridas indexController.mniRelatorioDemandas.label = Reporte de Demandas indexController.mniRelatorioReceitaServico.label = Reporte de Ingreso por Servicio +indexController.mniRelatorioReceitaEmbarcadaServico.label = Reporte de Ingreso Embarcado por Servicio indexController.mniRelatorioCancelamentoVendaCartao.label = Reporte Cancelación de Venta con Tarjeta indexController.mniRelatorioCancelamentoTransacao.label = Relatório de Cancelamento J3 indexController.mniRelatorioTabelaPreco.label = Relátorio de Tabela de Preços @@ -6488,6 +6489,16 @@ busquedaOCDParamController.FormaPagamentoOCD.label = Formas de pago para la gene busquedaOCDParamController.SomenteCartao.label = Solo tarjeta busquedaOCDParamController.TodasFormasPagamento.label = Todas las formas de pago +# Relatorio Receita Embarcada Servico Controller +relatorioReceitaEmbarcadaServicoController.window.title = Relatório de Receita Embarcada por Serviço +relatorioReceitaEmbarcadaServicoController.lbDePeriodoViagem.value = Período de Viagem +relatorioReceitaEmbarcadaServicoController.lbAtePeriodoViagem.value = até +relatorioReceitaEmbarcadaServicoController.lbCidadeOrigem.value = Localidade Origem +relatorioReceitaEmbarcadaServicoController.lbCidadeDestino.value = Localidade Destino +relatorioReceitaEmbarcadaServicoController.lbEmpresa.value = Empresa +relatorioReceitaEmbarcadaServicoController.lbClase.value = Classe +relatorioReceitaEmbarcadaServicoController.lbServico.value = N. Serviço + # Relatorio Conferencia Formulario Fisico relatorioConferenciaFormularioFisicoController.lbDataIni.value = Data Inicial relatorioConferenciaFormularioFisicoController.lbDataFin.value = Data Final @@ -6495,4 +6506,4 @@ relatorioConferenciaFormularioFisicoController.lbEmpresa.value = Empresa relatorioConferenciaFormularioFisicoController.lbTipoVenda.value = Tipo Venda relatorioConferenciaFormularioFisicoController.lbPuntoVenta.value = Agência relatorioConferenciaFormularioFisicoController.msg.erro.puntoventa = O Campo Agência é obrigatório! -relatorioConferenciaFormularioFisicoController.msg.erro.empresa = O Campo Empresa é obrigatório! \ No newline at end of file +relatorioConferenciaFormularioFisicoController.msg.erro.empresa = O Campo Empresa é obrigatório!>>>>>>> .r57294 diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 9b6e96ed8..415df1ad0 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -256,6 +256,7 @@ indexController.mniRelatorioCorridas.label = Relatório de Serviços indexController.mniRelatorioCorridas.label = Relatório de Serviços indexController.mniRelatorioDemandas.label = Relatório de Demandas indexController.mniRelatorioReceitaServico.label = Relatório de Receita por Serviço +indexController.mniRelatorioReceitaEmbarcadaServico.label = Relatório de Receita Embarcada por Serviço indexController.mniRelatorioCancelamentoVendaCartao.label = Relatório Cancelamento de Venda de Cartão indexController.mniRelatorioCancelamentoTransacao.label = Relatório de Cancelamento J3 indexController.mniRelatorioTabelaPreco.label = Relátorio de Tabela de Preços @@ -6636,4 +6637,14 @@ relatorioConferenciaFormularioFisicoController.msg.erro.empresa = O Campo Empres busquedaImportacionFiscalEcfPendenciaReducaoZController.window.title=Impressão Fiscal :: Pendência Redução Z busquedaImportacionFiscalEcfReducaoZController.window.title=Impressão Fiscal :: ECF Integrado c/ Redução Z busquedaImportacionFiscalEcfPendenciaReducaoZController.window.title=Impressão Fiscal :: Pendência Redução Z -busquedaImportacionFiscalEcfReducaoZController.window.title=Impressão Fiscal :: ECF Integrado c/ Redução Z \ No newline at end of file +busquedaImportacionFiscalEcfReducaoZController.window.title=Impressão Fiscal :: ECF Integrado c/ Redução Z + +# Relatorio Receita Embarcada Servico Controller +relatorioReceitaEmbarcadaServicoController.window.title = Relatório de Receita Embarcada por Serviço +relatorioReceitaEmbarcadaServicoController.lbDePeriodoViagem.value = Período de Viagem +relatorioReceitaEmbarcadaServicoController.lbAtePeriodoViagem.value = até +relatorioReceitaEmbarcadaServicoController.lbCidadeOrigem.value = Localidade Origem +relatorioReceitaEmbarcadaServicoController.lbCidadeDestino.value = Localidade Destino +relatorioReceitaEmbarcadaServicoController.lbEmpresa.value = Empresa +relatorioReceitaEmbarcadaServicoController.lbClase.value = Classe +relatorioReceitaEmbarcadaServicoController.lbServico.value = N. Serviço \ No newline at end of file diff --git a/web/gui/relatorios/filtroRelatorioReceitaEmbarcadaServico.zul b/web/gui/relatorios/filtroRelatorioReceitaEmbarcadaServico.zul new file mode 100644 index 000000000..6723373c9 --- /dev/null +++ b/web/gui/relatorios/filtroRelatorioReceitaEmbarcadaServico.zul @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +