From 5d67805b31da98884df8f1e81fc7ec0a182cdff1 Mon Sep 17 00:00:00 2001 From: "lucas.taia" Date: Fri, 15 Mar 2019 20:20:52 +0000 Subject: [PATCH] fixes bug#13655 dev:lucas qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@90839 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioBpe.java | 126 +++++++++ .../RelatorioBPe_es.properties | 24 ++ .../RelatorioBPe_pt_BR.properties | 24 ++ .../relatorios/templates/RelatorioBPe.jasper | Bin 0 -> 35589 bytes .../relatorios/templates/RelatorioBPe.jrxml | 263 ++++++++++++++++++ .../relatorios/RelatorioBPeController.java | 252 +++++++++++++++++ .../item/relatorios/ItemMenuRelatorioBPe.java | 25 ++ .../utilerias/menu/menu_original.properties | 1 + web/WEB-INF/i3-label_es_MX.label | 18 +- web/WEB-INF/i3-label_pt_BR.label | 18 +- web/gui/relatorios/filtroRelatorioBPe.zul | 70 +++++ 11 files changed, 819 insertions(+), 2 deletions(-) create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBpe.java create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_es.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_pt_BR.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jrxml create mode 100644 src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBPeController.java create mode 100644 src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioBPe.java create mode 100644 web/gui/relatorios/filtroRelatorioBPe.zul diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBpe.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBpe.java new file mode 100644 index 000000000..c4550d08d --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBpe.java @@ -0,0 +1,126 @@ +package com.rjconsultores.ventaboletos.relatorios.impl; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +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; + +public class RelatorioBpe extends Relatorio { + + public RelatorioBpe(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); + + Date dtInicio = (Date) parametros.get("DATA_INICIO"); + Date dtFim = (Date) parametros.get("DATA_FIM"); + + PreparedStatement ps = conexao.prepareStatement(sql.toString()); + ps.setString(1, DateUtil.getStringDate(dtInicio, "dd/MM/yyyy") + " 00:00:00"); + ps.setString(2, DateUtil.getStringDate(dtFim, "dd/MM/yyyy") + " 23:59:59"); + + ResultSet rset = ps.executeQuery(); + + while (rset.next()) { + Map dataResult = new HashMap(); + + dataResult.put("dtvenda", rset.getString("dtvenda")); + dataResult.put("hrvenda", rset.getString("hrvenda")); + dataResult.put("origem", rset.getString("origem")); + dataResult.put("destino", rset.getString("destino")); + dataResult.put("dtviagem", rset.getString("dtviagem")); + dataResult.put("vlbpe", rset.getString("vlbpe")); + dataResult.put("chbpe", rset.getString("chbpe")); + dataResult.put("num_bpe", rset.getString("num_bpe")); + dataResult.put("numserie_bpe", rset.getString("numserie_bpe")); + dataResult.put("status", rset.getString("status")); + dataResult.put("obs", rset.getString("obs")); + dataResult.put("qrcode", rset.getString("qrcode")); + + this.dados.add(dataResult); + } + + this.resultSet = rset; + } + }); + } + + @Override + protected void processaParametros() throws Exception { + } + + private String getSql(Map parametros) { + + StringBuilder sql = new StringBuilder(); + + String estados = (String) parametros.get("ESTADOS_ID"); + Integer empresaId = (Integer) parametros.get("EMPRESA_ID"); + String status = (String) parametros.get("STATUS"); + + sql.append("SELECT"); + sql.append(" TO_CHAR(COALESCE(bpe.DT_VENDA,bol.FECHORVENTA),'dd/mm/yyyy') as dtvenda, "); + sql.append(" TO_CHAR(COALESCE(bpe.DT_VENDA,bol.FECHORVENTA),'HH24:MI:SS') as hrvenda, "); + sql.append(" ori.DESCPARADA as origem, "); + sql.append(" dest.DESCPARADA as destino,"); + sql.append(" TO_CHAR(bol.FECHORVIAJE,'dd/mm/yyyy HH24:MI:SS') as dtviagem, "); + sql.append(" TO_CHAR(COALESCE(bol.PRECIOPAGADO,0) + coalesce(bol.IMPORTETAXAEMBARQUE,0) + coalesce(bol.IMPORTESEGURO,0) + coalesce(bol.IMPORTEPEDAGIO,0) + coalesce(bol.IMPORTEOUTROS,0)) as vlbpe, "); + sql.append(" bpe.CHBPE, "); + sql.append(" bol.NUM_BPE as num_bpe, "); + sql.append(" COALESCE(bol.NUMSERIE_BPE, '1') as numserie_bpe, "); + sql.append(" CASE bpe.CODSTAT "); + sql.append(" WHEN '100' THEN (CASE WHEN bpe.TIPOSUBSTITUICAO IS NULL THEN 'Autorizado' ELSE 'Substituído' END ) "); + sql.append(" WHEN '135' THEN (CASE bpe.TIPOEVENTO WHEN '110111' THEN 'Cancelado' WHEN '110115' THEN 'Não embarcado' ELSE NULL END) "); + sql.append(" ELSE 'Rejeitado' END as status, "); + sql.append(" CASE WHEN bpe.CODSTAT not in ('100','135') THEN bpe.motivo ELSE NULL END as obs, "); + sql.append(" bpe.QRCODE"); + + sql.append(" FROM BPE bpe "); + sql.append(" LEFT JOIN BOLETO bol ON bol.BOLETO_ID = bpe.BOLETO_ID and bpe.activo = 1 "); + sql.append(" LEFT JOIN estado e ON e.CODIBGE = bpe.UF "); + sql.append(" LEFT JOIN marca ma ON bol.MARCA_ID = ma.MARCA_ID "); + sql.append(" LEFT JOIN empresa ep on ma.EMPRESA_ID = ep.EMPRESA_ID "); + sql.append(" LEFT JOIN PARADA ori on bol.ORIGEN_ID = ori.PARADA_ID "); + sql.append(" LEFT JOIN PARADA dest on bol.DESTINO_ID = dest.PARADA_ID "); + + sql.append(" WHERE bol.ACTIVO = 1 and e.ACTIVO = 1 "); + + if (empresaId != null) { + sql.append(" AND ep.EMPRESA_ID = " + empresaId + " "); + } + if (estados != null) { + sql.append(" AND e.ESTADO_ID IN ( " + estados + " )"); + } + + if (status != null && status.equals("A")) { + sql.append(" AND bpe.CODSTAT = '100' AND bpe.TIPOSUBSTITUICAO IS NULL "); + } else if (status != null && status.equals("C")) { + sql.append(" AND bpe.CODSTAT = '135' AND bpe.TIPOEVENTO = '110111' "); + } else if (status != null && status.equals("S")) { + sql.append(" AND bpe.CODSTAT = '100' AND bpe.TIPOSUBSTITUICAO IS NOT NULL "); + } else if (status != null && status.equals("NE")) { + sql.append(" AND bpe.CODSTAT = '135' AND bpe.TIPOEVENTO = '110115' "); + } else if (status != null && status.equals("R")) { + sql.append(" AND bpe.CODSTAT NOT IN ('100','135') "); + } + + sql.append(" AND COALESCE(bpe.DT_VENDA,bol.FECHORVENTA) >= TO_DATE(?,'DD/MM/YYYY HH24:MI:SS') "); + sql.append(" AND COALESCE(bpe.DT_VENDA,bol.FECHORVENTA) <= TO_DATE(?,'DD/MM/YYYY HH24:MI:SS') "); + + sql.append(" ORDER BY bol.NUM_BPE, COALESCE(bol.NUMSERIE_BPE, '1') ASC "); + + return sql.toString(); + } +} \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_es.properties new file mode 100644 index 000000000..be7477a3e --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_es.properties @@ -0,0 +1,24 @@ +#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: + +label.dataVenda=Data Venda +label.horaVenda=Hora Venda +label.origem=Origem +label.destino=Destino +label.dataViagem=Data Viagem +label.valorBPe=Valor +label.chaveAcesso=Chave Acesso +label.numBPe=Número BPe +label.serie=Série +label.status=Status +label.obs=Observação \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_pt_BR.properties new file mode 100644 index 000000000..be7477a3e --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_pt_BR.properties @@ -0,0 +1,24 @@ +#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: + +label.dataVenda=Data Venda +label.horaVenda=Hora Venda +label.origem=Origem +label.destino=Destino +label.dataViagem=Data Viagem +label.valorBPe=Valor +label.chaveAcesso=Chave Acesso +label.numBPe=Número BPe +label.serie=Série +label.status=Status +label.obs=Observação \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jasper new file mode 100644 index 0000000000000000000000000000000000000000..713b9ecf930dacb3954bdea0adbf988e97749937 GIT binary patch literal 35589 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 P@#d+=7rjpHbCdXARWvNl literal 0 HcmV?d00001 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jrxml new file mode 100644 index 000000000..4a3145c05 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jrxml @@ -0,0 +1,263 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + <band height="79" splitType="Stretch"> + <textField pattern="" isBlankWhenNull="false"> + <reportElement mode="Transparent" x="0" y="0" width="180" height="41" forecolor="#000000" backcolor="#FFFFFF" uuid="da52f710-3882-4beb-ba6f-870e03f6800d"/> + <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none"> + <font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> + <paragraph lineSpacing="Single"/> + </textElement> + <textFieldExpression><![CDATA[$P{NOME_RELATORIO}]]></textFieldExpression> + </textField> + <textField evaluationTime="Report" pattern="" isBlankWhenNull="false"> + <reportElement mode="Transparent" x="1207" y="25" width="21" height="16" forecolor="#000000" backcolor="#FFFFFF" uuid="2f4f1314-9363-4e6d-822f-c85c1890998b"/> + <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none"> + <font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> + <paragraph lineSpacing="Single"/> + </textElement> + <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression> + </textField> + <textField pattern="" isBlankWhenNull="false"> + <reportElement mode="Transparent" x="1124" y="42" width="104" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="c8a70b8d-369e-48ae-a911-a5d9692316f7"/> + <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> + <font fontName="SansSerif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> + <paragraph lineSpacing="Single"/> + </textElement> + <textFieldExpression><![CDATA[$R{cabecalho.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression> + </textField> + <textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false"> + <reportElement mode="Transparent" x="1124" y="0" width="104" height="25" forecolor="#000000" backcolor="#FFFFFF" uuid="ad4bbfb8-582d-4aa2-904d-8dfe60e54442"/> + <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none"> + <font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> + <paragraph lineSpacing="Single"/> + </textElement> + <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> + </textField> + <textField pattern="" isBlankWhenNull="false"> + <reportElement mode="Transparent" x="939" y="25" width="267" height="16" forecolor="#000000" backcolor="#FFFFFF" uuid="8601bf20-f5f8-4fed-9445-7adfe580d236"/> + <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> + <font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> + <paragraph lineSpacing="Single"/> + </textElement> + <textFieldExpression><![CDATA[$R{cabecalho.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{cabecalho.de}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="939" y="0" width="185" height="25" uuid="b48a0903-0b2a-4ae5-ae04-811d097a9f91"/> + <textElement textAlignment="Right"> + <font size="9" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression> + </textField> + <line> + <reportElement x="-1" y="58" width="1231" height="1" uuid="3c577f75-c6d6-4c11-a846-bfe71a8a1b42"/> + </line> + <textField isStretchWithOverflow="true"> + <reportElement x="-1" y="59" width="1231" height="15" uuid="aff6535e-c25b-4f31-ad3a-baacc52e4974"/> + <textElement verticalAlignment="Middle"> + <font size="10"/> + </textElement> + <textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression> + </textField> + <line> + <reportElement positionType="Float" x="-1" y="78" width="1231" height="1" uuid="84641d2c-21a5-47f0-b4a8-afe7bf700cb6"/> + </line> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBPeController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBPeController.java new file mode 100644 index 000000000..13e7c1525 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBPeController.java @@ -0,0 +1,252 @@ +package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios; + +import java.text.SimpleDateFormat; +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.Combobox; +import org.zkoss.zul.Comboitem; +import org.zkoss.zul.Datebox; +import org.zkoss.zul.Radio; +import org.zkoss.zul.Radiogroup; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioBpe; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.service.EmpresaService; +import com.rjconsultores.ventaboletos.service.EstadoService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; +import com.rjconsultores.ventaboletos.web.utilerias.render.RenderEstadoUf; + +@Controller("relatorioBPeController") +@Scope("prototype") +public class RelatorioBPeController extends MyGenericForwardComposer { + + private static final long serialVersionUID = 1L; + + private Datebox dtInicio; + private Datebox dtFim; + private MyComboboxEstandar cmbEmpresa; + private Combobox cmbPuntoVenta; + private Radio rdbStatus; + private Radiogroup rdbGroup; + private MyListbox estadoList; + + private List lsEmpresa; + private List lsEstado; + + @Autowired + private DataSource dataSourceRead; + @Autowired + private EmpresaService empresaService; + @Autowired + private EstadoService estadoService; + + @Override + public void doAfterCompose(Component comp) throws Exception { + lsEmpresa = empresaService.obtenerTodos(); + lsEstado = estadoService.obtenerTodos(); + super.doAfterCompose(comp); + + estadoList.setItemRenderer(new RenderEstadoUf()); + estadoList.setData(lsEstado); + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + private void executarRelatorio() throws Exception { + Map parametros = new HashMap(); + StringBuilder filtro = new StringBuilder(); + SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy"); + + if (!validar()) { + return; + } + + if (dtInicio.getValue() != null) { + filtro.append("Data : ") + .append(format.format(dtInicio.getValue())) + .append(" - ") + .append(format.format(dtFim.getValue())) + .append(";"); + } + + parametros.put("DATA_INICIO", (java.util.Date) dtInicio.getValue()); + parametros.put("DATA_FIM", (java.util.Date) dtFim.getValue()); + + parametros.put("NOME_RELATORIO", Labels.getLabel("relatorioBPeController.window.title")); + parametros.put("USUARIO", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString()); + parametros.put("USUARIO_NOME", UsuarioLogado.getUsuarioLogado().getNombusuario()); + + filtro.append("UF: "); + String estadosIds = ""; + String UFs = ""; + List lsEstadosSelecionados = estadoList.getSelectedsItens(); + if (lsEstadosSelecionados.size() > 0) { + for (int i = 0; i < lsEstadosSelecionados.size(); i++) { + Estado estado = (Estado) lsEstadosSelecionados.get(i); + UFs = UFs + estado.getCveestado() + ","; + estadosIds = estadosIds + estado.getEstadoId() + ","; + } + + estadosIds = estadosIds.substring(0, estadosIds.length() - 1); + UFs = UFs.substring(0, UFs.length() - 1); + parametros.put("ESTADOS_ID", estadosIds); + } else { + filtro.append("Todos "); + } + + filtro.append(UFs).append(";"); + + filtro.append("Empresa: "); + Comboitem itemEmpresa = cmbEmpresa.getSelectedItem(); + if (itemEmpresa != null) { + Empresa empresa = (Empresa) itemEmpresa.getValue(); + parametros.put("EMPRESA_ID", empresa.getEmpresaId()); + filtro.append(empresa.getNombempresa() + ";"); + } else { + filtro.append(" Todas; "); + } + + filtro.append(" Status; " + rdbGroup.getSelectedItem().getLabel()); + parametros.put("STATUS", rdbGroup.getSelectedItem().getValue()); + + parametros.put("FILTROS", filtro.toString()); + + Relatorio relatorio = new RelatorioBpe(parametros, dataSourceRead.getConnection()); + + Map args = new HashMap(); + args.put("relatorio", relatorio); + + openWindow("/component/reportView.zul", + Labels.getLabel("relatorioBPeController.window.title"), args, MODAL); + } + + private boolean validar() { + try { + if (dtInicio.getValue() == null || dtFim.getValue() == null) { + Messagebox.show(Labels.getLabel("relatorioBPeController.MSG.informarData"), + Labels.getLabel("relatorioBPeController.window.title"), + Messagebox.OK, Messagebox.INFORMATION); + return false; + } + + if(dtInicio.getValue().after(dtFim.getValue())){ + Messagebox.show(Labels.getLabel("relatorioBPeController.MSG.dataInicialMaiorQueFinal"), + Labels.getLabel("relatorioBPeController.window.title"), + Messagebox.OK, Messagebox.INFORMATION); + return false; + } + + } catch (InterruptedException ex) { + return false; + } + return true; + } + + public void onClick$btnExecutarRelatorio(Event ev) throws Exception { + executarRelatorio(); + } + + public Datebox getDtInicio() { + return dtInicio; + } + + public void setDtInicio(Datebox dtInicio) { + this.dtInicio = dtInicio; + } + + public Datebox getDtFim() { + return dtFim; + } + + public void setDtFim(Datebox dtFim) { + this.dtFim = dtFim; + } + + public MyComboboxEstandar getCmbEmpresa() { + return cmbEmpresa; + } + + public void setCmbEmpresa(MyComboboxEstandar cmbEmpresa) { + this.cmbEmpresa = cmbEmpresa; + } + + public Combobox getCmbPuntoVenta() { + return cmbPuntoVenta; + } + + public void setCmbPuntoVenta(Combobox cmbPuntoVenta) { + this.cmbPuntoVenta = cmbPuntoVenta; + } + + public Radio getRdbStatus() { + return rdbStatus; + } + + public void setRdbStatus(Radio rdbStatus) { + this.rdbStatus = rdbStatus; + } + + public MyListbox getEstadoList() { + return estadoList; + } + + public void setEstadoList(MyListbox estadoList) { + this.estadoList = estadoList; + } + + public List getLsEmpresa() { + return lsEmpresa; + } + + public void setLsEmpresa(List lsEmpresa) { + this.lsEmpresa = lsEmpresa; + } + + public List getLsEstado() { + return lsEstado; + } + + public void setLsEstado(List lsEstado) { + this.lsEstado = lsEstado; + } + + public EmpresaService getEmpresaService() { + return empresaService; + } + + public void setEmpresaService(EmpresaService empresaService) { + this.empresaService = empresaService; + } + + public DataSource getDataSourceRead() { + return dataSourceRead; + } + + public void setDataSourceRead(DataSource dataSourceRead) { + this.dataSourceRead = dataSourceRead; + } + + public EstadoService getEstadoService() { + return estadoService; + } + + public void setEstadoService(EstadoService estadoService) { + this.estadoService = estadoService; + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioBPe.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioBPe.java new file mode 100644 index 000000000..7ffd285a6 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioBPe.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 ItemMenuRelatorioBPe extends DefaultItemMenuSistema { + + public ItemMenuRelatorioBPe() { + super("indexController.mniRelatorioBPe.label"); + } + + @Override + public String getClaveMenu() { + return "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.RELATORIO.BPE"; + } + + @Override + public void ejecutar() { + PantallaUtileria.openWindow("/gui/relatorios/filtroRelatorioBPe.zul", + Labels.getLabel("relatorioBPeController.window.title"), getArgs(), desktop); + + } +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/menu_original.properties b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/menu_original.properties index 67064a33d..7dac115ef 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/menu_original.properties +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/menu_original.properties @@ -127,6 +127,7 @@ analitico=com.rjconsultores.ventaboletos.web.utilerias.menu.item.analitico.MenuA analitico.item=com.rjconsultores.ventaboletos.web.utilerias.menu.item.analitico.ItemMenuAnalitico analitico.gerenciais=com.rjconsultores.ventaboletos.web.utilerias.menu.item.analitico.gerenciais.SubMenuGerenciais analitico.gerenciais.segundaVia=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioSegundaVia +analitico.gerenciais.relatorioBPe=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioBPe analitico.gerenciais.cadastroClientes=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioCadastroClientes analitico.gerenciais.historicoClientes=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioHistoricoClientes analitico.gerenciais.aidfDetalhado=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioAidfDetalhado diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 6af9392bc..678d31836 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -296,6 +296,7 @@ indexController.mniRelatorioAIDFDetalhado.label = Reporte Estoque indexController.mniRelatorioMovimentacaoEstoque.label = Movimientos del Stock indexController.mniRelatorioHistoricoClientes.label = Histórico Clientes indexController.mniRelatorioCadastroClientes.label = Cadastro Clientes +indexController.mniRelatorioBPe.label = BPe indexController.mniRelatorioSegundaVia.label = Segunda Via indexController.mniPrecoApanhe.label = Precio Apanhe indexController.mniRelatorioVendasPacotesResumido.label = Ventas de paquetes - Resumido @@ -7885,4 +7886,19 @@ customController.btnSalvar.tooltiptext = Salvar customController.MSG.suscribirOK = Customização Registrada com Sucesso. customController.MSG.borrarPergunta = Eliminar customização? customController.MSG.borrarOK = Customização Excluida com Sucesso. -customController.MSG.modificar = Cuidado! Ao alterar este valor o sistema será modificado automaticamente.>>>>>>> .r90642 +customController.MSG.modificar = Cuidado! Ao alterar este valor o sistema será modificado automaticamente. + +#Relatorio BPe +relatorioBPeController.window.title = Relatório BPe +relatorioBPeController.lbEmpresa.value = Empresa +relatorioBPeController.lbDtInicio.value = Data Inicio +relatorioBPeController.lbDtFim.value = Data Fim +relatorioBPeController.lbUF.value = UF +relatorioBPeController.lbStatus.value = Status +relatorioBPeController.lbAutorizado.value = Autorizado +relatorioBPeController.lbRejeitado.value = Rejeitado +relatorioBPeController.lbCancelado.value = Cancelado +relatorioBPeController.lbSubstituido.value = Substituído +relatorioBPeController.lbNaoEmbarcado.value = Não embarcado +relatorioBPeController.MSG.informarData = Favor informar data inicial e final. +relatorioBPeController.MSG.dataInicialMaiorQueFinal = Data de inicio não pode ser maior do que a final. \ No newline at end of file diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index e59a91658..4da8d276c 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -309,6 +309,7 @@ indexController.mniRelatorioAIDFDetalhado.label = Relatório Estoque indexController.mniRelatorioMovimentacaoEstoque.label = Movimentação de Estoque indexController.mniRelatorioHistoricoClientes.label = Histórico Clientes indexController.mniRelatorioCadastroClientes.label = Cadastro Clientes +indexController.mniRelatorioBPe.label = BPe indexController.mniRelatorioConsultaAntt.label= Consulta ANTT indexController.mniRelatorioSegundaVia.label = Segunda Via indexController.mniPrecoApanhe.label = Preço Apanhe @@ -8360,4 +8361,19 @@ customController.btnSalvar.tooltiptext = Salvar customController.MSG.suscribirOK = Customização Registrada com Sucesso. customController.MSG.borrarPergunta = Eliminar customização? customController.MSG.borrarOK = Customização Excluida com Sucesso. -customController.MSG.modificar = Cuidado! Ao alterar este valor o sistema será modificado automaticamente. \ No newline at end of file +customController.MSG.modificar = Cuidado! Ao alterar este valor o sistema será modificado automaticamente. + +#Relatorio BPe +relatorioBPeController.window.title = Relatório BPe +relatorioBPeController.lbEmpresa.value = Empresa +relatorioBPeController.lbDtInicio.value = Data Inicio +relatorioBPeController.lbDtFim.value = Data Fim +relatorioBPeController.lbUF.value = UF +relatorioBPeController.lbStatus.value = Status +relatorioBPeController.lbAutorizado.value = Autorizado +relatorioBPeController.lbRejeitado.value = Rejeitado +relatorioBPeController.lbCancelado.value = Cancelado +relatorioBPeController.lbSubstituido.value = Substituído +relatorioBPeController.lbNaoEmbarcado.value = Não embarcado +relatorioBPeController.MSG.informarData = Favor informar data inicial e final. +relatorioBPeController.MSG.dataInicialMaiorQueFinal = Data de inicio não pode ser maior do que a final. \ No newline at end of file diff --git a/web/gui/relatorios/filtroRelatorioBPe.zul b/web/gui/relatorios/filtroRelatorioBPe.zul new file mode 100644 index 000000000..ccce94003 --- /dev/null +++ b/web/gui/relatorios/filtroRelatorioBPe.zul @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +