diff --git a/citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/BemPatrimonialService.java b/citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/BemPatrimonialService.java index 3da9209..1902be8 100644 --- a/citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/BemPatrimonialService.java +++ b/citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/BemPatrimonialService.java @@ -904,5 +904,5 @@ public interface BemPatrimonialService extends GenericService buscaIdBensPorEntradaItem(Long entradaItemId); - void alterarStatusBemPatrimonialInventario(Dominio novoStatus, Long idBem); + void alterarStatusBemPatrimonialInventario(Dominio novoStatus, Long idBem, Long idInventarioBemPatrimonial); } diff --git a/citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/BemPatrimonialServiceImpl.java b/citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/BemPatrimonialServiceImpl.java index 5deeaee..0e8a7a9 100644 --- a/citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/BemPatrimonialServiceImpl.java +++ b/citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/BemPatrimonialServiceImpl.java @@ -2705,7 +2705,7 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl @RequestMapping(value = "/alterarStatusBemPatrimonialInventario", method = RequestMethod.GET, produces = "application/json") @ResponseBody - public Boolean alterarStatusBemPatrimonialInventario(@RequestParam(value = "idDominioStatusBem") Long idDominioStatusBem, @RequestParam(value = "idBemPatrimonial") Long idBemPatrimonial) { - this.bemPatrimonialService.alterarStatusBemPatrimonialInventario(this.dominioService.find(idDominioStatusBem), idBemPatrimonial); + public Boolean alterarStatusBemPatrimonialInventario(@RequestParam(value = "idDominioStatusBem") Long idDominioStatusBem, @RequestParam(value = "idBemPatrimonial") Long idBemPatrimonial, @RequestParam(value = "idInventarioBemPatrimonial") Long idInventarioBemPatrimonial) { + this.bemPatrimonialService.alterarStatusBemPatrimonialInventario(this.dominioService.find(idDominioStatusBem), idBemPatrimonial, idInventarioBemPatrimonial); return true; } diff --git a/citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/InventarioController.js b/citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/InventarioController.js index 338f894..2552a98 100644 --- a/citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/InventarioController.js +++ b/citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/InventarioController.js @@ -4197,7 +4197,7 @@ citApp.controller('InventarioController', ['$scope', '$filter', '$translate', '$ $scope.setLoadingSalva(true); var idBem = $scope.dadosBemPatrimonialSelecionado['bemPatrimonial.id'] ? $scope.dadosBemPatrimonialSelecionado['bemPatrimonial.id'] : $scope.dadosBemPatrimonialSelecionado.bemPatrimonial.id; // Salva a baixa - BemPatrimonialRepository.alterarStatusBemPatrimonialInventario(dominioStatusBem.id, idBem).then(function(result) { + BemPatrimonialRepository.alterarStatusBemPatrimonialInventario(dominioStatusBem.id, idBem, $scope.dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.id).then(function(result) { $timeout(function(){ // Salva a alteração do dominío inconsistência - Data tratamento DominioRepository.buscaDominioByCodigoAndChave(2, 'tipoTratamentoInconsistencia').then(function(result) { @@ -4207,12 +4207,17 @@ citApp.controller('InventarioController', ['$scope', '$filter', '$translate', '$ }); if($scope.executarAlteracaoStatusBemModalConfirm){ + $scope.dadosBemPatrimonialSelecionado.$showInconsistencias = false; $scope.$modalConfirmInstance.dismiss('cancel'); $scope.tratarInconsistenciasAutomaticamente(); } else { + $scope.dadosBemPatrimonialSelecionado.$showInconsistencias = false; $scope.$modalInstance.dismiss('cancel'); $scope.setLoading(false); } + $scope.scrollToCadastro('#atualizarMultiplosBensPatrimoniais'); + $scope.getBensPatrimoniaisEstruturaOrganizacional($scope.estruturaOrganizacional); + $scope.irParaFim(); }); }; diff --git a/citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/repository/BemPatrimonialRepository.js b/citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/repository/BemPatrimonialRepository.js index edcbffe..132902a 100644 --- a/citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/repository/BemPatrimonialRepository.js +++ b/citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/repository/BemPatrimonialRepository.js @@ -153,8 +153,8 @@ citApp.factory('BemPatrimonialRepository', ['RestangularPatrimonio', 'AbstractRe return restangularPatrimonio.one(this.route+"/veirificaTransferenciaMaisRecenteBemPatrimonial").get({"idBem": idBem}).then(); }; - this.alterarStatusBemPatrimonialInventario = function(idStatusBem, idBem) { - return restangularPatrimonio.one(this.route+"/alterarStatusBemPatrimonialInventario").get({"idDominioStatusBem": idStatusBem , "idBemPatrimonial": idBem}).then(); + this.alterarStatusBemPatrimonialInventario = function(idStatusBem, idBem, idInventarioBemPatrimonial) { + return restangularPatrimonio.one(this.route+"/alterarStatusBemPatrimonialInventario").get({"idDominioStatusBem": idStatusBem , "idBemPatrimonial": idBem, "idInventarioBemPatrimonial": idInventarioBemPatrimonial}).then(); }; } -- libgit2 0.21.2