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

fixes bug #9387 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@73059 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2017-08-24 22:22:11 +00:00
parent 3891c2f931
commit 34814e633a
5 changed files with 39 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java
View File

@ -210,9 +210,9 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
private String getSql(Integer empresaId, String puntoVentas, String estados, Date dataVendaInicial, Date dataVendaFinal, Date dataDevolucaoInicial, Date dataDevolucaoFinal, Boolean isApenasBilhetesImpressos) { private String getSql(Integer empresaId, String puntoVentas, String estados, Date dataVendaInicial, Date dataVendaFinal, Date dataDevolucaoInicial, Date dataDevolucaoFinal, Boolean isApenasBilhetesImpressos) {
StringBuilder sql = new StringBuilder(); StringBuilder sql = new StringBuilder();
sql.append("SELECT COALESCE(AIDF.ACFISCAL,SUBSTR(R4.NUMSERIE20, -6, 7)) AS AIDF, "); sql.append("SELECT COALESCE(AIDF.ACFISCAL,COALESCE(AIDF.ACFISCAL,COALESCE(SUBSTR(ML2.NUMSERIE20, -6, 7),SUBSTR(R4.NUMSERIE20, -6, 7)))) AS AIDF, ");
sql.append(" COALESCE(B.NUMFOLIOSISTEMA, B.NUMOPERACION) AS NUMFOLIOSISTEMA, "); sql.append(" COALESCE(B.NUMFOLIOSISTEMA, B.NUMOPERACION) AS NUMFOLIOSISTEMA, ");
sql.append(" CASE WHEN R4.NUMSERIE20 IS NULL THEN B.NUMSERIEPREIMPRESA ELSE NULL END AS SERIE_SUBSERIE, "); sql.append(" CASE WHEN R4.NUMSERIE20 IS NOT NULL OR ML2.NUMSERIE20 IS NOT NULL THEN NULL ELSE B.NUMSERIEPREIMPRESA END AS SERIE_SUBSERIE, ");
sql.append(" B.NUMFOLIOPREIMPRESO AS FOLIO, "); sql.append(" B.NUMFOLIOPREIMPRESO AS FOLIO, ");
sql.append(" B.PRECIOBASE AS PRECIOBASE, "); sql.append(" B.PRECIOBASE AS PRECIOBASE, ");
sql.append(" E.NOMBEMPRESA AS NOMB_EMPRESA, "); sql.append(" E.NOMBEMPRESA AS NOMB_EMPRESA, ");
@ -246,6 +246,7 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
sql.append("INNER JOIN CIUDAD CD ON (CD.CIUDAD_ID = DES.CIUDAD_ID ) "); sql.append("INNER JOIN CIUDAD CD ON (CD.CIUDAD_ID = DES.CIUDAD_ID ) ");
sql.append("INNER JOIN ESTADO EST ON EST.ESTADO_ID = CO.ESTADO_ID "); sql.append("INNER JOIN ESTADO EST ON EST.ESTADO_ID = CO.ESTADO_ID ");
sql.append("LEFT JOIN FISCAL_R4 R4 ON R4.BOLETO_ID = B.BOLETOORIGINAL_ID "); sql.append("LEFT JOIN FISCAL_R4 R4 ON R4.BOLETO_ID = B.BOLETOORIGINAL_ID ");
sql.append("LEFT JOIN FISCAL_ML2 ML2 ON ML2.BOLETO_ID = B.BOLETOORIGINAL_ID ");
sql.append("LEFT JOIN PUNTO_VENTA PTVO ON PTVO.PUNTOVENTA_ID = B.PTOVTAVENTA_ID "); sql.append("LEFT JOIN PUNTO_VENTA PTVO ON PTVO.PUNTOVENTA_ID = B.PTOVTAVENTA_ID ");
sql.append("LEFT JOIN ALIAS_SERVICO S ON S.ORIGEN_ID = B.ORIGEN_ID "); sql.append("LEFT JOIN ALIAS_SERVICO S ON S.ORIGEN_ID = B.ORIGEN_ID ");

2
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetesConsolidado.java
View File

@ -136,7 +136,6 @@ public class RelatorioDevolucaoBilhetesConsolidado extends Relatorio {
sql.append("INNER JOIN CIUDAD CO ON (CO.CIUDAD_ID = ORI.CIUDAD_ID ) "); sql.append("INNER JOIN CIUDAD CO ON (CO.CIUDAD_ID = ORI.CIUDAD_ID ) ");
sql.append("INNER JOIN CIUDAD CD ON (CD.CIUDAD_ID = DES.CIUDAD_ID ) "); sql.append("INNER JOIN CIUDAD CD ON (CD.CIUDAD_ID = DES.CIUDAD_ID ) ");
sql.append("INNER JOIN ESTADO EST ON EST.ESTADO_ID = CO.ESTADO_ID "); sql.append("INNER JOIN ESTADO EST ON EST.ESTADO_ID = CO.ESTADO_ID ");
sql.append("LEFT JOIN FISCAL_R4 R4 ON R4.BOLETO_ID = B.BOLETOORIGINAL_ID ");
sql.append("LEFT JOIN ALIAS_SERVICO S ON S.ORIGEN_ID = B.ORIGEN_ID "); sql.append("LEFT JOIN ALIAS_SERVICO S ON S.ORIGEN_ID = B.ORIGEN_ID ");
sql.append(" AND S.DESTINO_ID = B.DESTINO_ID AND (S.CORRIDA_ID = B.CORRIDA_ID OR S.CORRIDA_ID IS NULL) "); sql.append(" AND S.DESTINO_ID = B.DESTINO_ID AND (S.CORRIDA_ID = B.CORRIDA_ID OR S.CORRIDA_ID IS NULL) ");
@ -152,7 +151,6 @@ public class RelatorioDevolucaoBilhetesConsolidado extends Relatorio {
sql.append("JOIN EMPRESA_IMPOSTO EI ON EI.EMPRESA_ID = E.EMPRESA_ID "); sql.append("JOIN EMPRESA_IMPOSTO EI ON EI.EMPRESA_ID = E.EMPRESA_ID ");
sql.append(" AND EI.ESTADO_ID = COALESCE(EOS.ESTADO_ID, EST.ESTADO_ID) AND EI.ACTIVO = 1 "); sql.append(" AND EI.ESTADO_ID = COALESCE(EOS.ESTADO_ID, EST.ESTADO_ID) AND EI.ACTIVO = 1 ");
sql.append("LEFT JOIN AIDF AIDF ON AIDF.AIDF_ID = B.AIDF_ID ");
sql.append("LEFT JOIN BOLETO BORI ON BORI.BOLETO_ID = B.BOLETOORIGINAL_ID "); sql.append("LEFT JOIN BOLETO BORI ON BORI.BOLETO_ID = B.BOLETOORIGINAL_ID ");
sql.append("WHERE B.MOTIVOCANCELACION_ID IN (31,32,10,37,99,36) "); sql.append("WHERE B.MOTIVOCANCELACION_ID IN (31,32,10,37,99,36) ");
sql.append("AND B.INDSTATUSBOLETO = 'C' "); sql.append("AND B.INDSTATUSBOLETO = 'C' ");

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

Binary file not shown.

106
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.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="RelatorioDevolucaoBilhetes" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2"> <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="RelatorioDevolucaoBilhetes" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
<property name="ireport.zoom" value="1.5"/> <property name="ireport.zoom" value="1.5"/>
<property name="ireport.x" value="0"/> <property name="ireport.x" value="470"/>
<property name="ireport.y" value="0"/> <property name="ireport.y" value="124"/>
<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/> <style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
<style name="table"> <style name="table">
<box> <box>
@ -210,14 +210,14 @@
<groupFooter> <groupFooter>
<band height="15"> <band height="15">
<textField pattern="###0.00" isBlankWhenNull="true"> <textField pattern="###0.00" isBlankWhenNull="true">
<reportElement x="584" y="1" width="45" height="14" uuid="67bdceb4-d6ed-42c5-871f-d809ffec832b"/> <reportElement x="541" y="1" width="74" height="14" uuid="67bdceb4-d6ed-42c5-871f-d809ffec832b"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{vSubTotalContabil}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{vSubTotalContabil}]]></textFieldExpression>
</textField> </textField>
<textField pattern="###0.00" isBlankWhenNull="true"> <textField pattern="###0.00" isBlankWhenNull="true">
<reportElement x="534" y="1" width="50" height="14" uuid="943bc881-8248-4da5-999a-62b2f67a573a"/> <reportElement x="447" y="1" width="94" height="14" uuid="943bc881-8248-4da5-999a-62b2f67a573a"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
@ -227,7 +227,7 @@
<reportElement x="1" y="0" width="800" height="1" uuid="eb29c074-35dc-47d8-855b-78b95676b7ae"/> <reportElement x="1" y="0" width="800" height="1" uuid="eb29c074-35dc-47d8-855b-78b95676b7ae"/>
</line> </line>
<textField pattern="###0.00" isBlankWhenNull="true"> <textField pattern="###0.00" isBlankWhenNull="true">
<reportElement x="672" y="1" width="40" height="14" uuid="6e65196e-b844-4c3d-9697-44aadad52344"/> <reportElement x="662" y="1" width="46" height="14" uuid="6e65196e-b844-4c3d-9697-44aadad52344"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
@ -241,21 +241,14 @@
<textFieldExpression><![CDATA["Subtotal - " + $F{fechorVenta}]]></textFieldExpression> <textFieldExpression><![CDATA["Subtotal - " + $F{fechorVenta}]]></textFieldExpression>
</textField> </textField>
<textField pattern=" ###0.00" isBlankWhenNull="true"> <textField pattern=" ###0.00" isBlankWhenNull="true">
<reportElement x="470" y="1" width="64" height="14" uuid="49c16eb0-9d9d-4e17-a1a7-20391bde4035"/> <reportElement x="708" y="1" width="42" height="14" uuid="dd9cdc1b-7478-467b-ab0c-c6b491790a34"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$V{vSubTotalBilhete}]]></textFieldExpression>
</textField>
<textField pattern=" ###0.00" isBlankWhenNull="true">
<reportElement x="712" y="1" width="45" height="14" uuid="dd9cdc1b-7478-467b-ab0c-c6b491790a34"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{vSubTotalIsenta}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{vSubTotalIsenta}]]></textFieldExpression>
</textField> </textField>
<textField pattern=" ###0.00" isBlankWhenNull="true"> <textField pattern=" ###0.00" isBlankWhenNull="true">
<reportElement x="757" y="1" width="45" height="14" uuid="3a9f3181-f27b-4978-9a0b-16ad6c20032a"/> <reportElement x="750" y="1" width="52" height="14" uuid="3a9f3181-f27b-4978-9a0b-16ad6c20032a"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
@ -421,28 +414,21 @@
</graphicElement> </graphicElement>
</line> </line>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="220" y="1" width="75" height="14" isPrintWhenDetailOverflows="true" uuid="1835789f-f3ff-4d8d-ba10-12c6d693b270"/> <reportElement stretchType="RelativeToTallestObject" x="242" y="1" width="75" height="14" isPrintWhenDetailOverflows="true" uuid="1835789f-f3ff-4d8d-ba10-12c6d693b270"/>
<textElement verticalAlignment="Middle" markup="none"> <textElement verticalAlignment="Middle" markup="none">
<font size="6" isBold="true"/> <font size="6" isBold="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.aidf}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.aidf}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="360" y="1" width="65" height="14" isPrintWhenDetailOverflows="true" uuid="d6813bb4-94c3-4f9b-af61-54e3676c31bb"/> <reportElement stretchType="RelativeToTallestObject" x="382" y="1" width="65" height="14" isPrintWhenDetailOverflows="true" uuid="d6813bb4-94c3-4f9b-af61-54e3676c31bb"/>
<textElement verticalAlignment="Middle" markup="none"> <textElement verticalAlignment="Middle" markup="none">
<font size="6" isBold="true"/> <font size="6" isBold="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.serieSubs}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.serieSubs}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="425" y="1" width="45" height="14" isPrintWhenDetailOverflows="true" uuid="60cc6a71-4f40-49de-9f78-08b65931d16d"/> <reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="541" y="1" width="74" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="0b598d85-e93d-4916-b9a1-c80e694aabb6"/>
<textElement verticalAlignment="Middle" markup="none">
<font size="6" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.numero}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="584" y="1" width="45" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="0b598d85-e93d-4916-b9a1-c80e694aabb6"/>
<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none"> <textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/> <paragraph lineSpacing="Single"/>
@ -450,7 +436,7 @@
<textFieldExpression><![CDATA[$R{label.baseCalc}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.baseCalc}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="629" y="1" width="43" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="e647ff9e-f7e2-4c90-a75f-d831980391b6"/> <reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="615" y="1" width="47" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="e647ff9e-f7e2-4c90-a75f-d831980391b6"/>
<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none"> <textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/> <paragraph lineSpacing="Single"/>
@ -458,7 +444,7 @@
<textFieldExpression><![CDATA[$R{label.aliquota}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.aliquota}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="672" y="1" width="40" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="a1a4be94-54f7-42f0-bdd3-5b0b2d6a37c4"/> <reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="662" y="1" width="46" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="a1a4be94-54f7-42f0-bdd3-5b0b2d6a37c4"/>
<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none"> <textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/> <paragraph lineSpacing="Single"/>
@ -466,21 +452,14 @@
<textFieldExpression><![CDATA[$R{label.icms}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.icms}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="534" y="1" width="50" height="14" isPrintWhenDetailOverflows="true" uuid="ed400846-62e0-4199-8c0d-c4b7741d934c"/> <reportElement stretchType="RelativeToTallestObject" x="447" y="1" width="94" height="14" isPrintWhenDetailOverflows="true" uuid="ed400846-62e0-4199-8c0d-c4b7741d934c"/>
<textElement textAlignment="Right" verticalAlignment="Middle" markup="none"> <textElement textAlignment="Right" verticalAlignment="Middle" markup="none">
<font size="6" isBold="true"/> <font size="6" isBold="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.vrContabil}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.vrContabil}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="470" y="1" width="64" height="14" isPrintWhenDetailOverflows="true" uuid="2b804e18-71b2-44b5-89c3-4393430c94f3"/> <reportElement stretchType="RelativeToTallestObject" x="317" y="1" width="65" height="14" isPrintWhenDetailOverflows="true" uuid="a46545d1-264f-4dd1-8d6e-fa62df9cf49b"/>
<textElement textAlignment="Right" verticalAlignment="Middle" markup="none">
<font size="6" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.totalBilhete}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="295" y="1" width="65" height="14" isPrintWhenDetailOverflows="true" uuid="a46545d1-264f-4dd1-8d6e-fa62df9cf49b"/>
<textElement verticalAlignment="Middle" markup="none"> <textElement verticalAlignment="Middle" markup="none">
<font size="6" isBold="true"/> <font size="6" isBold="true"/>
</textElement> </textElement>
@ -508,14 +487,14 @@
<textFieldExpression><![CDATA[$R{label.numpuntoventaOrigem}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.numpuntoventaOrigem}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="155" y="1" width="65" height="14" isPrintWhenDetailOverflows="true" uuid="fc142d15-a328-4187-89dc-9d8d4f3dd270"/> <reportElement stretchType="RelativeToTallestObject" x="155" y="1" width="87" height="14" isPrintWhenDetailOverflows="true" uuid="fc142d15-a328-4187-89dc-9d8d4f3dd270"/>
<textElement verticalAlignment="Middle" markup="none"> <textElement verticalAlignment="Middle" markup="none">
<font size="6" isBold="true"/> <font size="6" isBold="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.fechorDevolucao}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.fechorDevolucao}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="712" y="1" width="45" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="a77ed233-da19-434c-b3d9-e7a418acaf00"/> <reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="708" y="1" width="42" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="a77ed233-da19-434c-b3d9-e7a418acaf00"/>
<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none"> <textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/> <paragraph lineSpacing="Single"/>
@ -523,7 +502,7 @@
<textFieldExpression><![CDATA[$R{label.isenta}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.isenta}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="757" y="1" width="45" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="8dc706f6-dd2d-4b71-acf0-fa8dcd5c4f8d"/> <reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="750" y="1" width="52" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="8dc706f6-dd2d-4b71-acf0-fa8dcd5c4f8d"/>
<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none"> <textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/> <paragraph lineSpacing="Single"/>
@ -535,63 +514,49 @@
<detail> <detail>
<band height="14"> <band height="14">
<textField isBlankWhenNull="true"> <textField isBlankWhenNull="true">
<reportElement x="220" y="0" width="75" height="14" uuid="a34502fa-62b7-44b6-9218-90034054b7ac"/> <reportElement x="242" y="0" width="75" height="14" uuid="a34502fa-62b7-44b6-9218-90034054b7ac"/>
<textElement verticalAlignment="Middle"> <textElement verticalAlignment="Middle">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{aidf}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{aidf}]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isBlankWhenNull="true">
<reportElement x="360" y="0" width="65" height="14" uuid="73fc6712-d370-49e2-ac39-55e2fa5ce9e2"/> <reportElement x="382" y="0" width="65" height="14" uuid="73fc6712-d370-49e2-ac39-55e2fa5ce9e2"/>
<textElement verticalAlignment="Middle"> <textElement verticalAlignment="Middle">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{serieSubSerie}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{serieSubSerie}]]></textFieldExpression>
</textField> </textField>
<textField pattern=" ###0.00"> <textField pattern=" ###0.00">
<reportElement x="534" y="0" width="50" height="14" uuid="b14dbaab-e9a1-4aae-a12c-6305da9d2f80"/> <reportElement x="447" y="0" width="94" height="14" uuid="b14dbaab-e9a1-4aae-a12c-6305da9d2f80"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{precioPagado}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{precioPagado}]]></textFieldExpression>
</textField> </textField>
<textField pattern="###0.00"> <textField pattern="###0.00">
<reportElement x="470" y="0" width="64" height="14" uuid="a1bcec7c-0ca6-4f9f-a4c7-9757842b1b4f"/> <reportElement x="615" y="0" width="47" height="14" uuid="3285bf53-66f1-4dc2-b3db-d12875efa546"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{totalBilhete}]]></textFieldExpression>
</textField>
<textField pattern="###0.00">
<reportElement x="629" y="0" width="43" height="14" uuid="3285bf53-66f1-4dc2-b3db-d12875efa546"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{tributacaoimportacao} == null ? $F{icmsInterestadual} : $F{tributacaoimportacao}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{tributacaoimportacao} == null ? $F{icmsInterestadual} : $F{tributacaoimportacao}]]></textFieldExpression>
</textField> </textField>
<textField pattern="###0.00"> <textField pattern="###0.00">
<reportElement x="584" y="0" width="45" height="14" uuid="6772d6a9-3611-4cb6-9c3b-f78dc3fb5dc0"/> <reportElement x="541" y="0" width="74" height="14" uuid="6772d6a9-3611-4cb6-9c3b-f78dc3fb5dc0"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{valorContabil}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{valorContabil}]]></textFieldExpression>
</textField> </textField>
<textField pattern=" ###0.00" isBlankWhenNull="true"> <textField pattern=" ###0.00" isBlankWhenNull="true">
<reportElement x="672" y="0" width="40" height="14" uuid="e948b0e2-03c4-47c9-91f1-90d3a3fc4bf4"/> <reportElement x="662" y="0" width="46" height="14" uuid="e948b0e2-03c4-47c9-91f1-90d3a3fc4bf4"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{valorIcms}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{valorIcms}]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true">
<reportElement x="425" y="0" width="45" height="14" uuid="755796e0-1c3a-470a-a226-35e01d006653"/>
<textElement verticalAlignment="Middle">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{folio}]]></textFieldExpression>
</textField>
<textField> <textField>
<reportElement x="295" y="0" width="65" height="14" uuid="46bc3410-c01a-4e91-a8e9-17f02536e23d"/> <reportElement x="317" y="0" width="65" height="14" uuid="46bc3410-c01a-4e91-a8e9-17f02536e23d"/>
<textElement verticalAlignment="Middle" markup="none"> <textElement verticalAlignment="Middle" markup="none">
<font size="6" isBold="false"/> <font size="6" isBold="false"/>
</textElement> </textElement>
@ -619,21 +584,21 @@
<textFieldExpression><![CDATA[$F{numpuntoventaOrigem}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{numpuntoventaOrigem}]]></textFieldExpression>
</textField> </textField>
<textField pattern="" isBlankWhenNull="true"> <textField pattern="" isBlankWhenNull="true">
<reportElement x="155" y="0" width="65" height="14" uuid="c7b4a542-1cfc-4646-a423-53c5ea12d4f3"/> <reportElement x="155" y="0" width="87" height="14" uuid="c7b4a542-1cfc-4646-a423-53c5ea12d4f3"/>
<textElement verticalAlignment="Middle"> <textElement verticalAlignment="Middle">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{fechorDevolucao}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{fechorDevolucao}]]></textFieldExpression>
</textField> </textField>
<textField pattern=" ###0.00" isBlankWhenNull="true"> <textField pattern=" ###0.00" isBlankWhenNull="true">
<reportElement x="712" y="0" width="45" height="14" uuid="cdc6fee6-76ba-4cd9-95ee-0ad7fe34c515"/> <reportElement x="708" y="0" width="42" height="14" uuid="cdc6fee6-76ba-4cd9-95ee-0ad7fe34c515"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{valorIsenta}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{valorIsenta}]]></textFieldExpression>
</textField> </textField>
<textField pattern=" ###0.00" isBlankWhenNull="true"> <textField pattern=" ###0.00" isBlankWhenNull="true">
<reportElement x="757" y="0" width="45" height="14" uuid="4b5bd414-7154-4d27-9be3-5764b19cd5d9"/> <reportElement x="750" y="0" width="52" height="14" uuid="4b5bd414-7154-4d27-9be3-5764b19cd5d9"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
@ -671,42 +636,35 @@
<reportElement positionType="Float" x="1" y="15" width="800" height="1" uuid="ff50b0f9-831b-428e-9177-b264920c542b"/> <reportElement positionType="Float" x="1" y="15" width="800" height="1" uuid="ff50b0f9-831b-428e-9177-b264920c542b"/>
</line> </line>
<textField pattern="###0.00"> <textField pattern="###0.00">
<reportElement stretchType="RelativeToTallestObject" x="534" y="1" width="50" height="14" uuid="5bb73e4d-a51b-4a04-bed0-8fa3eb7f8553"/> <reportElement stretchType="RelativeToTallestObject" x="447" y="1" width="94" height="14" uuid="5bb73e4d-a51b-4a04-bed0-8fa3eb7f8553"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{precioPagado_total}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{precioPagado_total}]]></textFieldExpression>
</textField> </textField>
<textField pattern="###0.00"> <textField pattern="###0.00">
<reportElement stretchType="RelativeToTallestObject" x="584" y="1" width="45" height="14" uuid="7c3ce565-f549-48d2-815d-9b4d7a39b1ca"/> <reportElement stretchType="RelativeToTallestObject" x="541" y="1" width="74" height="14" uuid="7c3ce565-f549-48d2-815d-9b4d7a39b1ca"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{vTotalContabil}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{vTotalContabil}]]></textFieldExpression>
</textField> </textField>
<textField pattern="###0.00"> <textField pattern="###0.00">
<reportElement stretchType="RelativeToTallestObject" x="672" y="1" width="40" height="14" uuid="7a2dbe9b-868e-46db-b3b3-6e759d4dba98"/> <reportElement stretchType="RelativeToTallestObject" x="662" y="1" width="46" height="14" uuid="7a2dbe9b-868e-46db-b3b3-6e759d4dba98"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{valorIcms_total}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{valorIcms_total}]]></textFieldExpression>
</textField> </textField>
<textField pattern="###0.00" isBlankWhenNull="false">
<reportElement stretchType="RelativeToTallestObject" x="470" y="1" width="64" height="14" uuid="80bddbda-0eec-4839-9510-35800aa6d742"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$V{vTotalBilhete}]]></textFieldExpression>
</textField>
<textField pattern=" ###0.00" isBlankWhenNull="true"> <textField pattern=" ###0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="757" y="1" width="45" height="14" uuid="fba9c1d7-5a33-4229-9371-31aacc2a9fbb"/> <reportElement stretchType="RelativeToTallestObject" x="750" y="1" width="52" height="14" uuid="fba9c1d7-5a33-4229-9371-31aacc2a9fbb"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{vTotalOutras}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{vTotalOutras}]]></textFieldExpression>
</textField> </textField>
<textField pattern=" ###0.00" isBlankWhenNull="true"> <textField pattern=" ###0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="712" y="1" width="45" height="14" uuid="e6928dff-a4be-42a7-bb7e-281a23110d3a"/> <reportElement stretchType="RelativeToTallestObject" x="708" y="1" width="42" height="14" uuid="e6928dff-a4be-42a7-bb7e-281a23110d3a"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/> <font size="6"/>
</textElement> </textElement>

