From e5e141b8eab00cb7e987c83be0b80a8f6508dbc0 Mon Sep 17 00:00:00 2001
From: THIAGO VIEIRA DI COIMBRA ROCHA <thiago.coimbra@cit.local>
Date: Thu, 7 Apr 2016 10:51:48 -0300
Subject: [PATCH] Adicionada a coluna 'Consumo acumulado'. Adicionada repeticao do cabecalho da tabela que lista a quantidade de materiais quando ha quebra de pagina no meio da tabela.

---
 cit-almoxarifado-web/src/main/resources/reports/consumoAlmoxarifado.jrxml   | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------
 cit-almoxarifado-web/src/main/resources/reports/templateRetratoRepeat.jrxml | 17 +++++++----------
 2 files changed, 63 insertions(+), 31 deletions(-)

diff --git a/cit-almoxarifado-web/src/main/resources/reports/consumoAlmoxarifado.jrxml b/cit-almoxarifado-web/src/main/resources/reports/consumoAlmoxarifado.jrxml
index 3ca2ae0..3d49d8c 100644
--- a/cit-almoxarifado-web/src/main/resources/reports/consumoAlmoxarifado.jrxml
+++ b/cit-almoxarifado-web/src/main/resources/reports/consumoAlmoxarifado.jrxml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.2.1.final using JasperReports Library version 6.2.1  -->
+<!-- 2016-04-07T10:47:17 -->
 <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="consumoAlmoxarifado" language="groovy" pageWidth="555" pageHeight="802" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="16b0028f-e4d1-4c28-96d2-f9a51170b4df">
-	<property name="ireport.zoom" value="2.0"/>
+	<property name="ireport.zoom" value="2.2000000000000015"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<parameter name="organizacaoNome" class="java.lang.String" isForPrompting="false"/>
@@ -59,19 +61,26 @@ order by nomeMaterial, ano, mes]]>
 	<field name="quantidadedevolucao" class="java.math.BigDecimal"/>
 	<field name="quantidaderequisicao" class="java.math.BigDecimal"/>
 	<field name="quantidadebaixa" class="java.math.BigDecimal"/>
-	<group name="group_material">
+	<variable name="CONSUMO_ACUMULADO" class="java.math.BigDecimal" resetType="Group" resetGroup="group_material" calculation="Sum">
+		<variableExpression><![CDATA[$V{ATUAL} == null ? new BigDecimal(0) : $V{ATUAL}]]></variableExpression>
+		<initialValueExpression><![CDATA[]]></initialValueExpression>
+	</variable>
+	<variable name="ATUAL" class="java.math.BigDecimal" resetType="Group" resetGroup="group_material">
+		<variableExpression><![CDATA[$F{quantidaderequisicao}]]></variableExpression>
+	</variable>
+	<group name="group_material" isReprintHeaderOnEachPage="true">
 		<groupExpression><![CDATA[$F{nomematerial}]]></groupExpression>
 		<groupHeader>
 			<band height="75">
 				<textField>
-					<reportElement uuid="1c95fe7b-14fc-4a54-97f7-b62f274a1f33" x="0" y="16" width="555" height="20"/>
+					<reportElement x="0" y="16" width="555" height="20" uuid="1c95fe7b-14fc-4a54-97f7-b62f274a1f33"/>
 					<textElement markup="styled">
 						<paragraph leftIndent="3"/>
 					</textElement>
 					<textFieldExpression><![CDATA[( $F{nomematerial} != null ? "<b>Material:  </b>"+ $F{nomematerial} : "" )]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement uuid="c966cc02-448a-4582-809e-53b94149a4bd" x="0" y="55" width="46" height="20"/>
+					<reportElement x="0" y="55" width="46" height="20" uuid="c966cc02-448a-4582-809e-53b94149a4bd"/>
 					<box>
 						<topPen lineWidth="0.25"/>
 						<leftPen lineWidth="0.25"/>
@@ -84,7 +93,7 @@ order by nomeMaterial, ano, mes]]>
 					<text><![CDATA[Ano]]></text>
 				</staticText>
 				<staticText>
-					<reportElement uuid="e8bced89-1080-4c7c-94c6-fe8521ac2add" x="46" y="55" width="47" height="20"/>
+					<reportElement x="46" y="55" width="47" height="20" uuid="e8bced89-1080-4c7c-94c6-fe8521ac2add"/>
 					<box>
 						<topPen lineWidth="0.25"/>
 						<leftPen lineWidth="0.25"/>
