diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java index aced64e3c..a74251448 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java @@ -14,6 +14,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.commons.lang.StringUtils; + import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.IndStatusBoleto; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; @@ -56,7 +58,11 @@ public class RelatorioBilhetesVendidosNovoLayout extends Relatorio { sql.append(" t.preciopagado AS valorcontabil,"); sql.append(" t.preciopagado - (t.preciopagado * coalesce(t.porcredbaseicms / 100,0))AS valorbasecalculo,"); sql.append(" t.valoraliquiotaicms,"); - sql.append(" ((t.preciopagado - (t.preciopagado * coalesce(t.porcredbaseicms / 100,0))) * t.icms) / 100 AS valoricms "); + sql.append(" ((t.preciopagado - (t.preciopagado * coalesce(t.porcredbaseicms / 100,0))) * t.icms) / 100 AS valoricms,"); + sql.append(" cod_origem,"); + sql.append(" origem,"); + sql.append(" cod_destino,"); + sql.append(" destino "); sql.append("from"); sql.append(" (select distinct est.icms,"); sql.append(" c.preciopagado,"); @@ -69,12 +75,17 @@ public class RelatorioBilhetesVendidosNovoLayout extends Relatorio { sql.append(" c.numfoliosistema as formfinal,"); sql.append(" c.numseriepreimpresa as serie,"); sql.append(" c.preciopagado as valorcontabil,"); - sql.append(" est.icms as valoraliquiotaicms"); + sql.append(" est.icms as valoraliquiotaicms,"); + sql.append(" po.parada_id cod_origem, "); + sql.append(" po.descparada origem,"); + sql.append(" pd.parada_id cod_destino,"); + sql.append(" pd.descparada destino"); sql.append(" from caja c"); sql.append(" left join aidf a on a.aidf_id = c.aidf_id"); sql.append(" left join aidf_especie ae on (a.aidfesp_id = ae.aidfesp_id)"); sql.append(" join empresa e on e.empresa_id = c.empresacorrida_id"); sql.append(" join parada po on po.parada_id = c.origen_id"); + sql.append(" join parada pd on pd.parada_id = c.destino_id"); sql.append(" join ciudad co on co.ciudad_id = po.ciudad_id"); sql.append(" join estado est on est.estado_id = co.estado_id"); sql.append(" join empresa_imposto ei on ei.empresa_id = e.empresa_id"); @@ -145,6 +156,10 @@ public class RelatorioBilhetesVendidosNovoLayout extends Relatorio { bean.setStatusPassagem((String) (rset.getObject("statuspassagem") != null && rset.getObject("statuspassagem").equals("V") ? "N" : rset.getString("statuspassagem"))); bean.setEspecie((String) (rset.getObject("especie") == null ? "" : rset.getObject("especie"))); bean.setCodFiscal("5357"); // código fixo indicado pelo cliente mantis 10516 + bean.setCodOrigem(StringUtils.defaultString(rset.getString("cod_origem"))); + bean.setOrigem(StringUtils.defaultString(rset.getString("origem"))); + bean.setCodDestino(StringUtils.defaultString(rset.getString("cod_destino"))); + bean.setDestino(StringUtils.defaultString(rset.getString("destino"))); lsDadosRelatorio.add(bean); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosNovoLayout_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosNovoLayout_es.properties index f299de5a2..f473f8da4 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosNovoLayout_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosNovoLayout_es.properties @@ -23,4 +23,6 @@ label.valorCancelado=Qtd. Cancec header.periodo=Período: header.tipoLinha=Tipo Linha: header.estado=Estado -label.codFiscal=Cod. Fiscal \ No newline at end of file +label.codFiscal=Cod. Fiscal +label.origem=Fuente +label.destino=Destino \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosNovoLayout_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosNovoLayout_pt_BR.properties index 191f2c178..a64e65782 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosNovoLayout_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosNovoLayout_pt_BR.properties @@ -23,4 +23,6 @@ label.valorCancelado=Qtd. Cancec header.periodo=Período: header.tipoLinha=Tipo Linha: header.estado=Estado: -label.codFiscal=Cod. Fiscal \ No newline at end of file +label.codFiscal=Cod. Fiscal +label.origem=Origem +label.destino=Destino \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosNovoLayout.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosNovoLayout.jasper index f397c0c6a..cd58de81b 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosNovoLayout.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosNovoLayout.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosNovoLayout.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosNovoLayout.jrxml index 882fa04e3..f32047bab 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosNovoLayout.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosNovoLayout.jrxml @@ -1,7 +1,7 @@ - + @@ -41,13 +41,15 @@ + + <band height="28"> <textField> - <reportElement x="142" y="2" width="416" height="20" uuid="e15d26de-6873-4576-b49b-8dc546b39dbe"/> + <reportElement uuid="e15d26de-6873-4576-b49b-8dc546b39dbe" x="142" y="2" width="416" height="20"/> <textElement textAlignment="Center"> <font size="12" isBold="true"/> </textElement> @@ -58,87 +60,87 @@ <pageHeader> <band height="91" splitType="Stretch"> <textField> - <reportElement x="351" y="23" width="111" height="20" uuid="e5d4714c-07cc-42ff-a7a8-76d6f6d3e716"/> + <reportElement uuid="e5d4714c-07cc-42ff-a7a8-76d6f6d3e716" x="351" y="23" width="111" height="20"/> <textElement> <font size="14" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{header.periodo}]]></textFieldExpression> </textField> <textField> - <reportElement x="462" y="6" width="181" height="17" uuid="66b2d0f6-2bf1-4bc7-9ec0-a34444e04d60"/> + <reportElement uuid="66b2d0f6-2bf1-4bc7-9ec0-a34444e04d60" x="462" y="6" width="181" height="17"/> <textElement> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression> </textField> <textField evaluationTime="Report"> - <reportElement x="781" y="23" width="76" height="20" uuid="8ca68351-fc00-4f19-b94f-f2fd1f41964f"/> + <reportElement uuid="8ca68351-fc00-4f19-b94f-f2fd1f41964f" x="781" y="23" width="76" height="20"/> <textElement textAlignment="Right"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression> </textField> <textField> - <reportElement x="643" y="23" width="79" height="20" uuid="be1692e9-f130-4d08-9173-6ca3e4699030"/> + <reportElement uuid="be1692e9-f130-4d08-9173-6ca3e4699030" x="643" y="23" width="79" height="20"/> <textElement> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$R{header.pagina}]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy HH:mm"> - <reportElement x="643" y="6" width="214" height="17" uuid="6f671365-868e-41a6-81ee-a308d1d91e1d"/> + <reportElement uuid="6f671365-868e-41a6-81ee-a308d1d91e1d" x="643" y="6" width="214" height="17"/> <textElement textAlignment="Left"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> </textField> <textField> - <reportElement x="722" y="23" width="59" height="20" uuid="7548d623-fb6c-48d4-b8b7-504f5437a79a"/> + <reportElement uuid="7548d623-fb6c-48d4-b8b7-504f5437a79a" x="722" y="23" width="59" height="20"/> <textElement textAlignment="Right"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression> </textField> <line> - <reportElement x="0" y="89" width="857" height="1" uuid="ee05e1fa-6963-4ff9-b3c8-c6cd1bb54e94"/> + <reportElement uuid="ee05e1fa-6963-4ff9-b3c8-c6cd1bb54e94" x="0" y="89" width="857" height="1"/> </line> <textField> - <reportElement x="142" y="23" width="179" height="20" uuid="4d4f219a-3607-4255-b549-fc5ada2ad59e"/> + <reportElement uuid="4d4f219a-3607-4255-b549-fc5ada2ad59e" x="142" y="23" width="179" height="20"/> <textElement verticalAlignment="Bottom"> <font size="14"/> </textElement> <textFieldExpression><![CDATA[$P{EMPRESA}]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy"> - <reportElement x="462" y="23" width="96" height="20" uuid="eed2f1a3-3688-4d0c-b0da-77ff99289c93"/> + <reportElement uuid="eed2f1a3-3688-4d0c-b0da-77ff99289c93" x="462" y="23" width="96" height="20"/> <textElement> <font size="14"/> </textElement> <textFieldExpression><![CDATA[$P{DATA_INICIAL}]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy"> - <reportElement x="558" y="23" width="85" height="20" uuid="b151a471-e821-4b4f-b9a2-a5cc73d2e702"/> + <reportElement uuid="b151a471-e821-4b4f-b9a2-a5cc73d2e702" x="558" y="23" width="85" height="20"/> <textElement> <font size="14"/> </textElement> <textFieldExpression><![CDATA[$P{DATA_FINAL}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="0" y="23" width="142" height="20" isPrintWhenDetailOverflows="true" uuid="e97938f6-a4ba-488b-b53c-50d9420422ac"/> + <reportElement uuid="e97938f6-a4ba-488b-b53c-50d9420422ac" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="0" y="23" width="142" height="20" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" verticalAlignment="Bottom" markup="none"> <font size="14" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.empresa}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="0" y="44" width="142" height="20" isPrintWhenDetailOverflows="true" uuid="37578e45-7834-459f-b021-b38fa08df7e4"/> + <reportElement uuid="37578e45-7834-459f-b021-b38fa08df7e4" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="0" y="44" width="142" height="20" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" verticalAlignment="Bottom" markup="none"> <font size="14" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{header.estado}]]></textFieldExpression> </textField> <textField> - <reportElement x="142" y="44" width="179" height="20" uuid="4ace9692-147a-46cb-9ae3-5c7224a3d4d0"/> + <reportElement uuid="4ace9692-147a-46cb-9ae3-5c7224a3d4d0" x="142" y="44" width="179" height="20"/> <textElement verticalAlignment="Bottom"> <font size="14"/> </textElement> @@ -149,180 +151,208 @@ <columnHeader> <band height="35" splitType="Stretch"> <line> - <reportElement mode="Transparent" x="0" y="33" width="857" height="1" uuid="ae94e51c-f84c-405c-a9c3-d8fd0c48f03a"/> + <reportElement uuid="ae94e51c-f84c-405c-a9c3-d8fd0c48f03a" mode="Transparent" x="0" y="33" width="857" height="1"/> </line> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="297" y="0" width="54" height="33" isPrintWhenDetailOverflows="true" uuid="7965e761-2e24-4f17-84eb-9431c98ce72c"/> + <reportElement uuid="7965e761-2e24-4f17-84eb-9431c98ce72c" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="363" y="0" width="54" height="33" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" verticalAlignment="Bottom" markup="none"> <font size="11" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.formInicial}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="351" y="0" width="53" height="33" isPrintWhenDetailOverflows="true" uuid="bbaa5f53-76e0-491e-9145-e522122709e5"/> + <reportElement uuid="bbaa5f53-76e0-491e-9145-e522122709e5" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="417" y="0" width="53" height="33" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" verticalAlignment="Bottom" markup="none"> <font size="11" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.formFinal}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="404" y="0" width="58" height="33" isPrintWhenDetailOverflows="true" uuid="2b25ca5a-2c25-4c7d-87d1-5bfd205177a9"/> + <reportElement uuid="2b25ca5a-2c25-4c7d-87d1-5bfd205177a9" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="470" y="0" width="48" height="33" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" verticalAlignment="Bottom" markup="none"> <font size="11" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.serie}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="560" y="0" width="83" height="33" isPrintWhenDetailOverflows="true" uuid="e3f4df4e-24a9-45b3-8ac3-f8b66d46a15f"/> + <reportElement uuid="e3f4df4e-24a9-45b3-8ac3-f8b66d46a15f" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="583" y="0" width="60" height="33" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" verticalAlignment="Bottom" markup="none"> <font size="11" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.valorContabil}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="643" y="0" width="79" height="33" isPrintWhenDetailOverflows="true" uuid="79775d53-3de4-4c0c-8ec7-3be13738dc14"/> + <reportElement uuid="79775d53-3de4-4c0c-8ec7-3be13738dc14" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="643" y="0" width="79" height="33" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" verticalAlignment="Bottom" markup="none"> <font size="11" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.valorBaseCalculo}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="722" y="0" width="59" height="33" isPrintWhenDetailOverflows="true" uuid="746627ad-15b0-4435-93ce-6d370b75e594"/> + <reportElement uuid="746627ad-15b0-4435-93ce-6d370b75e594" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="722" y="0" width="59" height="33" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" verticalAlignment="Bottom" markup="none"> <font size="11" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.valorAliquiotaICMS}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="0" y="0" width="45" height="33" isPrintWhenDetailOverflows="true" uuid="6d6bbde3-210f-4dfb-9b84-2383480eb46f"/> + <reportElement uuid="6d6bbde3-210f-4dfb-9b84-2383480eb46f" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="0" y="0" width="27" height="33" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" verticalAlignment="Bottom" markup="none"> <font size="11" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.UF}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="45" y="0" width="154" height="33" isPrintWhenDetailOverflows="true" uuid="fc3e1df1-ad7b-45de-ab36-78126000b123"/> + <reportElement uuid="fc3e1df1-ad7b-45de-ab36-78126000b123" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="27" y="0" width="64" height="33" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" verticalAlignment="Bottom" markup="none"> <font size="11" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.dataVenda}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="781" y="0" width="76" height="33" isPrintWhenDetailOverflows="true" uuid="dc108100-3fd4-4d37-a73b-40f8490b623a"/> + <reportElement uuid="dc108100-3fd4-4d37-a73b-40f8490b623a" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="781" y="0" width="76" height="33" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" verticalAlignment="Bottom" markup="none"> <font size="11" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.valorICMS}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="238" y="0" width="59" height="33" isPrintWhenDetailOverflows="true" uuid="97eb7851-4964-4114-acba-015e2bed5ed6"/> + <reportElement uuid="97eb7851-4964-4114-acba-015e2bed5ed6" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="304" y="0" width="59" height="33" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" verticalAlignment="Bottom" markup="none"> <font size="11" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.especie}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="199" y="0" width="39" height="33" isPrintWhenDetailOverflows="true" uuid="cbe72c43-c7dd-4074-9095-aa85726e634f"/> + <reportElement uuid="b18ba0f0-ebe6-44bf-9d22-692f77a65d25" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="518" y="0" width="64" height="33" isPrintWhenDetailOverflows="true"/> + <textElement textAlignment="Center" verticalAlignment="Bottom" markup="none"> + <font size="11" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{label.codFiscal}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement uuid="5325ce65-863f-40fe-89c7-5d1d8bd15e1b" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="91" y="0" width="85" height="33" isPrintWhenDetailOverflows="true"/> + <textElement textAlignment="Center" verticalAlignment="Bottom" markup="none"> + <font size="11" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{label.origem}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement uuid="cbe72c43-c7dd-4074-9095-aa85726e634f" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="261" y="0" width="43" height="33" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" verticalAlignment="Bottom" markup="none"> <font size="11" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.status}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="462" y="0" width="98" height="33" isPrintWhenDetailOverflows="true" uuid="b18ba0f0-ebe6-44bf-9d22-692f77a65d25"/> + <reportElement uuid="39babc35-ccd6-45af-8046-85df311d753e" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="176" y="0" width="85" height="33" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" verticalAlignment="Bottom" markup="none"> <font size="11" isBold="true"/> </textElement> - <textFieldExpression><![CDATA[$R{label.codFiscal}]]></textFieldExpression> + <textFieldExpression><![CDATA[$R{label.destino}]]></textFieldExpression> </textField> </band> </columnHeader> <detail> <band height="23" splitType="Stretch"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="781" y="1" width="76" height="22" isPrintWhenDetailOverflows="true" uuid="784343f8-f7aa-4997-82e7-312878bd9a27"/> + <reportElement uuid="784343f8-f7aa-4997-82e7-312878bd9a27" stretchType="RelativeToTallestObject" mode="Transparent" x="781" y="1" width="76" height="22" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" verticalAlignment="Top" markup="none"> <font size="11" isBold="false"/> </textElement> <textFieldExpression><![CDATA[$F{valorICMS}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" x="297" y="1" width="54" height="22" isPrintWhenDetailOverflows="true" uuid="ad46494b-0240-46d1-a775-f91f0035d7f8"/> + <reportElement uuid="ad46494b-0240-46d1-a775-f91f0035d7f8" stretchType="RelativeToTallestObject" x="363" y="1" width="54" height="22" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" verticalAlignment="Top" markup="none"> <font size="11" isBold="false"/> </textElement> <textFieldExpression><![CDATA[$F{formInicial}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="560" y="1" width="83" height="22" isPrintWhenDetailOverflows="true" uuid="0ed9578b-73d5-4f51-b21c-07d9419bbc08"/> + <reportElement uuid="0ed9578b-73d5-4f51-b21c-07d9419bbc08" stretchType="RelativeToTallestObject" mode="Transparent" x="583" y="1" width="60" height="22" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" verticalAlignment="Top" markup="none"> <font size="11" isBold="false"/> </textElement> <textFieldExpression><![CDATA[$F{valorContabil}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" x="351" y="1" width="53" height="22" isPrintWhenDetailOverflows="true" uuid="1ed844e5-7aa4-49ee-8024-765e5ae49f74"/> + <reportElement uuid="1ed844e5-7aa4-49ee-8024-765e5ae49f74" stretchType="RelativeToTallestObject" x="417" y="1" width="53" height="22" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" verticalAlignment="Top" markup="none"> <font size="11" isBold="false"/> </textElement> <textFieldExpression><![CDATA[$F{formFinal}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="643" y="1" width="79" height="22" isPrintWhenDetailOverflows="true" uuid="92017408-1781-4e17-90b7-5ff86457cf6d"/> + <reportElement uuid="92017408-1781-4e17-90b7-5ff86457cf6d" stretchType="RelativeToTallestObject" mode="Transparent" x="643" y="1" width="79" height="22" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" verticalAlignment="Top" markup="none"> <font size="11" isBold="false"/> </textElement> <textFieldExpression><![CDATA[$F{valorBaseCalculo}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="722" y="1" width="59" height="22" isPrintWhenDetailOverflows="true" uuid="36f5d507-0340-4c7e-b44b-5057c1e8bee6"/> + <reportElement uuid="36f5d507-0340-4c7e-b44b-5057c1e8bee6" stretchType="RelativeToTallestObject" mode="Transparent" x="722" y="1" width="59" height="22" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" verticalAlignment="Top" markup="none"> <font size="11" isBold="false"/> </textElement> <textFieldExpression><![CDATA[$F{valorAliquiotaICMS}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="404" y="1" width="58" height="22" isPrintWhenDetailOverflows="true" uuid="16c5bcd4-ac1c-4c49-b065-5794fb9c2e32"/> + <reportElement uuid="16c5bcd4-ac1c-4c49-b065-5794fb9c2e32" stretchType="RelativeToTallestObject" mode="Transparent" x="470" y="1" width="48" height="22" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" verticalAlignment="Top" markup="none"> <font size="11" isBold="false"/> </textElement> <textFieldExpression><![CDATA[$F{serie}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="false"> - <reportElement stretchType="RelativeToTallestObject" x="0" y="1" width="45" height="22" isPrintWhenDetailOverflows="true" uuid="16f536ed-9001-4b34-85f4-a01198390b7d"/> + <reportElement uuid="16f536ed-9001-4b34-85f4-a01198390b7d" stretchType="RelativeToTallestObject" x="0" y="1" width="27" height="22" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" verticalAlignment="Top" markup="none"> <font size="11" isBold="false"/> </textElement> <textFieldExpression><![CDATA[$F{uf}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="false"> - <reportElement stretchType="RelativeToTallestObject" x="45" y="1" width="154" height="22" isPrintWhenDetailOverflows="true" uuid="09aeacb1-1c4d-4c40-8b13-b328e3f1afe7"/> + <reportElement uuid="09aeacb1-1c4d-4c40-8b13-b328e3f1afe7" stretchType="RelativeToTallestObject" x="27" y="1" width="64" height="22" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" verticalAlignment="Top" markup="none"> <font size="11" isBold="false"/> </textElement> <textFieldExpression><![CDATA[$F{dataVenda}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="false"> - <reportElement stretchType="RelativeToTallestObject" x="238" y="1" width="59" height="22" isPrintWhenDetailOverflows="true" uuid="b0c28690-12bf-478c-90ae-a36ee69948f6"/> + <reportElement uuid="b0c28690-12bf-478c-90ae-a36ee69948f6" stretchType="RelativeToTallestObject" x="304" y="1" width="59" height="22" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" verticalAlignment="Top" markup="none"> <font size="11" isBold="false"/> </textElement> <textFieldExpression><![CDATA[$F{especie}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="false"> - <reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="199" y="1" width="39" height="22" isPrintWhenDetailOverflows="true" uuid="5767fd4a-2a72-45d6-9733-89a155b69895"/> + <reportElement uuid="5767fd4a-2a72-45d6-9733-89a155b69895" stretchType="RelativeToTallestObject" mode="Transparent" x="261" y="1" width="43" height="22" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" verticalAlignment="Top" markup="none"> <font size="11" isBold="false"/> </textElement> <textFieldExpression><![CDATA[$F{statusPassagem}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="462" y="1" width="98" height="22" isPrintWhenDetailOverflows="true" uuid="53bdff45-7508-4ddd-96ef-2eef4cd69207"/> + <reportElement uuid="53bdff45-7508-4ddd-96ef-2eef4cd69207" stretchType="RelativeToTallestObject" mode="Transparent" x="518" y="1" width="64" height="22" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" verticalAlignment="Top" markup="none"> <font size="11" isBold="false"/> </textElement> <textFieldExpression><![CDATA[$F{codFiscal}]]></textFieldExpression> </textField> + <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="false"> + <reportElement uuid="b7f640cf-0dbd-4898-ae1c-7bc530fef102" stretchType="RelativeToTallestObject" mode="Transparent" x="91" y="1" width="85" height="22" isPrintWhenDetailOverflows="true"/> + <textElement textAlignment="Center" verticalAlignment="Top" markup="none"> + <font size="11" isBold="false"/> + </textElement> + <textFieldExpression><![CDATA[$F{origem}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="false"> + <reportElement uuid="ea62ae06-050b-40e9-9df7-b96b461e6ada" stretchType="RelativeToTallestObject" mode="Transparent" x="176" y="1" width="85" height="22" isPrintWhenDetailOverflows="true"/> + <textElement textAlignment="Center" verticalAlignment="Top" markup="none"> + <font size="11" isBold="false"/> + </textElement> + <textFieldExpression><![CDATA[$F{destino}]]></textFieldExpression> + </textField> </band> </detail> <columnFooter> @@ -337,7 +367,7 @@ <noData> <band height="20"> <textField> - <reportElement x="0" y="0" width="857" height="20" uuid="5a6c1b7b-2242-4cf1-b957-723b906ee620"/> + <reportElement uuid="5a6c1b7b-2242-4cf1-b957-723b906ee620" x="0" y="0" width="857" height="20"/> <textElement textAlignment="Center"/> <textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression> </textField> diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioBilhetesVendidosNovoLayoutBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioBilhetesVendidosNovoLayoutBean.java index d237f7118..7c191e83a 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioBilhetesVendidosNovoLayoutBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioBilhetesVendidosNovoLayoutBean.java @@ -20,6 +20,10 @@ public class RelatorioBilhetesVendidosNovoLayoutBean { private String bilhete; private String dataVenda; private String codFiscal; + private String codOrigem; + private String codDestino; + private String origem; + private String destino; public String getCodFiscal() { return codFiscal; @@ -149,4 +153,36 @@ public class RelatorioBilhetesVendidosNovoLayoutBean { this.dataVenda = dataVenda; } + public String getCodOrigem() { + return codOrigem; + } + + public void setCodOrigem(String codOrigem) { + this.codOrigem = codOrigem; + } + + public String getCodDestino() { + return codDestino; + } + + public void setCodDestino(String codDestino) { + this.codDestino = codDestino; + } + + public String getOrigem() { + return origem; + } + + public void setOrigem(String origem) { + this.origem = origem; + } + + public String getDestino() { + return destino; + } + + public void setDestino(String destino) { + this.destino = destino; + } + }