fixed bug #7675 - Correção de relatório para diminuir a quantidade de páginas e alteração em valor do campo dif para considerar o folio inicial.
git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@57819 d1611594-4594-4d17-8e1d-87c2c4800839master
thiago
parent
78a457fe39
commit
7799c21137
|
|
@ -40,7 +40,7 @@ public class RelatorioConferenciaFormularioFisico extends Relatorio {
|
|||
sql.append(" max(c.fechorventa) as fechamento, ");
|
||||
sql.append(" min(c.numfoliopreimpreso) as minfisico, ");
|
||||
sql.append(" max(c.numfoliopreimpreso) as maxfisico, ");
|
||||
sql.append(" max(c.numfoliopreimpreso) - min(c.numfoliopreimpreso) as dif1, ");
|
||||
sql.append(" (max(c.numfoliopreimpreso) + 1) - min(c.numfoliopreimpreso) as dif1, ");
|
||||
sql.append(" count(case when (c.indreimpresion = 1 and c.indstatusboleto = 'E') then -1 else 1 end) as total ");
|
||||
sql.append("from ");
|
||||
sql.append(" caja c ");
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -2,7 +2,7 @@
|
|||
<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="RelatorioCheckin" pageWidth="842" pageHeight="675" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="48d32af4-ba9f-41c2-91a5-5d2fe57e149c">
|
||||
<property name="ireport.zoom" value="1.4641000000000008"/>
|
||||
<property name="ireport.x" value="0"/>
|
||||
<property name="ireport.y" value="49"/>
|
||||
<property name="ireport.y" value="0"/>
|
||||
<parameter name="NOME_RELATORIO" class="java.lang.String"/>
|
||||
<parameter name="DATA_INICIAL" class="java.util.Date"/>
|
||||
<parameter name="DATA_FINAL" class="java.util.Date"/>
|
||||
|
|
@ -27,24 +27,26 @@
|
|||
<group name="caixa">
|
||||
<groupExpression><![CDATA[$F{caixa}]]></groupExpression>
|
||||
<groupHeader>
|
||||
<band height="30">
|
||||
<band height="19">
|
||||
<textField>
|
||||
<reportElement uuid="9591658f-b725-4d9d-8863-5435c1540e95" x="125" y="7" width="263" height="20"/>
|
||||
<textElement verticalAlignment="Middle"/>
|
||||
<reportElement uuid="9591658f-b725-4d9d-8863-5435c1540e95" x="125" y="2" width="263" height="16"/>
|
||||
<textElement verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{caixa}]]></textFieldExpression>
|
||||
</textField>
|
||||
<line>
|
||||
<reportElement uuid="acc2f86e-4ee2-4e61-807f-27fd740db652" x="0" y="0" width="792" height="1"/>
|
||||
</line>
|
||||
<staticText>
|
||||
<reportElement uuid="3e57e8b7-68d6-4357-b273-8389cab912f3" x="39" y="7" width="84" height="20"/>
|
||||
<reportElement uuid="3e57e8b7-68d6-4357-b273-8389cab912f3" x="39" y="2" width="84" height="16"/>
|
||||
<textElement verticalAlignment="Middle">
|
||||
<font isBold="true"/>
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<text><![CDATA[Agência:]]></text>
|
||||
</staticText>
|
||||
<rectangle>
|
||||
<reportElement uuid="1cb8c7c8-c094-41cc-863d-b7f13228e6ca" x="0" y="7" width="26" height="20"/>
|
||||
<reportElement uuid="1cb8c7c8-c094-41cc-863d-b7f13228e6ca" x="0" y="2" width="20" height="14"/>
|
||||
</rectangle>
|
||||
</band>
|
||||
</groupHeader>
|
||||
|
|
@ -71,7 +73,7 @@
|
|||
<band splitType="Stretch"/>
|
||||
</pageHeader>
|
||||
<columnHeader>
|
||||
<band height="85" splitType="Stretch">
|
||||
<band height="78" splitType="Stretch">
|
||||
<textField>
|
||||
<reportElement uuid="1e817468-1e3c-495d-a701-12515d636388" x="84" y="20" width="471" height="22"/>
|
||||
<textElement verticalAlignment="Middle"/>
|
||||
|
|
@ -109,112 +111,112 @@
|
|||
<textFieldExpression><![CDATA[$P{DATA_FINAL}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="e4282770-fa67-4c58-a5aa-92e4d6f27166" x="39" y="68" width="31" height="17"/>
|
||||
<reportElement uuid="e4282770-fa67-4c58-a5aa-92e4d6f27166" x="39" y="61" width="31" height="15"/>
|
||||
<textElement markup="none">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{datail.terminal}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="1e0b20c0-f208-4853-8601-73cec6e1992e" x="70" y="68" width="92" height="17"/>
|
||||
<reportElement uuid="1e0b20c0-f208-4853-8601-73cec6e1992e" x="70" y="61" width="92" height="15"/>
|
||||
<textElement markup="none">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{datail.caixa}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="32e830a3-6303-465c-85aa-12678fe6b80a" x="162" y="68" width="45" height="17"/>
|
||||
<reportElement uuid="32e830a3-6303-465c-85aa-12678fe6b80a" x="162" y="61" width="45" height="15"/>
|
||||
<textElement markup="none">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{datail.serie}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="a5ac8565-1ca0-425b-9d25-97d26753e7ec" x="207" y="68" width="70" height="17" isPrintWhenDetailOverflows="true"/>
|
||||
<reportElement uuid="a5ac8565-1ca0-425b-9d25-97d26753e7ec" x="207" y="61" width="70" height="15" isPrintWhenDetailOverflows="true"/>
|
||||
<textElement rotation="None" markup="none">
|
||||
<font size="8" isBold="true" isUnderline="false"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{datail.usuario}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="44e42972-eac1-40e6-ba0e-7c83b208d41b" x="311" y="68" width="77" height="17"/>
|
||||
<reportElement uuid="44e42972-eac1-40e6-ba0e-7c83b208d41b" x="311" y="61" width="77" height="15"/>
|
||||
<textElement markup="none">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{datail.abertura}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="29e15a6a-68ff-4f19-832f-ce0d7a7310ae" x="464" y="68" width="52" height="16" isPrintWhenDetailOverflows="true"/>
|
||||
<reportElement uuid="29e15a6a-68ff-4f19-832f-ce0d7a7310ae" x="464" y="61" width="52" height="15" isPrintWhenDetailOverflows="true"/>
|
||||
<textElement textAlignment="Right" markup="none">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{datail.bilheteFisicoAbertura}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="28a7ce94-e2d1-4a68-a816-185b176ba0a8" x="388" y="68" width="76" height="17" isPrintWhenDetailOverflows="true"/>
|
||||
<reportElement uuid="28a7ce94-e2d1-4a68-a816-185b176ba0a8" x="388" y="61" width="76" height="15" isPrintWhenDetailOverflows="true"/>
|
||||
<textElement markup="none">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{datail.fechamento}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="dddef494-9886-46f0-a409-6dd4a5475162" x="516" y="68" width="52" height="16" isPrintWhenDetailOverflows="true"/>
|
||||
<reportElement uuid="dddef494-9886-46f0-a409-6dd4a5475162" x="516" y="61" width="52" height="15" isPrintWhenDetailOverflows="true"/>
|
||||
<textElement textAlignment="Right" markup="none">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{datail.bilheteFisicoFechamento}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="f7cee4f0-a2e0-4617-be45-34564f2a52c1" x="598" y="68" width="50" height="15" isPrintWhenDetailOverflows="true"/>
|
||||
<reportElement uuid="f7cee4f0-a2e0-4617-be45-34564f2a52c1" x="598" y="61" width="50" height="15" isPrintWhenDetailOverflows="true"/>
|
||||
<textElement textAlignment="Right" markup="none">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{datail.bilheteLogicoAbertura}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="c341bc6d-ab37-41d2-95f0-16e918baaaad" x="648" y="69" width="50" height="16" isPrintWhenDetailOverflows="true"/>
|
||||
<reportElement uuid="c341bc6d-ab37-41d2-95f0-16e918baaaad" x="648" y="61" width="50" height="15" isPrintWhenDetailOverflows="true"/>
|
||||
<textElement textAlignment="Right" markup="none">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{datail.bilheteLogicoFechamento}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="d040b34d-dd10-4d5a-ae20-c14ee7240c22" x="568" y="68" width="30" height="16" isPrintWhenDetailOverflows="true"/>
|
||||
<reportElement uuid="d040b34d-dd10-4d5a-ae20-c14ee7240c22" x="568" y="61" width="30" height="15" isPrintWhenDetailOverflows="true"/>
|
||||
<textElement textAlignment="Right" markup="none">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{datail.dif}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="706c5fdb-ffcb-48a2-8328-699b264b6c43" x="698" y="68" width="30" height="16" isPrintWhenDetailOverflows="true"/>
|
||||
<reportElement uuid="706c5fdb-ffcb-48a2-8328-699b264b6c43" x="698" y="61" width="30" height="15" isPrintWhenDetailOverflows="true"/>
|
||||
<textElement textAlignment="Right" markup="none">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{datail.dif}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="c636597b-5dac-4bf4-a70c-33d088bb8757" x="728" y="68" width="61" height="16" isPrintWhenDetailOverflows="true"/>
|
||||
<reportElement uuid="c636597b-5dac-4bf4-a70c-33d088bb8757" x="728" y="61" width="61" height="15" isPrintWhenDetailOverflows="true"/>
|
||||
<textElement textAlignment="Right" markup="none">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{datail.total}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="2c1adbf8-a646-42ee-95c0-f625d4ceb14f" x="277" y="68" width="34" height="16" isPrintWhenDetailOverflows="true"/>
|
||||
<reportElement uuid="2c1adbf8-a646-42ee-95c0-f625d4ceb14f" x="277" y="61" width="34" height="15" isPrintWhenDetailOverflows="true"/>
|
||||
<textElement rotation="None" markup="none">
|
||||
<font size="8" isBold="true" isUnderline="false"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{datail.turno}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="1cfe040e-ad09-41cc-abb8-db89fa01a555" x="464" y="52" width="104" height="16" isPrintWhenDetailOverflows="true"/>
|
||||
<reportElement uuid="1cfe040e-ad09-41cc-abb8-db89fa01a555" x="464" y="45" width="104" height="16" isPrintWhenDetailOverflows="true"/>
|
||||
<textElement textAlignment="Center" markup="none">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{datail.bilheteFisico}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="7d1be3b8-8106-4dd4-b078-73cb375db2b0" x="598" y="52" width="100" height="16" isPrintWhenDetailOverflows="true"/>
|
||||
<reportElement uuid="7d1be3b8-8106-4dd4-b078-73cb375db2b0" x="598" y="45" width="100" height="16" isPrintWhenDetailOverflows="true"/>
|
||||
<textElement textAlignment="Center" markup="none">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
|
|
@ -223,107 +225,107 @@
|
|||
</band>
|
||||
</columnHeader>
|
||||
<detail>
|
||||
<band height="23" splitType="Stretch">
|
||||
<band height="17" splitType="Stretch">
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="82b42ca3-255a-4038-9730-35e2f9a1bb0f" x="39" y="0" width="31" height="20"/>
|
||||
<reportElement uuid="82b42ca3-255a-4038-9730-35e2f9a1bb0f" x="39" y="0" width="31" height="16"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{terminal}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="c5cc5e04-b1fa-4ebc-b408-3810648fc7eb" x="70" y="0" width="92" height="20"/>
|
||||
<reportElement uuid="c5cc5e04-b1fa-4ebc-b408-3810648fc7eb" x="70" y="0" width="92" height="16"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{caixa}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="d4baaf3d-a171-4b29-8aa8-cef5b56a11b3" x="162" y="0" width="45" height="20"/>
|
||||
<reportElement uuid="d4baaf3d-a171-4b29-8aa8-cef5b56a11b3" x="162" y="0" width="45" height="16"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{serie}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="" isBlankWhenNull="true">
|
||||
<reportElement uuid="acbbd64d-1fbd-4b4f-b7d5-5a11005ae98e" x="207" y="0" width="70" height="20"/>
|
||||
<reportElement uuid="acbbd64d-1fbd-4b4f-b7d5-5a11005ae98e" x="207" y="0" width="70" height="16"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{usuario}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="true">
|
||||
<reportElement uuid="64e2b043-f9cb-4211-852c-def2fed7ae2c" x="311" y="0" width="77" height="20"/>
|
||||
<reportElement uuid="64e2b043-f9cb-4211-852c-def2fed7ae2c" x="311" y="0" width="77" height="16"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{abertura}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="true">
|
||||
<reportElement uuid="80c86e43-26cc-428c-b2e5-99d685118a06" x="388" y="0" width="76" height="20"/>
|
||||
<reportElement uuid="80c86e43-26cc-428c-b2e5-99d685118a06" x="388" y="0" width="76" height="16"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{fechamento}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="" isBlankWhenNull="true">
|
||||
<reportElement uuid="c777b9ac-f2f3-4bfa-9eed-593abae4c3bd" x="648" y="0" width="50" height="20"/>
|
||||
<reportElement uuid="c777b9ac-f2f3-4bfa-9eed-593abae4c3bd" x="648" y="0" width="50" height="16"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{bilheteLogicoFechamento}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="" isBlankWhenNull="true">
|
||||
<reportElement uuid="648d03b0-ee8a-4b2f-af9f-c33c4d01f40e" x="464" y="0" width="52" height="20"/>
|
||||
<reportElement uuid="648d03b0-ee8a-4b2f-af9f-c33c4d01f40e" x="464" y="0" width="52" height="16"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{bilheteFisicoAbertura}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="" isBlankWhenNull="true">
|
||||
<reportElement uuid="22664e0d-f3d2-4eaf-9eea-3acedd65183e" x="516" y="0" width="52" height="20"/>
|
||||
<reportElement uuid="22664e0d-f3d2-4eaf-9eea-3acedd65183e" x="516" y="0" width="52" height="16"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{bilheteFisicoFechamento}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="" isBlankWhenNull="true">
|
||||
<reportElement uuid="882c06a1-647f-4506-9c78-ec71e2a65b83" x="568" y="0" width="30" height="20"/>
|
||||
<reportElement uuid="882c06a1-647f-4506-9c78-ec71e2a65b83" x="568" y="0" width="30" height="16"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{dif1}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="" isBlankWhenNull="true">
|
||||
<reportElement uuid="d975aaf9-a224-4cbb-8d7b-bb6cbc00ec1b" x="598" y="0" width="50" height="20"/>
|
||||
<reportElement uuid="d975aaf9-a224-4cbb-8d7b-bb6cbc00ec1b" x="598" y="0" width="50" height="16"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{bilheteLogicoAbertura}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="" isBlankWhenNull="true">
|
||||
<reportElement uuid="a4273724-e408-4266-a6d3-358f5eebf1df" x="698" y="0" width="30" height="20"/>
|
||||
<reportElement uuid="a4273724-e408-4266-a6d3-358f5eebf1df" x="698" y="0" width="30" height="16"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{dif2}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="" isBlankWhenNull="true">
|
||||
<reportElement uuid="62d70d18-269f-415d-ae0f-5806990b177f" x="728" y="0" width="61" height="20"/>
|
||||
<reportElement uuid="62d70d18-269f-415d-ae0f-5806990b177f" x="728" y="0" width="61" height="16"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{total}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="" isBlankWhenNull="true">
|
||||
<reportElement uuid="a16f6612-4d70-410b-b86d-68c99cdcbbf1" x="277" y="0" width="34" height="20"/>
|
||||
<reportElement uuid="a16f6612-4d70-410b-b86d-68c99cdcbbf1" x="277" y="0" width="34" height="16"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{turno}]]></textFieldExpression>
|
||||
</textField>
|
||||
<rectangle>
|
||||
<reportElement uuid="48534aca-e618-49aa-a8f0-d04663d6c92e" x="0" y="1" width="26" height="20"/>
|
||||
<reportElement uuid="48534aca-e618-49aa-a8f0-d04663d6c92e" x="0" y="1" width="20" height="14"/>
|
||||
</rectangle>
|
||||
</band>
|
||||
</detail>
|
||||
|
|
|
|||
Loading…
Reference in New Issue