@@ -97,7 +106,7 @@ order by nomeMaterial, ano, mes]]>
 					<text><![CDATA[Mês]]></text>
 				</staticText>
 				<staticText>
-					<reportElement uuid="164bb1d3-1de6-427e-b02c-8f94d49d5bef" x="93" y="55" width="113" height="20"/>
+					<reportElement x="93" y="55" width="89" height="20" uuid="164bb1d3-1de6-427e-b02c-8f94d49d5bef"/>
 					<box>
 						<topPen lineWidth="0.25"/>
 						<leftPen lineWidth="0.25"/>
@@ -110,7 +119,7 @@ order by nomeMaterial, ano, mes]]>
 					<text><![CDATA[Aquisição]]></text>
 				</staticText>
 				<staticText>
-					<reportElement uuid="3770cb36-3c52-4fc5-9713-8dc2c46c72c7" x="206" y="55" width="115" height="20"/>
+					<reportElement x="182" y="55" width="88" height="20" uuid="3770cb36-3c52-4fc5-9713-8dc2c46c72c7"/>
 					<box>
 						<topPen lineWidth="0.25"/>
 						<leftPen lineWidth="0.25"/>
@@ -123,7 +132,7 @@ order by nomeMaterial, ano, mes]]>
 					<text><![CDATA[Devolução]]></text>
 				</staticText>
 				<staticText>
-					<reportElement uuid="effed099-29e5-442a-9049-7f238bdaefa7" x="321" y="55" width="115" height="20"/>
+					<reportElement x="270" y="55" width="88" height="20" uuid="effed099-29e5-442a-9049-7f238bdaefa7"/>
 					<box>
 						<topPen lineWidth="0.25"/>
 						<leftPen lineWidth="0.25"/>
@@ -136,7 +145,7 @@ order by nomeMaterial, ano, mes]]>
 					<text><![CDATA[Requisição]]></text>
 				</staticText>
 				<staticText>
-					<reportElement uuid="352e2222-706d-4d58-9a83-f72a06e66370" x="436" y="55" width="119" height="20"/>
+					<reportElement x="358" y="55" width="89" height="20" uuid="352e2222-706d-4d58-9a83-f72a06e66370"/>
 					<box>
 						<topPen lineWidth="0.25"/>
 						<leftPen lineWidth="0.25"/>
@@ -149,7 +158,7 @@ order by nomeMaterial, ano, mes]]>
 					<text><![CDATA[Baixa]]></text>
 				</staticText>
 				<staticText>
-					<reportElement uuid="c6884041-a180-464b-a06a-740ae159e591" x="93" y="35" width="228" height="20"/>
+					<reportElement x="93" y="35" width="177" height="20" uuid="c6884041-a180-464b-a06a-740ae159e591"/>
 					<box>
 						<topPen lineWidth="0.25"/>
 						<leftPen lineWidth="0.25"/>
@@ -162,7 +171,7 @@ order by nomeMaterial, ano, mes]]>
 					<text><![CDATA[Entrada]]></text>
 				</staticText>
 				<staticText>
-					<reportElement uuid="2095d6a8-4556-4fd9-b307-dbf7b5e22acf" x="321" y="35" width="234" height="20"/>
+					<reportElement x="270" y="35" width="177" height="20" uuid="2095d6a8-4556-4fd9-b307-dbf7b5e22acf"/>
 					<box>
 						<topPen lineWidth="0.25"/>
 						<leftPen lineWidth="0.25"/>
@@ -175,7 +184,7 @@ order by nomeMaterial, ano, mes]]>
 					<text><![CDATA[Saída]]></text>
 				</staticText>
 				<staticText>
-					<reportElement uuid="ba8a20b6-916b-4981-8d1d-58da926577fb" x="0" y="35" width="93" height="20"/>
+					<reportElement x="0" y="35" width="93" height="20" uuid="ba8a20b6-916b-4981-8d1d-58da926577fb"/>
 					<box>
 						<topPen lineWidth="0.25"/>
 						<leftPen lineWidth="0.25"/>
@@ -187,13 +196,26 @@ order by nomeMaterial, ano, mes]]>
 					</textElement>
 					<text><![CDATA[Referência]]></text>
 				</staticText>
