diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java index 416b1f6bf..94c9053c1 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java @@ -57,18 +57,24 @@ public class RelatorioBPe extends Relatorio { dataResult.put("dtvenda", rset.getString("dtvenda")); dataResult.put("hrvenda", rset.getString("hrvenda")); + dataResult.put("locpuntoventa", rset.getString("locpuntoventa")); 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("vlbpe", rset.getBigDecimal("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")); - dataResult.put("errocontingencia", rset.getString("errocontingencia")); - + dataResult.put("valortarifa", rset.getBigDecimal("valortarifa")); + dataResult.put("valortaxa", rset.getBigDecimal("valortaxa")); + dataResult.put("valorpedagio", rset.getBigDecimal("valorpedagio")); + dataResult.put("valorseguro", rset.getBigDecimal("valorseguro")); + dataResult.put("valoroutros", rset.getBigDecimal("valoroutros")); + dataResult.put("errocontingencia", rset.getBigDecimal("errocontingencia")); + this.dados.add(dataResult); } @@ -104,13 +110,19 @@ public class RelatorioBPe extends Relatorio { sql.append(" COALESCE(oriA.DESCPARADA, ori.DESCPARADA) as origem, "); sql.append(" COALESCE(destA.DESCPARADA, dest.DESCPARADA) as destino,"); } - + sql.append(" locpv.DESCPARADA as locpuntoventa, "); sql.append(" ori.DESCPARADA as origem, "); sql.append(" dest.DESCPARADA as destino,"); sql.append(" TO_CHAR(bol.FECHORVIAJE,'dd/mm/yyyy HH24:MI') 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(" COALESCE(bol.PRECIOPAGADO,0) + coalesce(bol.IMPORTETAXAEMBARQUE,0) + coalesce(bol.IMPORTESEGURO,0) + coalesce(bol.IMPORTEPEDAGIO,0) + coalesce(bol.IMPORTEOUTROS,0) as vlbpe, "); + sql.append(" COALESCE(bol.PRECIOPAGADO,0) as valortarifa, "); + sql.append(" COALESCE(bol.IMPORTETAXAEMBARQUE,0) as valortaxa, "); + sql.append(" COALESCE(bol.IMPORTEPEDAGIO,0) as valorpedagio, "); + sql.append(" COALESCE(bol.IMPORTESEGURO,0) as valorseguro, "); + sql.append(" COALESCE(bol.IMPORTEOUTROS,0) as valoroutros, "); + sql.append(" bpe.CHBPE, "); sql.append(" bol.NUM_BPE as num_bpe, "); sql.append(" COALESCE(bol.NUMSERIE_BPE, '1') as numserie_bpe, "); @@ -170,6 +182,10 @@ public class RelatorioBPe extends Relatorio { 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(" LEFT JOIN PUNTO_VENTA pv "); + sql.append(" ON bol.PUNTOVENTA_ID = pv.PUNTOVENTA_ID "); + sql.append(" LEFT JOIN PARADA locpv "); + sql.append(" ON pv.PARADA_ID = locpv.PARADA_ID AND locpv.activo = 1"); sql.append(" WHERE e.ACTIVO = 1 "); 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 b09eb6878..47009c601 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPeRejeitadoEnvioContingencia_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPeRejeitadoEnvioContingencia_es.properties @@ -16,7 +16,13 @@ label.horaVenda=Hora Venda label.origem=Origem label.destino=Destino label.dataViagem=Data Viagem -label.valorBPe=Valor +label.valorBPe=Valor Tot +label.origemPV= Loc. Venda +label.valortarifa=Tarifa +label.valortaxa=Taxa +label.valorpedagio=Pedágio +label.valorseguro=Seguro +label.valoroutros=Outros label.chaveAcesso=Chave Acesso label.numBPe=Número BPe label.serie=Série 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 b09eb6878..47009c601 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 @@ -16,7 +16,13 @@ label.horaVenda=Hora Venda label.origem=Origem label.destino=Destino label.dataViagem=Data Viagem -label.valorBPe=Valor +label.valorBPe=Valor Tot +label.origemPV= Loc. Venda +label.valortarifa=Tarifa +label.valortaxa=Taxa +label.valorpedagio=Pedágio +label.valorseguro=Seguro +label.valoroutros=Outros label.chaveAcesso=Chave Acesso label.numBPe=Número BPe label.serie=Série diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_es.properties index be7477a3e..ced84eb2a 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_es.properties @@ -16,9 +16,16 @@ label.horaVenda=Hora Venda label.origem=Origem label.destino=Destino label.dataViagem=Data Viagem -label.valorBPe=Valor +label.valorBPe=Valor +label.origemPV= Loc. Venda +label.valortarifa=Tarifa +label.valortaxa=Taxa +label.valorpedagio=Pedágio +label.valorseguro=Seguro +label.valoroutros=Outros 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 +label.obs=Observação +header.filtro.total=Total Geral: \ 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 index be7477a3e..829b63ebf 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_pt_BR.properties @@ -10,13 +10,20 @@ cabecalho.impressorPor=Impressor por: cabecalho.pagina=Página cabecalho.de=de cabecalho.filtros=Filtros: +header.filtro.total=Total Geral: label.dataVenda=Data Venda label.horaVenda=Hora Venda label.origem=Origem label.destino=Destino label.dataViagem=Data Viagem -label.valorBPe=Valor +label.valorBPe=Valor +label.origemPV= Loc. Venda +label.valortarifa=Tarifa +label.valortaxa=Taxa +label.valorpedagio=Pedágio +label.valorseguro=Seguro +label.valoroutros=Outros label.chaveAcesso=Chave Acesso label.numBPe=Número BPe label.serie=Série diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jasper index 7c89a0afe..3269e1c1b 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jrxml index 855efd327..9afd3b6da 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jrxml @@ -1,12 +1,18 @@ - - + + + @@ -15,17 +21,59 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band height="79" splitType="Stretch"> <textField pattern="" isBlankWhenNull="false"> - <reportElement mode="Transparent" x="0" y="0" width="1021" height="41" forecolor="#000000" backcolor="#FFFFFF" uuid="da52f710-3882-4beb-ba6f-870e03f6800d"/> + <reportElement uuid="da52f710-3882-4beb-ba6f-870e03f6800d" mode="Transparent" x="0" y="0" width="1021" height="41" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none"> <font fontName="SansSerif" size="16" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> @@ -33,7 +81,7 @@ <textFieldExpression><![CDATA[$P{NOME_RELATORIO}]]></textFieldExpression> </textField> <textField evaluationTime="Report" pattern="" isBlankWhenNull="false"> - <reportElement mode="Transparent" x="1289" y="25" width="21" height="16" forecolor="#000000" backcolor="#FFFFFF" uuid="2f4f1314-9363-4e6d-822f-c85c1890998b"/> + <reportElement uuid="2f4f1314-9363-4e6d-822f-c85c1890998b" mode="Transparent" x="1289" y="25" width="21" height="16" forecolor="#000000" backcolor="#FFFFFF"/> <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"/> @@ -41,7 +89,7 @@ <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="false"> - <reportElement mode="Transparent" x="1021" y="42" width="289" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="c8a70b8d-369e-48ae-a911-a5d9692316f7"/> + <reportElement uuid="c8a70b8d-369e-48ae-a911-a5d9692316f7" mode="Transparent" x="1021" y="42" width="289" height="15" forecolor="#000000" backcolor="#FFFFFF"/> <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"/> @@ -49,7 +97,7 @@ <textFieldExpression><![CDATA[$R{cabecalho.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false"> - <reportElement mode="Transparent" x="1206" y="0" width="104" height="25" forecolor="#000000" backcolor="#FFFFFF" uuid="ad4bbfb8-582d-4aa2-904d-8dfe60e54442"/> + <reportElement uuid="ad4bbfb8-582d-4aa2-904d-8dfe60e54442" mode="Transparent" x="1206" y="0" width="104" height="25" forecolor="#000000" backcolor="#FFFFFF"/> <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"/> @@ -57,7 +105,7 @@ <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="false"> - <reportElement mode="Transparent" x="1021" y="25" width="267" height="16" forecolor="#000000" backcolor="#FFFFFF" uuid="8601bf20-f5f8-4fed-9445-7adfe580d236"/> + <reportElement uuid="8601bf20-f5f8-4fed-9445-7adfe580d236" mode="Transparent" x="1021" y="25" width="267" height="16" forecolor="#000000" backcolor="#FFFFFF"/> <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"/> @@ -65,73 +113,66 @@ <textFieldExpression><![CDATA[$R{cabecalho.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{cabecalho.de}]]></textFieldExpression> </textField> <textField> - <reportElement x="1021" y="0" width="185" height="25" uuid="b48a0903-0b2a-4ae5-ae04-811d097a9f91"/> + <reportElement uuid="b48a0903-0b2a-4ae5-ae04-811d097a9f91" x="1021" y="0" width="185" height="25"/> <textElement textAlignment="Right"> <font size="9" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression> </textField> <line> - <reportElement x="-1" y="58" width="1311" height="1" uuid="3c577f75-c6d6-4c11-a846-bfe71a8a1b42"/> + <reportElement uuid="3c577f75-c6d6-4c11-a846-bfe71a8a1b42" x="-1" y="58" width="1311" height="1"/> </line> <textField isStretchWithOverflow="true"> - <reportElement x="-1" y="59" width="1311" height="15" uuid="aff6535e-c25b-4f31-ad3a-baacc52e4974"/> + <reportElement uuid="aff6535e-c25b-4f31-ad3a-baacc52e4974" x="-1" y="57" width="1311" height="21"/> <textElement verticalAlignment="Middle"> - <font size="10"/> + <font size="12" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression> </textField> <line> - <reportElement positionType="Float" x="-1" y="78" width="1311" height="1" uuid="84641d2c-21a5-47f0-b4a8-afe7bf700cb6"/> + <reportElement uuid="84641d2c-21a5-47f0-b4a8-afe7bf700cb6" positionType="Float" x="-1" y="78" width="1311" height="1"/> </line> </band> - + - + - + - + - - - - - - - - - + + - + - + @@ -139,81 +180,130 @@ - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + @@ -222,39 +312,176 @@ - - - - - - - - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - +