From b5df515eebdca7c53ca8068f838e1da5f82a4fca Mon Sep 17 00:00:00 2001 From: walace Date: Fri, 29 Dec 2017 17:48:27 +0000 Subject: [PATCH] fixes bug #10104 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@77642 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioSegundaVia.java | 96 +++-- .../RelatorioSegundaVia_es.properties | 78 +++- .../RelatorioSegundaVia_pt_BR.properties | 3 + .../templates/RelatorioSegundaVia.jasper | Bin 38484 -> 49789 bytes .../templates/RelatorioSegundaVia.jrxml | 376 ++++++++++++------ .../utilitarios/RelatorioSegundaViaBean.java | 153 ++++++- 6 files changed, 529 insertions(+), 177 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioSegundaVia.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioSegundaVia.java index 5d482a6a4..e2e686c71 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioSegundaVia.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioSegundaVia.java @@ -77,22 +77,33 @@ public class RelatorioSegundaVia extends Relatorio { private RelatorioSegundaViaBean criarRelatorioSegundaViaBean(ResultSet rset) throws SQLException { RelatorioSegundaViaBean r = new RelatorioSegundaViaBean(); + r.setBilheteiro(rset.getString("bilheteiro")); r.setBilhete(rset.getInt("bilhete")); - r.setCoo(rset.getInt("coo") == 0 ? null : rset.getInt("coo")); r.setDataVenda(rset.getTimestamp("dataVenda")); r.setDataViagem(rset.getDate("dataViagem")); - r.setDestino(rset.getInt("destino")); - r.setOrigem(rset.getInt("origem")); + r.setDataServico(rset.getDate("dataServico")); + r.setDataSegundaVia(rset.getDate("dataSegundaVia")); + r.setDestino(rset.getString("destino")); + r.setOrigem(rset.getString("origem")); + r.setDescDestino(rset.getString("descDestino")); + r.setDescOrigem(rset.getString("descOrigem")); r.setPedagio(rset.getBigDecimal("pedagio")); - r.setPoltrona(rset.getInt("poltrona")); - r.setPreImpresso(rset.getString("preImpresso")); - r.setPuntoVenta(rset.getInt("puntoVenta")); + r.setPoltrona(rset.getString("poltrona")); r.setSeguro(rset.getBigDecimal("seguro")); - r.setSerieImpFiscal(rset.getString("serieImpFiscal")); + r.setSerieImpFiscal(rset.getString("serieImpFiscal")); + r.setSerieImpFiscalSegundaVia(rset.getString("serieImpFiscalSegundaVia")); r.setServico(rset.getString("servico")); r.setTaxa(rset.getBigDecimal("taxa")); r.setTarifa(rset.getBigDecimal("tarifa")); + r.setNomeEmpresa(rset.getString("nomeEmpresa")); + r.setNomeAgencia(rset.getString("nomeAgencia")); + r.setLinha(rset.getString("linha")); + r.setCcf(rset.getString("ccf")); + r.setTpp(rset.getBigDecimal("tpp")); + r.setSiglaTipoPassagem(rset.getString("siglaTipoPassagem")); + r.setTipoPassagem(rset.getString("tipoPassagem")); + r.setValorTotal(rset.getBigDecimal("valortotal")); return r; } }); @@ -105,39 +116,56 @@ public class RelatorioSegundaVia extends Relatorio { private String getSqlDados(Date dataInicial, Date dataFinal, Integer empresaId, Integer puntoVentaId) { StringBuilder sql = new StringBuilder(); - sql.append("SELECT boleto.CORRIDA_ID AS servico, "); - sql.append("boleto.FECHORVIAJE AS dataViagem, "); - sql.append("boleto.ORIGEN_ID AS origem, "); - sql.append("boleto.DESTINO_ID AS destino, "); - sql.append("boleto.NUMASIENTO AS poltrona, "); - sql.append("boleto.FECHORVENTA AS dataVenda, "); - sql.append("boleto.NUMFOLIOSISTEMA AS bilhete, "); - sql.append("usuario.NOMBUSUARIO AS bilheteiro, "); - sql.append("boleto.PUNTOVENTA_ID AS puntoVenta, "); - sql.append("boleto.PRECIOPAGADO AS tarifa, "); - sql.append("boleto.IMPORTETAXAEMBARQUE AS taxa, "); - sql.append("boleto.IMPORTESEGURO AS seguro, "); - sql.append("boleto.IMPORTEPEDAGIO AS pedagio, "); - sql.append("r4.COO AS coo, "); - sql.append("boleto.NUMFOLIOPREIMPRESO AS preimpresso, "); - sql.append("boleto.NUMSERIEPREIMPRESA AS seriePreImpresso, "); - sql.append("boleto.SERIEIMPFISCAL AS serieImpFiscal "); - - sql.append("FROM BOLETO boleto "); - sql.append("INNER JOIN USUARIO usuario ON boleto.USUARIO_ID = usuario.USUARIO_ID "); - sql.append("inner join fiscal_impressora fi on fi.numserie = boleto.SERIEIMPFISCALORIGINAL "); - sql.append("inner join fiscal_r4 r4 on r4.NUMSERIE20 = fi.NUMSERIE20 and r4.CONTADOR = boleto.CCF "); - sql.append("WHERE boleto.INDSEGUNDAVIAIMPRESSA = 1 "); + sql.append("select "); + sql.append("e.nombempresa as nomeEmpresa, "); + sql.append("pt.nombpuntoventa as nomeAgencia, "); + sql.append("usuario.nombusuario as bilheteiro, "); + sql.append("case when c.motivoreimpresion_id = 99 then b.fecsegundavia else null end as dataSegundaVia,"); + sql.append("c.fechorventa as dataVenda, "); + sql.append("c.feccorrida as dataServico,"); + sql.append("c.fechorviaje as dataViagem, "); + sql.append("c.corrida_id as servico, "); + sql.append("r.descruta as linha, "); + sql.append("po.cveparada as origem, "); + sql.append("pd.cveparada as destino,"); + sql.append("po.descparada as descOrigem, "); + sql.append("pd.descparada as descDestino, "); + sql.append("c.numasiento as poltrona, "); + sql.append("c.serieimpfiscal as serieImpFiscal, "); + sql.append("c.numfoliosistema as bilhete, "); + sql.append("c.ccf,"); + sql.append("b.serieimpfiscal as serieImpFiscalSegundaVia, "); + sql.append("ca.cvecategoria as siglaTipoPassagem,"); + sql.append("ca.desccategoria as tipoPassagem,"); + sql.append("(select sum(cfpv.importe) from caja_formapago cfpv where cfpv.caja_id = c.caja_id and cfpv.activo = 1) as valortotal,"); + sql.append("c.preciopagado as tarifa, "); + sql.append("c.importeseguro as seguro, "); + sql.append("c.importepedagio as pedagio, "); + sql.append("c.importetaxaembarque as taxa, "); + sql.append("c.importetpp as tpp "); + sql.append("from caja c "); + sql.append("inner join boleto b on (c.transacao_id = b.boleto_id)"); + sql.append("inner join usuario usuario on c.usuario_id = usuario.usuario_id "); + sql.append("left join fiscal_impressora fi on fi.numserie = c.serieimpfiscaloriginal "); + sql.append("left join fiscal_r4 r4 on r4.numserie20 = fi.numserie20 and r4.contador = c.ccf "); + sql.append("inner join empresa e on e.empresa_id = c.empresacorrida_id "); + sql.append("inner join categoria ca on c.categoria_id = ca.categoria_id "); + sql.append("inner join ruta r on r.ruta_id = c.ruta_id "); + sql.append("inner join parada po on po.parada_id = c.origen_id "); + sql.append("inner join parada pd on pd.parada_id = c.destino_id "); + sql.append("inner join punto_venta pt on pt.puntoventa_id = c.puntoventa_id "); + + sql.append("where b.indsegundaviaimpressa = 1 "); if (dataInicial != null && dataFinal != null) { - sql.append(" AND boleto.FECSEGUNDAVIA BETWEEN :dataInicial AND :dataFinal"); + sql.append(" and b.fecsegundavia between :dataInicial and :dataFinal"); } if (empresaId != null && empresaId != -1) { - sql.append(" AND boleto.EMPRESACORRIDA_ID = " + empresaId); + sql.append(" and c.empresacorrida_id = " + empresaId); } if (puntoVentaId != null && puntoVentaId != -1) { - sql.append(" AND boleto.PUNTOVENTA_ID = " + puntoVentaId); + sql.append(" and c.puntoventa_id = " + puntoVentaId); } - + sql.append(" order by c.numfoliosistema, c.caja_id " ); return sql.toString(); } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioSegundaVia_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioSegundaVia_es.properties index 989002da4..c35d69e0f 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioSegundaVia_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioSegundaVia_es.properties @@ -1,22 +1,56 @@ -cabecalho.nome=Relatório Segunda Via -cabecalho.periodo=Período -cabecalho.periodoA=à -cabecalho.puntoVenta=Agência: -cabecalho.empresa=Empresa: -label.servico=Serviço -label.dataViagem=Data Viagem -label.origem=Origem -label.destino=Destino -label.poltrona=Poltrona -label.dataVenda=Data Venda -label.bilheteiro=Bilheteiro -label.bilhete=Bilhete -label.puntoVenta=Agência -label.tarifa=Tarifa -label.taxa=Taxa -label.seguro=Seguro -label.pedagio=Pedágio -label.coo=Coo -label.preImpresso=Pre Imp. -label.serieImpFiscal=Série -msg.noData=Não foi possivel obter dados com os parâmetros informados. \ No newline at end of file +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. +msg.a=à + +#Labels header +header.periodo=Período: +header.data.hora=Data/Hora\: +header.pagina=Página\: +header.filtro=Filtro\: +header.filtro.servico=Serviço\: +header.filtro.linha=Linha\: +header.filtro.grupo=Grupo de Linhas\: +header.empresa=Empresa\: +header.periodo.viagem=Período Viagem +header.periodo.venda=Período Venda + +#Labels detail + +detail.data=Data +detail.dataServico=Data Servi. +detail.origen=Origem +detail.destino=Destino +detail.km=Km +detail.linha=Linha +detail.servicio=Serviço +detail.hora=Hora +detail.tipobilhete=Tipo Venda +detail.tipopassagem=Tipo Passagem +detail.pasajero=Passageiro +detail.documento=Doc +detail.precio=Preço +detail.desconto=Desc.(%) +detail.valorCobrado=Vlr.Cobrado +detail.tarifa=Tarifa +detail.bilheteiro=Bilheteiro +detail.agencia=Agência +detail.dataMD=Data MD +detail.empresa=Empresa +detail.tipo=Tipo +detail.tipoDoc=Tipo Doc. +detail.tarifa=Tarifa +detail.seguro=Seguro +detail.utr=UTR +detail.tpp=TPP +detail.pedagio=Pedágio +detail.rg=RG +detail.status=Status +detail.codOrigem=Cod. Origem +detail.codDestino=Cod. Destino +detail.total=Total +detail.ccf=CCf + +linhas=Linhas + +detail.numfoliosistema=Bilhete +detail.numasiento=Poltrona diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioSegundaVia_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioSegundaVia_pt_BR.properties index f4ac401f1..bbc7a873a 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioSegundaVia_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioSegundaVia_pt_BR.properties @@ -5,6 +5,7 @@ cabecalho.puntoVenta=Ag cabecalho.empresa=Empresa: label.servico=Serviço label.dataViagem=Data Viagem +label.dataSegundaVia=Data Segunda Via. label.origem=Origem label.destino=Destino label.codOrigem=Cod.Origem @@ -29,6 +30,8 @@ label.horaTransacao=Hora Trans. label.linha=Linha label.ccf=ccf label.ecf=ecf +label.utr=UTR +label.tpp=TPP label.siglaTipoPassagem=Sigl.Tip.Pass label.tipoPassagem=Tp.Pass label.valorTotal=Vlr.Tot diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioSegundaVia.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioSegundaVia.jasper index 224bfebec2db76344beef08f6b4b1a7765df2fe1..c6123b54ba06b18fa30859099542227582c48b57 100644 GIT binary patch literal 49789 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 cYcyS8*aljwU%rX{9|I(qt^fc4 literal 38484 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 - - + + @@ -16,8 +16,8 @@ - - + + @@ -25,289 +25,441 @@ - + + + + + + + + + + + + + + + + - <band height="81" splitType="Stretch"> + <band height="109" splitType="Stretch"> <textField> - <reportElement uuid="6d12efc3-f23b-431a-bfb1-9950e6bfe6fc" x="53" y="61" width="139" height="20"/> - <textElement/> + <reportElement x="53" y="61" width="127" height="20" uuid="6d12efc3-f23b-431a-bfb1-9950e6bfe6fc"/> <textFieldExpression><![CDATA[$P{puntoVenta}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="7830e707-ce31-4907-8665-aa462d023a82" x="0" y="20" width="620" height="20"/> + <reportElement x="0" y="20" width="621" height="20" uuid="7830e707-ce31-4907-8665-aa462d023a82"/> <textElement> <font isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{cabecalho.periodo} + " " + $P{dataInicial} + " " + $R{cabecalho.periodoA} + " " + $P{dataFinal}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="b148e230-ff82-488a-bcdd-5ceb2ea723e3" x="0" y="0" width="620" height="20"/> + <reportElement x="0" y="0" width="621" height="20" uuid="b148e230-ff82-488a-bcdd-5ceb2ea723e3"/> <textElement markup="none"> <font size="14" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{cabecalho.nome}]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy HH:mm"> - <reportElement uuid="1f9eb9ba-8865-4a88-9dbb-471a1907d3c5" x="638" y="0" width="164" height="20"/> + <reportElement x="621" y="0" width="209" height="20" uuid="1f9eb9ba-8865-4a88-9dbb-471a1907d3c5"/> <textElement textAlignment="Right"> <font isBold="true"/> </textElement> <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> </textField> <textField> - <reportElement uuid="47f0b61e-1ba4-43e4-9a4a-c8e17972b943" x="0" y="61" width="53" height="20"/> - <textElement/> + <reportElement x="0" y="61" width="53" height="20" uuid="47f0b61e-1ba4-43e4-9a4a-c8e17972b943"/> <textFieldExpression><![CDATA[$R{cabecalho.puntoVenta}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="f4c6e5b9-844d-440a-9a47-719101152087" x="0" y="41" width="53" height="20"/> + <reportElement x="0" y="41" width="53" height="20" uuid="f4c6e5b9-844d-440a-9a47-719101152087"/> <textElement markup="none"/> <textFieldExpression><![CDATA[$R{cabecalho.empresa}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="6985a79c-5487-47e6-acf7-e94ef7c24073" x="53" y="41" width="139" height="20"/> - <textElement/> + <reportElement x="53" y="41" width="127" height="20" uuid="6985a79c-5487-47e6-acf7-e94ef7c24073"/> <textFieldExpression><![CDATA[$P{empresa}]]></textFieldExpression> </textField> </band> - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - + - + - - + + - - + + - + - + - + - + - + - + - - - - - - - - + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioSegundaViaBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioSegundaViaBean.java index be1890542..e7fc1fb28 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioSegundaViaBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioSegundaViaBean.java @@ -7,10 +7,12 @@ public class RelatorioSegundaViaBean { private String servico; private Date dataViagem; - private Integer origem; - private Integer destino; - private Integer poltrona; + private Date dataServico; + private String origem; + private String destino; + private String poltrona; private Date dataVenda; + private Date dataSegundaVia; private String bilheteiro; private Integer bilhete; private Integer puntoVenta; @@ -18,10 +20,23 @@ public class RelatorioSegundaViaBean { private BigDecimal tarifa; private BigDecimal seguro; private BigDecimal pedagio; + private BigDecimal tpp; + private BigDecimal utr; private Integer coo; private String preImpresso; private String seriePreImpresso; private String serieImpFiscal; + private String serieImpFiscalSegundaVia; + private String nomeEmpresa; + private String nomeAgencia; + private String linha; + private String descOrigem; + private String descDestino; + private String ccf; + private String ecf; + private BigDecimal valorTotal; + private String siglaTipoPassagem; + private String tipoPassagem; public String getServico() { return servico; @@ -39,27 +54,27 @@ public class RelatorioSegundaViaBean { this.dataViagem = dataViagem; } - public Integer getOrigem() { + public String getOrigem() { return origem; } - public void setOrigem(Integer origem) { + public void setOrigem(String origem) { this.origem = origem; } - public Integer getDestino() { + public String getDestino() { return destino; } - public void setDestino(Integer destino) { + public void setDestino(String destino) { this.destino = destino; } - public Integer getPoltrona() { + public String getPoltrona() { return poltrona; } - public void setPoltrona(Integer poltrona) { + public void setPoltrona(String poltrona) { this.poltrona = poltrona; } @@ -159,4 +174,124 @@ public class RelatorioSegundaViaBean { this.serieImpFiscal = serieImpFiscal; } + public String getNomeEmpresa() { + return nomeEmpresa; + } + + public void setNomeEmpresa(String nomeEmpresa) { + this.nomeEmpresa = nomeEmpresa; + } + + public String getNomeAgencia() { + return nomeAgencia; + } + + public void setNomeAgencia(String nomeAgencia) { + this.nomeAgencia = nomeAgencia; + } + + public Date getDataServico() { + return dataServico; + } + + public void setDataServico(Date dataServico) { + this.dataServico = dataServico; + } + + public String getLinha() { + return linha; + } + + public void setLinha(String linha) { + this.linha = linha; + } + + public String getDescOrigem() { + return descOrigem; + } + + public void setDescOrigem(String descOrigem) { + this.descOrigem = descOrigem; + } + + public String getDescDestino() { + return descDestino; + } + + public void setDescDestino(String descDestino) { + this.descDestino = descDestino; + } + + public String getCcf() { + return ccf; + } + + public void setCcf(String ccf) { + this.ccf = ccf; + } + + public String getEcf() { + return ecf; + } + + public void setEcf(String ecf) { + this.ecf = ecf; + } + + public BigDecimal getValorTotal() { + return valorTotal; + } + + public void setValorTotal(BigDecimal valorTotal) { + this.valorTotal = valorTotal; + } + + public String getSiglaTipoPassagem() { + return siglaTipoPassagem; + } + + public void setSiglaTipoPassagem(String siglaTipoPassagem) { + this.siglaTipoPassagem = siglaTipoPassagem; + } + + public String getTipoPassagem() { + return tipoPassagem; + } + + public void setTipoPassagem(String tipoPassagem) { + this.tipoPassagem = tipoPassagem; + } + + public String getSerieImpFiscalSegundaVia() { + return serieImpFiscalSegundaVia; + } + + public void setSerieImpFiscalSegundaVia(String serieImpFiscalSegundaVia) { + this.serieImpFiscalSegundaVia = serieImpFiscalSegundaVia; + } + + public Date getDataSegundaVia() { + return dataSegundaVia; + } + + public void setDataSegundaVia(Date dataSegundaVia) { + this.dataSegundaVia = dataSegundaVia; + } + + public BigDecimal getTpp() { + return tpp; + } + + public void setTpp(BigDecimal tpp) { + this.tpp = tpp; + } + + public BigDecimal getUtr() { + return utr; + } + + public void setUtr(BigDecimal utr) { + this.utr = utr; + } + }