+				<staticText>
+					<reportElement x="447" y="35" width="108" height="40" uuid="d273cbee-4310-4eb9-be01-d1edefcce441"/>
+					<box>
+						<topPen lineWidth="0.25"/>
+						<leftPen lineWidth="0.25"/>
+						<bottomPen lineWidth="0.25"/>
+						<rightPen lineWidth="0.25"/>
+					</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font isBold="true"/>
+					</textElement>
+					<text><![CDATA[ Consumo acumulado]]></text>
+				</staticText>
 			</band>
 		</groupHeader>
 	</group>
 	<pageHeader>
 		<band height="31" splitType="Stretch">
 			<textField>
-				<reportElement uuid="0d306098-c2dd-4b78-a930-18635e8981d9" x="350" y="11" width="205" height="20"/>
+				<reportElement x="350" y="11" width="205" height="20" uuid="0d306098-c2dd-4b78-a930-18635e8981d9"/>
 				<textElement markup="styled">
 					<paragraph leftIndent="3"/>
 				</textElement>
@@ -203,7 +225,7 @@ new SimpleDateFormat("dd/MM/yyyy").format(new SimpleDateFormat("yyyy-MM-dd HH:mm
 new SimpleDateFormat("dd/MM/yyyy").format(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse($P{dataFim}))]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="68205108-b0cf-4b7d-a58a-5e571970955b" x="0" y="11" width="350" height="20"/>
+				<reportElement x="0" y="11" width="350" height="20" uuid="68205108-b0cf-4b7d-a58a-5e571970955b"/>
 				<textElement markup="styled">
 					<paragraph leftIndent="3"/>
 				</textElement>
@@ -214,7 +236,7 @@ new SimpleDateFormat("dd/MM/yyyy").format(new SimpleDateFormat("yyyy-MM-dd HH:mm
 	<detail>
 		<band height="20" splitType="Stretch">
 			<textField>
-				<reportElement uuid="80f075f5-2b87-4a67-a933-e4aeb469e8b4" x="0" y="0" width="46" height="20"/>
+				<reportElement x="0" y="0" width="46" height="20" uuid="80f075f5-2b87-4a67-a933-e4aeb469e8b4"/>
 				<box>
 					<topPen lineWidth="0.25"/>
 					<leftPen lineWidth="0.25"/>
@@ -225,7 +247,7 @@ new SimpleDateFormat("dd/MM/yyyy").format(new SimpleDateFormat("yyyy-MM-dd HH:mm
 				<textFieldExpression><![CDATA[$F{ano}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="914b8e4d-4f19-44c3-885a-d9c7aa03020c" x="46" y="0" width="47" height="20"/>
+				<reportElement x="46" y="0" width="47" height="20" uuid="914b8e4d-4f19-44c3-885a-d9c7aa03020c"/>
 				<box>
 					<topPen lineWidth="0.25"/>
 					<leftPen lineWidth="0.25"/>
@@ -236,7 +258,7 @@ new SimpleDateFormat("dd/MM/yyyy").format(new SimpleDateFormat("yyyy-MM-dd HH:mm
 				<textFieldExpression><![CDATA[$F{mes}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement uuid="3914fa52-02d8-42f6-87dc-3aa10df7d573" x="206" y="0" width="115" height="20"/>
+				<reportElement x="182" y="0" width="88" height="20" uuid="3914fa52-02d8-42f6-87dc-3aa10df7d573"/>
 				<box>
 					<topPen lineWidth="0.25"/>
 					<leftPen lineWidth="0.25"/>
@@ -249,7 +271,7 @@ new SimpleDateFormat("dd/MM/yyyy").format(new SimpleDateFormat("yyyy-MM-dd HH:mm
 				<textFieldExpression><![CDATA[$F{quantidadedevolucao}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement uuid="64b534e8-16b7-4444-9d56-37cf3d6d514f" x="321" y="0" width="115" height="20"/>
+				<reportElement x="270" y="0" width="88" height="20" uuid="64b534e8-16b7-4444-9d56-37cf3d6d514f"/>
 				<box>
 					<topPen lineWidth="0.25"/>
 					<leftPen lineWidth="0.25"/>
@@ -262,7 +284,7 @@ new SimpleDateFormat("dd/MM/yyyy").format(new SimpleDateFormat("yyyy-MM-dd HH:mm
 				<textFieldExpression><![CDATA[$F{quantidaderequisicao}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement uuid="1a62346e-a9f8-4f8f-80ca-e8ef067a577c" x="93" y="0" width="113" height="20"/>
+				<reportElement x="93" y="0" width="89" height="20" uuid="1a62346e-a9f8-4f8f-80ca-e8ef067a577c"/>
 				<box>
 					<topPen lineWidth="0.25"/>
 					<leftPen lineWidth="0.25"/>
@@ -275,7 +297,7 @@ new SimpleDateFormat("dd/MM/yyyy").format(new SimpleDateFormat("yyyy-MM-dd HH:mm
 				<textFieldExpression><![CDATA[$F{quantidadeentrada}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement uuid="5c4f5f35-dbc0-45d2-b46b-989b9adc51ec" x="436" y="0" width="119" height="20"/>
+				<reportElement x="358" y="0" width="89" height="20" uuid="5c4f5f35-dbc0-45d2-b46b-989b9adc51ec"/>
 				<box>
 					<topPen lineWidth="0.25"/>
 					<leftPen lineWidth="0.25"/>
@@ -287,12 +309,25 @@ new SimpleDateFormat("dd/MM/yyyy").format(new SimpleDateFormat("yyyy-MM-dd HH:mm
 				</textElement>
 				<textFieldExpression><![CDATA[$F{quantidadebaixa}]]></textFieldExpression>
 			</textField>
+			<textField pattern="#,##0.00">
+				<reportElement x="447" y="0" width="108" height="20" uuid="5af406c6-e5d7-47a4-be36-bde6107eb374"/>
+				<box>
+					<topPen lineWidth="0.25"/>
+					<leftPen lineWidth="0.25"/>
+					<bottomPen lineWidth="0.25"/>
+					<rightPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<paragraph rightIndent="3"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{CONSUMO_ACUMULADO}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<noData>
 		<band height="20">
 			<staticText>
-				<reportElement uuid="6c321c4d-3031-4b30-9a75-e9f165c635af" x="0" y="0" width="555" height="20"/>
+				<reportElement x="0" y="0" width="555" height="20" uuid="6c321c4d-3031-4b30-9a75-e9f165c635af"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font isBold="true"/>
 				</textElement>
diff --git a/cit-almoxarifado-web/src/main/resources/reports/templateRetratoRepeat.jrxml b/cit-almoxarifado-web/src/main/resources/reports/templateRetratoRepeat.jrxml
index 89b7199..f106ff9 100644
--- a/cit-almoxarifado-web/src/main/resources/reports/templateRetratoRepeat.jrxml
+++ b/cit-almoxarifado-web/src/main/resources/reports/templateRetratoRepeat.jrxml
@@ -1,8 +1,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="templateRetrato" language="groovy" pageWidth="595" pageHeight="842" whenNoDataType="AllSectionsNoDetail" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="2a9bde7e-349d-4f0b-b96c-98310606be6f">
-	<property name="ireport.zoom" value="2.0"/>
-	<property name="ireport.x" value="25"/>
-	<property name="ireport.y" value="12"/>
+	<property name="ireport.zoom" value="1.8181818181818197"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
 	<parameter name="ORGANIZACAO_ID" class="java.lang.Long">
 		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
 	</parameter>
@@ -73,22 +73,19 @@ from anexoimagem aImagem right join configuracao conf on aImagem.configuracao_id
 			</subreport>
 		</band>
 	</detail>
-	<columnFooter>
-		<band height="50"/>
-	</columnFooter>
 	<pageFooter>
-		<band height="50">
+		<band height="30">
 			<textField>
-				<reportElement x="436" y="30" width="80" height="20" uuid="5e321400-e0dd-41c0-9b36-09d2b35badd7"/>
+				<reportElement x="436" y="10" width="80" height="20" uuid="5e321400-e0dd-41c0-9b36-09d2b35badd7"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA["Página "+$V{PAGE_NUMBER}+" de"]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Report">
-				<reportElement x="518" y="30" width="37" height="20" uuid="af94fb21-5bc2-47cb-a430-9e8535eafd64"/>
+				<reportElement x="518" y="10" width="37" height="20" uuid="af94fb21-5bc2-47cb-a430-9e8535eafd64"/>
 				<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="0" y="30" width="200" height="20" uuid="a8005405-5789-414d-ad22-8c928ac106b8"/>
+				<reportElement x="0" y="10" width="200" height="20" uuid="a8005405-5789-414d-ad22-8c928ac106b8"/>
 				<textElement textAlignment="Left"/>
 				<textFieldExpression><![CDATA["Emitido em: " + new java.text.SimpleDateFormat("dd/MM/yyyy HH:mm:ss").format(new Date())]]></textFieldExpression>
 			</textField>
--
libgit2 0.21.2