Download as
Browse Code »

Commit e2b9ab3482a4db1c1f59673188a1a0c99e356f66

Authored by erick.sato
1 parent c3d6deb9
Exists in master

[Redmine Atendimento #4827]Valida remoção material local estoque

Showing 2 changed files with 20 additions and 4 deletions   Show diff stats
cit-adm-materiais-api/src/main/resources/scripts-bd/postgres/v1.15.0/01-cit-adm-materiais-v1.15.0-postgres.sql
  Diff comments   View file @e2b9ab3
... ... @@ -1676,4 +1676,9 @@ ALTER TABLE alm_ee_transferencia DROP CONSTRAINT fk_tou1v0a8mfd68auhh7imc6vw6;
1676 1676  
1677 1677 -- GEOVANE INICIO 13/05/2016
1678 1678 ALTER TABLE alm_me_fifoitem_aud ADD COLUMN entradaitem_id bigint;
1679   --- GEOVANE FIM 13/05/2016
1680 1679 \ No newline at end of file
  1680 +-- GEOVANE FIM 13/05/2016
  1681 +
  1682 +-- ERICK INICIO 12/05/2016
  1683 +
  1684 +ALTER TABLE alm_ee_transferencia DROP CONSTRAINT uk_tou1v0a8mfd68auhh7imc6vw6;
  1685 +-- ERICK FIM 12/05/2016
... ...
cit-adm-materiais-web/src/main/webapp/assets/js/angular/custom/controller/MaterialController.js
  Diff comments   View file @e2b9ab3
... ... @@ -749,10 +749,21 @@ citApp.controller('MaterialController', ['$scope', 'MaterialRepository', 'Classi
749 749 $scope.$modalConfirmInstance.dismiss('cancel');
750 750 return;
751 751 }
752   - $scope.MaterialLocalEstoqueRepository.remove($scope.matEndEstoqueCheck).then(function(result) {
753   - $scope.listaLocaisEstoqueMaterial();
754   - $scope.setLoading(false);
  752 +
  753 + $scope.MaterialLocalEstoqueRepository.get($scope.matEndEstoqueCheck.id).then(function(result) {
  754 + if(result.quantidade > 0){
  755 + $scope.showAlert("warning", $translate.instant('ADMINISTRACAODEMATERIAIS.MSG.REMOVER_LOCAL_ESTOQUE_MATERIAL_VINCULADO_ENTRADA_ALMOX_ITEM'));
  756 + $scope.setLoading(false);
  757 + $scope.$modalConfirmInstance.dismiss('cancel');
  758 + return;
  759 + }
  760 +
  761 + $scope.MaterialLocalEstoqueRepository.remove($scope.matEndEstoqueCheck).then(function(result) {
  762 + $scope.listaLocaisEstoqueMaterial();
  763 + $scope.setLoading(false);
  764 + });
755 765 });
  766 +
756 767 });
757 768  
758 769 $scope.$modalConfirmInstance.dismiss('cancel');
... ...