Download as
Browse Code »

Commit 09ec71e4883abcd991c4ba524cad573cd8114fdf

Authored by thiago.coimbra
1 parent a78de1b6
Exists in master

redmine #5045 Correcao da exibicao dos anexos da entrada de bens no relatorio sintetico.

Showing 2 changed files with 96 additions and 93 deletions   Show diff stats
citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/TransferenciaItemServiceImpl.java
  Diff comments   View file @09ec71e
... ... @@ -263,7 +263,7 @@ public class TransferenciaItemServiceImpl extends GenericServiceImpl<Transferenc
263 263 transferenciaItem.setBemPatrimonial(bemPatrimonial);
264 264 transferenciaItem.setDominioSituacaoFisica(bemPatrimonial.getDominioSituacaoFisica());
265 265  
266   - if(UtilObjeto.isReferencia(bemPatrimonial.getEstruturaOrganizacionalAtual())){
  266 + if(!UtilObjeto.isReferencia(bemPatrimonial.getEstruturaOrganizacionalAtual())){
267 267 lancarBusinessException(true, "PATRIMONIO.VALIDACAO.TRANSFERENCIA_ITEM_SEM_EO_ORIGEM", CodigoErro.REGRA_NEGOCIO.getValue(), bemPatrimonial.getNumeroPatrimonial());
268 268 }
269 269  
... ...
citgrp-patrimonio-web/src/main/resources/reports/entradaPatrimonioBensSintetico.jrxml
  Diff comments   View file @09ec71e
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-05-10T15:26:54 -->
  2 +<!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2 -->
  3 +<!-- 2016-05-30T16:51:57 -->
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="entradaMaterialAnalitico" language="groovy" pageWidth="555" pageHeight="802" columnWidth="555" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="151318af-6127-44c9-89d0-65848a7d6d80">
5 5 <property name="ireport.zoom" value="1.5000000000000007"/>
6 6 <property name="ireport.x" value="0"/>
... ... @@ -115,10 +115,10 @@ order by material]]&gt;
115 115 </variable>
116 116 <group name="material">
117 117 <groupHeader>
118   - <band height="20">
  118 + <band height="65">
119 119 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
120 120 <staticText>
121   - <reportElement x="1" y="0" width="28" height="20" uuid="8420bff4-8deb-4208-be8f-b7919088f245">
  121 + <reportElement positionType="FixRelativeToBottom" x="1" y="45" width="28" height="20" uuid="8420bff4-8deb-4208-be8f-b7919088f245">
122 122 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
123 123 </reportElement>
124 124 <box>
... ... @@ -133,7 +133,7 @@ order by material]]&gt;
133 133 <text><![CDATA[Item]]></text>
134 134 </staticText>
135 135 <staticText>
136   - <reportElement x="29" y="0" width="71" height="20" uuid="7be9be1f-5a43-4ab0-b4e4-368070199eba"/>
  136 + <reportElement positionType="FixRelativeToBottom" x="29" y="45" width="71" height="20" uuid="7be9be1f-5a43-4ab0-b4e4-368070199eba"/>
137 137 <box>
138 138 <topPen lineWidth="0.25"/>
139 139 <leftPen lineWidth="0.25"/>
... ... @@ -146,7 +146,7 @@ order by material]]&gt;
146 146 <text><![CDATA[Quantidade]]></text>
147 147 </staticText>
148 148 <staticText>
149   - <reportElement x="100" y="0" width="348" height="20" uuid="74728506-3c31-4062-81ad-1621e7b48b30"/>
  149 + <reportElement positionType="FixRelativeToBottom" x="100" y="45" width="348" height="20" uuid="74728506-3c31-4062-81ad-1621e7b48b30"/>
