diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPTA.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPTA.java index ad79df124..6939b589c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPTA.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPTA.java @@ -155,7 +155,7 @@ public class RelatorioVendasPTA extends Relatorio { sql.append("INNER JOIN PARADA pd ON (original.DESTINO_ID = pd.PARADA_ID) "); sql.append("WHERE to_date(original.FECHORVENTA,'dd/MM/yy') BETWEEN :DATA_INICIAL AND :DATA_FINAL "); sql.append(" AND ORIGINAL.INDSTATUSBOLETO = 'V' "); - sql.append(" AND ORIGINAL.TIPOVENTA_ID IN (5,12,18,41,49) and (original.MOTIVOCANCELACION_ID is null or original.MOTIVOCANCELACION_ID = 16 ) "); + sql.append(" AND ORIGINAL.TIPOVENTA_ID IN (5,12,18,41,49) "); sql.append(agencia.equals("-1") || agencia.equals("TODAS") ? "" : " AND original.PUNTOVENTA_ID in (" + agencia + ") "); sql.append("AND original.EMPRESACORRIDA_ID =" + empresa.getEmpresaId() + " "); } else if (situacaoBoleto.getCodigo().equals(-1)) { // Todos (Vendidos e Cancelados) @@ -181,7 +181,7 @@ public class RelatorioVendasPTA extends Relatorio { sql.append("INNER JOIN PARADA pd ON (ORIGINAL.DESTINO_ID = pd.PARADA_ID) "); sql.append("WHERE to_date(ORIGINAL.FECHORVENTA,'dd/MM/yy') BETWEEN :DATA_INICIAL AND :DATA_FINAL "); sql.append(" AND ORIGINAL.INDSTATUSBOLETO = 'V' "); - sql.append(" AND ORIGINAL.TIPOVENTA_ID IN (5,12,18,41,49) and (ORIGINAL.MOTIVOCANCELACION_ID is null or ORIGINAL.MOTIVOCANCELACION_ID = 16 ) "); + sql.append(" AND ORIGINAL.TIPOVENTA_ID IN (5,12,18,41,49) "); sql.append(agencia.equals("-1") || agencia.equals("TODAS") ? "" : " AND ORIGINAL.PUNTOVENTA_ID in (" + agencia + ") "); sql.append("AND ORIGINAL.EMPRESACORRIDA_ID =" + empresa.getEmpresaId() + " "); sql.append("UNION ALL "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPTA.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPTA.jasper index 5b22cf536..48e1d52af 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPTA.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPTA.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPTA.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPTA.jrxml index 6a829b37f..353018556 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPTA.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPTA.jrxml @@ -1,7 +1,7 @@ - - + + @@ -36,21 +36,21 @@ - + - + - + @@ -58,7 +58,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -74,15 +74,15 @@ - + - + - + @@ -90,15 +90,15 @@ - + - + - + @@ -106,7 +106,7 @@ - + @@ -114,7 +114,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -130,10 +130,10 @@ - + - + @@ -150,7 +150,7 @@ <band height="32"> <textField> - <reportElement x="309" y="2" width="256" height="27" uuid="766b74e4-28c9-4045-8538-343a8bc8e665"/> + <reportElement x="237" y="5" width="320" height="27" uuid="766b74e4-28c9-4045-8538-343a8bc8e665"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="18" isBold="true"/> </textElement> @@ -161,58 +161,50 @@ <pageHeader> <band height="49"> <textField> - <reportElement x="133" y="27" width="57" height="22" uuid="c52ee81b-b6a0-44cd-b0e0-c61177419f22"/> + <reportElement x="161" y="27" width="76" height="22" uuid="c52ee81b-b6a0-44cd-b0e0-c61177419f22"/> <textElement> <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression><![CDATA[$R{label.dataFinal}]]></textFieldExpression> </textField> <textField> - <reportElement x="3" y="27" width="54" height="22" uuid="1ffb28ce-353b-45c6-95a3-ba5c40faa4b5"/> + <reportElement x="3" y="27" width="88" height="22" uuid="1ffb28ce-353b-45c6-95a3-ba5c40faa4b5"/> <textElement> <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression><![CDATA[$R{label.dataInicial}]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy"> - <reportElement x="183" y="27" width="54" height="22" isPrintWhenDetailOverflows="true" uuid="74a3108b-f2bf-4a05-8a0e-ef3bc6e23e78"/> + <reportElement x="237" y="27" width="72" height="22" isPrintWhenDetailOverflows="true" uuid="74a3108b-f2bf-4a05-8a0e-ef3bc6e23e78"/> <textElement> <font size="10" isBold="false"/> </textElement> <textFieldExpression><![CDATA[$P{DATA_FINAL}]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy"> - <reportElement x="57" y="27" width="54" height="22" isPrintWhenDetailOverflows="true" uuid="145289a7-0f0a-4aa0-aab7-2bad8b44292e"/> + <reportElement x="91" y="27" width="70" height="22" isPrintWhenDetailOverflows="true" uuid="145289a7-0f0a-4aa0-aab7-2bad8b44292e"/> <textElement> <font size="10" isBold="false"/> </textElement> <textFieldExpression><![CDATA[$P{DATA_INICIAL}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="false"> - <reportElement mode="Transparent" x="448" y="4" width="102" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="8857ff4c-243b-4073-9466-98722a23eccf"/> + <reportElement mode="Transparent" x="387" y="4" width="170" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="8857ff4c-243b-4073-9466-98722a23eccf"/> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <font fontName="SansSerif" size="10" isBold="true" 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> + <textFieldExpression><![CDATA[$R{cabecalho.pagina} + " " + $V{PAGE_NUMBER} + " " + $R{cabecalho.de}+" "+$V{PAGE_NUMBER}]]></textFieldExpression> </textField> <textField> - <reportElement x="609" y="4" width="107" height="15" uuid="d095c344-00e0-4532-8035-8b93ef192a56"/> + <reportElement x="557" y="4" width="136" height="15" uuid="d095c344-00e0-4532-8035-8b93ef192a56"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="10" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression> </textField> - <textField evaluationTime="Report" pattern="" isBlankWhenNull="false"> - <reportElement mode="Transparent" x="551" y="4" width="14" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="17bc8d21-5221-4757-ade1-9b3d1b4c10ce"/> - <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none"> - <font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> - <paragraph lineSpacing="Single"/> - </textElement> - <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression> - </textField> <textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false"> - <reportElement mode="Transparent" x="716" y="3" width="84" height="16" forecolor="#000000" backcolor="#FFFFFF" uuid="b8a08223-0a24-43a7-8ebe-17a3db2d83fe"/> + <reportElement mode="Transparent" x="694" y="4" width="106" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="b8a08223-0a24-43a7-8ebe-17a3db2d83fe"/> <textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none"> <font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> @@ -225,95 +217,95 @@ <band/> </columnHeader> <detail> - <band height="18" splitType="Stretch"> + <band height="14" splitType="Stretch"> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement x="456" y="2" width="103" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="0b904fc9-5da8-42df-86e7-0749839574b6"/> + <reportElement x="446" y="2" width="111" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="0b904fc9-5da8-42df-86e7-0749839574b6"/> <textElement textAlignment="Center"> - <font size="8"/> + <font size="7"/> </textElement> <textFieldExpression><![CDATA[$F{descricaoLinha}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true"> - <reportElement x="559" y="2" width="50" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="a2f90f64-e8eb-45b8-828b-53c01e7258a0"/> + <reportElement x="557" y="2" width="52" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="a2f90f64-e8eb-45b8-828b-53c01e7258a0"/> <textElement textAlignment="Center"> - <font size="8"/> + <font size="7"/> </textElement> <textFieldExpression><![CDATA[$F{servico}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <reportElement x="651" y="2" width="42" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="584271a9-2bf3-4c50-a4cf-6615c17bf989"/> <textElement textAlignment="Center"> - <font size="8"/> + <font size="7"/> </textElement> <textFieldExpression><![CDATA[$F{status}.equals("VENDIDO") ?$F{situacaoVendido} : $F{situacaoCancelado}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true"> <reportElement x="91" y="2" width="70" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="546f445d-2263-4cdc-a1d7-681d40f311e4"/> <textElement textAlignment="Center"> - <font size="8"/> + <font size="7"/> </textElement> <textFieldExpression><![CDATA[$F{status}.equals("VENDIDO") ? $F{dataEmissao} : $F{dataVenda}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true"> <reportElement x="161" y="2" width="76" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="eba09120-e3ae-4119-af20-8ff20c45d935"/> <textElement textAlignment="Center"> - <font size="8"/> + <font size="7"/> </textElement> <textFieldExpression><![CDATA[$F{dataEmbarque}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <reportElement x="237" y="2" width="39" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="374795a6-5fae-417c-93d9-ae0c9e12829a"/> <textElement textAlignment="Center"> - <font size="8"/> + <font size="7"/> </textElement> <textFieldExpression><![CDATA[$F{bilhete}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement x="694" y="2" width="106" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="8bf03127-bc20-45ab-94cd-deeafa4b83c1"/> <textElement textAlignment="Center"> - <font size="8"/> + <font size="7"/> </textElement> <textFieldExpression><![CDATA[$F{status}.equals("VENDIDO") ?$F{nomeAgenciaVenda} : $F{agencia}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <reportElement x="276" y="2" width="33" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="59a943b3-dc5a-49cf-92f9-1a271ba72a0e"/> <textElement textAlignment="Center"> - <font size="8"/> + <font size="7"/> </textElement> <textFieldExpression><![CDATA[$F{preco}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <reportElement x="309" y="2" width="25" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="4a3859e1-2fcf-4ce3-89ca-024ab4628dcf"/> <textElement textAlignment="Center"> - <font size="8"/> + <font size="7"/> </textElement> <textFieldExpression><![CDATA[$F{taxas}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement x="334" y="2" width="53" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="aac72eec-aa72-45bc-91ad-409dd211e6e3"/> <textElement textAlignment="Center"> - <font size="8"/> + <font size="7"/> </textElement> <textFieldExpression><![CDATA[$F{descricaoOrigem}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement x="387" y="2" width="69" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="4dee0341-1423-40ac-b025-6e162c8c3853"/> + <reportElement x="387" y="2" width="59" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="4dee0341-1423-40ac-b025-6e162c8c3853"/> <textElement textAlignment="Center"> - <font size="8"/> + <font size="7"/> </textElement> <textFieldExpression><![CDATA[$F{descricaoDestino}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <reportElement x="609" y="2" width="42" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="3b5b4e26-d826-4983-bd0b-d81762314d05"/> <textElement textAlignment="Center"> - <font size="8"/> + <font size="7"/> </textElement> <textFieldExpression><![CDATA[$F{poltrona}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement x="0" y="2" width="91" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="ad1ffaa8-6c48-4316-ba3c-ea68579af300"/> <textElement textAlignment="Center"> - <font size="8"/> + <font size="7"/> </textElement> <textFieldExpression><![CDATA[$F{status}.equals("VENDIDO") ? $F{agencia} : $F{nomeAgenciaVenda}]]></textFieldExpression> </textField> @@ -323,39 +315,39 @@ <band splitType="Stretch"/> </columnFooter> <pageFooter> - <band height="32" splitType="Stretch"/> + <band height="6" splitType="Stretch"/> </pageFooter> <summary> - <band height="39" splitType="Stretch"> + <band height="43" splitType="Stretch"> <textField> - <reportElement x="0" y="5" width="57" height="14" uuid="25ee1dfc-86be-4ed3-a15b-1b88311553d3"/> + <reportElement x="0" y="11" width="91" height="14" uuid="25ee1dfc-86be-4ed3-a15b-1b88311553d3"/> <textElement textAlignment="Center"> <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression><![CDATA[$R{label.total}]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="19" width="57" height="14" uuid="77ae1865-5196-4f91-ab72-716ce1d52a74"/> + <reportElement x="0" y="25" width="91" height="14" uuid="77ae1865-5196-4f91-ab72-716ce1d52a74"/> <textElement textAlignment="Center"> <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression><![CDATA[$R{label.saldo}]]></textFieldExpression> </textField> <textField> - <reportElement x="57" y="19" width="54" height="14" uuid="36e218b6-49e0-4b1b-a473-ec3f2e79fde3"/> + <reportElement x="91" y="25" width="70" height="14" uuid="36e218b6-49e0-4b1b-a473-ec3f2e79fde3"/> <textElement textAlignment="Center"/> <textFieldExpression><![CDATA[$P{SALDO}]]></textFieldExpression> </textField> <textField> - <reportElement x="57" y="5" width="54" height="14" uuid="f4ce69ee-521c-4f17-9b7f-d7028d2f355a"/> + <reportElement x="91" y="11" width="70" height="14" uuid="f4ce69ee-521c-4f17-9b7f-d7028d2f355a"/> <textElement textAlignment="Center"/> <textFieldExpression><![CDATA[$P{TOTAL}]]></textFieldExpression> </textField> <line> - <reportElement x="0" y="3" width="800" height="1" uuid="6dc831c6-bfb2-4350-aa40-edc3dacd8b2c"/> + <reportElement x="0" y="8" width="800" height="1" uuid="6dc831c6-bfb2-4350-aa40-edc3dacd8b2c"/> </line> <line> - <reportElement x="0" y="35" width="802" height="1" uuid="5ab0d28f-17af-469c-a9da-9aab6e0b4b50"/> + <reportElement x="0" y="40" width="802" height="1" uuid="5ab0d28f-17af-469c-a9da-9aab6e0b4b50"/> </line> </band> </summary>