4
web/gui/relatorios/filtroRelatorioDevolucaoBilhetes.zul
View File

@ -21,11 +21,13 @@
value="${c:l('relatorioDevolucaoBilhetesAgenciaController.lbDataVendaIni.value')}" /> value="${c:l('relatorioDevolucaoBilhetesAgenciaController.lbDataVendaIni.value')}" />
<datebox id="datInicial" width="90%" <datebox id="datInicial" width="90%"
format="dd/MM/yyyy" format="dd/MM/yyyy"
constraint="no empty"
maxlength="10" /> maxlength="10" />
<label <label
value="${c:l('relatorioDevolucaoBilhetesAgenciaController.lbDataVendaFin.value')}" /> value="${c:l('relatorioDevolucaoBilhetesAgenciaController.lbDataVendaFin.value')}" />
<datebox id="datFinal" width="90%" <datebox id="datFinal" width="90%"
format="dd/MM/yyyy" format="dd/MM/yyyy"
constraint="no empty"
maxlength="10" /> maxlength="10" />
</row> </row>
@ -34,11 +36,13 @@
value="${c:l('relatorioDevolucaoBilhetesAgenciaController.lbDataDevolucaoIni.value')}" /> value="${c:l('relatorioDevolucaoBilhetesAgenciaController.lbDataDevolucaoIni.value')}" />
<datebox id="datDevolucaoInicial" width="90%" <datebox id="datDevolucaoInicial" width="90%"
format="dd/MM/yyyy" format="dd/MM/yyyy"
constraint="no empty"
maxlength="10" /> maxlength="10" />
<label <label
value="${c:l('relatorioDevolucaoBilhetesAgenciaController.lbDataDevolucaoFin.value')}" /> value="${c:l('relatorioDevolucaoBilhetesAgenciaController.lbDataDevolucaoFin.value')}" />
<datebox id="datDevolucaoFinal" width="90%" <datebox id="datDevolucaoFinal" width="90%"
format="dd/MM/yyyy" format="dd/MM/yyyy"
constraint="no empty"
maxlength="10" /> maxlength="10" />
</row> </row>