fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug#15134 

dev:
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@97128 d1611594-4594-4d17-8e1d-87c2c4800839
master
thiago.clemente 2019-08-30 19:30:05 +00:00
parent 833b78033f
commit 08ad948a61
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentacaoBilhete.java
View File

@ -163,6 +163,7 @@ public class RelatorioMovimentacaoBilhete extends Relatorio {
gratuidadeBean.setCodOrigem(rset.getString("codOrigem")); gratuidadeBean.setCodOrigem(rset.getString("codOrigem"));
gratuidadeBean.setCodDestino(rset.getString("codDestino")); gratuidadeBean.setCodDestino(rset.getString("codDestino"));
gratuidadeBean.setDescorgao(rset.getString("descorgao")); gratuidadeBean.setDescorgao(rset.getString("descorgao"));
gratuidadeBean.setTpp(rset.getBigDecimal("importetpp"));
// Mantis 15134 // Mantis 15134
gratuidadeBean.setDireccionnumero(rset.getString("direccionnumero")); gratuidadeBean.setDireccionnumero(rset.getString("direccionnumero"));
@ -172,6 +173,8 @@ public class RelatorioMovimentacaoBilhete extends Relatorio {
gratuidadeBean.setSerie(rset.getString("serie")); gratuidadeBean.setSerie(rset.getString("serie"));
gratuidadeBean.setSubserie(rset.getString("subserie")); gratuidadeBean.setSubserie(rset.getString("subserie"));
gratuidadeBean.setNumbpe(rset.getString("num_bpe")); gratuidadeBean.setNumbpe(rset.getString("num_bpe"));
gratuidadeBean.setChavebpe(rset.getString("chbpe"));
gratuidadeBean.setProtocolobpe(rset.getString("nprot"));
if (indstatusboleto.equalsIgnoreCase("TROCA PASSAGEM") if (indstatusboleto.equalsIgnoreCase("TROCA PASSAGEM")
|| indstatusboleto.equalsIgnoreCase("TRANSFERÊNCIA") || indstatusboleto.equalsIgnoreCase("TRANSFERÊNCIA")
@ -263,13 +266,14 @@ public class RelatorioMovimentacaoBilhete extends Relatorio {
sb.append(" r.prefixo,"); sb.append(" r.prefixo,");
sb.append(" aidf.serie serie, "); sb.append(" aidf.serie serie, ");
sb.append(" aidf.subserie subserie, "); sb.append(" aidf.subserie subserie, ");
sb.append(" bpe.num_bpe num_bpe, "); sb.append(" b.num_bpe num_bpe, ");
sb.append(" bpe.chbpe chbpe, "); sb.append(" bpe.chbpe chbpe, ");
sb.append(" bpe.nprot nprot, "); sb.append(" bpe.nprot nprot, ");
sb.append(" 'N/A' as serienovo , "); sb.append(" 'N/A' as serienovo , ");
sb.append(" 'N/A' as subserienovo , "); sb.append(" 'N/A' as subserienovo , ");
sb.append(" 'N/A' as ccfnovo , "); sb.append(" 'N/A' as ccfnovo , ");
sb.append(" 'N/A' as bpenovo "); sb.append(" 'N/A' as bpenovo, ");
sb.append(" b.importetpp ");
sb.append(" FROM boleto b"); sb.append(" FROM boleto b");
sb.append(" JOIN categoria ca ON b.categoria_id = ca.categoria_id"); sb.append(" JOIN categoria ca ON b.categoria_id = ca.categoria_id");
sb.append(" JOIN parada ori ON ori.parada_id = b.origen_id"); sb.append(" JOIN parada ori ON ori.parada_id = b.origen_id");
@ -397,13 +401,14 @@ public class RelatorioMovimentacaoBilhete extends Relatorio {
sb.append(" r.prefixo,"); sb.append(" r.prefixo,");
sb.append(" aidf.serie serie, "); sb.append(" aidf.serie serie, ");
sb.append(" aidf.subserie subserie, "); sb.append(" aidf.subserie subserie, ");
sb.append(" bpe.num_bpe num_bpe, "); sb.append(" c.num_bpe num_bpe, ");
sb.append(" bpe.chbpe chbpe, "); sb.append(" bpe.chbpe chbpe, ");
sb.append(" bpe.nprot nprot, "); sb.append(" bpe.nprot nprot, ");
sb.append(" cori.ccf as ccfnovo, "); sb.append(" cori.ccf as ccfnovo, ");
sb.append(" aidf_ori.serie serienovo, "); sb.append(" aidf_ori.serie serienovo, ");
sb.append(" aidf_ori.subserie subserienovo, "); sb.append(" aidf_ori.subserie subserienovo, ");
sb.append(" bpe_ori.num_bpe bpenovo "); sb.append(" bpe_ori.num_bpe bpenovo, ");
sb.append(" c.importetpp ");
sb.append(" FROM caja c"); sb.append(" FROM caja c");
sb.append(" JOIN categoria ca ON c.categoria_id = ca.categoria_id"); sb.append(" JOIN categoria ca ON c.categoria_id = ca.categoria_id");
sb.append(" JOIN parada ori ON ori.parada_id = c.origen_id"); sb.append(" JOIN parada ori ON ori.parada_id = c.origen_id");

2
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioMovimentacaoBilhete_es.properties
View File

@ -51,4 +51,4 @@ detail.tpp=TPP
detail.status=Status detail.status=Status
detail.chave=Ch. BP-e detail.chave=Ch. BP-e
detail.protocolo=Pt. BP-e detail.protocolo=Pt. BP-e
detail.total=Total detail.total=Total:

BIN
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentacaoBilhete.jasper
View File

Binary file not shown.

10
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentacaoBilhete.jrxml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioMovimentacaoBilhete" pageWidth="1152" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1132" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" resourceBundle="RelatorioMovimentacaoBilhete" whenResourceMissingType="Empty" uuid="94834362-0ecc-46da-b0a2-5cdee355da3e"> <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioMovimentacaoBilhete" pageWidth="1152" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1132" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" resourceBundle="RelatorioMovimentacaoBilhete" whenResourceMissingType="Empty" uuid="94834362-0ecc-46da-b0a2-5cdee355da3e">
<property name="ireport.zoom" value="1.696390473489942"/> <property name="ireport.zoom" value="1.696390473489942"/>
<property name="ireport.x" value="10"/> <property name="ireport.x" value="177"/>
<property name="ireport.y" value="0"/> <property name="ireport.y" value="48"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/> <property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/>
<parameter name="fecInicioViagem" class="java.lang.String"> <parameter name="fecInicioViagem" class="java.lang.String">
<defaultValueExpression><![CDATA[]]></defaultValueExpression> <defaultValueExpression><![CDATA[]]></defaultValueExpression>
@ -45,7 +45,7 @@
<field name="seguro" class="java.math.BigDecimal"/> <field name="seguro" class="java.math.BigDecimal"/>
<field name="utr" class="java.math.BigDecimal"/> <field name="utr" class="java.math.BigDecimal"/>
<field name="pedagio" class="java.math.BigDecimal"/> <field name="pedagio" class="java.math.BigDecimal"/>
<field name="tpp" class="java.lang.String"/> <field name="tpp" class="java.math.BigDecimal"/>
<field name="status" class="java.lang.String"/> <field name="status" class="java.lang.String"/>
<field name="dataMd" class="java.lang.String"/> <field name="dataMd" class="java.lang.String"/>
<field name="codOrigem" class="java.lang.String"/> <field name="codOrigem" class="java.lang.String"/>
@ -467,7 +467,7 @@
<band splitType="Stretch"/> <band splitType="Stretch"/>
</columnHeader> </columnHeader>
<detail> <detail>
<band height="31" splitType="Prevent"> <band height="27" splitType="Prevent">
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement uuid="3111776a-f727-4313-841c-55dabd804df4" stretchType="RelativeToBandHeight" x="150" y="0" width="25" height="23"/> <reportElement uuid="3111776a-f727-4313-841c-55dabd804df4" stretchType="RelativeToBandHeight" x="150" y="0" width="25" height="23"/>
<textElement> <textElement>
@ -491,7 +491,7 @@
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="37fa056d-c401-4268-a455-c5caf5e4eb54" stretchType="RelativeToBandHeight" x="450" y="0" width="25" height="23"/> <reportElement uuid="37fa056d-c401-4268-a455-c5caf5e4eb54" stretchType="RelativeToBandHeight" x="450" y="0" width="25" height="23"/>
<textElement> <textElement textAlignment="Center">
<font size="5"/> <font size="5"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{numasiento}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{numasiento}]]></textFieldExpression>