Download as
Browse Code »

Commit e5e141b8eab00cb7e987c83be0b80a8f6508dbc0

Authored by THIAGO VIEIRA DI COIMBRA ROCHA
1 parent 6ebbdd8b
Exists in master

Adicionada a coluna 'Consumo acumulado'. Adicionada repeticao do cabecalho da ta… 

…bela que lista a quantidade de materiais quando ha quebra de pagina no meio da tabela.
Showing 2 changed files with 63 additions and 31 deletions   Show diff stats
cit-almoxarifado-web/src/main/resources/reports/consumoAlmoxarifado.jrxml
  Diff comments   View file @e5e141b
1 1 <?xml version="1.0" encoding="UTF-8"?>
  2 +<!-- Created with Jaspersoft Studio version 6.2.1.final using JasperReports Library version 6.2.1 -->
  3 +<!-- 2016-04-07T10:47:17 -->
2 4 <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">
3   - <property name="ireport.zoom" value="2.0"/>
  5 + <property name="ireport.zoom" value="2.2000000000000015"/>
4 6 <property name="ireport.x" value="0"/>
5 7 <property name="ireport.y" value="0"/>
6 8 <parameter name="organizacaoNome" class="java.lang.String" isForPrompting="false"/>
... ... @@ -59,19 +61,26 @@ order by nomeMaterial, ano, mes]]&gt;
59 61 <field name="quantidadedevolucao" class="java.math.BigDecimal"/>
60 62 <field name="quantidaderequisicao" class="java.math.BigDecimal"/>
61 63 <field name="quantidadebaixa" class="java.math.BigDecimal"/>
62   - <group name="group_material">
  64 + <variable name="CONSUMO_ACUMULADO" class="java.math.BigDecimal" resetType="Group" resetGroup="group_material" calculation="Sum">
  65 + <variableExpression><![CDATA[$V{ATUAL} == null ? new BigDecimal(0) : $V{ATUAL}]]></variableExpression>
  66 + <initialValueExpression><![CDATA[]]></initialValueExpression>
  67 + </variable>
  68 + <variable name="ATUAL" class="java.math.BigDecimal" resetType="Group" resetGroup="group_material">
  69 + <variableExpression><![CDATA[$F{quantidaderequisicao}]]></variableExpression>
  70 + </variable>
  71 + <group name="group_material" isReprintHeaderOnEachPage="true">
63 72 <groupExpression><![CDATA[$F{nomematerial}]]></groupExpression>
64 73 <groupHeader>
65 74 <band height="75">
66 75 <textField>
67   - <reportElement uuid="1c95fe7b-14fc-4a54-97f7-b62f274a1f33" x="0" y="16" width="555" height="20"/>
  76 + <reportElement x="0" y="16" width="555" height="20" uuid="1c95fe7b-14fc-4a54-97f7-b62f274a1f33"/>
68 77 <textElement markup="styled">
69 78 <paragraph leftIndent="3"/>
70 79 </textElement>
71 80 <textFieldExpression><![CDATA[( $F{nomematerial} != null ? "<b>Material: </b>"+ $F{nomematerial} : "" )]]></textFieldExpression>
72 81 </textField>
73 82 <staticText>
74   - <reportElement uuid="c966cc02-448a-4582-809e-53b94149a4bd" x="0" y="55" width="46" height="20"/>
  83 + <reportElement x="0" y="55" width="46" height="20" uuid="c966cc02-448a-4582-809e-53b94149a4bd"/>
75 84 <box>
76 85 <topPen lineWidth="0.25"/>
77 86 <leftPen lineWidth="0.25"/>
... ... @@ -84,7 +93,7 @@ order by nomeMaterial, ano, mes]]&gt;
84 93 <text><![CDATA[Ano]]></text>
85 94 </staticText>
86 95 <staticText>
87   - <reportElement uuid="e8bced89-1080-4c7c-94c6-fe8521ac2add" x="46" y="55" width="47" height="20"/>
  96 + <reportElement x="46" y="55" width="47" height="20" uuid="e8bced89-1080-4c7c-94c6-fe8521ac2add"/>
88 97 <box>
89 98 <topPen lineWidth="0.25"/>
90 99 <leftPen lineWidth="0.25"/>
... ... @@ -97,7 +106,7 @@ order by nomeMaterial, ano, mes]]&gt;
97 106 <text><![CDATA[Mês]]></text>
98 107 </staticText>
99 108 <staticText>
100   - <reportElement uuid="164bb1d3-1de6-427e-b02c-8f94d49d5bef" x="93" y="55" width="113" height="20"/>
  109 + <reportElement x="93" y="55" width="89" height="20" uuid="164bb1d3-1de6-427e-b02c-8f94d49d5bef"/>
