Download as
Browse Code »

Commit 18f7e4fa35d524da0318c369354d2c14cc014a6d

Authored by geovane.filho
1 parent 3b481d19
Exists in master

Redmine #4922 Correções no salvamento de entrada de materiais

Showing 2 changed files with 14 additions and 2 deletions   Show diff stats
cit-almoxarifado-api/src/main/java/br/com/centralit/api/service/impl/MovimentoEstoqueServiceImpl.java
  Diff comments   View file @18f7e4f
... ... @@ -681,8 +681,10 @@ public class MovimentoEstoqueServiceImpl extends GenericServiceImpl<MovimentoEst
681 681 @Override
682 682 public Collection<MovimentoEstoque> findAllByEntradaItem(EntradaAlmoxarifadoItem entradaAlmoxarifadoItem) {
683 683 Dominio classeReferenciaEntradaItem = this.dominioService.findByChaveAndCodigo(DominioMaterial.CLASSE_REFERENCIA, DominioMaterial.REFERENCIA_ENTRADA_ALMOXARIFADO_ITEM);
684   -
685   - return this.findAllByClasseReferencia(classeReferenciaEntradaItem, entradaAlmoxarifadoItem.getId());
  684 + if(entradaAlmoxarifadoItem.getId() != null){
  685 + return this.findAllByClasseReferencia(classeReferenciaEntradaItem, entradaAlmoxarifadoItem.getId());
  686 + }
  687 + return new ArrayList<MovimentoEstoque>();
686 688 }
687 689  
688 690 }
... ...
cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/EntradaAlmoxarifadoController.js
  Diff comments   View file @18f7e4f
... ... @@ -1250,6 +1250,16 @@ citApp.controller(&#39;EntradaAlmoxarifadoController&#39;, [&#39;$scope&#39;, &#39;$filter&#39;, &#39;FileUp
1250 1250 ++count;
1251 1251 }
1252 1252 });
  1253 + } else {
  1254 + tempMateriais.forEach(function(item){
  1255 + if(materialCarac.caracteristica.chaveDominio === item.caracteristica.chaveDominio) {
  1256 + $scope.entradaItem.caracteristicas.push({
  1257 + materialCaracteristica: angular.copy(item),
  1258 + listaDominios: []
  1259 + });
  1260 + ++count;
  1261 + }
  1262 + });
1253 1263 }
1254 1264  
1255 1265 if(count === limiteArray) {
... ...