From 09ec71e4883abcd991c4ba524cad573cd8114fdf Mon Sep 17 00:00:00 2001
From: thiago.coimbra <thiago.coimbra@centralit.com.br>
Date: Mon, 30 May 2016 18:03:03 -0300
Subject: [PATCH] redmine #5045 Correcao da exibicao dos anexos da entrada de bens no relatorio sintetico.

---
 citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/TransferenciaItemServiceImpl.java |   2 +-
 citgrp-patrimonio-web/src/main/resources/reports/entradaPatrimonioBensSintetico.jrxml                   | 187 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------
 2 files changed, 96 insertions(+), 93 deletions(-)

diff --git a/citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/TransferenciaItemServiceImpl.java b/citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/TransferenciaItemServiceImpl.java
index a648306..82f37c1 100644
--- a/citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/TransferenciaItemServiceImpl.java
+++ b/citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/TransferenciaItemServiceImpl.java
@@ -263,7 +263,7 @@ public class TransferenciaItemServiceImpl extends GenericServiceImpl<Transferenc
 		transferenciaItem.setBemPatrimonial(bemPatrimonial);
 		transferenciaItem.setDominioSituacaoFisica(bemPatrimonial.getDominioSituacaoFisica());
 		
-		if(UtilObjeto.isReferencia(bemPatrimonial.getEstruturaOrganizacionalAtual())){
+		if(!UtilObjeto.isReferencia(bemPatrimonial.getEstruturaOrganizacionalAtual())){
 			lancarBusinessException(true, "PATRIMONIO.VALIDACAO.TRANSFERENCIA_ITEM_SEM_EO_ORIGEM", CodigoErro.REGRA_NEGOCIO.getValue(), bemPatrimonial.getNumeroPatrimonial());
 		}
 
diff --git a/citgrp-patrimonio-web/src/main/resources/reports/entradaPatrimonioBensSintetico.jrxml b/citgrp-patrimonio-web/src/main/resources/reports/entradaPatrimonioBensSintetico.jrxml
index 7179bcc..694d7c9 100644
--- a/citgrp-patrimonio-web/src/main/resources/reports/entradaPatrimonioBensSintetico.jrxml
+++ b/citgrp-patrimonio-web/src/main/resources/reports/entradaPatrimonioBensSintetico.jrxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.2.1.final using JasperReports Library version 6.2.1  -->
-<!-- 2016-05-10T15:26:54 -->
+<!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2  -->
+<!-- 2016-05-30T16:51:57 -->
 <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="entradaMaterialAnalitico" language="groovy" pageWidth="555" pageHeight="802" columnWidth="555" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="151318af-6127-44c9-89d0-65848a7d6d80">
 	<property name="ireport.zoom" value="1.5000000000000007"/>
 	<property name="ireport.x" value="0"/>
@@ -115,10 +115,10 @@ order by material]]>
 	</variable>
 	<group name="material">
 		<groupHeader>
-			<band height="20">
+			<band height="65">
 				<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 				<staticText>
-					<reportElement x="1" y="0" width="28" height="20" uuid="8420bff4-8deb-4208-be8f-b7919088f245">
+					<reportElement positionType="FixRelativeToBottom" x="1" y="45" width="28" height="20" uuid="8420bff4-8deb-4208-be8f-b7919088f245">
 						<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 					</reportElement>
 					<box>
@@ -133,7 +133,7 @@ order by material]]>
 					<text><![CDATA[Item]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="29" y="0" width="71" height="20" uuid="7be9be1f-5a43-4ab0-b4e4-368070199eba"/>
+					<reportElement positionType="FixRelativeToBottom" x="29" y="45" width="71" height="20" uuid="7be9be1f-5a43-4ab0-b4e4-368070199eba"/>
 					<box>
 						<topPen lineWidth="0.25"/>
 						<leftPen lineWidth="0.25"/>
@@ -146,7 +146,7 @@ order by material]]>
 					<text><![CDATA[Quantidade]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="100" y="0" width="348" height="20" uuid="74728506-3c31-4062-81ad-1621e7b48b30"/>
+					<reportElement positionType="FixRelativeToBottom" x="100" y="45" width="348" height="20" uuid="74728506-3c31-4062-81ad-1621e7b48b30"/>
 					<box>
 						<topPen lineWidth="0.25"/>
 						<leftPen lineWidth="0.25"/>
@@ -159,7 +159,7 @@ order by material]]>
 					<text><![CDATA[Descrição]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="448" y="0" width="107" height="20" uuid="58addf31-22e0-4fc6-8aa3-11dd3c2975da"/>
+					<reportElement positionType="FixRelativeToBottom" x="448" y="45" width="107" height="20" uuid="58addf31-22e0-4fc6-8aa3-11dd3c2975da"/>
 					<box>
 						<topPen lineWidth="0.25"/>
 						<leftPen lineWidth="0.25"/>
@@ -172,95 +172,98 @@ order by material]]>
 					<text><![CDATA[Valor de
  Aquisições (R$)]]></text>
 				</staticText>
+				<componentElement>
+					<reportElement key="table" style="table" positionType="Float" x="0" y="7" width="553" height="34" isRemoveLineWhenBlank="true" uuid="ac5ae1b5-aa23-4d3b-9b3b-d849811a96a2">
+						<property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.FreeLayout"/>
+						<printWhenExpression><![CDATA[$V{REPORT_COUNT} == 0]]></printWhenExpression>
+					</reportElement>
+					<jr:table xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd">
+						<datasetRun subDataset="Documentos" uuid="c039d6f6-8568-4729-a72e-192d473c2cbc">
+							<datasetParameter name="idEntrada">
+								<datasetParameterExpression><![CDATA[$P{idEntrada}]]></datasetParameterExpression>
+							</datasetParameter>
+							<datasetParameter name="REPORT_CONNECTION">
+								<datasetParameterExpression><![CDATA[$P{REPORT_CONNECTION}]]></datasetParameterExpression>
+							</datasetParameter>
+							<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
+						</datasetRun>
+						<jr:column width="192" uuid="9e2f77bb-e200-43b9-b2ff-4090a2fd6841">
+							<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+							<jr:columnHeader style="table_TD" height="17" rowSpan="1">
+								<property name="com.jaspersoft.studio.unit.height" value="px"/>
+								<staticText>
+									<reportElement x="0" y="0" width="192" height="17" uuid="d5edc33c-5361-47d4-a38b-1dc7ee836df7">
+										<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+									</reportElement>
+									<textElement textAlignment="Center" verticalAlignment="Middle">
+										<font size="7" isBold="true"/>
+									</textElement>
+									<text><![CDATA[Tipo do Documento]]></text>
+								</staticText>
+							</jr:columnHeader>
+							<jr:detailCell style="table_TD" height="17" rowSpan="1">
+								<property name="com.jaspersoft.studio.unit.height" value="px"/>
+								<textField isBlankWhenNull="true">
+									<reportElement x="0" y="0" width="192" height="17" uuid="a2272d92-cbbf-4eb9-b92c-3fe5eccb6000">
+										<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+									</reportElement>
+									<textElement textAlignment="Left" verticalAlignment="Middle">
+										<font size="6"/>
+										<paragraph leftIndent="3" rightIndent="3"/>
+									</textElement>
+									<textFieldExpression><![CDATA["00" + $V{REPORT_COUNT} + " - " + $F{tipodocumento}]]></textFieldExpression>
+								</textField>
+							</jr:detailCell>
+						</jr:column>
+						<jr:column width="219" uuid="a3adb636-e796-4942-b216-781d1182c98d">
+							<jr:columnHeader style="table_TD" height="17" rowSpan="1">
+								<staticText>
+									<reportElement x="0" y="0" width="219" height="17" uuid="659764b7-7859-4a09-8971-23b56f141acb"/>
+									<textElement textAlignment="Center" verticalAlignment="Middle">
+										<font size="7" isBold="true"/>
+									</textElement>
+									<text><![CDATA[Nº do Documento]]></text>
+								</staticText>
+							</jr:columnHeader>
+							<jr:detailCell style="table_TD" height="17" rowSpan="1">
+								<textField isBlankWhenNull="true">
+									<reportElement x="0" y="0" width="219" height="17" uuid="d6d49e5e-9527-4de5-b140-7dae3bafb8c2"/>
+									<textElement textAlignment="Left" verticalAlignment="Middle">
+										<font size="6"/>
+										<paragraph leftIndent="3" rightIndent="3"/>
+									</textElement>
+									<textFieldExpression><![CDATA[$F{numerodocumento}]]></textFieldExpression>
+								</textField>
+							</jr:detailCell>
+						</jr:column>
+						<jr:column width="145" uuid="0d57795a-41a9-4ec7-bb82-db658b326010">
+							<jr:columnHeader style="table_TD" height="17" rowSpan="1">
+								<staticText>
+									<reportElement x="0" y="0" width="145" height="17" uuid="177af7af-37b6-4f23-80e1-6243bb9419ec"/>
+									<textElement textAlignment="Center" verticalAlignment="Middle">
+										<font size="7" isBold="true"/>
+									</textElement>
+									<text><![CDATA[Data]]></text>
+								</staticText>
+							</jr:columnHeader>
+							<jr:detailCell style="table_TD" height="17" rowSpan="1">
+								<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+									<reportElement x="0" y="0" width="145" height="17" uuid="cab05436-c8dd-4d10-9302-71415f5cd529"/>
+									<textElement textAlignment="Center" verticalAlignment="Middle">
+										<font size="6"/>
+									</textElement>
+									<textFieldExpression><![CDATA[$F{data}]]></textFieldExpression>
+								</textField>
+							</jr:detailCell>
+						</jr:column>
+					</jr:table>
+				</componentElement>
 			</band>
 		</groupHeader>
 	</group>
 	<pageHeader>
-		<band height="159" splitType="Stretch">
+		<band height="112" splitType="Stretch">
 			<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
-			<componentElement>
-				<reportElement key="table" style="table" positionType="Float" x="1" y="114" width="553" height="34" uuid="ac5ae1b5-aa23-4d3b-9b3b-d849811a96a2"/>
-				<jr:table xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd">
-					<datasetRun subDataset="Documentos" uuid="c039d6f6-8568-4729-a72e-192d473c2cbc">
-						<datasetParameter name="idEntrada">
-							<datasetParameterExpression><![CDATA[$P{idEntrada}]]></datasetParameterExpression>
-						</datasetParameter>
-						<datasetParameter name="REPORT_CONNECTION">
-							<datasetParameterExpression><![CDATA[$P{REPORT_CONNECTION}]]></datasetParameterExpression>
-						</datasetParameter>
-						<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
-					</datasetRun>
-					<jr:column width="192" uuid="9e2f77bb-e200-43b9-b2ff-4090a2fd6841">
-						<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
-						<jr:columnHeader style="table_TD" height="17" rowSpan="1">
-							<property name="com.jaspersoft.studio.unit.height" value="px"/>
-							<staticText>
-								<reportElement x="0" y="0" width="192" height="17" uuid="d5edc33c-5361-47d4-a38b-1dc7ee836df7">
-									<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
-								</reportElement>
-								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font size="7" isBold="true"/>
-								</textElement>
-								<text><![CDATA[Tipo do Documento]]></text>
-							</staticText>
-						</jr:columnHeader>
-						<jr:detailCell style="table_TD" height="17" rowSpan="1">
-							<property name="com.jaspersoft.studio.unit.height" value="px"/>
-							<textField isBlankWhenNull="true">
-								<reportElement x="0" y="0" width="192" height="17" uuid="a2272d92-cbbf-4eb9-b92c-3fe5eccb6000">
-									<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
-								</reportElement>
-								<textElement textAlignment="Left" verticalAlignment="Middle">
-									<font size="6"/>
-									<paragraph leftIndent="3" rightIndent="3"/>
-								</textElement>
-								<textFieldExpression><![CDATA["00" + $V{COLUMN_COUNT} + " - " + $F{tipodocumento}]]></textFieldExpression>
-							</textField>
-						</jr:detailCell>
-					</jr:column>
-					<jr:column width="219" uuid="a3adb636-e796-4942-b216-781d1182c98d">
-						<jr:columnHeader style="table_TD" height="17" rowSpan="1">
-							<staticText>
-								<reportElement x="0" y="0" width="219" height="17" uuid="659764b7-7859-4a09-8971-23b56f141acb"/>
-								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font size="7" isBold="true"/>
-								</textElement>
-								<text><![CDATA[Nº do Documento]]></text>
-							</staticText>
-						</jr:columnHeader>
-						<jr:detailCell style="table_TD" height="17" rowSpan="1">
-							<textField isBlankWhenNull="true">
-								<reportElement x="0" y="0" width="219" height="17" uuid="d6d49e5e-9527-4de5-b140-7dae3bafb8c2"/>
-								<textElement textAlignment="Left" verticalAlignment="Middle">
-									<font size="6"/>
-									<paragraph leftIndent="3" rightIndent="3"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$F{numerodocumento}]]></textFieldExpression>
-							</textField>
-						</jr:detailCell>
-					</jr:column>
-					<jr:column width="145" uuid="0d57795a-41a9-4ec7-bb82-db658b326010">
-						<jr:columnHeader style="table_TD" height="17" rowSpan="1">
-							<staticText>
-								<reportElement x="0" y="0" width="145" height="17" uuid="177af7af-37b6-4f23-80e1-6243bb9419ec"/>
-								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font size="7" isBold="true"/>
-								</textElement>
-								<text><![CDATA[Data]]></text>
-							</staticText>
-						</jr:columnHeader>
-						<jr:detailCell style="table_TD" height="17" rowSpan="1">
-							<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-								<reportElement x="0" y="0" width="145" height="17" uuid="cab05436-c8dd-4d10-9302-71415f5cd529"/>
-								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font size="6"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$F{data}]]></textFieldExpression>
-							</textField>
-						</jr:detailCell>
-					</jr:column>
-				</jr:table>
-			</componentElement>
 			<textField isBlankWhenNull="true">
 				<reportElement positionType="Float" x="0" y="88" width="554" height="17" uuid="fd198531-8133-4f1c-8fe7-385cad2e302e">
 					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
@@ -337,7 +340,7 @@ new SimpleDateFormat("dd/MM/yyyy").format($F{datarecebimento})]]></textFieldExpr
 			<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToBandHeight" x="100" y="0" width="348" height="17" uuid="10c2f1c3-a7a1-47b9-9859-11bf5e3821fb"/>
-				<box>
+				<box topPadding="0" leftPadding="0" bottomPadding="0" rightPadding="0">
 					<topPen lineWidth="0.25"/>
 					<leftPen lineWidth="0.25"/>
 					<bottomPen lineWidth="0.25"/>
--
libgit2 0.21.2