101 110 <box>
102 111 <topPen lineWidth="0.25"/>
103 112 <leftPen lineWidth="0.25"/>
... ... @@ -110,7 +119,7 @@ order by nomeMaterial, ano, mes]]&gt;
110 119 <text><![CDATA[Aquisição]]></text>
111 120 </staticText>
112 121 <staticText>
113   - <reportElement uuid="3770cb36-3c52-4fc5-9713-8dc2c46c72c7" x="206" y="55" width="115" height="20"/>
  122 + <reportElement x="182" y="55" width="88" height="20" uuid="3770cb36-3c52-4fc5-9713-8dc2c46c72c7"/>
114 123 <box>
115 124 <topPen lineWidth="0.25"/>
116 125 <leftPen lineWidth="0.25"/>
... ... @@ -123,7 +132,7 @@ order by nomeMaterial, ano, mes]]&gt;
123 132 <text><![CDATA[Devolução]]></text>
124 133 </staticText>
125 134 <staticText>
126   - <reportElement uuid="effed099-29e5-442a-9049-7f238bdaefa7" x="321" y="55" width="115" height="20"/>
  135 + <reportElement x="270" y="55" width="88" height="20" uuid="effed099-29e5-442a-9049-7f238bdaefa7"/>
127 136 <box>
128 137 <topPen lineWidth="0.25"/>
129 138 <leftPen lineWidth="0.25"/>
... ... @@ -136,7 +145,7 @@ order by nomeMaterial, ano, mes]]&gt;
136 145 <text><![CDATA[Requisição]]></text>
137 146 </staticText>
138 147 <staticText>
139   - <reportElement uuid="352e2222-706d-4d58-9a83-f72a06e66370" x="436" y="55" width="119" height="20"/>
  148 + <reportElement x="358" y="55" width="89" height="20" uuid="352e2222-706d-4d58-9a83-f72a06e66370"/>
140 149 <box>
141 150 <topPen lineWidth="0.25"/>
142 151 <leftPen lineWidth="0.25"/>
... ... @@ -149,7 +158,7 @@ order by nomeMaterial, ano, mes]]&gt;
149 158 <text><![CDATA[Baixa]]></text>
150 159 </staticText>
151 160 <staticText>
152   - <reportElement uuid="c6884041-a180-464b-a06a-740ae159e591" x="93" y="35" width="228" height="20"/>
  161 + <reportElement x="93" y="35" width="177" height="20" uuid="c6884041-a180-464b-a06a-740ae159e591"/>
153 162 <box>
154 163 <topPen lineWidth="0.25"/>
155 164 <leftPen lineWidth="0.25"/>
... ... @@ -162,7 +171,7 @@ order by nomeMaterial, ano, mes]]&gt;
162 171 <text><![CDATA[Entrada]]></text>
163 172 </staticText>
164 173 <staticText>
165   - <reportElement uuid="2095d6a8-4556-4fd9-b307-dbf7b5e22acf" x="321" y="35" width="234" height="20"/>
  174 + <reportElement x="270" y="35" width="177" height="20" uuid="2095d6a8-4556-4fd9-b307-dbf7b5e22acf"/>
166 175 <box>
167 176 <topPen lineWidth="0.25"/>
168 177 <leftPen lineWidth="0.25"/>
... ... @@ -175,7 +184,7 @@ order by nomeMaterial, ano, mes]]&gt;
175 184 <text><![CDATA[Saída]]></text>
176 185 </staticText>
177 186 <staticText>
178   - <reportElement uuid="ba8a20b6-916b-4981-8d1d-58da926577fb" x="0" y="35" width="93" height="20"/>
  187 + <reportElement x="0" y="35" width="93" height="20" uuid="ba8a20b6-916b-4981-8d1d-58da926577fb"/>
179 188 <box>
180 189 <topPen lineWidth="0.25"/>
181 190 <leftPen lineWidth="0.25"/>
... ... @@ -187,13 +196,26 @@ order by nomeMaterial, ano, mes]]&gt;
187 196 </textElement>
188 197 <text><![CDATA[Referência]]></text>
189 198 </staticText>
  199 + <staticText>
  200 + <reportElement x="447" y="35" width="108" height="40" uuid="d273cbee-4310-4eb9-be01-d1edefcce441"/>
  201 + <box>
  202 + <topPen lineWidth="0.25"/>
  203 + <leftPen lineWidth="0.25"/>
  204 + <bottomPen lineWidth="0.25"/>
  205 + <rightPen lineWidth="0.25"/>
  206 + </box>
  207 + <textElement textAlignment="Center" verticalAlignment="Middle">
  208 + <font isBold="true"/>
  209 + </textElement>
  210 + <text><![CDATA[ Consumo acumulado]]></text>
  211 + </staticText>
