From 18f7e4fa35d524da0318c369354d2c14cc014a6d Mon Sep 17 00:00:00 2001 From: geovane.filho Date: Wed, 25 May 2016 09:32:38 -0300 Subject: [PATCH] Redmine #4922 Correções no salvamento de entrada de materiais --- cit-almoxarifado-api/src/main/java/br/com/centralit/api/service/impl/MovimentoEstoqueServiceImpl.java | 6 ++++-- cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/EntradaAlmoxarifadoController.js | 10 ++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) 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 bbb7bbd..c94759d 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 @@ -681,8 +681,10 @@ public class MovimentoEstoqueServiceImpl extends GenericServiceImpl findAllByEntradaItem(EntradaAlmoxarifadoItem entradaAlmoxarifadoItem) { Dominio classeReferenciaEntradaItem = this.dominioService.findByChaveAndCodigo(DominioMaterial.CLASSE_REFERENCIA, DominioMaterial.REFERENCIA_ENTRADA_ALMOXARIFADO_ITEM); - - return this.findAllByClasseReferencia(classeReferenciaEntradaItem, entradaAlmoxarifadoItem.getId()); + if(entradaAlmoxarifadoItem.getId() != null){ + return this.findAllByClasseReferencia(classeReferenciaEntradaItem, entradaAlmoxarifadoItem.getId()); + } + return new ArrayList(); } } diff --git a/cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/EntradaAlmoxarifadoController.js b/cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/EntradaAlmoxarifadoController.js index b42d97b..2a7bfc9 100644 --- a/cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/EntradaAlmoxarifadoController.js +++ b/cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/EntradaAlmoxarifadoController.js @@ -1250,6 +1250,16 @@ citApp.controller('EntradaAlmoxarifadoController', ['$scope', '$filter', 'FileUp ++count; } }); + } else { + tempMateriais.forEach(function(item){ + if(materialCarac.caracteristica.chaveDominio === item.caracteristica.chaveDominio) { + $scope.entradaItem.caracteristicas.push({ + materialCaracteristica: angular.copy(item), + listaDominios: [] + }); + ++count; + } + }); } if(count === limiteArray) { -- libgit2 0.21.2