150 150 <box>
151 151 <topPen lineWidth="0.25"/>
152 152 <leftPen lineWidth="0.25"/>
... ... @@ -159,7 +159,7 @@ order by material]]&gt;
159 159 <text><![CDATA[Descrição]]></text>
160 160 </staticText>
161 161 <staticText>
162   - <reportElement x="448" y="0" width="107" height="20" uuid="58addf31-22e0-4fc6-8aa3-11dd3c2975da"/>
  162 + <reportElement positionType="FixRelativeToBottom" x="448" y="45" width="107" height="20" uuid="58addf31-22e0-4fc6-8aa3-11dd3c2975da"/>
163 163 <box>
164 164 <topPen lineWidth="0.25"/>
165 165 <leftPen lineWidth="0.25"/>
... ... @@ -172,95 +172,98 @@ order by material]]&gt;
172 172 <text><![CDATA[Valor de
173 173 Aquisições (R$)]]></text>
174 174 </staticText>
  175 + <componentElement>
  176 + <reportElement key="table" style="table" positionType="Float" x="0" y="7" width="553" height="34" isRemoveLineWhenBlank="true" uuid="ac5ae1b5-aa23-4d3b-9b3b-d849811a96a2">
  177 + <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.FreeLayout"/>
  178 + <printWhenExpression><![CDATA[$V{REPORT_COUNT} == 0]]></printWhenExpression>
  179 + </reportElement>
  180 + <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">
  181 + <datasetRun subDataset="Documentos" uuid="c039d6f6-8568-4729-a72e-192d473c2cbc">
  182 + <datasetParameter name="idEntrada">
  183 + <datasetParameterExpression><![CDATA[$P{idEntrada}]]></datasetParameterExpression>
  184 + </datasetParameter>
  185 + <datasetParameter name="REPORT_CONNECTION">
  186 + <datasetParameterExpression><![CDATA[$P{REPORT_CONNECTION}]]></datasetParameterExpression>
  187 + </datasetParameter>
  188 + <connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
  189 + </datasetRun>
  190 + <jr:column width="192" uuid="9e2f77bb-e200-43b9-b2ff-4090a2fd6841">
  191 + <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  192 + <jr:columnHeader style="table_TD" height="17" rowSpan="1">
  193 + <property name="com.jaspersoft.studio.unit.height" value="px"/>
  194 + <staticText>
  195 + <reportElement x="0" y="0" width="192" height="17" uuid="d5edc33c-5361-47d4-a38b-1dc7ee836df7">
  196 + <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  197 + </reportElement>
  198 + <textElement textAlignment="Center" verticalAlignment="Middle">
  199 + <font size="7" isBold="true"/>
  200 + </textElement>
  201 + <text><![CDATA[Tipo do Documento]]></text>
  202 + </staticText>
  203 + </jr:columnHeader>
  204 + <jr:detailCell style="table_TD" height="17" rowSpan="1">
  205 + <property name="com.jaspersoft.studio.unit.height" value="px"/>
  206 + <textField isBlankWhenNull="true">
  207 + <reportElement x="0" y="0" width="192" height="17" uuid="a2272d92-cbbf-4eb9-b92c-3fe5eccb6000">
  208 + <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  209 + </reportElement>
  210 + <textElement textAlignment="Left" verticalAlignment="Middle">
  211 + <font size="6"/>
  212 + <paragraph leftIndent="3" rightIndent="3"/>
  213 + </textElement>
  214 + <textFieldExpression><![CDATA["00" + $V{REPORT_COUNT} + " - " + $F{tipodocumento}]]></textFieldExpression>
  215 + </textField>
  216 + </jr:detailCell>
  217 + </jr:column>
  218 + <jr:column width="219" uuid="a3adb636-e796-4942-b216-781d1182c98d">
  219 + <jr:columnHeader style="table_TD" height="17" rowSpan="1">
  220 + <staticText>
  221 + <reportElement x="0" y="0" width="219" height="17" uuid="659764b7-7859-4a09-8971-23b56f141acb"/>
  222 + <textElement textAlignment="Center" verticalAlignment="Middle">
  223 + <font size="7" isBold="true"/>
  224 + </textElement>
  225 + <text><![CDATA[Nº do Documento]]></text>
  226 + </staticText>
  227 + </jr:columnHeader>
  228 + <jr:detailCell style="table_TD" height="17" rowSpan="1">
  229 + <textField isBlankWhenNull="true">
  230 + <reportElement x="0" y="0" width="219" height="17" uuid="d6d49e5e-9527-4de5-b140-7dae3bafb8c2"/>
  231 + <textElement textAlignment="Left" verticalAlignment="Middle">
  232 + <font size="6"/>
  233 + <paragraph leftIndent="3" rightIndent="3"/>
  234 + </textElement>
  235 + <textFieldExpression><![CDATA[$F{numerodocumento}]]></textFieldExpression>
  236 + </textField>
  237 + </jr:detailCell>
  238 + </jr:column>
  239 + <jr:column width="145" uuid="0d57795a-41a9-4ec7-bb82-db658b326010">
  240 + <jr:columnHeader style="table_TD" height="17" rowSpan="1">
  241 + <staticText>
  242 + <reportElement x="0" y="0" width="145" height="17" uuid="177af7af-37b6-4f23-80e1-6243bb9419ec"/>
  243 + <textElement textAlignment="Center" verticalAlignment="Middle">
  244 + <font size="7" isBold="true"/>
  245 + </textElement>
  246 + <text><![CDATA[Data]]></text>
  247 + </staticText>
  248 + </jr:columnHeader>
  249 + <jr:detailCell style="table_TD" height="17" rowSpan="1">
  250 + <textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
  251 + <reportElement x="0" y="0" width="145" height="17" uuid="cab05436-c8dd-4d10-9302-71415f5cd529"/>
  252 + <textElement textAlignment="Center" verticalAlignment="Middle">
  253 + <font size="6"/>
  254 + </textElement>
  255 + <textFieldExpression><![CDATA[$F{data}]]></textFieldExpression>
  256 + </textField>
  257 + </jr:detailCell>
  258 + </jr:column>
  259 + </jr:table>
  260 + </componentElement>