190 212 </band>
191 213 </groupHeader>
192 214 </group>
193 215 <pageHeader>
194 216 <band height="31" splitType="Stretch">
195 217 <textField>
196   - <reportElement uuid="0d306098-c2dd-4b78-a930-18635e8981d9" x="350" y="11" width="205" height="20"/>
  218 + <reportElement x="350" y="11" width="205" height="20" uuid="0d306098-c2dd-4b78-a930-18635e8981d9"/>
197 219 <textElement markup="styled">
198 220 <paragraph leftIndent="3"/>
199 221 </textElement>
... ... @@ -203,7 +225,7 @@ new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format(new SimpleDateFormat(&quot;yyyy-MM-dd HH:mm
203 225 new SimpleDateFormat("dd/MM/yyyy").format(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse($P{dataFim}))]]></textFieldExpression>
204 226 </textField>
205 227 <textField>
206   - <reportElement uuid="68205108-b0cf-4b7d-a58a-5e571970955b" x="0" y="11" width="350" height="20"/>
  228 + <reportElement x="0" y="11" width="350" height="20" uuid="68205108-b0cf-4b7d-a58a-5e571970955b"/>
207 229 <textElement markup="styled">
208 230 <paragraph leftIndent="3"/>
209 231 </textElement>
... ... @@ -214,7 +236,7 @@ new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format(new SimpleDateFormat(&quot;yyyy-MM-dd HH:mm
214 236 <detail>
215 237 <band height="20" splitType="Stretch">
216 238 <textField>
217   - <reportElement uuid="80f075f5-2b87-4a67-a933-e4aeb469e8b4" x="0" y="0" width="46" height="20"/>
  239 + <reportElement x="0" y="0" width="46" height="20" uuid="80f075f5-2b87-4a67-a933-e4aeb469e8b4"/>
218 240 <box>
219 241 <topPen lineWidth="0.25"/>
220 242 <leftPen lineWidth="0.25"/>
... ... @@ -225,7 +247,7 @@ new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format(new SimpleDateFormat(&quot;yyyy-MM-dd HH:mm
225 247 <textFieldExpression><![CDATA[$F{ano}]]></textFieldExpression>
226 248 </textField>
227 249 <textField>
228   - <reportElement uuid="914b8e4d-4f19-44c3-885a-d9c7aa03020c" x="46" y="0" width="47" height="20"/>
  250 + <reportElement x="46" y="0" width="47" height="20" uuid="914b8e4d-4f19-44c3-885a-d9c7aa03020c"/>
229 251 <box>
230 252 <topPen lineWidth="0.25"/>
231 253 <leftPen lineWidth="0.25"/>
... ... @@ -236,7 +258,7 @@ new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format(new SimpleDateFormat(&quot;yyyy-MM-dd HH:mm
236 258 <textFieldExpression><![CDATA[$F{mes}]]></textFieldExpression>
237 259 </textField>
238 260 <textField pattern="#,##0.00">
239   - <reportElement uuid="3914fa52-02d8-42f6-87dc-3aa10df7d573" x="206" y="0" width="115" height="20"/>
  261 + <reportElement x="182" y="0" width="88" height="20" uuid="3914fa52-02d8-42f6-87dc-3aa10df7d573"/>
240 262 <box>
241 263 <topPen lineWidth="0.25"/>
242 264 <leftPen lineWidth="0.25"/>
... ... @@ -249,7 +271,7 @@ new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format(new SimpleDateFormat(&quot;yyyy-MM-dd HH:mm
249 271 <textFieldExpression><![CDATA[$F{quantidadedevolucao}]]></textFieldExpression>
250 272 </textField>
251 273 <textField pattern="#,##0.00">
252   - <reportElement uuid="64b534e8-16b7-4444-9d56-37cf3d6d514f" x="321" y="0" width="115" height="20"/>
  274 + <reportElement x="270" y="0" width="88" height="20" uuid="64b534e8-16b7-4444-9d56-37cf3d6d514f"/>
253 275 <box>
254 276 <topPen lineWidth="0.25"/>
255 277 <leftPen lineWidth="0.25"/>
... ... @@ -262,7 +284,7 @@ new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format(new SimpleDateFormat(&quot;yyyy-MM-dd HH:mm
262 284 <textFieldExpression><![CDATA[$F{quantidaderequisicao}]]></textFieldExpression>
263 285 </textField>
264 286 <textField pattern="#,##0.00">
265   - <reportElement uuid="1a62346e-a9f8-4f8f-80ca-e8ef067a577c" x="93" y="0" width="113" height="20"/>
  287 + <reportElement x="93" y="0" width="89" height="20" uuid="1a62346e-a9f8-4f8f-80ca-e8ef067a577c"/>
266 288 <box>
267 289 <topPen lineWidth="0.25"/>
268 290 <leftPen lineWidth="0.25"/>
... ... @@ -275,7 +297,7 @@ new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format(new SimpleDateFormat(&quot;yyyy-MM-dd HH:mm
275 297 <textFieldExpression><![CDATA[$F{quantidadeentrada}]]></textFieldExpression>
276 298 </textField>
277 299 <textField pattern="#,##0.00">
278   - <reportElement uuid="5c4f5f35-dbc0-45d2-b46b-989b9adc51ec" x="436" y="0" width="119" height="20"/>
  300 + <reportElement x="358" y="0" width="89" height="20" uuid="5c4f5f35-dbc0-45d2-b46b-989b9adc51ec"/>
279 301 <box>
280 302 <topPen lineWidth="0.25"/>
281 303 <leftPen lineWidth="0.25"/>
... ... @@ -287,12 +309,25 @@ new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format(new SimpleDateFormat(&quot;yyyy-MM-dd HH:mm
287 309 </textElement>
288 310 <textFieldExpression><![CDATA[$F{quantidadebaixa}]]></textFieldExpression>
289 311 </textField>
  312 + <textField pattern="#,##0.00">
  313 + <reportElement x="447" y="0" width="108" height="20" uuid="5af406c6-e5d7-47a4-be36-bde6107eb374"/>
  314 + <box>
  315 + <topPen lineWidth="0.25"/>
  316 + <leftPen lineWidth="0.25"/>
  317 + <bottomPen lineWidth="0.25"/>
  318 + <rightPen lineWidth="0.25"/>
  319 + </box>
  320 + <textElement textAlignment="Center" verticalAlignment="Middle">
  321 + <paragraph rightIndent="3"/>
  322 + </textElement>
  323 + <textFieldExpression><![CDATA[$V{CONSUMO_ACUMULADO}]]></textFieldExpression>
  324 + </textField>
290 325 </band>
291 326 </detail>
292 327 <noData>
293 328 <band height="20">
294 329 <staticText>
295   - <reportElement uuid="6c321c4d-3031-4b30-9a75-e9f165c635af" x="0" y="0" width="555" height="20"/>
  330 + <reportElement x="0" y="0" width="555" height="20" uuid="6c321c4d-3031-4b30-9a75-e9f165c635af"/>
296 331 <textElement textAlignment="Center" verticalAlignment="Middle">
297 332 <font isBold="true"/>
298 333 </textElement>
... ...
cit-almoxarifado-web/src/main/resources/reports/templateRetratoRepeat.jrxml
  Diff comments   View file @e5e141b
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <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">
3   - <property name="ireport.zoom" value="2.0"/>
4   - <property name="ireport.x" value="25"/>
5   - <property name="ireport.y" value="12"/>
  3 + <property name="ireport.zoom" value="1.8181818181818197"/>
  4 + <property name="ireport.x" value="0"/>
  5 + <property name="ireport.y" value="0"/>
6 6 <parameter name="ORGANIZACAO_ID" class="java.lang.Long">
7 7 <defaultValueExpression><![CDATA[]]></defaultValueExpression>
8 8 </parameter>
... ... @@ -73,22 +73,19 @@ from anexoimagem aImagem right join configuracao conf on aImagem.configuracao_id
73 73 </subreport>
74 74 </band>
75 75 </detail>
76   - <columnFooter>
77   - <band height="50"/>
78   - </columnFooter>
79 76 <pageFooter>
80   - <band height="50">
  77 + <band height="30">
81 78 <textField>
82   - <reportElement x="436" y="30" width="80" height="20" uuid="5e321400-e0dd-41c0-9b36-09d2b35badd7"/>
  79 + <reportElement x="436" y="10" width="80" height="20" uuid="5e321400-e0dd-41c0-9b36-09d2b35badd7"/>
83 80 <textElement textAlignment="Right"/>
84 81 <textFieldExpression><![CDATA["Página "+$V{PAGE_NUMBER}+" de"]]></textFieldExpression>
85 82 </textField>
86 83 <textField evaluationTime="Report">
87   - <reportElement x="518" y="30" width="37" height="20" uuid="af94fb21-5bc2-47cb-a430-9e8535eafd64"/>
  84 + <reportElement x="518" y="10" width="37" height="20" uuid="af94fb21-5bc2-47cb-a430-9e8535eafd64"/>
88 85 <textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
89 86 </textField>
90 87 <textField>
91   - <reportElement x="0" y="30" width="200" height="20" uuid="a8005405-5789-414d-ad22-8c928ac106b8"/>
  88 + <reportElement x="0" y="10" width="200" height="20" uuid="a8005405-5789-414d-ad22-8c928ac106b8"/>
92 89 <textElement textAlignment="Left"/>
93 90 <textFieldExpression><![CDATA["Emitido em: " + new java.text.SimpleDateFormat("dd/MM/yyyy HH:mm:ss").format(new Date())]]></textFieldExpression>
94 91 </textField>
... ...