diff --git a/pom.xml b/pom.xml
index e1d43ecda..0f974adbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
br.com.rjconsultores
ventaboletosadm
- 1.0.67
+ 1.0.68
war
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java
index c732414f9..3dc7fdaea 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java
@@ -76,7 +76,8 @@ public class RelatorioBPe extends Relatorio {
dataResult.put("valorseguro", rset.getBigDecimal("valorseguro"));
dataResult.put("valoroutros", rset.getBigDecimal("valoroutros"));
dataResult.put("errocontingencia", rset.getString("errocontingencia"));
-
+ dataResult.put("evento", rset.getString("evento"));
+
this.dados.add(dataResult);
}
@@ -105,7 +106,7 @@ public class RelatorioBPe extends Relatorio {
sql.append(" SELECT ");
sql.append(" dtvenda, hrvenda, locpuntoventa,numPuntoVenta, origem, destino, dtviagem, vlbpe, valortarifa, valortaxa, valorpedagio, ");
- sql.append(" valorseguro, valoroutros, chbpe, protocolo, num_bpe, numserie_bpe, status, obs, qrcode, errocontingencia ");
+ sql.append(" valorseguro, valoroutros, chbpe, protocolo, num_bpe, numserie_bpe, status, obs, qrcode, errocontingencia, evento ");
sql.append(" FROM ( ");
getSelectFrom(sql, alias);
@@ -218,8 +219,6 @@ public class RelatorioBPe extends Relatorio {
}
sql.append(" locpv.DESCPARADA as locpuntoventa, ");
sql.append(" pv.NUMPUNTOVENTA as numPuntoVenta, ");
-
-
sql.append(" TO_CHAR(bol.FECHORVIAJE,'dd/mm/yyyy HH24:MI') as dtviagem, ");
sql.append(" COALESCE(bol.PRECIOPAGADO,0) + coalesce(bol.IMPORTETAXAEMBARQUE,0) + coalesce(bol.IMPORTESEGURO,0) + coalesce(bol.IMPORTEPEDAGIO,0) + coalesce(bol.IMPORTEOUTROS,0) as vlbpe, ");
@@ -234,29 +233,31 @@ public class RelatorioBPe extends Relatorio {
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 ( ");
+ sql.append(" CASE bpe.tipoevento WHEN '110111' THEN 'Cancelado' ");
+ sql.append(" WHEN '110116' THEN 'Alteração de Poltrona' ");
+ sql.append(" WHEN '110115' THEN 'Não embarcado' ELSE '' END as evento, ");
+
+ sql.append(" case bpe.codstat when '100' then ( ");
sql.append(" case ");
sql.append(" when bpe.tiposubstituicao is null and bpeSub.bpe_id is null and bpe.indcontingencia = 0 then 'Autorizado' ");
sql.append(" when bpe.tiposubstituicao is null and bpeSub.bpe_id is null and bpe.indcontingencia = 1 then 'Aut.Conting.' ");
- sql.append(" when bpe.tiposubstituicao is not null then 'Autorizado/Substituição' ");
- sql.append(" when bpeSub.bpe_id is not null then 'Autorizado/Substituído' ");
+ sql.append(" when bpe.tiposubstituicao is not null then 'Autorizado/Substituição' ");
+ sql.append(" when bpeSub.bpe_id is not null then 'Autorizado/SubstituÃdo' ");
sql.append(" else 'Autorizado' ");
sql.append(" end ");
sql.append(" ) ");
sql.append(" when '102' then ( ");
sql.append(" case ");
- sql.append(" when bpe.tiposubstituicao is not null then 'Substituição' ");
- sql.append(" when bpeSub.bpe_id is not null then 'Substituído' ");
+ sql.append(" when bpe.tiposubstituicao is not null then 'Substituição' ");
+ sql.append(" when bpeSub.bpe_id is not null then 'SubstituÃdo' ");
sql.append(" end ");
sql.append(" ) ");
sql.append(" when '135' then ( ");
sql.append(" case bpe.tipoevento ");
sql.append(" when '110111' then 'Cancelado' ");
- sql.append(" when '110115' then 'Não embarcado' ");
+ sql.append(" when '110115' then 'Não embarcado' ");
sql.append(" else '' ");
sql.append(" end ");
sql.append(" ) ");
@@ -264,8 +265,8 @@ public class RelatorioBPe extends Relatorio {
sql.append(" when '150' then 'Aut.Conting.' ");
sql.append(" when '-1' then 'Pendente Envio' ");
sql.append(" when '-2' then 'Pendente Envio' ");
- sql.append(" when '-10' then 'Rejeitado Envio Contingência' ");
- sql.append(" when '-20' then 'Rejeitado Envio Contingência' ");
+ sql.append(" when '-10' then 'Rejeitado Envio Contingência' ");
+ sql.append(" when '-20' then 'Rejeitado Envio Contingência' ");
sql.append(" else 'Rejeitado' ");
sql.append(" end as status, ");
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPeRejeitadoEnvioContingencia_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPeRejeitadoEnvioContingencia_es.properties
index 47009c601..b721b11ea 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPeRejeitadoEnvioContingencia_es.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPeRejeitadoEnvioContingencia_es.properties
@@ -28,4 +28,5 @@ label.numBPe=N
label.serie=Série
label.status=Status
label.obs=Observação
-label.erroEnvioContingencia=Erro Envio em Contingência
\ No newline at end of file
+label.erroEnvioContingencia=Erro Envio em Contingência
+label.evento=Tipo Evento
\ No newline at end of file
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPeRejeitadoEnvioContingencia_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPeRejeitadoEnvioContingencia_pt_BR.properties
index 47009c601..b721b11ea 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPeRejeitadoEnvioContingencia_pt_BR.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPeRejeitadoEnvioContingencia_pt_BR.properties
@@ -28,4 +28,5 @@ label.numBPe=N
label.serie=Série
label.status=Status
label.obs=Observação
-label.erroEnvioContingencia=Erro Envio em Contingência
\ No newline at end of file
+label.erroEnvioContingencia=Erro Envio em Contingência
+label.evento=Tipo Evento
\ No newline at end of file
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPeRejeitadoEnvioContingencia.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPeRejeitadoEnvioContingencia.jasper
index f63b9a6e4..9cef4cf4a 100644
Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPeRejeitadoEnvioContingencia.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPeRejeitadoEnvioContingencia.jasper differ
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPeRejeitadoEnvioContingencia.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPeRejeitadoEnvioContingencia.jrxml
index 1784ff70d..035292a68 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPeRejeitadoEnvioContingencia.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPeRejeitadoEnvioContingencia.jrxml
@@ -1,5 +1,6 @@
-
+
+
@@ -7,6 +8,15 @@
+
+
+
+
+
+
+
+
+
@@ -23,10 +33,13 @@
+
+
+
<band height="75" splitType="Stretch">
<textField pattern="" isBlankWhenNull="false">
- <reportElement uuid="da52f710-3882-4beb-ba6f-870e03f6800d" mode="Transparent" x="0" y="0" width="1371" height="41" forecolor="#000000" backcolor="#FFFFFF"/>
+ <reportElement mode="Transparent" x="0" y="0" width="1445" height="41" forecolor="#000000" backcolor="#FFFFFF" uuid="da52f710-3882-4beb-ba6f-870e03f6800d"/>
<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
<font fontName="SansSerif" size="16" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@@ -34,7 +47,7 @@
<textFieldExpression><![CDATA[$P{NOME_RELATORIO}]]></textFieldExpression>
</textField>
<textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
- <reportElement uuid="2f4f1314-9363-4e6d-822f-c85c1890998b" mode="Transparent" x="1639" y="25" width="21" height="16" forecolor="#000000" backcolor="#FFFFFF"/>
+ <reportElement mode="Transparent" x="1713" 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="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@@ -42,7 +55,7 @@
<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="false">
- <reportElement uuid="c8a70b8d-369e-48ae-a911-a5d9692316f7" mode="Transparent" x="1371" y="42" width="289" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+ <reportElement mode="Transparent" x="1445" y="42" width="289" 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"/>
@@ -50,7 +63,7 @@
<textFieldExpression><![CDATA[$R{cabecalho.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression>
</textField>
<textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false">
- <reportElement uuid="ad4bbfb8-582d-4aa2-904d-8dfe60e54442" mode="Transparent" x="1556" y="0" width="104" height="25" forecolor="#000000" backcolor="#FFFFFF"/>
+ <reportElement mode="Transparent" x="1630" y="0" width="104" height="25" forecolor="#000000" backcolor="#FFFFFF" uuid="ad4bbfb8-582d-4aa2-904d-8dfe60e54442"/>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="9" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@@ -58,7 +71,7 @@
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="false">
- <reportElement uuid="8601bf20-f5f8-4fed-9445-7adfe580d236" mode="Transparent" x="1371" y="25" width="267" height="16" forecolor="#000000" backcolor="#FFFFFF"/>
+ <reportElement mode="Transparent" x="1445" 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="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@@ -66,73 +79,73 @@
<textFieldExpression><![CDATA[$R{cabecalho.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{cabecalho.de}]]></textFieldExpression>
</textField>
<textField>
- <reportElement uuid="b48a0903-0b2a-4ae5-ae04-811d097a9f91" x="1371" y="0" width="185" height="25"/>
+ <reportElement x="1445" y="0" width="185" height="25" uuid="b48a0903-0b2a-4ae5-ae04-811d097a9f91"/>
<textElement textAlignment="Right">
<font size="9" isBold="false"/>
</textElement>
<textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression>
</textField>
<line>
- <reportElement uuid="3c577f75-c6d6-4c11-a846-bfe71a8a1b42" x="-1" y="58" width="1661" height="1"/>
+ <reportElement x="-1" y="58" width="1661" height="1" uuid="3c577f75-c6d6-4c11-a846-bfe71a8a1b42"/>
</line>
<textField isStretchWithOverflow="true">
- <reportElement uuid="aff6535e-c25b-4f31-ad3a-baacc52e4974" x="-1" y="59" width="1661" height="15"/>
+ <reportElement x="-1" y="59" width="1735" height="15" uuid="aff6535e-c25b-4f31-ad3a-baacc52e4974"/>
<textElement verticalAlignment="Middle">
<font size="10" isBold="false"/>
</textElement>
<textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression>
</textField>
<line>
- <reportElement uuid="84641d2c-21a5-47f0-b4a8-afe7bf700cb6" positionType="Float" x="-1" y="74" width="1661" height="1"/>
+ <reportElement positionType="Float" x="-1" y="74" width="1661" height="1" uuid="84641d2c-21a5-47f0-b4a8-afe7bf700cb6"/>
</line>
</band>
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -140,28 +153,28 @@
-
+
-
+
-
+
-
+
@@ -169,60 +182,67 @@
-
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -231,28 +251,28 @@
-
+
-
+
-
+
-
+
@@ -260,18 +280,25 @@
-
+
+
+
+
+
+
+
+
-
+