175 261 </band>
176 262 </groupHeader>
177 263 </group>
178 264 <pageHeader>
179   - <band height="159" splitType="Stretch">
  265 + <band height="112" splitType="Stretch">
180 266 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
181   - <componentElement>
182   - <reportElement key="table" style="table" positionType="Float" x="1" y="114" width="553" height="34" uuid="ac5ae1b5-aa23-4d3b-9b3b-d849811a96a2"/>
183   - <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">
184   - <datasetRun subDataset="Documentos" uuid="c039d6f6-8568-4729-a72e-192d473c2cbc">
185   - <datasetParameter name="idEntrada">
186   - <datasetParameterExpression><![CDATA[$P{idEntrada}]]></datasetParameterExpression>
187   - </datasetParameter>
188   - <datasetParameter name="REPORT_CONNECTION">
189   - <datasetParameterExpression><![CDATA[$P{REPORT_CONNECTION}]]></datasetParameterExpression>
190   - </datasetParameter>
191   - <connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
192   - </datasetRun>
193   - <jr:column width="192" uuid="9e2f77bb-e200-43b9-b2ff-4090a2fd6841">
194   - <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
195   - <jr:columnHeader style="table_TD" height="17" rowSpan="1">
196   - <property name="com.jaspersoft.studio.unit.height" value="px"/>
197   - <staticText>
198   - <reportElement x="0" y="0" width="192" height="17" uuid="d5edc33c-5361-47d4-a38b-1dc7ee836df7">
199   - <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
200   - </reportElement>
201   - <textElement textAlignment="Center" verticalAlignment="Middle">
202   - <font size="7" isBold="true"/>
203   - </textElement>
204   - <text><![CDATA[Tipo do Documento]]></text>
205   - </staticText>
206   - </jr:columnHeader>
207   - <jr:detailCell style="table_TD" height="17" rowSpan="1">
208   - <property name="com.jaspersoft.studio.unit.height" value="px"/>
209   - <textField isBlankWhenNull="true">
210   - <reportElement x="0" y="0" width="192" height="17" uuid="a2272d92-cbbf-4eb9-b92c-3fe5eccb6000">
211   - <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
212   - </reportElement>
213   - <textElement textAlignment="Left" verticalAlignment="Middle">
214   - <font size="6"/>
215   - <paragraph leftIndent="3" rightIndent="3"/>
216   - </textElement>
217   - <textFieldExpression><![CDATA["00" + $V{COLUMN_COUNT} + " - " + $F{tipodocumento}]]></textFieldExpression>
218   - </textField>
219   - </jr:detailCell>
220   - </jr:column>
221   - <jr:column width="219" uuid="a3adb636-e796-4942-b216-781d1182c98d">
222   - <jr:columnHeader style="table_TD" height="17" rowSpan="1">
223   - <staticText>
224   - <reportElement x="0" y="0" width="219" height="17" uuid="659764b7-7859-4a09-8971-23b56f141acb"/>
225   - <textElement textAlignment="Center" verticalAlignment="Middle">
226   - <font size="7" isBold="true"/>
227   - </textElement>
228   - <text><![CDATA[Nº do Documento]]></text>
229   - </staticText>
230   - </jr:columnHeader>
231   - <jr:detailCell style="table_TD" height="17" rowSpan="1">
232   - <textField isBlankWhenNull="true">
233   - <reportElement x="0" y="0" width="219" height="17" uuid="d6d49e5e-9527-4de5-b140-7dae3bafb8c2"/>
234   - <textElement textAlignment="Left" verticalAlignment="Middle">
235   - <font size="6"/>
236   - <paragraph leftIndent="3" rightIndent="3"/>
237   - </textElement>
238   - <textFieldExpression><![CDATA[$F{numerodocumento}]]></textFieldExpression>
239   - </textField>
240   - </jr:detailCell>
241   - </jr:column>
242   - <jr:column width="145" uuid="0d57795a-41a9-4ec7-bb82-db658b326010">
243   - <jr:columnHeader style="table_TD" height="17" rowSpan="1">
244   - <staticText>
245   - <reportElement x="0" y="0" width="145" height="17" uuid="177af7af-37b6-4f23-80e1-6243bb9419ec"/>
246   - <textElement textAlignment="Center" verticalAlignment="Middle">
247   - <font size="7" isBold="true"/>
248   - </textElement>
249   - <text><![CDATA[Data]]></text>
250   - </staticText>
251   - </jr:columnHeader>
252   - <jr:detailCell style="table_TD" height="17" rowSpan="1">
253   - <textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
254   - <reportElement x="0" y="0" width="145" height="17" uuid="cab05436-c8dd-4d10-9302-71415f5cd529"/>
255   - <textElement textAlignment="Center" verticalAlignment="Middle">
256   - <font size="6"/>
257   - </textElement>
258   - <textFieldExpression><![CDATA[$F{data}]]></textFieldExpression>
259   - </textField>
260   - </jr:detailCell>
261   - </jr:column>
262   - </jr:table>
263   - </componentElement>
264 267 <textField isBlankWhenNull="true">
265 268 <reportElement positionType="Float" x="0" y="88" width="554" height="17" uuid="fd198531-8133-4f1c-8fe7-385cad2e302e">
266 269 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
... ... @@ -337,7 +340,7 @@ new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($F{datarecebimento})]]&gt;&lt;/textFieldExpr
337 340 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
338 341 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
339 342 <reportElement stretchType="RelativeToBandHeight" x="100" y="0" width="348" height="17" uuid="10c2f1c3-a7a1-47b9-9859-11bf5e3821fb"/>
340   - <box>
  343 + <box topPadding="0" leftPadding="0" bottomPadding="0" rightPadding="0">
341 344 <topPen lineWidth="0.25"/>
342 345 <leftPen lineWidth="0.25"/>
343 346 <bottomPen lineWidth="0.25"/>
... ...