diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java index 04fe63dd1..52cc994db 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java @@ -144,6 +144,7 @@ public class RelatorioGratuidade extends Relatorio { gratuidadeBean.setCodOrigem(rset.getString("codOrigem")); gratuidadeBean.setCodDestino(rset.getString("codDestino")); gratuidadeBean.setDescorgao(rset.getString("descorgao")); + gratuidadeBean.setChbpe(rset.getString("chbpe")); lsDadosRelatorio.add(gratuidadeBean); } @@ -213,7 +214,8 @@ public class RelatorioGratuidade extends Relatorio { sb.append(" else b.indstatusboleto "); sb.append(" end as indstatusboleto, "); sb.append(" ori.cveparada codorigem,"); - sb.append(" des.cveparada coddestino"); + sb.append(" des.cveparada coddestino,"); + sb.append(" bpe.chbpe chbpe "); sb.append(" FROM boleto b"); sb.append(" JOIN categoria ca ON b.categoria_id = ca.categoria_id"); sb.append(" JOIN parada ori ON ori.parada_id = b.origen_id"); @@ -232,6 +234,7 @@ public class RelatorioGratuidade extends Relatorio { sb.append(" JOIN marca m on m.marca_id = b.marca_id"); sb.append(" JOIN empresa e on e.empresa_id = m.empresa_id"); sb.append(" JOIN orgao_concedente og ON og.orgaoconcedente_id = tar.orgaoconcedente_id"); + sb.append(" LEFT JOIN bpe bpe on bpe.boleto_id = b.boleto_id "); sb.append(" WHERE 1=1 and b.tipoventa_id = 15"); sb.append(" AND b.indstatusboleto = 'S' "); @@ -321,7 +324,8 @@ public class RelatorioGratuidade extends Relatorio { sb.append(" when c.indreimpresion = 1 and c.motivoreimpresion_id = 99 then 'REIMPRESSO' "); sb.append(" end as indstatusboleto,"); sb.append(" ori.cveparada codorigem,"); - sb.append(" des.cveparada coddestino"); + sb.append(" des.cveparada coddestino,"); + sb.append(" bpe.chbpe chbpe "); sb.append(" FROM caja c"); sb.append(" JOIN categoria ca ON c.categoria_id = ca.categoria_id"); sb.append(" JOIN parada ori ON ori.parada_id = c.origen_id"); @@ -342,6 +346,7 @@ public class RelatorioGratuidade extends Relatorio { sb.append(" JOIN orgao_concedente og ON og.orgaoconcedente_id = tar.orgaoconcedente_id"); sb.append(" LEFT JOIN bpe bpe on bpe.boleto_id = c.transacao_id "); sb.append(" LEFT JOIN cambio_titularidad ct on ct.boleto_id = c.transacao_id "); + sb.append(" LEFT JOIN bpe bpe on bpe.boleto_id = c.transacao_id "); sb.append(" WHERE 1=1 "); sb.append(" and c.motivoreimpresion_id is null "); sb.append(" and (c.motivocancelacion_id IN ("); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidadeSimplificado_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidadeSimplificado_es.properties index 3bf1616e0..692f477d8 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidadeSimplificado_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidadeSimplificado_es.properties @@ -49,6 +49,7 @@ detail.codOrigem=Cod. Origem detail.codDestino=Cod. Destino detail.total=Total detail.ccf=CCf +detail.chaveBPe=Ch. BP-e linhas=Linhas diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidadeSimplificado_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidadeSimplificado_pt_BR.properties index 35322a8d6..9a936fe2c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidadeSimplificado_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidadeSimplificado_pt_BR.properties @@ -49,6 +49,7 @@ detail.codOrigem=Cod. Origem detail.codDestino=Cod. Destino detail.total=Total detail.ccf=CCf +detail.chaveBPe=Ch. BP-e linhas=Linhas diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_es.properties index c35d69e0f..18cda1a0e 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_es.properties @@ -49,6 +49,7 @@ detail.codOrigem=Cod. Origem detail.codDestino=Cod. Destino detail.total=Total detail.ccf=CCf +detail.chaveBPe=Ch. BP-e linhas=Linhas diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_pt_BR.properties index c35d69e0f..18cda1a0e 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_pt_BR.properties @@ -49,6 +49,7 @@ detail.codOrigem=Cod. Origem detail.codDestino=Cod. Destino detail.total=Total detail.ccf=CCf +detail.chaveBPe=Ch. BP-e linhas=Linhas diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jasper index 7c6eb6d89..48394c0a5 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jrxml index aade7f73f..c6a103fad 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jrxml @@ -1,8 +1,8 @@ - - - + + + @@ -54,6 +54,7 @@ + @@ -124,22 +125,22 @@ - + - + - - + + @@ -152,49 +153,49 @@ - + - + - + - + - + - + - + @@ -208,21 +209,21 @@ - + - + - + @@ -236,63 +237,63 @@ - + - + - + - + - + - + - + - + - + @@ -313,14 +314,14 @@ - + - + @@ -341,13 +342,20 @@ + + + + + + + - + @@ -356,133 +364,133 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -517,35 +525,35 @@ - + - + - + - + - + @@ -558,6 +566,13 @@ + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeSimplificado.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeSimplificado.jasper index 6e11aefb2..c8a74d6fc 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeSimplificado.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeSimplificado.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeSimplificado.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeSimplificado.jrxml index 4b453ab29..cff94a258 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeSimplificado.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeSimplificado.jrxml @@ -1,8 +1,8 @@ - - - + + + @@ -54,6 +54,7 @@ + @@ -69,208 +70,232 @@ <band height="144"> <textField> - <reportElement x="0" y="0" width="318" height="37" uuid="652312bd-292a-424d-a234-5f157e3699c6"/> + <reportElement uuid="652312bd-292a-424d-a234-5f157e3699c6" x="0" y="0" width="318" height="37"/> + <textElement/> <textFieldExpression><![CDATA[$P{TITULO}]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="37" width="148" height="23" uuid="e5d4714c-07cc-42ff-a7a8-76d6f6d3e716"/> + <reportElement uuid="e5d4714c-07cc-42ff-a7a8-76d6f6d3e716" x="0" y="37" width="148" height="23"/> + <textElement/> <textFieldExpression><![CDATA[$R{header.periodo.viagem}]]></textFieldExpression> </textField> <textField> - <reportElement x="739" y="37" width="72" height="23" uuid="66b2d0f6-2bf1-4bc7-9ec0-a34444e04d60"/> + <reportElement uuid="66b2d0f6-2bf1-4bc7-9ec0-a34444e04d60" x="739" y="37" width="72" height="23"/> + <textElement/> <textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression> </textField> <textField evaluationTime="Report"> - <reportElement x="1070" y="37" width="62" height="23" uuid="8ca68351-fc00-4f19-b94f-f2fd1f41964f"/> + <reportElement uuid="8ca68351-fc00-4f19-b94f-f2fd1f41964f" x="1070" y="37" width="62" height="23"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression> </textField> <textField> - <reportElement x="930" y="37" width="95" height="23" uuid="be1692e9-f130-4d08-9173-6ca3e4699030"/> + <reportElement uuid="be1692e9-f130-4d08-9173-6ca3e4699030" x="930" y="37" width="95" height="23"/> + <textElement/> <textFieldExpression><![CDATA[$R{header.pagina}]]></textFieldExpression> </textField> <textField> - <reportElement x="148" y="37" width="170" height="23" uuid="4914d9e7-6ce8-4512-b1f8-13f3b572ac50"/> + <reportElement uuid="4914d9e7-6ce8-4512-b1f8-13f3b572ac50" x="148" y="37" width="170" height="23"/> + <textElement/> <textFieldExpression><![CDATA[( $P{fecInicioViagem} != null ? ($P{fecInicioViagem} + " à " + $P{fecFinalViagem}) : "" )]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy HH:mm"> - <reportElement x="811" y="37" width="119" height="23" uuid="6f671365-868e-41a6-81ee-a308d1d91e1d"/> + <reportElement uuid="6f671365-868e-41a6-81ee-a308d1d91e1d" x="811" y="37" width="119" height="23"/> <textElement textAlignment="Left"/> <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> </textField> <textField> - <reportElement x="1025" y="37" width="45" height="23" uuid="7548d623-fb6c-48d4-b8b7-504f5437a79a"/> + <reportElement uuid="7548d623-fb6c-48d4-b8b7-504f5437a79a" x="1025" y="37" width="45" height="23"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="60" width="148" height="21" uuid="a79c03e0-bbe4-4b1c-8297-533a0d137b27"/> + <reportElement uuid="a79c03e0-bbe4-4b1c-8297-533a0d137b27" x="0" y="60" width="148" height="21"/> + <textElement/> <textFieldExpression><![CDATA[$R{header.periodo.venda}]]></textFieldExpression> </textField> <textField> - <reportElement x="148" y="60" width="170" height="21" uuid="b31b00a3-1ced-4f9c-acb7-470646f7b335"/> + <reportElement uuid="b31b00a3-1ced-4f9c-acb7-470646f7b335" x="148" y="60" width="170" height="21"/> + <textElement/> <textFieldExpression><![CDATA[( $P{fecInicioVenda} != null ? ($P{fecInicioVenda} + " à " + $P{fecFinalVenda}) : "" )]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="81" width="148" height="20" uuid="8fb67bb3-6ff2-40d1-b338-714f199ea7f0"/> + <reportElement uuid="8fb67bb3-6ff2-40d1-b338-714f199ea7f0" x="0" y="81" width="148" height="20"/> + <textElement/> <textFieldExpression><![CDATA[$R{header.empresa}]]></textFieldExpression> </textField> <textField> - <reportElement x="1" y="114" width="147" height="26" uuid="2c09f3ff-c554-4ce2-886e-eaab93fa15eb"/> + <reportElement uuid="2c09f3ff-c554-4ce2-886e-eaab93fa15eb" x="1" y="114" width="147" height="26"/> <textElement> <font size="10"/> </textElement> <textFieldExpression><![CDATA[$R{detail.origen}]]></textFieldExpression> </textField> <textField> - <reportElement x="148" y="114" width="170" height="26" uuid="e18edb89-17f4-417e-8041-664f11245cbd"/> + <reportElement uuid="e18edb89-17f4-417e-8041-664f11245cbd" x="148" y="114" width="170" height="26"/> <textElement> <font size="10"/> </textElement> <textFieldExpression><![CDATA[$R{detail.destino}]]></textFieldExpression> </textField> <textField> - <reportElement x="739" y="114" width="72" height="26" uuid="0948a2fc-fc39-4f2d-ab06-d7c97a66df39"/> + <reportElement uuid="0948a2fc-fc39-4f2d-ab06-d7c97a66df39" x="693" y="114" width="72" height="26"/> <textElement> <font size="10"/> </textElement> <textFieldExpression><![CDATA[$R{detail.numasiento}]]></textFieldExpression> </textField> <textField> - <reportElement x="318" y="114" width="96" height="26" uuid="c4b5d11d-79a1-4850-8294-8ccaa0898bca"/> + <reportElement uuid="c4b5d11d-79a1-4850-8294-8ccaa0898bca" x="318" y="114" width="72" height="26"/> <textElement> <font size="10"/> </textElement> <textFieldExpression><![CDATA[$R{detail.numfoliosistema}]]></textFieldExpression> </textField> <textField> - <reportElement x="414" y="114" width="93" height="26" uuid="2af7bea7-e8bf-424a-9813-c9d2be7c0459"/> + <reportElement uuid="2af7bea7-e8bf-424a-9813-c9d2be7c0459" x="390" y="114" width="71" height="26"/> <textElement textAlignment="Center"> <font size="10"/> </textElement> <textFieldExpression><![CDATA[$R{detail.dataMD}]]></textFieldExpression> </textField> <textField> - <reportElement x="930" y="114" width="95" height="27" uuid="7b62e459-04bc-4227-be76-24bf5938d552"/> + <reportElement uuid="7b62e459-04bc-4227-be76-24bf5938d552" x="855" y="114" width="95" height="27"/> <textElement> <font size="10"/> </textElement> <textFieldExpression><![CDATA[$R{detail.tipo}]]></textFieldExpression> </textField> <textField> - <reportElement x="1025" y="114" width="107" height="26" uuid="17200d3a-6195-42d1-bc36-ff2baffb56ce"/> + <reportElement uuid="17200d3a-6195-42d1-bc36-ff2baffb56ce" x="950" y="114" width="107" height="26"/> <textElement textAlignment="Center"> <font size="10"/> </textElement> <textFieldExpression><![CDATA[$R{detail.hora}]]></textFieldExpression> </textField> <line> - <reportElement x="1" y="140" width="1131" height="1" uuid="8e2d6686-e4d7-43d5-b3a9-46adc3e58350"/> + <reportElement uuid="8e2d6686-e4d7-43d5-b3a9-46adc3e58350" x="1" y="140" width="1131" height="1"/> </line> <textField> - <reportElement x="148" y="81" width="170" height="20" uuid="3541e1b0-8dfe-404e-9461-64d10d85531a"/> + <reportElement uuid="3541e1b0-8dfe-404e-9461-64d10d85531a" x="148" y="81" width="170" height="20"/> + <textElement/> <textFieldExpression><![CDATA[$P{nomb_empresa}]]></textFieldExpression> </textField> <textField> - <reportElement x="811" y="114" width="119" height="26" uuid="c79866b7-1c62-4d05-99ac-7149916a1a03"/> - <textElement> + <reportElement uuid="c79866b7-1c62-4d05-99ac-7149916a1a03" x="765" y="114" width="88" height="26"/> + <textElement textAlignment="Right"> <font size="10"/> </textElement> <textFieldExpression><![CDATA[$R{detail.desconto}]]></textFieldExpression> </textField> <textField> - <reportElement x="507" y="114" width="232" height="26" uuid="ba5886a6-f2fe-4bec-a845-96569ac6e9ee"/> + <reportElement uuid="ba5886a6-f2fe-4bec-a845-96569ac6e9ee" x="461" y="114" width="232" height="26"/> <textElement textAlignment="Center"> <font size="10"/> </textElement> <textFieldExpression><![CDATA[$R{detail.pasajero}]]></textFieldExpression> </textField> + <textField> + <reportElement uuid="fbca00cc-88d2-405c-b9fd-59dadd10e1e4" x="1057" y="114" width="75" height="26"/> + <textElement> + <font size="10"/> + </textElement> + <textFieldExpression><![CDATA[$R{detail.chaveBPe}]]></textFieldExpression> + </textField> </band> - + - + - + - + - + - + - - + + - + - + - + + + + + + + + - + - + + - - + + @@ -278,7 +303,8 @@ - + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java index d032cfe59..19e6ef060 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java @@ -41,6 +41,7 @@ public class RelatorioGratuidadeBean { private String codDestino; private String descorgao; private String ccf; + private String chbpe; // Mantis 15731 public String getFecdatviaje() { return fecdatviaje; @@ -259,4 +260,11 @@ public class RelatorioGratuidadeBean { this.tpp = tpp; } + public String getChbpe() { + return chbpe; + } + + public void setChbpe(String chbpe) { + this.chbpe = chbpe; + } }