diff --git a/cit-almoxarifado-api/src/main/java/br/com/centralit/api/dao/AtendimentoRequisicaoConsumoFIFODao.java b/cit-almoxarifado-api/src/main/java/br/com/centralit/api/dao/AtendimentoRequisicaoConsumoFIFODao.java new file mode 100644 index 0000000..a5869e4 --- /dev/null +++ b/cit-almoxarifado-api/src/main/java/br/com/centralit/api/dao/AtendimentoRequisicaoConsumoFIFODao.java @@ -0,0 +1,5 @@ +package br.com.centralit.api.dao; + +import br.com.centralit.framework.dao.arquitetura.CitGenericDAO; + +public interface AtendimentoRequisicaoConsumoFIFODao extends CitGenericDAO {} diff --git a/cit-almoxarifado-api/src/main/java/br/com/centralit/api/dao/impl/AtendimentoRequisicaoConsumoFIFODaoHibernate.java b/cit-almoxarifado-api/src/main/java/br/com/centralit/api/dao/impl/AtendimentoRequisicaoConsumoFIFODaoHibernate.java new file mode 100644 index 0000000..b32b1a6 --- /dev/null +++ b/cit-almoxarifado-api/src/main/java/br/com/centralit/api/dao/impl/AtendimentoRequisicaoConsumoFIFODaoHibernate.java @@ -0,0 +1,14 @@ +package br.com.centralit.api.dao.impl; + +import org.springframework.stereotype.Repository; + +import br.com.centralit.api.dao.AtendimentoRequisicaoConsumoFIFODao; +import br.com.centralit.api.model.AtendimentoRequisicaoConsumoItemFIFO; +import br.com.centralit.framework.dao.arquitetura.CitGenericDAOImpl; + +@Repository("atendimentoRequisicaoConsumoFIFODao") +public class AtendimentoRequisicaoConsumoFIFODaoHibernate extends CitGenericDAOImpl implements AtendimentoRequisicaoConsumoFIFODao { + public AtendimentoRequisicaoConsumoFIFODaoHibernate() { + super(AtendimentoRequisicaoConsumoItemFIFO.class); + } +} diff --git a/cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/AtendimentoRequisicaoConsumoItem.java b/cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/AtendimentoRequisicaoConsumoItem.java index 4b1d1ef..3aad379 100644 --- a/cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/AtendimentoRequisicaoConsumoItem.java +++ b/cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/AtendimentoRequisicaoConsumoItem.java @@ -80,19 +80,24 @@ public class AtendimentoRequisicaoConsumoItem extends PersistentObjectAuditOrgan private AtendimentoRequisicaoConsumo atendimentoRequisicaoConsumo; @ManyToOne(fetch = FetchType.LAZY, optional = false) - @JsonView({ ViewsAlmoxarifado.AtendimentoRequisicaoConsumoItem.class, ViewsAlmoxarifado.AtendimentoRequisicaoConsumoEditView.class, Views.MaterialConsultaInfo.class, ViewsAdmMateriais.RequisicaoConsumoEditView.class }) + @JsonView({ ViewsAlmoxarifado.AtendimentoRequisicaoConsumoItem.class, + ViewsAlmoxarifado.AtendimentoRequisicaoConsumoEditView.class, Views.MaterialConsultaInfo.class, + ViewsAdmMateriais.RequisicaoConsumoEditView.class }) private RequisicaoConsumoItem requisicaoConsumoItem; /** Atributo material. */ @ManyToOne(fetch = FetchType.LAZY, optional = false) - @JsonView({ ViewsAlmoxarifado.AtendimentoRequisicaoConsumoItem.class, ViewsAlmoxarifado.AtendimentoRequisicaoConsumoEditView.class, ViewsAdmMateriais.RequisicaoConsumoEditView.class }) + @JsonView({ ViewsAlmoxarifado.AtendimentoRequisicaoConsumoItem.class, + ViewsAlmoxarifado.AtendimentoRequisicaoConsumoEditView.class, + ViewsAdmMateriais.RequisicaoConsumoEditView.class }) private MaterialConsumo material; @OneToMany(fetch = FetchType.LAZY, mappedBy = "atendimentoRequisicaoConsumoItem", cascade = CascadeType.ALL, orphanRemoval = true) - @JsonView({ ViewsAlmoxarifado.AtendimentoRequisicaoConsumoEditView.class, ViewsAdmMateriais.RequisicaoConsumoEditView.class }) + @JsonView({ ViewsAlmoxarifado.AtendimentoRequisicaoConsumoEditView.class, + ViewsAdmMateriais.RequisicaoConsumoEditView.class }) private Collection atendimentoRequisicaoConsumoItemEnderecos; - @OneToMany(fetch = FetchType.LAZY, mappedBy = "atendimentoRequisicaoConsumoItem", cascade = CascadeType.ALL, orphanRemoval = true) + @OneToMany(fetch = FetchType.LAZY, mappedBy = "atendimentoRequisicaoConsumoItem", cascade = CascadeType.ALL) @JsonView({ ViewsAlmoxarifado.AtendimentoRequisicaoConsumoEditView.class }) private Collection atendimentoRequisicaoConsumoItemFIFOs; @@ -204,8 +209,7 @@ public class AtendimentoRequisicaoConsumoItem extends PersistentObjectAuditOrgan public void setAtendimentoRequisicaoConsumoItemFIFOs( Collection atendimentoRequisicaoConsumoItemFIFOs) { - this.atendimentoRequisicaoConsumoItemFIFOs.clear(); - this.atendimentoRequisicaoConsumoItemFIFOs.addAll(atendimentoRequisicaoConsumoItemFIFOs); + this.atendimentoRequisicaoConsumoItemFIFOs = atendimentoRequisicaoConsumoItemFIFOs; } } diff --git a/cit-almoxarifado-api/src/main/java/br/com/centralit/api/service/AtendimentoRequisicaoConsumoFIFOService.java b/cit-almoxarifado-api/src/main/java/br/com/centralit/api/service/AtendimentoRequisicaoConsumoFIFOService.java new file mode 100644 index 0000000..08b9b33 --- /dev/null +++ b/cit-almoxarifado-api/src/main/java/br/com/centralit/api/service/AtendimentoRequisicaoConsumoFIFOService.java @@ -0,0 +1,7 @@ +package br.com.centralit.api.service; + +import br.com.centralit.api.model.AtendimentoRequisicaoConsumoItemFIFO; +import br.com.centralit.framework.service.arquitetura.GenericService; + +public interface AtendimentoRequisicaoConsumoFIFOService extends GenericService { +} diff --git a/cit-almoxarifado-api/src/main/java/br/com/centralit/api/service/impl/AtendimentoRequisicaoConsumoFIFOServiceImpl.java b/cit-almoxarifado-api/src/main/java/br/com/centralit/api/service/impl/AtendimentoRequisicaoConsumoFIFOServiceImpl.java new file mode 100644 index 0000000..af98046 --- /dev/null +++ b/cit-almoxarifado-api/src/main/java/br/com/centralit/api/service/impl/AtendimentoRequisicaoConsumoFIFOServiceImpl.java @@ -0,0 +1,22 @@ +package br.com.centralit.api.service.impl; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import br.com.centralit.api.dao.AtendimentoRequisicaoConsumoFIFODao; +import br.com.centralit.api.model.AtendimentoRequisicaoConsumoItemFIFO; +import br.com.centralit.api.service.AtendimentoRequisicaoConsumoFIFOService; +import br.com.centralit.framework.service.arquitetura.GenericServiceImpl; + +@Service("atendimentoRequisicaoConsumoFIFOService") +public class AtendimentoRequisicaoConsumoFIFOServiceImpl extends GenericServiceImpl implements AtendimentoRequisicaoConsumoFIFOService { + + private AtendimentoRequisicaoConsumoFIFODao atendimentoRequisicaoConsumoFIFODao; + + @Autowired + public AtendimentoRequisicaoConsumoFIFOServiceImpl(AtendimentoRequisicaoConsumoFIFODao atendimentoRequisicaoConsumoFIFODao) { + this.dao = atendimentoRequisicaoConsumoFIFODao; + this.atendimentoRequisicaoConsumoFIFODao = atendimentoRequisicaoConsumoFIFODao; + } + +} diff --git a/cit-almoxarifado-api/src/main/java/br/com/centralit/api/service/impl/AtendimentoRequisicaoConsumoServiceImpl.java b/cit-almoxarifado-api/src/main/java/br/com/centralit/api/service/impl/AtendimentoRequisicaoConsumoServiceImpl.java index 9c7fc4c..4f92b86 100644 --- a/cit-almoxarifado-api/src/main/java/br/com/centralit/api/service/impl/AtendimentoRequisicaoConsumoServiceImpl.java +++ b/cit-almoxarifado-api/src/main/java/br/com/centralit/api/service/impl/AtendimentoRequisicaoConsumoServiceImpl.java @@ -25,6 +25,7 @@ import br.com.centralit.api.model.MaterialEstoqueFIFOItem; import br.com.centralit.api.model.MaterialLocalEstoque; import br.com.centralit.api.model.MovimentoEstoque; import br.com.centralit.api.model.RequisicaoConsumoItem; +import br.com.centralit.api.service.AtendimentoRequisicaoConsumoFIFOService; import br.com.centralit.api.service.AtendimentoRequisicaoConsumoItemService; import br.com.centralit.api.service.AtendimentoRequisicaoConsumoService; import br.com.centralit.api.service.ConfiguracaoParametroSistemaService; @@ -122,6 +123,9 @@ public class AtendimentoRequisicaoConsumoServiceImpl extends GenericServiceImpl< @Autowired private MaterialEstoqueFIFOItemService materialEstoqueFIFOItemService; + + @Autowired + private AtendimentoRequisicaoConsumoFIFOService atendimentoRequisicaoConsumoFIFOService; private Dominio idioma; @@ -298,6 +302,8 @@ public class AtendimentoRequisicaoConsumoServiceImpl extends GenericServiceImpl< this.movimentoEstoqueService.remove(movimentoEstoque); } + atendimentoRequisicaoConsumoFIFOService.removeList(new ArrayList(item.getAtendimentoRequisicaoConsumoItemFIFOs())); + } } diff --git a/cit-almoxarifado-api/src/main/java/br/com/centralit/api/service/impl/MovimentoEstoqueServiceImpl.java b/cit-almoxarifado-api/src/main/java/br/com/centralit/api/service/impl/MovimentoEstoqueServiceImpl.java index 035547c..601ff0b 100644 --- a/cit-almoxarifado-api/src/main/java/br/com/centralit/api/service/impl/MovimentoEstoqueServiceImpl.java +++ b/cit-almoxarifado-api/src/main/java/br/com/centralit/api/service/impl/MovimentoEstoqueServiceImpl.java @@ -36,6 +36,7 @@ import br.com.centralit.api.model.MaterialEstoque; import br.com.centralit.api.model.MaterialEstoqueFIFOItem; import br.com.centralit.api.model.MaterialLocalEstoque; import br.com.centralit.api.model.MovimentoEstoque; +import br.com.centralit.api.service.AtendimentoRequisicaoConsumoFIFOService; import br.com.centralit.api.service.AtendimentoRequisicaoConsumoItemService; import br.com.centralit.api.service.BaixaAlmoxarifadoItemService; import br.com.centralit.api.service.ConfiguracaoParametroSistemaService; @@ -144,6 +145,9 @@ public class MovimentoEstoqueServiceImpl extends GenericServiceImpl