From 5861c1e2138ce8f02e5687ef414ef09b151921e3 Mon Sep 17 00:00:00 2001 From: "alexandre.lima" Date: Thu, 22 Feb 2018 14:12:27 +0000 Subject: [PATCH] =?UTF-8?q?Fixes=20Bug=20#10516=20-=20Code=20review=20feit?= =?UTF-8?q?o=20com=20o=20Leo=20e=20testado=20pelo=20Renato=20Ficou=20acord?= =?UTF-8?q?ado=20que=20o=20campo=20c=C3=B3d.=20Fiscal=20conter=C3=A1=20um?= =?UTF-8?q?=20valor=20fixo=20e=20que=20o=20campo=20status=20sair=C3=A1=20d?= =?UTF-8?q?a=20=C3=BAltima=20posi=C3=A7=C3=A3o=20para=20a=20terceira.=20De?= =?UTF-8?q?=20acordo=20com=20o=20Renato,=20essa=20altera=C3=A7=C3=A3o=20?= =?UTF-8?q?=C3=A9=20para=20todos=20os=20clientes.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@79103 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioBilhetesVendidosNovoLayout.java | 3 +- ...ioBilhetesVendidosNovoLayout_es.properties | 1 + ...ilhetesVendidosNovoLayout_pt_BR.properties | 1 + ...RelatorioBilhetesVendidosNovoLayout.jasper | Bin 41707 -> 40740 bytes .../RelatorioBilhetesVendidosNovoLayout.jrxml | 126 ++++++++---------- ...latorioBilhetesVendidosNovoLayoutBean.java | 9 ++ 6 files changed, 70 insertions(+), 70 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java index 993daa4f5..323351e7e 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java @@ -129,8 +129,9 @@ public class RelatorioBilhetesVendidosNovoLayout extends Relatorio { bean.setValorAliquiotaICMS((BigDecimal) (rset.getObject("valoraliquiotaicms") == null ? "" : rset.getObject("valoraliquiotaicms"))); bean.setValorICMS((BigDecimal) (rset.getObject("valoricms") == null ? "" : rset.getObject("valoricms"))); bean.setUf((String) (rset.getObject("cveestado") == null ? "" : rset.getObject("cveestado"))); - bean.setStatusPassagem((String) (rset.getObject("statuspassagem") == null ? "" : IndStatusBoleto.valueOf(rset.getString("statuspassagem")).getValue())); + 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 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 75e5cef72..f299de5a2 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosNovoLayout_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosNovoLayout_es.properties @@ -23,3 +23,4 @@ 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 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 75e5cef72..f299de5a2 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,3 +23,4 @@ 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosNovoLayout.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosNovoLayout.jasper index 641f0c9ff6b63a492a4c74c2e16f97228de92839..a6fe43cda94361ddc30b03211d426c3b193b0d82 100644 GIT binary patch delta 10228 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 delta 10980 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 Fe*i$DUTgpW diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosNovoLayout.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosNovoLayout.jrxml index b186acfe3..d86074b9f 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosNovoLayout.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosNovoLayout.jrxml @@ -1,8 +1,8 @@ - - - + + + @@ -40,13 +40,14 @@ + <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> @@ -57,87 +58,87 @@ <pageHeader> <band height="89" splitType="Stretch"> <textField> - <reportElement x="321" y="23" width="131" height="20" uuid="e5d4714c-07cc-42ff-a7a8-76d6f6d3e716"/> + <reportElement uuid="e5d4714c-07cc-42ff-a7a8-76d6f6d3e716" x="321" y="23" width="131" height="20"/> <textElement> <font size="14" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{header.periodo}]]></textFieldExpression> </textField> <textField> - <reportElement x="628" y="6" width="138" height="17" uuid="66b2d0f6-2bf1-4bc7-9ec0-a34444e04d60"/> + <reportElement uuid="66b2d0f6-2bf1-4bc7-9ec0-a34444e04d60" x="628" y="6" width="138" height="17"/> <textElement> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression> </textField> <textField evaluationTime="Report"> - <reportElement x="833" y="23" width="24" height="23" uuid="8ca68351-fc00-4f19-b94f-f2fd1f41964f"/> + <reportElement uuid="8ca68351-fc00-4f19-b94f-f2fd1f41964f" x="833" y="23" width="24" height="23"/> <textElement textAlignment="Right"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression> </textField> <textField> - <reportElement x="766" y="23" width="43" height="23" uuid="be1692e9-f130-4d08-9173-6ca3e4699030"/> + <reportElement uuid="be1692e9-f130-4d08-9173-6ca3e4699030" x="766" y="23" width="43" height="23"/> <textElement> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$R{header.pagina}]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy HH:mm"> - <reportElement x="766" y="6" width="91" height="17" uuid="6f671365-868e-41a6-81ee-a308d1d91e1d"/> + <reportElement uuid="6f671365-868e-41a6-81ee-a308d1d91e1d" x="766" y="6" width="91" height="17"/> <textElement textAlignment="Left"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> </textField> <textField> - <reportElement x="809" y="23" width="24" height="23" uuid="7548d623-fb6c-48d4-b8b7-504f5437a79a"/> + <reportElement uuid="7548d623-fb6c-48d4-b8b7-504f5437a79a" x="809" y="23" width="24" height="23"/> <textElement textAlignment="Right"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression> </textField> <line> - <reportElement x="0" y="87" width="857" height="1" uuid="ee05e1fa-6963-4ff9-b3c8-c6cd1bb54e94"/> + <reportElement uuid="ee05e1fa-6963-4ff9-b3c8-c6cd1bb54e94" x="0" y="87" 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="452" y="23" width="77" height="20" uuid="eed2f1a3-3688-4d0c-b0da-77ff99289c93"/> + <reportElement uuid="eed2f1a3-3688-4d0c-b0da-77ff99289c93" x="452" y="23" width="77" height="20"/> <textElement> <font size="14"/> </textElement> <textFieldExpression><![CDATA[$P{DATA_INICIAL}]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy"> - <reportElement x="530" y="23" width="83" height="20" uuid="b151a471-e821-4b4f-b9a2-a5cc73d2e702"/> + <reportElement uuid="b151a471-e821-4b4f-b9a2-a5cc73d2e702" x="530" y="23" width="83" 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> @@ -148,194 +149,180 @@ <columnHeader> <band height="34" 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="201" y="0" width="67" height="33" isPrintWhenDetailOverflows="true" uuid="2cbc8ddc-38e5-4914-8189-5761ddeb2ce9"/> - <textElement textAlignment="Center" verticalAlignment="Bottom" markup="none"> - <font size="11" isBold="true"/> - </textElement> - <textFieldExpression><![CDATA[$R{label.numAIDF}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="268" y="0" width="53" height="33" isPrintWhenDetailOverflows="true" uuid="7965e761-2e24-4f17-84eb-9431c98ce72c"/> + <reportElement uuid="7965e761-2e24-4f17-84eb-9431c98ce72c" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="241" 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.formInicial}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="321" 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="294" 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="374" y="0" width="79" height="33" isPrintWhenDetailOverflows="true" uuid="2b25ca5a-2c25-4c7d-87d1-5bfd205177a9"/> + <reportElement uuid="2b25ca5a-2c25-4c7d-87d1-5bfd205177a9" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="347" y="0" width="58" 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="453" y="0" width="77" height="33" isPrintWhenDetailOverflows="true" uuid="ab6b6770-67e8-4224-9304-8de30d3c1384"/> - <textElement textAlignment="Center" verticalAlignment="Bottom" markup="none"> - <font size="11" isBold="true"/> - </textElement> - <textFieldExpression><![CDATA[$R{label.subSerie}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="530" 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="503" y="0" width="83" 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="613" 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="586" 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="692" 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="665" 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="45" 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="97" height="33" isPrintWhenDetailOverflows="true" uuid="fc3e1df1-ad7b-45de-ab36-78126000b123"/> + <reportElement uuid="fc3e1df1-ad7b-45de-ab36-78126000b123" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="45" y="0" width="97" 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="751" y="0" width="67" height="33" isPrintWhenDetailOverflows="true" uuid="dc108100-3fd4-4d37-a73b-40f8490b623a"/> + <reportElement uuid="dc108100-3fd4-4d37-a73b-40f8490b623a" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="724" y="0" width="133" 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="142" 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="181" 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="818" y="0" width="40" height="33" isPrintWhenDetailOverflows="true" uuid="cbe72c43-c7dd-4074-9095-aa85726e634f"/> + <reportElement uuid="cbe72c43-c7dd-4074-9095-aa85726e634f" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="142" y="0" width="39" 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 uuid="b18ba0f0-ebe6-44bf-9d22-692f77a65d25" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="405" y="0" width="98" height="33" isPrintWhenDetailOverflows="true"/> + <textElement textAlignment="Center" verticalAlignment="Bottom" markup="none"> + <font size="11" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{label.codFiscal}]]></textFieldExpression> + </textField> </band> </columnHeader> <detail> <band height="18" splitType="Stretch"> <textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="false"> - <reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="751" y="1" width="67" height="16" isPrintWhenDetailOverflows="true" uuid="784343f8-f7aa-4997-82e7-312878bd9a27"/> + <reportElement uuid="784343f8-f7aa-4997-82e7-312878bd9a27" stretchType="RelativeToTallestObject" mode="Transparent" x="724" y="1" width="133" height="16" 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="267" y="1" width="53" height="16" isPrintWhenDetailOverflows="true" uuid="ad46494b-0240-46d1-a775-f91f0035d7f8"/> + <reportElement uuid="ad46494b-0240-46d1-a775-f91f0035d7f8" stretchType="RelativeToTallestObject" x="240" y="1" width="53" height="16" 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="529" y="1" width="84" height="16" isPrintWhenDetailOverflows="true" uuid="0ed9578b-73d5-4f51-b21c-07d9419bbc08"/> + <reportElement uuid="0ed9578b-73d5-4f51-b21c-07d9419bbc08" stretchType="RelativeToTallestObject" mode="Transparent" x="502" y="1" width="84" height="16" 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="320" y="1" width="53" height="16" isPrintWhenDetailOverflows="true" uuid="1ed844e5-7aa4-49ee-8024-765e5ae49f74"/> + <reportElement uuid="1ed844e5-7aa4-49ee-8024-765e5ae49f74" stretchType="RelativeToTallestObject" x="293" y="1" width="53" height="16" 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="613" y="1" width="79" height="16" isPrintWhenDetailOverflows="true" uuid="92017408-1781-4e17-90b7-5ff86457cf6d"/> + <reportElement uuid="92017408-1781-4e17-90b7-5ff86457cf6d" stretchType="RelativeToTallestObject" mode="Transparent" x="586" y="1" width="79" height="16" 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="692" y="1" width="59" height="16" isPrintWhenDetailOverflows="true" uuid="36f5d507-0340-4c7e-b44b-5057c1e8bee6"/> + <reportElement uuid="36f5d507-0340-4c7e-b44b-5057c1e8bee6" stretchType="RelativeToTallestObject" mode="Transparent" x="665" y="1" width="59" height="16" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" verticalAlignment="Top" markup="none"> <font size="11" isBold="false"/> </textElement> <textFieldExpression><![CDATA[$F{valorAliquiotaICMS}]]></textFieldExpression> </textField> - <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="452" y="1" width="78" height="16" isPrintWhenDetailOverflows="true" uuid="7f08e540-2cf9-4da3-b40a-fb7d5275751f"/> - <textElement textAlignment="Center" verticalAlignment="Top" markup="none"> - <font size="11" isBold="false"/> - </textElement> - <textFieldExpression><![CDATA[$F{subSerie}]]></textFieldExpression> - </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="373" y="1" width="79" height="16" isPrintWhenDetailOverflows="true" uuid="16c5bcd4-ac1c-4c49-b065-5794fb9c2e32"/> + <reportElement uuid="16c5bcd4-ac1c-4c49-b065-5794fb9c2e32" stretchType="RelativeToTallestObject" mode="Transparent" x="346" y="1" width="58" height="16" 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="16" isPrintWhenDetailOverflows="true" uuid="16f536ed-9001-4b34-85f4-a01198390b7d"/> + <reportElement uuid="16f536ed-9001-4b34-85f4-a01198390b7d" stretchType="RelativeToTallestObject" x="0" y="1" width="45" height="16" 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="dd/MM/yyyy" isBlankWhenNull="false"> - <reportElement stretchType="RelativeToTallestObject" x="45" y="1" width="97" height="16" isPrintWhenDetailOverflows="true" uuid="09aeacb1-1c4d-4c40-8b13-b328e3f1afe7"/> + <reportElement uuid="09aeacb1-1c4d-4c40-8b13-b328e3f1afe7" stretchType="RelativeToTallestObject" x="45" y="1" width="97" height="16" 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="#,##0.00" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" x="201" y="1" width="66" height="16" isPrintWhenDetailOverflows="true" uuid="9e980077-0d28-437f-a699-6b4319090045"/> - <textElement textAlignment="Center" verticalAlignment="Top" markup="none"> - <font size="11" isBold="false"/> - </textElement> - <textFieldExpression><![CDATA[$F{numAIDF}]]></textFieldExpression> - </textField> <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="false"> - <reportElement stretchType="RelativeToTallestObject" x="142" y="1" width="59" height="16" isPrintWhenDetailOverflows="true" uuid="b0c28690-12bf-478c-90ae-a36ee69948f6"/> + <reportElement uuid="b0c28690-12bf-478c-90ae-a36ee69948f6" stretchType="RelativeToTallestObject" x="181" y="1" width="59" height="16" 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="818" y="1" width="39" height="16" isPrintWhenDetailOverflows="true" uuid="5767fd4a-2a72-45d6-9733-89a155b69895"/> + <reportElement uuid="5767fd4a-2a72-45d6-9733-89a155b69895" stretchType="RelativeToTallestObject" mode="Transparent" x="142" y="2" width="39" height="16" 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 uuid="53bdff45-7508-4ddd-96ef-2eef4cd69207" stretchType="RelativeToTallestObject" mode="Transparent" x="405" y="2" width="97" height="16" isPrintWhenDetailOverflows="true"/> + <textElement textAlignment="Center" verticalAlignment="Top" markup="none"> + <font size="11" isBold="false"/> + </textElement> + <textFieldExpression><![CDATA[$F{codFiscal}]]></textFieldExpression> + </textField> </band> </detail> <columnFooter> @@ -350,7 +337,8 @@ <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/> <textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression> </textField> </band> diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioBilhetesVendidosNovoLayoutBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioBilhetesVendidosNovoLayoutBean.java index 994a804b6..9a38a2dca 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioBilhetesVendidosNovoLayoutBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioBilhetesVendidosNovoLayoutBean.java @@ -20,6 +20,15 @@ public class RelatorioBilhetesVendidosNovoLayoutBean { private String statusPassagem; private String bilhete; private Date dataVenda; + private String codFiscal; + + public String getCodFiscal() { + return codFiscal; + } + + public void setCodFiscal(String codFiscal) { + this.codFiscal = codFiscal; + } public String getNumAIDF() { return numAIDF;