diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java index 188235a83..db3416ef9 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java @@ -49,6 +49,7 @@ public class RelatorioBPe extends Relatorio { dataResult.put("status", rset.getString("status")); dataResult.put("obs", rset.getString("obs")); dataResult.put("qrcode", rset.getString("qrcode")); + dataResult.put("errocontingencia", rset.getString("errocontingencia")); this.dados.add(dataResult); } @@ -72,10 +73,10 @@ public class RelatorioBPe extends Relatorio { sql.append("SELECT"); sql.append(" TO_CHAR(COALESCE(bpe.DT_VENDA,bol.FECHORVENTA),'dd/mm/yyyy') as dtvenda, "); - sql.append(" TO_CHAR(COALESCE(bpe.DT_VENDA,bol.FECHORVENTA),'HH24:MI:SS') as hrvenda, "); + sql.append(" TO_CHAR(COALESCE(bpe.DT_VENDA,bol.FECHORVENTA),'HH24:MI') as hrvenda, "); sql.append(" ori.DESCPARADA as origem, "); sql.append(" dest.DESCPARADA as destino,"); - sql.append(" TO_CHAR(bol.FECHORVIAJE,'dd/mm/yyyy HH24:MI:SS') as dtviagem, "); + 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(" bpe.CHBPE, "); sql.append(" bol.NUM_BPE as num_bpe, "); @@ -87,7 +88,7 @@ public class RelatorioBPe extends Relatorio { sql.append(" WHEN '150' THEN 'Aut.Conting.' "); sql.append(" ELSE 'Rejeitado' END as status, "); sql.append(" CASE WHEN bpe.CODSTAT not in ('100','135') THEN bpe.motivo ELSE NULL END as obs, "); - sql.append(" bpe.QRCODE"); + sql.append(" bpe.QRCODE, bpe.errocontingencia "); sql.append(" FROM BPE bpe "); sql.append(" LEFT JOIN BOLETO bol ON bol.BOLETO_ID = bpe.BOLETO_ID and bpe.activo = 1 "); @@ -118,6 +119,8 @@ public class RelatorioBPe extends Relatorio { sql.append(" AND bpe.CODSTAT NOT IN ('100','135','102','150') "); }else if (status != null && status.equals("AA")) { sql.append(" AND bpe.CODSTAT = '150' AND bpe.TIPOSUBSTITUICAO IS NULL AND bol.ACTIVO = 1 "); + }else if (status != null && status.equals("RC")) { + sql.append(" AND bpe.CODSTAT IN ('-10','-20') AND bol.ACTIVO = 1 "); } sql.append(" AND COALESCE(bpe.DT_VENDA,bol.FECHORVENTA) >= TO_DATE(?,'DD/MM/YYYY HH24:MI:SS') "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPeRejeitadoEnvioContingencia.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPeRejeitadoEnvioContingencia.java new file mode 100644 index 000000000..e75ec5804 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPeRejeitadoEnvioContingencia.java @@ -0,0 +1,12 @@ +package com.rjconsultores.ventaboletos.relatorios.impl; + +import java.sql.Connection; +import java.util.Map; + +public class RelatorioBPeRejeitadoEnvioContingencia extends RelatorioBPe { + + public RelatorioBPeRejeitadoEnvioContingencia(Map parametros, Connection conexao) throws Exception { + super(parametros, conexao); + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPeRejeitadoEnvioContingencia_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPeRejeitadoEnvioContingencia_es.properties new file mode 100644 index 000000000..b09eb6878 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPeRejeitadoEnvioContingencia_es.properties @@ -0,0 +1,25 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. + +#Labels cabeçalho +cabecalho.relatorio=Relatório: +cabecalho.periodo=Período: +cabecalho.periodoA=à +cabecalho.dataHora=Data/Hora: +cabecalho.impressorPor=Impressor por: +cabecalho.pagina=Página +cabecalho.de=de +cabecalho.filtros=Filtros: + +label.dataVenda=Data Venda +label.horaVenda=Hora Venda +label.origem=Origem +label.destino=Destino +label.dataViagem=Data Viagem +label.valorBPe=Valor +label.chaveAcesso=Chave Acesso +label.numBPe=Número BPe +label.serie=Série +label.status=Status +label.obs=Observação +label.erroEnvioContingencia=Erro Envio em Contingência \ 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 new file mode 100644 index 000000000..b09eb6878 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPeRejeitadoEnvioContingencia_pt_BR.properties @@ -0,0 +1,25 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. + +#Labels cabeçalho +cabecalho.relatorio=Relatório: +cabecalho.periodo=Período: +cabecalho.periodoA=à +cabecalho.dataHora=Data/Hora: +cabecalho.impressorPor=Impressor por: +cabecalho.pagina=Página +cabecalho.de=de +cabecalho.filtros=Filtros: + +label.dataVenda=Data Venda +label.horaVenda=Hora Venda +label.origem=Origem +label.destino=Destino +label.dataViagem=Data Viagem +label.valorBPe=Valor +label.chaveAcesso=Chave Acesso +label.numBPe=Número BPe +label.serie=Série +label.status=Status +label.obs=Observação +label.erroEnvioContingencia=Erro Envio em Contingência \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jasper index 5033bfd7f..6565be5fb 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 1f56dfc68..35464c7bf 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jrxml @@ -1,7 +1,7 @@ - - + + @@ -25,7 +25,7 @@ <band height="79" splitType="Stretch"> <textField pattern="" isBlankWhenNull="false"> - <reportElement mode="Transparent" x="0" y="0" width="180" height="41" forecolor="#000000" backcolor="#FFFFFF" uuid="da52f710-3882-4beb-ba6f-870e03f6800d"/> + <reportElement mode="Transparent" x="0" y="0" width="937" height="41" forecolor="#000000" backcolor="#FFFFFF" uuid="da52f710-3882-4beb-ba6f-870e03f6800d"/> <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"/> @@ -41,7 +41,7 @@ <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="false"> - <reportElement mode="Transparent" x="1124" y="42" width="104" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="c8a70b8d-369e-48ae-a911-a5d9692316f7"/> + <reportElement mode="Transparent" x="939" 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"/> @@ -89,79 +89,80 @@ <columnHeader> <band height="15"> <textField> - <reportElement x="0" y="0" width="48" height="15" uuid="2d8bc8b7-05a7-493a-ac4f-52f7f39cfa8b"/> - <textElement textAlignment="Center"> - <font size="10" isBold="true" pdfFontName="Helvetica-Bold"/> + <reportElement x="0" y="0" width="54" height="15" uuid="2d8bc8b7-05a7-493a-ac4f-52f7f39cfa8b"/> + <textElement> + <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression><![CDATA[$R{label.dataVenda}]]></textFieldExpression> </textField> <textField> - <reportElement x="49" y="0" width="48" height="15" uuid="aae9977c-b656-4daf-8b9f-8fd3248542e3"/> - <textElement textAlignment="Center"> - <font size="10" isBold="true" pdfFontName="Helvetica-Bold"/> + <reportElement x="54" y="0" width="49" height="15" uuid="aae9977c-b656-4daf-8b9f-8fd3248542e3"/> + <textElement> + <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression><![CDATA[$R{label.horaVenda}]]></textFieldExpression> </textField> <textField> - <reportElement x="98" y="0" width="117" height="15" uuid="38753499-ea21-4051-aaa0-a8cdc36e087d"/> - <textElement textAlignment="Center"> - <font size="10" isBold="true" pdfFontName="Helvetica-Bold"/> + <reportElement x="103" y="0" width="117" height="15" uuid="38753499-ea21-4051-aaa0-a8cdc36e087d"/> + <textElement> + <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression><![CDATA[$R{label.origem}]]></textFieldExpression> </textField> <textField> - <reportElement x="215" y="0" width="116" height="15" uuid="8080038d-0253-4fe8-a21b-75c7257d81c5"/> - <textElement textAlignment="Center"> - <font size="10" isBold="true" pdfFontName="Helvetica-Bold"/> + <reportElement x="220" y="0" width="116" height="15" uuid="8080038d-0253-4fe8-a21b-75c7257d81c5"/> + <textElement> + <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression><![CDATA[$R{label.destino}]]></textFieldExpression> </textField> <textField> - <reportElement x="331" y="0" width="63" height="15" uuid="3998308e-b9fe-465e-b251-47d19d7c4ddd"/> - <textElement textAlignment="Center"> - <font size="10" isBold="true" pdfFontName="Helvetica-Bold"/> + <reportElement x="336" y="0" width="63" height="15" uuid="3998308e-b9fe-465e-b251-47d19d7c4ddd"/> + <textElement> + <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression><![CDATA[$R{label.dataViagem}]]></textFieldExpression> </textField> <textField> - <reportElement x="394" y="0" width="48" height="15" uuid="924ae914-4074-4746-97c0-b11119029cc0"/> - <textElement textAlignment="Center"> - <font size="10" isBold="true" pdfFontName="Helvetica-Bold"/> + <reportElement x="399" y="0" width="48" height="15" uuid="924ae914-4074-4746-97c0-b11119029cc0"/> + <textElement textAlignment="Right"> + <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression><![CDATA[$R{label.valorBPe}]]></textFieldExpression> </textField> <textField> - <reportElement x="443" y="0" width="270" height="15" uuid="f9f9f464-c0da-4d85-ad06-06567943eaa8"/> - <textElement textAlignment="Center"> - <font size="10" isBold="true" pdfFontName="Helvetica-Bold"/> + <reportElement x="448" y="0" width="270" height="15" uuid="f9f9f464-c0da-4d85-ad06-06567943eaa8"/> + <box leftPadding="5"/> + <textElement> + <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression><![CDATA[$R{label.chaveAcesso}]]></textFieldExpression> </textField> <textField> - <reportElement x="713" y="0" width="81" height="15" uuid="fa7c03df-c59f-4e31-96fa-8a508c19746d"/> - <textElement textAlignment="Center"> - <font size="10" isBold="true" pdfFontName="Helvetica-Bold"/> + <reportElement x="718" y="0" width="81" height="15" uuid="fa7c03df-c59f-4e31-96fa-8a508c19746d"/> + <textElement> + <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression><![CDATA[$R{label.numBPe}]]></textFieldExpression> </textField> <textField> - <reportElement x="794" y="0" width="61" height="15" uuid="abec744e-661d-407e-b21b-92cedc682316"/> - <textElement textAlignment="Center"> - <font size="10" isBold="true" pdfFontName="Helvetica-Bold"/> + <reportElement x="799" y="0" width="61" height="15" uuid="abec744e-661d-407e-b21b-92cedc682316"/> + <textElement> + <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression><![CDATA[$R{label.serie}]]></textFieldExpression> </textField> <textField> - <reportElement x="855" y="0" width="77" height="15" uuid="aaabe6ae-6466-4b39-8f39-b94460463dc8"/> - <textElement textAlignment="Center"> - <font size="10" isBold="true" pdfFontName="Helvetica-Bold"/> + <reportElement x="860" y="0" width="77" height="15" uuid="aaabe6ae-6466-4b39-8f39-b94460463dc8"/> + <textElement> + <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression><![CDATA[$R{label.status}]]></textFieldExpression> </textField> <textField> - <reportElement x="932" y="0" width="298" height="15" uuid="bdb50181-e913-4a43-9344-c599b323706a"/> - <textElement textAlignment="Center"> - <font size="10" isBold="true" pdfFontName="Helvetica-Bold"/> + <reportElement x="937" y="0" width="293" height="15" uuid="bdb50181-e913-4a43-9344-c599b323706a"/> + <textElement> + <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression><![CDATA[$R{label.obs}]]></textFieldExpression> </textField> @@ -169,90 +170,91 @@ </columnHeader> <detail> <band height="15" splitType="Stretch"> - <textField isBlankWhenNull="true"> - <reportElement x="0" y="0" width="48" height="15" uuid="e29821d0-e770-43f3-a6a2-082204e4a2c4"/> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="54" height="15" isPrintWhenDetailOverflows="true" uuid="e29821d0-e770-43f3-a6a2-082204e4a2c4"/> <textElement> - <font size="10"/> + <font size="9"/> </textElement> <textFieldExpression><![CDATA[$F{dtvenda}]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true"> - <reportElement x="49" y="0" width="48" height="15" uuid="b8ccaac1-5267-48a0-b637-b595f74b73a7"/> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement stretchType="RelativeToTallestObject" x="54" y="0" width="49" height="15" isPrintWhenDetailOverflows="true" uuid="b8ccaac1-5267-48a0-b637-b595f74b73a7"/> <textElement> - <font size="10"/> + <font size="9"/> </textElement> <textFieldExpression><![CDATA[$F{hrvenda}]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true"> - <reportElement x="98" y="0" width="117" height="15" uuid="2a28ff64-e39c-456c-9dc0-514a15406ed2"/> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement stretchType="RelativeToTallestObject" x="103" y="0" width="117" height="15" isPrintWhenDetailOverflows="true" uuid="2a28ff64-e39c-456c-9dc0-514a15406ed2"/> <textElement> - <font size="10"/> + <font size="9"/> </textElement> <textFieldExpression><![CDATA[$F{origem}]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true"> - <reportElement x="215" y="0" width="116" height="15" uuid="319b345c-ad14-4025-8fd3-3e34e8cacd54"/> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement stretchType="RelativeToTallestObject" x="220" y="0" width="116" height="15" isPrintWhenDetailOverflows="true" uuid="319b345c-ad14-4025-8fd3-3e34e8cacd54"/> <textElement> - <font size="10"/> + <font size="9"/> </textElement> <textFieldExpression><![CDATA[$F{destino}]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true"> - <reportElement x="331" y="0" width="63" height="15" uuid="e6244540-af1b-4d94-8b0f-d2c3e501db61"/> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement stretchType="RelativeToTallestObject" x="336" y="0" width="63" height="15" isPrintWhenDetailOverflows="true" uuid="e6244540-af1b-4d94-8b0f-d2c3e501db61"/> <textElement> - <font size="10"/> + <font size="9"/> </textElement> <textFieldExpression><![CDATA[$F{dtviagem}]]></textFieldExpression> </textField> - <textField pattern="¤ #,##0.00" isBlankWhenNull="true"> - <reportElement x="394" y="0" width="48" height="15" uuid="6e5187d9-591a-42ab-a394-3f990ea8adc1"/> - <textElement> - <font size="10"/> + <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> + <reportElement stretchType="RelativeToTallestObject" x="399" y="0" width="48" height="15" isPrintWhenDetailOverflows="true" uuid="6e5187d9-591a-42ab-a394-3f990ea8adc1"/> + <textElement textAlignment="Right"> + <font size="9"/> </textElement> <textFieldExpression><![CDATA[$F{vlbpe}]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true" hyperlinkType="Reference" hyperlinkTarget="Blank"> - <reportElement x="443" y="0" width="270" height="15" uuid="6db62c93-f853-4396-89ce-afcc6d510d91"/> + <textField isStretchWithOverflow="true" isBlankWhenNull="true" hyperlinkType="Reference" hyperlinkTarget="Blank"> + <reportElement stretchType="RelativeToTallestObject" x="448" y="0" width="270" height="15" isPrintWhenDetailOverflows="true" uuid="6db62c93-f853-4396-89ce-afcc6d510d91"/> + <box leftPadding="5"/> <textElement> <font size="9"/> </textElement> <textFieldExpression><![CDATA[$F{chbpe}]]></textFieldExpression> <hyperlinkReferenceExpression><![CDATA[$F{qrcode}]]></hyperlinkReferenceExpression> </textField> - <textField isBlankWhenNull="true"> - <reportElement x="713" y="0" width="81" height="15" uuid="07f16df1-fd27-46ba-9262-835eb8dddc96"/> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement stretchType="RelativeToTallestObject" x="718" y="0" width="81" height="15" isPrintWhenDetailOverflows="true" uuid="07f16df1-fd27-46ba-9262-835eb8dddc96"/> <textElement> - <font size="10"/> + <font size="9"/> </textElement> <textFieldExpression><![CDATA[$F{num_bpe}]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true"> - <reportElement x="794" y="0" width="61" height="15" uuid="fe71d802-0ba0-4336-b76a-f72a37b23075"/> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement stretchType="RelativeToTallestObject" x="799" y="0" width="61" height="15" isPrintWhenDetailOverflows="true" uuid="fe71d802-0ba0-4336-b76a-f72a37b23075"/> <textElement> - <font size="10"/> + <font size="9"/> </textElement> <textFieldExpression><![CDATA[$F{numserie_bpe}]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true"> - <reportElement x="855" y="0" width="77" height="15" uuid="66eaa400-673d-4b37-b2ef-982910e6c78c"/> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement stretchType="RelativeToTallestObject" x="860" y="0" width="77" height="15" isPrintWhenDetailOverflows="true" uuid="66eaa400-673d-4b37-b2ef-982910e6c78c"/> <textElement> - <font size="10"/> + <font size="9"/> </textElement> <textFieldExpression><![CDATA[$F{status}]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true"> - <reportElement x="932" y="0" width="298" height="15" uuid="7b8ce326-5e48-4b4f-ba2d-60fabfdc4119"/> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement stretchType="RelativeToTallestObject" x="937" y="0" width="293" height="15" isPrintWhenDetailOverflows="true" uuid="7b8ce326-5e48-4b4f-ba2d-60fabfdc4119"/> <textElement> - <font size="10"/> + <font size="9"/> </textElement> <textFieldExpression><![CDATA[$F{obs}]]></textFieldExpression> </textField> </band> </detail> <noData> - <band height="50"> + <band height="29"> <textField> - <reportElement x="0" y="24" width="575" height="26" uuid="6b9f63c1-76d9-4dd7-8fce-9bc0d91292af"/> + <reportElement x="0" y="2" width="575" height="26" uuid="6b9f63c1-76d9-4dd7-8fce-9bc0d91292af"/> <textElement markup="none"> <font size="11" isBold="true"/> </textElement> diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPeRejeitadoEnvioContingencia.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPeRejeitadoEnvioContingencia.jasper new file mode 100644 index 000000000..5b80f1745 Binary files /dev/null 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 new file mode 100644 index 000000000..f51be8a1b --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPeRejeitadoEnvioContingencia.jrxml @@ -0,0 +1,282 @@ +<?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="RelatorioBPeRejeitadoEnvioContingencia" pageWidth="1700" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="1660" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="2de20ee0-535e-49d2-a7be-c24a30351d9f"> + <property name="ireport.zoom" value="1.0"/> + <property name="ireport.x" value="378"/> + <property name="ireport.y" value="0"/> + <property name="net.sf.jasperreports.export.xls.exclude.origin.band.1" value="title"/> + <property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/> + <property name="net.sf.jasperreports.export.xls.remove.empty.space.between.rows" value="true"/> + <property name="net.sf.jasperreports.export.xls.remove.empty.space.between.columns" value="true"/> + <parameter name="USUARIO" class="java.lang.String"/> + <parameter name="NOME_RELATORIO" class="java.lang.String"/> + <parameter name="FILTROS" class="java.lang.String"/> + <field name="dtvenda" class="java.lang.String"/> + <field name="hrvenda" class="java.lang.String"/> + <field name="origem" class="java.lang.String"/> + <field name="destino" class="java.lang.String"/> + <field name="dtviagem" class="java.lang.String"/> + <field name="vlbpe" class="java.lang.String"/> + <field name="chbpe" class="java.lang.String"/> + <field name="num_bpe" class="java.lang.String"/> + <field name="numserie_bpe" class="java.lang.String"/> + <field name="status" class="java.lang.String"/> + <field name="obs" class="java.lang.String"/> + <field name="qrcode" class="java.lang.String"/> + <field name="errocontingencia" class="java.lang.String"/> + <title> + <band height="75" splitType="Stretch"> + <textField pattern="" isBlankWhenNull="false"> + <reportElement mode="Transparent" x="0" y="0" width="1371" 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"/> + </textElement> + <textFieldExpression><![CDATA[$P{NOME_RELATORIO}]]></textFieldExpression> + </textField> + <textField evaluationTime="Report" pattern="" isBlankWhenNull="false"> + <reportElement mode="Transparent" x="1639" 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"/> + </textElement> + <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression> + </textField> + <textField pattern="" isBlankWhenNull="false"> + <reportElement mode="Transparent" x="1371" 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"/> + </textElement> + <textFieldExpression><![CDATA[$R{cabecalho.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression> + </textField> + <textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false"> + <reportElement mode="Transparent" x="1556" y="0" width="104" height="25" forecolor="#000000" backcolor="#FFFFFF" uuid="ad4bbfb8-582d-4aa2-904d-8dfe60e54442"/> + <textElement textAlignment="Left" 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"/> + </textElement> + <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> + </textField> + <textField pattern="" isBlankWhenNull="false"> + <reportElement mode="Transparent" x="1371" 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"/> + </textElement> + <textFieldExpression><![CDATA[$R{cabecalho.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{cabecalho.de}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="1371" 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 x="-1" y="58" width="1661" height="1" uuid="3c577f75-c6d6-4c11-a846-bfe71a8a1b42"/> + </line> + <textField isStretchWithOverflow="true"> + <reportElement x="-1" y="59" width="1661" 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 positionType="Float" x="-1" y="74" width="1661" height="1" uuid="84641d2c-21a5-47f0-b4a8-afe7bf700cb6"/> + </line> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBPeController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBPeController.java index 11b310d53..aa1af1264 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBPeController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBPeController.java @@ -23,6 +23,7 @@ import org.zkoss.zul.Radiogroup; import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.Estado; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioBPe; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioBPeRejeitadoEnvioContingencia; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.service.EmpresaService; import com.rjconsultores.ventaboletos.service.EstadoService; @@ -77,7 +78,7 @@ public class RelatorioBPeController extends MyGenericForwardComposer { } if (dtInicio.getValue() != null) { - filtro.append("Data : ") + filtro.append("Data: ") .append(format.format(dtInicio.getValue())) .append(" - ") .append(format.format(dtFim.getValue())) @@ -106,7 +107,7 @@ public class RelatorioBPeController extends MyGenericForwardComposer { UFs = UFs.substring(0, UFs.length() - 1); parametros.put("ESTADOS_ID", estadosIds); } else { - filtro.append("Todos "); + filtro.append("Todos "); } filtro.append(UFs).append(";"); @@ -118,15 +119,20 @@ public class RelatorioBPeController extends MyGenericForwardComposer { parametros.put("EMPRESA_ID", empresa.getEmpresaId()); filtro.append(empresa.getNombempresa() + ";"); } else { - filtro.append(" Todas; "); + filtro.append(" Todas; "); } - filtro.append(" Status; " + rdbGroup.getSelectedItem().getLabel()); + filtro.append(" Status: " + rdbGroup.getSelectedItem().getLabel()); parametros.put("STATUS", rdbGroup.getSelectedItem().getValue()); parametros.put("FILTROS", filtro.toString()); - Relatorio relatorio = new RelatorioBPe(parametros, dataSourceRead.getConnection()); + Relatorio relatorio = null; + if(rdbGroup.getSelectedItem().getValue().equals("RC")) { + relatorio = new RelatorioBPeRejeitadoEnvioContingencia(parametros, dataSourceRead.getConnection()); + } else { + relatorio = new RelatorioBPe(parametros, dataSourceRead.getConnection()); + } Map args = new HashMap(); args.put("relatorio", relatorio); diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 703950a38..b22311018 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -8016,6 +8016,7 @@ relatorioBPeController.lbCancelado.value = Cancelado relatorioBPeController.lbSubstituido.value = Substituído relatorioBPeController.lbNaoEmbarcado.value = Não embarcado relatorioBPeController.lbAutorConting.value = Autorizado em Contingência +relatorioBPeController.lbRejeitadoEnvioContingencia.value = Rejeitado Envio em Contingência relatorioBPeController.MSG.informarData = Favor informar data inicial e final. relatorioBPeController.MSG.dataInicialMaiorQueFinal = Data de inicio não pode ser maior do que a final. diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 83c9ae878..c71a2df03 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -8544,6 +8544,7 @@ relatorioBPeController.lbCancelado.value = Cancelado relatorioBPeController.lbSubstituido.value = Substituído relatorioBPeController.lbNaoEmbarcado.value = Não embarcado relatorioBPeController.lbAutorConting.value = Autorizado em Contingência +relatorioBPeController.lbRejeitadoEnvioContingencia.value = Rejeitado Envio em Contingência relatorioBPeController.MSG.informarData = Favor informar data inicial e final. relatorioBPeController.MSG.dataInicialMaiorQueFinal = Data de inicio não pode ser maior do que a final. diff --git a/web/gui/relatorios/filtroRelatorioBPe.zul b/web/gui/relatorios/filtroRelatorioBPe.zul index c8ed21be2..1c3d857ab 100644 --- a/web/gui/relatorios/filtroRelatorioBPe.zul +++ b/web/gui/relatorios/filtroRelatorioBPe.zul @@ -7,11 +7,11 @@ + height="352px" width="940px" border="normal"> - - + + @@ -56,6 +56,7 @@ +