Download as
Browse Code »

Commit da9b4e3ef6ece74ce6a64990c9aeee9d7761a393

Authored by geovane.filho
1 parent cc63ad36
Exists in master

Redmine #4783 Validações

Showing 2 changed files with 4 additions and 2 deletions   Show diff stats
cit-adm-materiais-api/src/main/java/br/com/centralit/api/model/Material.java
  Diff comments   View file @da9b4e3
@@ -61,7 +61,7 @@ import com.fasterxml.jackson.annotation.JsonView; @@ -61,7 +61,7 @@ import com.fasterxml.jackson.annotation.JsonView;
61 @Audited 61 @Audited
62 @Entity 62 @Entity
63 @Inheritance(strategy = InheritanceType.JOINED) 63 @Inheritance(strategy = InheritanceType.JOINED)
64 -@JsonIgnoreProperties({"unidadeMedida"}) 64 +@JsonIgnoreProperties({"unidadeMedida", "unidadeArmazenamento", "tiposUnidadeMedidaEntrada"})
65 public class Material extends PersistentObjectAuditOrganizacao { 65 public class Material extends PersistentObjectAuditOrganizacao {
66 66
67 /** Atributo id. */ 67 /** Atributo id. */
@@ -86,7 +86,7 @@ public class Material extends PersistentObjectAuditOrganizacao { @@ -86,7 +86,7 @@ public class Material extends PersistentObjectAuditOrganizacao {
86 ViewsAdmMateriais.DevolucaoEditView.class, ViewsAdmMateriais.ConfiguracaoRessuprimentoListView.class, ViewsAdmMateriais.ConfiguracaoRessuprimentoEditView.class, 86 ViewsAdmMateriais.DevolucaoEditView.class, ViewsAdmMateriais.ConfiguracaoRessuprimentoListView.class, ViewsAdmMateriais.ConfiguracaoRessuprimentoEditView.class,
87 ViewsAdmMateriais.RequisicaoConsumoEditView.class, ViewsAdmMateriais.TransferenciaContaContabilEditView.class, ViewsAdmMateriais.CatalogoMaterialItemEditView.class, Views.InventarioMobileCompleto.class, Views.InventarioMobile.class, 87 ViewsAdmMateriais.RequisicaoConsumoEditView.class, ViewsAdmMateriais.TransferenciaContaContabilEditView.class, ViewsAdmMateriais.CatalogoMaterialItemEditView.class, Views.InventarioMobileCompleto.class, Views.InventarioMobile.class,
88 Views.DefinicaoDetentorEditView.class, Views.InventarioMobileJEDI.class, Views.BemPatrimonialListView.class, Views.SelecaoBemPatrimonialEditView.class, Views.EntradaItemEditView.class, ViewsAdmMateriais.MaterialConsultaInfo.class, 88 Views.DefinicaoDetentorEditView.class, Views.InventarioMobileJEDI.class, Views.BemPatrimonialListView.class, Views.SelecaoBemPatrimonialEditView.class, Views.EntradaItemEditView.class, ViewsAdmMateriais.MaterialConsultaInfo.class,
89 - ViewsAdmMateriais.RequisicaoConsumo.class, ViewsAdmMateriais.TransferenciaEnderecoEstoqueView.class}) 89 + ViewsAdmMateriais.RequisicaoConsumo.class, ViewsAdmMateriais.TransferenciaEnderecoEstoqueView.class, ViewsAdmMateriais.EntradaAlmoxarifadoEditView.class })
90 private String descricao; 90 private String descricao;
91 91
92 /** Atributo dominioTipoMaterial. */ 92 /** Atributo dominioTipoMaterial. */
cit-adm-materiais-api/src/main/java/br/com/centralit/api/model/MaterialCaracteristica.java
  Diff comments   View file @da9b4e3
@@ -11,6 +11,7 @@ import javax.persistence.ManyToOne; @@ -11,6 +11,7 @@ import javax.persistence.ManyToOne;
11 import org.hibernate.envers.AuditTable; 11 import org.hibernate.envers.AuditTable;
12 import org.hibernate.envers.Audited; 12 import org.hibernate.envers.Audited;
13 13
  14 +import br.com.centralit.api.framework.json.ViewsAdmMateriais;
14 import br.com.centralit.framework.json.Views; 15 import br.com.centralit.framework.json.Views;
15 import br.com.centralit.framework.model.arquitetura.PersistentObjectAudit; 16 import br.com.centralit.framework.model.arquitetura.PersistentObjectAudit;
16 17
@@ -89,6 +90,7 @@ public class MaterialCaracteristica extends PersistentObjectAudit { @@ -89,6 +90,7 @@ public class MaterialCaracteristica extends PersistentObjectAudit {
89 90
90 /** Atributo material. */ 91 /** Atributo material. */
91 @ManyToOne(fetch = FetchType.LAZY) 92 @ManyToOne(fetch = FetchType.LAZY)
  93 + @JsonView({ ViewsAdmMateriais.EntradaAlmoxarifadoEditView.class })
92 private Material material; 94 private Material material;
93 95
94 /** Atributo materialRemocao. */ 96 /** Atributo materialRemocao. */