Download as
Browse Code »

Commit 6e73662b4d7111f0effc744605c11ee4e6c8fffa

Authored by Ronan Tavares Camargo
1 parent bdc2eeb0
Exists in master

Corrigindo erro de merge

Showing 1 changed file with 70 additions and 167 deletions   Show diff stats
citgrp-patrimonio-web/src/main/resources/reports/BemPatrimonialAnaliticoUAeEndereco.jrxml
  Diff comments   View file @6e73662
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <!-- Created with Jaspersoft Studio version 6.2.1.final using JasperReports Library version 6.2.1 -->
3   -<!-- 2016-05-10T10:18:03 -->
  3 +<!-- 2016-05-12T15:13:42 -->
4 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="BemPatrimonialAnaliticoUAeEndereco" language="groovy" pageWidth="555" pageHeight="802" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="9fdf75fd-580c-4f39-b59f-a80b7105f175">
5 5 <property name="ireport.zoom" value="1.8150000000000004"/>
6 6 <property name="ireport.x" value="0"/>
... ... @@ -124,40 +124,31 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]&gt;
124 124 <group name="ORGAO" isStartNewColumn="true">
125 125 <groupExpression><![CDATA[$F{idorgao}]]></groupExpression>
126 126 <groupHeader>
127   - <band height="15" splitType="Prevent">
128   - <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  127 + <band height="20" splitType="Prevent">
129 128 <textField>
130   - <reportElement x="0" y="0" width="555" height="15" uuid="ca290805-90a4-480f-a2ff-0e93109e2240">
131   - <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
132   - </reportElement>
133   - <textElement verticalAlignment="Middle" markup="styled">
134   - <font size="8"/>
135   - </textElement>
  129 + <reportElement x="0" y="0" width="555" height="20" uuid="ca290805-90a4-480f-a2ff-0e93109e2240"/>
  130 + <textElement verticalAlignment="Middle" markup="styled"/>
136 131 <textFieldExpression><![CDATA["<b>Órgão: </b>" + $F{orgao}]]></textFieldExpression>
137 132 </textField>
138 133 </band>
139 134 </groupHeader>
140 135 <groupFooter>
141   - <band height="17">
142   - <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  136 + <band height="20">
143 137 <textField pattern="#,##0.00">
144   - <reportElement mode="Transparent" x="482" y="0" width="71" height="17" backcolor="#CCCCCC" uuid="92d29dbc-10f4-4399-93e9-9c2df007cba6"/>
145   - <box topPadding="0" leftPadding="0" bottomPadding="0" rightPadding="0">
  138 + <reportElement mode="Transparent" x="482" y="0" width="71" height="20" backcolor="#CCCCCC" uuid="92d29dbc-10f4-4399-93e9-9c2df007cba6"/>
  139 + <box>
146 140 <topPen lineWidth="0.5"/>
147 141 <leftPen lineWidth="0.5"/>
148 142 <bottomPen lineWidth="0.5"/>
149 143 <rightPen lineWidth="0.5"/>
150 144 </box>
151 145 <textElement textAlignment="Right" verticalAlignment="Middle">
152   - <font size="6"/>
153 146 <paragraph rightIndent="3"/>
154 147 </textElement>
155 148 <textFieldExpression><![CDATA[$V{TOTAL_GERAL_AQUISICAO}]]></textFieldExpression>
156 149 </textField>
157 150 <textField>
158   - <reportElement mode="Transparent" x="0" y="0" width="482" height="17" forecolor="#000000" backcolor="#CCCCCC" uuid="30c20b02-b6b6-40bd-a470-42e29f8f32ab">
159   - <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
160   - </reportElement>
  151 + <reportElement mode="Transparent" x="0" y="0" width="482" height="20" forecolor="#000000" backcolor="#CCCCCC" uuid="30c20b02-b6b6-40bd-a470-42e29f8f32ab"/>
161 152 <box>
162 153 <topPen lineWidth="0.5"/>
163 154 <leftPen lineWidth="0.5"/>
... ... @@ -165,7 +156,7 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]&gt;
165 156 <rightPen lineWidth="0.5"/>
166 157 </box>
167 158 <textElement textAlignment="Right" verticalAlignment="Middle">
168   - <font size="7" isBold="true"/>
  159 + <font isBold="true"/>
169 160 <paragraph rightIndent="3"/>
170 161 </textElement>
171 162 <textFieldExpression><![CDATA["Total por Órgão:"]]></textFieldExpression>
... ... @@ -176,40 +167,31 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]&gt;
176 167 <group name="UG">
177 168 <groupExpression><![CDATA[$F{idgestora}]]></groupExpression>
178 169 <groupHeader>
179   - <band height="15">
180   - <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  170 + <band height="20">
181 171 <textField>
182   - <reportElement x="0" y="0" width="555" height="15" uuid="9bc1859c-4340-4a65-b5ea-01e82822af03">
183   - <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
184   - </reportElement>
185   - <textElement verticalAlignment="Middle" markup="styled">
186   - <font size="8"/>
187   - </textElement>
  172 + <reportElement x="0" y="0" width="555" height="20" uuid="9bc1859c-4340-4a65-b5ea-01e82822af03"/>
  173 + <textElement verticalAlignment="Middle" markup="styled"/>
188 174 <textFieldExpression><![CDATA["<b>U.G.: </b>" + $F{gestora}]]></textFieldExpression>
189 175 </textField>
190 176 </band>
191 177 </groupHeader>
192 178 <groupFooter>
193   - <band height="17">
194   - <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  179 + <band height="20">
195 180 <textField pattern="#,##0.00">
196   - <reportElement mode="Transparent" x="482" y="0" width="71" height="17" backcolor="#CCCCCC" uuid="7bbf63ea-7676-4ea2-bbd3-6fdb04a569fa"/>
197   - <box topPadding="0" leftPadding="0" bottomPadding="0" rightPadding="0">
  181 + <reportElement mode="Transparent" x="482" y="0" width="71" height="20" backcolor="#CCCCCC" uuid="7bbf63ea-7676-4ea2-bbd3-6fdb04a569fa"/>
  182 + <box>
198 183 <topPen lineWidth="0.5"/>
199 184 <leftPen lineWidth="0.5"/>
200 185 <bottomPen lineWidth="0.5"/>
201 186 <rightPen lineWidth="0.5"/>
202 187 </box>
203 188 <textElement textAlignment="Right" verticalAlignment="Middle">
204   - <font size="6"/>
205 189 <paragraph rightIndent="3"/>
206 190 </textElement>
207 191 <textFieldExpression><![CDATA[$V{TOTAL_GERAL_AQUISICAO}]]></textFieldExpression>
208 192 </textField>
209 193 <textField>
210   - <reportElement mode="Transparent" x="0" y="0" width="482" height="17" forecolor="#000000" backcolor="#CCCCCC" uuid="022773ce-c9dc-4fb6-83fb-109fcb6c7f79">
211   - <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
212   - </reportElement>
  194 + <reportElement mode="Transparent" x="0" y="0" width="482" height="20" forecolor="#000000" backcolor="#CCCCCC" uuid="022773ce-c9dc-4fb6-83fb-109fcb6c7f79"/>
213 195 <box>
214 196 <topPen lineWidth="0.5"/>
215 197 <leftPen lineWidth="0.5"/>
... ... @@ -217,7 +199,7 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]&gt;
217 199 <rightPen lineWidth="0.5"/>
218 200 </box>
219 201 <textElement textAlignment="Right" verticalAlignment="Middle">
220   - <font size="7" isBold="true"/>
  202 + <font isBold="true"/>
221 203 <paragraph rightIndent="3"/>
222 204 </textElement>
223 205 <textFieldExpression><![CDATA["Total por U.G.:"]]></textFieldExpression>
... ... @@ -228,47 +210,36 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]&gt;
228 210 <group name="UA">
229 211 <groupExpression><![CDATA[$F{estruturaadministrativaid}]]></groupExpression>
230 212 <groupHeader>
231   - <band height="30">
232   - <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  213 + <band height="39">
233 214 <textField>
234   - <reportElement x="0" y="15" width="555" height="15" uuid="358a412c-642c-4489-9669-d3b9889a59e0"/>
235   - <textElement verticalAlignment="Middle" markup="styled">
236   - <font size="8"/>
237   - </textElement>
  215 + <reportElement x="0" y="19" width="555" height="20" uuid="358a412c-642c-4489-9669-d3b9889a59e0"/>
  216 + <textElement verticalAlignment="Middle" markup="styled"/>
238 217 <textFieldExpression><![CDATA["<b>Responsável U.A: </b>" + ( $F{responsavelua} != null ? $F{responsavelua} : "" )]]></textFieldExpression>
239 218 </textField>
240 219 <textField>
241   - <reportElement x="0" y="0" width="555" height="15" uuid="4fe698b9-7956-4bc7-81a9-5102582d037e">
242   - <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
243   - </reportElement>
244   - <textElement verticalAlignment="Middle" markup="styled">
245   - <font size="8"/>
246   - </textElement>
  220 + <reportElement x="0" y="0" width="555" height="20" uuid="4fe698b9-7956-4bc7-81a9-5102582d037e"/>
  221 + <textElement verticalAlignment="Middle" markup="styled"/>
247 222 <textFieldExpression><![CDATA["<b>Unidade Administrativa: </b>" + $F{estruturaadministrativa}]]></textFieldExpression>
248 223 </textField>
249 224 </band>
250 225 </groupHeader>
251 226 <groupFooter>
252   - <band height="17">
253   - <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  227 + <band height="20">
254 228 <textField pattern="#,##0.00">
255   - <reportElement x="482" y="0" width="71" height="17" uuid="70897358-9542-440f-a085-23a5f063be61"/>
256   - <box topPadding="0" leftPadding="0" bottomPadding="0" rightPadding="0">
  229 + <reportElement x="482" y="0" width="71" height="20" uuid="70897358-9542-440f-a085-23a5f063be61"/>
  230 + <box>
257 231 <topPen lineWidth="0.5"/>
258 232 <leftPen lineWidth="0.5"/>
259 233 <bottomPen lineWidth="0.5"/>
260 234 <rightPen lineWidth="0.5"/>
261 235 </box>
262 236 <textElement textAlignment="Right" verticalAlignment="Middle">
263   - <font size="6"/>
264 237 <paragraph rightIndent="3"/>
265 238 </textElement>
266 239 <textFieldExpression><![CDATA[$V{TOTAL_AQUISICAO_UA}]]></textFieldExpression>
267 240 </textField>
268 241 <textField>
269   - <reportElement mode="Transparent" x="0" y="0" width="482" height="17" backcolor="#CCCCCC" uuid="b34c3d88-44de-437d-a6bc-5126bae0a563">
270   - <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
271   - </reportElement>
  242 + <reportElement mode="Transparent" x="0" y="0" width="482" height="20" backcolor="#CCCCCC" uuid="b34c3d88-44de-437d-a6bc-5126bae0a563"/>
272 243 <box>
273 244 <topPen lineWidth="0.5"/>
274 245 <leftPen lineWidth="0.5"/>
... ... @@ -276,7 +247,7 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]&gt;
276 247 <rightPen lineWidth="0.5"/>
277 248 </box>
278 249 <textElement textAlignment="Right" verticalAlignment="Middle">
279   - <font size="7" isBold="true"/>
  250 + <font isBold="true"/>
280 251 <paragraph rightIndent="3"/>
281 252 </textElement>
282 253 <textFieldExpression><![CDATA["Total por U.A.:"]]></textFieldExpression>
... ... @@ -287,116 +258,87 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]&gt;
287 258 <group name="UL">
288 259 <groupExpression><![CDATA[$F{estruturalocalizadoraid}]]></groupExpression>
289 260 <groupHeader>
290   - <band height="45">
291   - <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  261 + <band height="62">
292 262 <staticText>
293   - <reportElement x="31" y="25" width="57" height="20" uuid="297476d7-a6a3-4ca7-b498-b668fdfc1807"/>
  263 + <reportElement x="31" y="32" width="57" height="30" uuid="297476d7-a6a3-4ca7-b498-b668fdfc1807"/>
294 264 <box>
295 265 <topPen lineWidth="0.5"/>
296 266 <leftPen lineWidth="0.5"/>
297 267 <bottomPen lineWidth="0.5"/>
298 268 <rightPen lineWidth="0.5"/>
299 269 </box>
300   - <textElement textAlignment="Center" verticalAlignment="Middle">
301   - <font size="7" isBold="true"/>
302   - </textElement>
  270 + <textElement textAlignment="Center" verticalAlignment="Middle"/>
303 271 <text><![CDATA[Patrimônio]]></text>
304 272 </staticText>
305 273 <staticText>
306   -<<<<<<< HEAD
307 274 <reportElement x="88" y="32" width="125" height="30" uuid="7f75ae5e-1e4b-478a-83b2-45693bf9253a"/>
308   -=======
309   - <reportElement x="88" y="25" width="180" height="20" uuid="7f75ae5e-1e4b-478a-83b2-45693bf9253a"/>
310   ->>>>>>> tarefa-2359
311 275 <box>
312 276 <topPen lineWidth="0.5"/>
313 277 <leftPen lineWidth="0.5"/>
314 278 <bottomPen lineWidth="0.5"/>
315 279 <rightPen lineWidth="0.5"/>
316 280 </box>
317   - <textElement textAlignment="Center" verticalAlignment="Middle">
318   - <font size="7" isBold="true"/>
319   - </textElement>
  281 + <textElement textAlignment="Center" verticalAlignment="Middle"/>
320 282 <text><![CDATA[Descrição]]></text>
321 283 </staticText>
322 284 <staticText>
323   - <reportElement x="411" y="25" width="71" height="20" uuid="08955c0b-402a-4912-8154-765e9d62b149"/>
  285 + <reportElement x="411" y="32" width="71" height="30" uuid="08955c0b-402a-4912-8154-765e9d62b149"/>
324 286 <box>
325 287 <topPen lineWidth="0.5"/>
326 288 <leftPen lineWidth="0.5"/>
327 289 <bottomPen lineWidth="0.5"/>
328 290 <rightPen lineWidth="0.5"/>
329 291 </box>
330   - <textElement textAlignment="Center" verticalAlignment="Middle">
331   - <font size="7" isBold="true"/>
332   - </textElement>
  292 + <textElement textAlignment="Center" verticalAlignment="Middle"/>
333 293 <text><![CDATA[Data Aquisição]]></text>
334 294 </staticText>
335 295 <staticText>
336   -<<<<<<< HEAD
337 296 <reportElement style="table" x="213" y="32" width="70" height="30" uuid="4d0449aa-a6a8-4f4b-90c4-d405271c1a9c"/>
338   -=======
339   - <reportElement x="268" y="25" width="74" height="20" uuid="4d0449aa-a6a8-4f4b-90c4-d405271c1a9c"/>
340   ->>>>>>> tarefa-2359
341 297 <box>
342 298 <topPen lineWidth="0.5"/>
343 299 <leftPen lineWidth="0.5"/>
344 300 <bottomPen lineWidth="0.5"/>
345 301 <rightPen lineWidth="0.5"/>
346 302 </box>
347   - <textElement textAlignment="Center" verticalAlignment="Middle">
348   - <font size="7" isBold="true"/>
349   - </textElement>
  303 + <textElement textAlignment="Center" verticalAlignment="Middle"/>
350 304 <text><![CDATA[Stiuação Física]]></text>
351 305 </staticText>
352 306 <staticText>
353   - <reportElement x="342" y="25" width="69" height="20" uuid="7785375d-eeed-40ed-81b2-702172084d2a"/>
  307 + <reportElement x="342" y="32" width="69" height="30" uuid="7785375d-eeed-40ed-81b2-702172084d2a"/>
354 308 <box>
355 309 <topPen lineWidth="0.5"/>
356 310 <leftPen lineWidth="0.5"/>
357 311 <bottomPen lineWidth="0.5"/>
358 312 <rightPen lineWidth="0.5"/>
359 313 </box>
360   - <textElement textAlignment="Center" verticalAlignment="Middle">
361   - <font size="7" isBold="true"/>
362   - </textElement>
  314 + <textElement textAlignment="Center" verticalAlignment="Middle"/>
363 315 <text><![CDATA[Conta]]></text>
364 316 </staticText>
365 317 <staticText>
366   - <reportElement x="482" y="25" width="71" height="20" uuid="1062e607-d314-484d-8184-6dd0f77148f8"/>
  318 + <reportElement x="482" y="32" width="71" height="30" uuid="1062e607-d314-484d-8184-6dd0f77148f8"/>
367 319 <box>
368 320 <topPen lineWidth="0.5"/>
369 321 <leftPen lineWidth="0.5"/>
370 322 <bottomPen lineWidth="0.5"/>
371 323 <rightPen lineWidth="0.5"/>
372 324 </box>
373   - <textElement textAlignment="Center" verticalAlignment="Middle">
374   - <font size="7" isBold="true"/>
375   - </textElement>
  325 + <textElement textAlignment="Center" verticalAlignment="Middle"/>
376 326 <text><![CDATA[Valor de Aquisição]]></text>
377 327 </staticText>
378 328 <staticText>
379   - <reportElement x="0" y="25" width="31" height="20" uuid="f3d3dd71-ca88-4b43-ba13-e14a3227f6a2">
380   - <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
381   - </reportElement>
  329 + <reportElement x="0" y="32" width="31" height="30" uuid="f3d3dd71-ca88-4b43-ba13-e14a3227f6a2"/>
382 330 <box>
383 331 <topPen lineWidth="0.5"/>
384 332 <leftPen lineWidth="0.5"/>
385 333 <bottomPen lineWidth="0.5"/>
386 334 <rightPen lineWidth="0.5"/>
387 335 </box>
388   - <textElement textAlignment="Center" verticalAlignment="Middle">
389   - <font size="7" isBold="true"/>
390   - </textElement>
  336 + <textElement textAlignment="Center" verticalAlignment="Middle"/>
391 337 <text><![CDATA[Item]]></text>
392 338 </staticText>
393 339 <textField>
394   - <reportElement x="0" y="10" width="555" height="15" uuid="d3137e58-c2c1-4263-a7bb-1065cf42550b">
395   - <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
396   - </reportElement>
397   - <textElement verticalAlignment="Middle" markup="styled">
398   - <font size="8"/>
399   - </textElement>
  340 + <reportElement x="0" y="10" width="555" height="20" uuid="d3137e58-c2c1-4263-a7bb-1065cf42550b"/>
  341 + <textElement verticalAlignment="Middle" markup="styled"/>
400 342 <textFieldExpression><![CDATA["<b>Endereço: </b>" + $F{endereco}]]></textFieldExpression>
401 343 </textField>
402 344 <staticText>
... ... @@ -413,12 +355,9 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]&gt;
413 355 </band>
414 356 </groupHeader>
415 357 <groupFooter>
416   - <band height="17">
417   - <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  358 + <band height="20">
418 359 <textField>
419   - <reportElement mode="Transparent" x="0" y="0" width="482" height="17" backcolor="#CCCCCC" uuid="f2ea7bcc-11dc-4d86-b892-5452fa6de216">
420   - <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
421   - </reportElement>
  360 + <reportElement mode="Transparent" x="0" y="0" width="482" height="20" backcolor="#CCCCCC" uuid="f2ea7bcc-11dc-4d86-b892-5452fa6de216"/>
422 361 <box>
423 362 <topPen lineWidth="0.5"/>
424 363 <leftPen lineWidth="0.5"/>
... ... @@ -426,23 +365,20 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]&gt;
426 365 <rightPen lineWidth="0.5"/>
427 366 </box>
428 367 <textElement textAlignment="Right" verticalAlignment="Middle">
429   - <font size="7" isBold="true"/>
  368 + <font isBold="true"/>
430 369 <paragraph rightIndent="3"/>
431 370 </textElement>
432 371 <textFieldExpression><![CDATA["Total por Endereço:"]]></textFieldExpression>
433 372 </textField>
434 373 <textField pattern="#,##0.00">
435   - <reportElement x="482" y="0" width="71" height="17" uuid="47f022b0-eed0-40ca-bd4c-d67b4c250573">
436   - <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
437   - </reportElement>
438   - <box topPadding="0" leftPadding="0" bottomPadding="0" rightPadding="0">
  374 + <reportElement x="482" y="0" width="71" height="20" uuid="47f022b0-eed0-40ca-bd4c-d67b4c250573"/>
  375 + <box>
439 376 <topPen lineWidth="0.5"/>
440 377 <leftPen lineWidth="0.5"/>
441 378 <bottomPen lineWidth="0.5"/>
442 379 <rightPen lineWidth="0.5"/>
443 380 </box>
444 381 <textElement textAlignment="Right" verticalAlignment="Middle">
445   - <font size="6"/>
446 382 <paragraph rightIndent="3"/>
447 383 </textElement>
448 384 <textFieldExpression><![CDATA[$V{TOTAL_AQUISICAO_UL}]]></textFieldExpression>
... ... @@ -454,115 +390,89 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]&gt;
454 390 <band splitType="Stretch"/>
455 391 </background>
456 392 <detail>
457   - <band height="17" splitType="Prevent">
458   - <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  393 + <band height="20" splitType="Prevent">
459 394 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
460   - <reportElement stretchType="RelativeToTallestObject" x="31" y="0" width="57" height="17" uuid="7e0f9476-2de2-43b0-b73f-0bda736252ae"/>
461   - <box topPadding="5" leftPadding="5" bottomPadding="5" rightPadding="5">
  395 + <reportElement stretchType="RelativeToTallestObject" x="31" y="0" width="57" height="20" uuid="7e0f9476-2de2-43b0-b73f-0bda736252ae"/>
  396 + <box>
462 397 <topPen lineWidth="0.5"/>
463 398 <leftPen lineWidth="0.5"/>
464 399 <bottomPen lineWidth="0.5"/>
465 400 <rightPen lineWidth="0.5"/>
466 401 </box>
467   - <textElement textAlignment="Center" verticalAlignment="Middle">
468   - <font size="6"/>
469   - </textElement>
  402 + <textElement textAlignment="Center" verticalAlignment="Middle"/>
470 403 <textFieldExpression><![CDATA[$F{numeropatrimonial}]]></textFieldExpression>
471 404 </textField>
472 405 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
473   -<<<<<<< HEAD
474 406 <reportElement stretchType="RelativeToTallestObject" x="88" y="0" width="125" height="20" uuid="60b42d10-a6c2-448b-89d5-22cde01bc01d"/>
475 407 <box>
476   -=======
477   - <reportElement stretchType="RelativeToTallestObject" x="88" y="0" width="180" height="17" uuid="60b42d10-a6c2-448b-89d5-22cde01bc01d"/>
478   - <box topPadding="5" leftPadding="5" bottomPadding="5" rightPadding="5">
479   ->>>>>>> tarefa-2359
480 408 <topPen lineWidth="0.5"/>
481 409 <leftPen lineWidth="0.5"/>
482 410 <bottomPen lineWidth="0.5"/>
483 411 <rightPen lineWidth="0.5"/>
484 412 </box>
485 413 <textElement verticalAlignment="Middle">
486   - <font size="6"/>
  414 + <font size="9"/>
487 415 <paragraph leftIndent="2" rightIndent="2"/>
488 416 </textElement>
489 417 <textFieldExpression><![CDATA[$F{materialdescricao} + " - " + $F{caracteristicamaterial}]]></textFieldExpression>
490 418 </textField>
491 419 <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
492   - <reportElement stretchType="RelativeToTallestObject" x="411" y="0" width="71" height="17" uuid="58f8d58e-eed6-4070-b28d-160a36fe99dc"/>
493   - <box topPadding="5" leftPadding="5" bottomPadding="5" rightPadding="5">
  420 + <reportElement stretchType="RelativeToTallestObject" x="411" y="0" width="71" height="20" uuid="58f8d58e-eed6-4070-b28d-160a36fe99dc"/>
  421 + <box>
494 422 <topPen lineWidth="0.5"/>
495 423 <leftPen lineWidth="0.5"/>
496 424 <bottomPen lineWidth="0.5"/>
497 425 <rightPen lineWidth="0.5"/>
498 426 </box>
499   - <textElement textAlignment="Center" verticalAlignment="Middle">
500   - <font size="6"/>
501   - </textElement>
  427 + <textElement textAlignment="Center" verticalAlignment="Middle"/>
502 428 <textFieldExpression><![CDATA[$F{dataaquisicao}]]></textFieldExpression>
503 429 </textField>
504 430 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
505   -<<<<<<< HEAD
506 431 <reportElement stretchType="RelativeToTallestObject" x="213" y="0" width="70" height="20" uuid="04dd801f-38ab-4df9-a9a8-fa4e34cdc0d8"/>
507 432 <box>
508   -=======
509   - <reportElement stretchType="RelativeToTallestObject" x="268" y="0" width="74" height="17" uuid="04dd801f-38ab-4df9-a9a8-fa4e34cdc0d8"/>
510   - <box topPadding="5" leftPadding="5" bottomPadding="5" rightPadding="5">
511   ->>>>>>> tarefa-2359
512 433 <topPen lineWidth="0.5"/>
513 434 <leftPen lineWidth="0.5"/>
514 435 <bottomPen lineWidth="0.5"/>
515 436 <rightPen lineWidth="0.5"/>
516 437 </box>
517 438 <textElement textAlignment="Left" verticalAlignment="Middle">
518   - <font size="6"/>
519 439 <paragraph leftIndent="2"/>
520 440 </textElement>
521 441 <textFieldExpression><![CDATA[$F{situacaofisica}]]></textFieldExpression>
522 442 </textField>
523 443 <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
524   - <reportElement stretchType="RelativeToTallestObject" x="482" y="0" width="71" height="17" uuid="30d1a2ec-a168-4e6b-b982-635e8aec1017"/>
525   - <box topPadding="0" leftPadding="0" bottomPadding="0" rightPadding="0">
  444 + <reportElement stretchType="RelativeToTallestObject" x="482" y="0" width="71" height="20" uuid="30d1a2ec-a168-4e6b-b982-635e8aec1017"/>
  445 + <box>
526 446 <topPen lineWidth="0.5"/>
527 447 <leftPen lineWidth="0.5"/>
528 448 <bottomPen lineWidth="0.5"/>
529 449 <rightPen lineWidth="0.5"/>
530 450 </box>
531 451 <textElement textAlignment="Right" verticalAlignment="Middle">
532   - <font size="6"/>
533 452 <paragraph rightIndent="3"/>
534 453 </textElement>
535 454 <textFieldExpression><![CDATA[$F{valoraquisicao}]]></textFieldExpression>
536 455 </textField>
537 456 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
538   - <reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="31" height="17" uuid="dfa8c602-17b9-4091-b6c1-6c6235f6706b">
539   - <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
540   - </reportElement>
541   - <box topPadding="5" leftPadding="5" bottomPadding="5" rightPadding="5">
  457 + <reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="31" height="20" uuid="dfa8c602-17b9-4091-b6c1-6c6235f6706b"/>
  458 + <box>
542 459 <topPen lineWidth="0.5"/>
543 460 <leftPen lineWidth="0.5"/>
544 461 <bottomPen lineWidth="0.5"/>
545 462 <rightPen lineWidth="0.5"/>
546 463 </box>
547   - <textElement textAlignment="Center" verticalAlignment="Middle">
548   - <font size="6"/>
549   - </textElement>
  464 + <textElement textAlignment="Center" verticalAlignment="Middle"/>
550 465 <textFieldExpression><![CDATA[$V{UL_COUNT}]]></textFieldExpression>
551 466 </textField>
552 467 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
553   - <reportElement stretchType="RelativeToTallestObject" x="342" y="0" width="69" height="17" uuid="1f37cabe-8329-43c1-ad1b-326a56f07eb5"/>
554   - <box topPadding="5" leftPadding="5" bottomPadding="5" rightPadding="5">
  468 + <reportElement stretchType="RelativeToTallestObject" x="342" y="0" width="69" height="20" uuid="1f37cabe-8329-43c1-ad1b-326a56f07eb5"/>
  469 + <box>
555 470 <topPen lineWidth="0.5"/>
556 471 <leftPen lineWidth="0.5"/>
557 472 <bottomPen lineWidth="0.5"/>
558 473 <rightPen lineWidth="0.5"/>
559 474 </box>
560   -<<<<<<< HEAD
561 475 <textElement textAlignment="Center" verticalAlignment="Middle">
562   -=======
563   - <textElement textAlignment="Left" verticalAlignment="Middle">
564   - <font size="6"/>
565   ->>>>>>> tarefa-2359
566 476 <paragraph leftIndent="2"/>
567 477 </textElement>
568 478 <textFieldExpression><![CDATA[$F{contacontabil}]]></textFieldExpression>
... ... @@ -583,12 +493,9 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]&gt;
583 493 </band>
584 494 </detail>
585 495 <summary>
586   - <band height="17">
587   - <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  496 + <band height="20">
588 497 <textField>
589   - <reportElement mode="Transparent" x="0" y="0" width="482" height="17" forecolor="#000000" backcolor="#CCCCCC" uuid="d6104a9e-2160-4570-bf52-41cd4c118a56">
590   - <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
591   - </reportElement>
  498 + <reportElement mode="Transparent" x="0" y="0" width="482" height="20" forecolor="#000000" backcolor="#CCCCCC" uuid="d6104a9e-2160-4570-bf52-41cd4c118a56"/>
592 499 <box>
593 500 <topPen lineWidth="0.5"/>
594 501 <leftPen lineWidth="0.5"/>
... ... @@ -596,21 +503,20 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]&gt;
596 503 <rightPen lineWidth="0.5"/>
597 504 </box>
598 505 <textElement textAlignment="Right" verticalAlignment="Middle">
599   - <font size="7" isBold="true"/>
  506 + <font isBold="true"/>
600 507 <paragraph rightIndent="3"/>
601 508 </textElement>
602 509 <textFieldExpression><![CDATA["Total Geral:"]]></textFieldExpression>
603 510 </textField>
604 511 <textField pattern="#,##0.00">
605   - <reportElement mode="Transparent" x="482" y="0" width="71" height="17" backcolor="#CCCCCC" uuid="478b456d-ba28-4b8e-89ae-6dffdfccab81"/>
606   - <box topPadding="0" leftPadding="0" bottomPadding="0" rightPadding="0">
  512 + <reportElement mode="Transparent" x="482" y="0" width="71" height="20" backcolor="#CCCCCC" uuid="478b456d-ba28-4b8e-89ae-6dffdfccab81"/>
  513 + <box>
607 514 <topPen lineWidth="0.5"/>
608 515 <leftPen lineWidth="0.5"/>
609 516 <bottomPen lineWidth="0.5"/>
610 517 <rightPen lineWidth="0.5"/>
611 518 </box>
612 519 <textElement textAlignment="Right" verticalAlignment="Middle">
613   - <font size="6"/>
614 520 <paragraph rightIndent="3"/>
615 521 </textElement>
616 522 <textFieldExpression><![CDATA[$V{TOTAL_GERAL_AQUISICAO}]]></textFieldExpression>
... ... @@ -618,14 +524,11 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]&gt;
618 524 </band>
619 525 </summary>
620 526 <noData>
621   - <band height="17">
622   - <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  527 + <band height="20">
623 528 <staticText>
624   - <reportElement x="0" y="0" width="555" height="17" uuid="068d2c48-e1b4-4a65-aedc-14223738c988">
625   - <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
626   - </reportElement>
  529 + <reportElement x="0" y="0" width="555" height="20" uuid="068d2c48-e1b4-4a65-aedc-14223738c988"/>
627 530 <textElement textAlignment="Center" verticalAlignment="Middle">
628   - <font size="8" isBold="true"/>
  531 + <font isBold="true"/>
629 532 </textElement>
630 533 <text><![CDATA[Seção vazia]]></text>
631 534 </staticText>
... ...