diff --git a/citgrp-patrimonio-web/src/main/java/br/com/centralit/controller/BemPatrimonialController.java b/citgrp-patrimonio-web/src/main/java/br/com/centralit/controller/BemPatrimonialController.java index 10f95a4..8616063 100644 --- a/citgrp-patrimonio-web/src/main/java/br/com/centralit/controller/BemPatrimonialController.java +++ b/citgrp-patrimonio-web/src/main/java/br/com/centralit/controller/BemPatrimonialController.java @@ -543,19 +543,46 @@ public class BemPatrimonialController extends GenericController @RequestMapping(method = RequestMethod.POST, produces = "application/json", value = "/alterarListaBemInconsistenciaTipo2") @ResponseBody public ResponseBodyWrapper alterarListaBemInconsistenciaTipo2(@RequestBody TratamentoInconsistenciaVH tratamentoInconsistenciaVH) throws Exception { + Organizacao organizacao = this.organizacaoService.find(this.getUsuario().getOrganizacao().getId()); + + if (!organizacao.getEmFechamento()) { - ResponseBodyWrapper responseBody = new ResponseBodyWrapper(this.bemPatrimonialService.alterarListaBemInconsistenciaTipo2(tratamentoInconsistenciaVH), getEditView()); + ResponseBodyWrapper responseBody = new ResponseBodyWrapper(this.bemPatrimonialService.alterarListaBemInconsistenciaTipo2(tratamentoInconsistenciaVH), getEditView()); - return responseBody; + return responseBody; + + } else { + MyRetornoStatus retorno = new MyRetornoStatus(); + retorno.data = tratamentoInconsistenciaVH; + retorno.mensagens.add(new MyMensagemRetorno(MyMensagemRetorno.TipoMensagemRetorno.warning, "MSG.ORGANIZACAO_EM_FECHAMENTO_MES")); + + ResponseBodyWrapper responseBody = new ResponseBodyWrapper(retorno, getEditView()); + + return responseBody; + } } @RequestMapping(method = RequestMethod.POST, produces = "application/json", value = "/alterarListaBemInconsistenciaTipo1") @ResponseBody public ResponseBodyWrapper alterarListaBemInconsistenciaTipo1(@RequestBody TratamentoInconsistenciaVH tratamentoInconsistenciaVH) throws Exception { + + Organizacao organizacao = this.organizacaoService.find(this.getUsuario().getOrganizacao().getId()); - ResponseBodyWrapper responseBody = new ResponseBodyWrapper(this.bemPatrimonialService.alterarListaBemInconsistenciaTipo1(tratamentoInconsistenciaVH), getEditView()); + if (!organizacao.getEmFechamento() && UtilObjeto.isReferencia(tratamentoInconsistenciaVH.getBaixa())) { - return responseBody; + ResponseBodyWrapper responseBody = new ResponseBodyWrapper(this.bemPatrimonialService.alterarListaBemInconsistenciaTipo1(tratamentoInconsistenciaVH), getEditView()); + + return responseBody; + + } else { + MyRetornoStatus retorno = new MyRetornoStatus(); + retorno.data = tratamentoInconsistenciaVH; + retorno.mensagens.add(new MyMensagemRetorno(MyMensagemRetorno.TipoMensagemRetorno.warning, "MSG.ORGANIZACAO_EM_FECHAMENTO_MES")); + + ResponseBodyWrapper responseBody = new ResponseBodyWrapper(retorno, getEditView()); + + return responseBody; + } } @RequestMapping(method = RequestMethod.POST, produces = "application/json", value = "/alterarListaBemInconsistenciaTipo10") diff --git a/citgrp-patrimonio-web/src/main/java/br/com/centralit/controller/EntradaController.java b/citgrp-patrimonio-web/src/main/java/br/com/centralit/controller/EntradaController.java index 7aa7ac6..26e424b 100644 --- a/citgrp-patrimonio-web/src/main/java/br/com/centralit/controller/EntradaController.java +++ b/citgrp-patrimonio-web/src/main/java/br/com/centralit/controller/EntradaController.java @@ -227,6 +227,27 @@ public class EntradaController extends GenericController { return responseBody; } } + + @RequestMapping(method = RequestMethod.DELETE, value = "/{id}") + @ResponseBody + public ResponseBodyWrapper delete(@PathVariable("id") Long id) { + + Organizacao organizacao = this.organizacaoService.find(this.getUsuario().getOrganizacao().getId()); + + if (!organizacao.getEmFechamento()) { + ResponseBodyWrapper responseBody = new ResponseBodyWrapper(entradaService.removeById(id), getEditView()); + + return responseBody; + } else { + MyRetornoStatus retorno = new MyRetornoStatus(); + retorno.data = id; + retorno.mensagens.add(new MyMensagemRetorno(MyMensagemRetorno.TipoMensagemRetorno.warning, "MSG.ORGANIZACAO_EM_FECHAMENTO_MES")); + + ResponseBodyWrapper responseBody = new ResponseBodyWrapper(retorno, getEditView()); + + return responseBody; + } + } @RequestMapping(value = "/{id}", method = RequestMethod.GET) @ResponseBody diff --git a/citgrp-patrimonio-web/src/main/java/br/com/centralit/controller/EntradaItemController.java b/citgrp-patrimonio-web/src/main/java/br/com/centralit/controller/EntradaItemController.java index 1d66f64..3b1e82e 100644 --- a/citgrp-patrimonio-web/src/main/java/br/com/centralit/controller/EntradaItemController.java +++ b/citgrp-patrimonio-web/src/main/java/br/com/centralit/controller/EntradaItemController.java @@ -2,16 +2,21 @@ package br.com.centralit.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import br.com.centralit.api.model.EntradaPatrimonioItem; +import br.com.centralit.api.model.MyMensagemRetorno; +import br.com.centralit.api.model.MyRetornoStatus; import br.com.centralit.api.service.EntradaItemService; +import br.com.centralit.api.service.OrganizacaoService; import br.com.centralit.framework.controller.GenericController; import br.com.centralit.framework.json.ResponseBodyWrapper; import br.com.centralit.framework.json.Views; +import br.com.centralit.framework.model.Organizacao; /** @@ -40,6 +45,9 @@ public class EntradaItemController extends GenericController