diff --git a/citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/TransferenciaServiceImpl.java b/citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/TransferenciaServiceImpl.java index be947e4..d5f586c 100644 --- a/citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/TransferenciaServiceImpl.java +++ b/citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/TransferenciaServiceImpl.java @@ -201,47 +201,23 @@ public class TransferenciaServiceImpl extends GenericServiceImpl(); transferenciaItemListTemp.add(transferenciaItem); } } - if(UtilObjeto.isReferencia(transferencia.getId())){ - List transferenciaItemList = new ArrayList(); - List transferenciaItensSalvos = this.transferenciaItemService.buscarTransferenciaItens(transferencia.getId()); - boolean itemNovo = true; - for (TransferenciaItem transferenciaItem : transferenciaItemListTemp) { - itemNovo = true; - for (TransferenciaItem transferenciaItemSalvo : transferenciaItensSalvos) { - if(transferenciaItem.getBemPatrimonial().getId() == transferenciaItemSalvo.getBemPatrimonial().getId()){ - transferenciaItemList.add(transferenciaItemSalvo); - itemNovo = false; - break; - } - } - if(itemNovo){ - transferenciaItem.setTransferencia(transferencia); - transferenciaItemList.add(transferenciaItem); - - } - } - transferencia.setSaidaTemporariaItens(transferenciaItemList); - }else{ - for (TransferenciaItem transferenciaItem : transferenciaItemListTemp) { - transferenciaItem.setTransferencia(transferencia); - } - transferencia.setSaidaTemporariaItens(transferenciaItemListTemp); + for (TransferenciaItem transferenciaItem : transferenciaItemListTemp) { + transferenciaItem.setTransferencia(transferencia); } - if(transferencia.getObservacoes() != null){ for (TransferenciaObservacao trataObs : transferencia.getObservacoes()) { trataObs.setTransferencia(transferencia); @@ -252,18 +228,13 @@ public class TransferenciaServiceImpl extends GenericServiceImpl transferenciaItemListTemp) { @@ -799,12 +770,12 @@ public class TransferenciaServiceImpl extends GenericServiceImpl internacionalizacaoList) { diff --git a/citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/TransferenciaController.js b/citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/TransferenciaController.js index 37089c2..0041cc9 100644 --- a/citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/TransferenciaController.js +++ b/citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/TransferenciaController.js @@ -467,12 +467,17 @@ citApp.controller('TransferenciaController', ['$scope', '$filter', '$timeout', ' $scope.permiteExcluirItem = function() { var deferred = $q.defer(); - if($scope.listaBemPatrimonialTemp.length == 1 && $scope.transferencia.id){ - $scope.showAlert("error", $translate.instant("PATRIMONIO.VALIDACAO.REMOVER_ULTIMO_ITEM_TRASNFERENCIA")); - deferred.resolve(false); - }else{ - deferred.resolve(true); - } + if($scope.listaBemPatrimonialTemp.length == $scope.listaItensSelecionados.length){ + $scope.showAlert("error", $translate.instant("PATRIMONIO.VALIDACAO.REMOVER_TODOS_ITEM_TRASNFERENCIA")); + deferred.resolve(false); + }else{ + if($scope.listaBemPatrimonialTemp.length == 1 && $scope.transferencia.id){ + $scope.showAlert("error", $translate.instant("PATRIMONIO.VALIDACAO.REMOVER_ULTIMO_ITEM_TRASNFERENCIA")); + deferred.resolve(false); + }else{ + deferred.resolve(true); + } + } return deferred.promise; } diff --git a/citgrp-patrimonio-web/src/main/webapp/html/transferencia/transferenciaEdit.html b/citgrp-patrimonio-web/src/main/webapp/html/transferencia/transferenciaEdit.html index 3de7f6e..8c56ef0 100644 --- a/citgrp-patrimonio-web/src/main/webapp/html/transferencia/transferenciaEdit.html +++ b/citgrp-patrimonio-web/src/main/webapp/html/transferencia/transferenciaEdit.html @@ -104,7 +104,7 @@ - + -- libgit2 0.21.2