Commit 6acd502c853da3ce445e2e6af9328d9cb8b9c931
Exists in
master
Merge branch 'tarefa-3943' of http://ferramentasgo.centralit.com.br:8080/scm/git…
…/cit-grp-almoxarifado into tarefa-3943
Showing
1 changed file
with
12 additions
and
3 deletions
Show diff stats
cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/EntradaAlmoxarifadoController.js
... | ... | @@ -1083,9 +1083,18 @@ citApp.controller('EntradaAlmoxarifadoController', ['$scope', '$filter', 'FileUp |
1083 | 1083 | |
1084 | 1084 | function buscaCaracteristicas(){ |
1085 | 1085 | if($scope.entradaItem.caracteristicas){ |
1086 | - $scope.setLoadingGet(true); | |
1087 | - $scope.caracteristicasGenericas = $scope.entradaItem.caracteristicas; | |
1088 | - abrirModalCaracteristicas(); | |
1086 | + $scope.carregarCaracteristicasGenericasMaterial($scope.entradaItem.material).then(function(){ | |
1087 | + $scope.setLoadingGet(true); | |
1088 | + angular.forEach($scope.caracteristicasGenericas, function(caracteristicaGenerica){ | |
1089 | + angular.forEach($scope.entradaItem.caracteristicas, function(caracteristicaSalva){ | |
1090 | + if(caracteristicaGenerica.materialCaracteristica.id == caracteristicaSalva.materialCaracteristica.id){ | |
1091 | + caracteristicaGenerica.valorCaracteristica = caracteristicaSalva.valorCaracteristica; | |
1092 | + } | |
1093 | + }); | |
1094 | + }); | |
1095 | + | |
1096 | + abrirModalCaracteristicas(); | |
1097 | + }); | |
1089 | 1098 | }else{ |
1090 | 1099 | $scope.carregarCaracteristicasGenericasMaterial($scope.entradaItem.material).then(function(){ |
1091 | 1100 | $scope.setLoadingGet(true); | ... | ... |