diff --git a/cit-almoxarifado-web/src/main/resources/reports/entradaAlmoxarifado.jrxml b/cit-almoxarifado-web/src/main/resources/reports/entradaAlmoxarifado.jrxml index a293afa..f6f9308 100644 --- a/cit-almoxarifado-web/src/main/resources/reports/entradaAlmoxarifado.jrxml +++ b/cit-almoxarifado-web/src/main/resources/reports/entradaAlmoxarifado.jrxml @@ -1,4 +1,6 @@ + + @@ -74,11 +76,11 @@ FROM entradaalmoxarifado ea eai.quantidade as quantidade, eai.valorunitario as valorUnitario, eai.valortotal as valorTotal -FROM entradaalmoxarifado ea +FROM alm_entrada ea INNER JOIN dominio d ON d.id = ea.dominiotipoentrada_id INNER JOIN parceiro parceiro ON parceiro.id = ea.fornecedor_id INNER JOIN pessoa p ON p.id = parceiro.pessoa_id - INNER JOIN entradaalmoxarifadoitem eai ON eai.entrada_id = ea.id + INNER JOIN alm_en_entradaitem eai ON eai.entrada_id = ea.id INNER JOIN material m ON m.id = eai.material_id AND $X{IN,m.id,idsMateriais} WHERE ea.almoxarifado_id = $P{idAlmoxarifado} AND ea.datarecebimento BETWEEN (TO_TIMESTAMP($P{dataInicio},'YYYY-MM-DD HH24:MI:SS')::timestamp without time zone) AND (TO_TIMESTAMP($P{dataFim},'YYYY-MM-DD HH24:MI:SS')::timestamp without time zone) 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 41d3653..398ac8c 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 @@ -202,6 +202,27 @@ citApp.controller('EntradaAlmoxarifadoController', ['$scope', '$filter', 'FileUp return result; }); }; + + $scope.dominioTipoRecebimentoListTemp = []; + $scope.alterarListaDominioTipoRecebimento = function(dominioTipoEntrada){ + if(dominioTipoEntrada){ + var codigo = dominioTipoEntrada.codigo; + + if(codigo === 1){ + $scope.dominioTipoRecebimentoListTemp = $scope.dominiosTipoRecebimentoOrcamentaria; + }else if(codigo === 2){ + $scope.dominioTipoRecebimentoListTemp = $scope.dominiosTipoRecebimentoExtraOrcamentaria; + }else{ + $scope.dominioTipoRecebimentoListTemp = []; + } + }else{ + $scope.dominioTipoRecebimentoListTemp = []; + } + + if($scope.relatorioEntradaAlmoxarifado && $scope.relatorioEntradaAlmoxarifado.dominioTipoRecebimento){ + delete $scope.relatorioEntradaAlmoxarifado.dominioTipoRecebimento; + } + } $scope.carregarItensMaterial = function(item){ diff --git a/cit-almoxarifado-web/src/main/webapp/html/entradaAlmoxarifado/relatorioEntradaAlmoxarifado.html b/cit-almoxarifado-web/src/main/webapp/html/entradaAlmoxarifado/relatorioEntradaAlmoxarifado.html index 369ef9f..3b79b03 100644 --- a/cit-almoxarifado-web/src/main/webapp/html/entradaAlmoxarifado/relatorioEntradaAlmoxarifado.html +++ b/cit-almoxarifado-web/src/main/webapp/html/entradaAlmoxarifado/relatorioEntradaAlmoxarifado.html @@ -67,7 +67,7 @@
@@ -75,7 +75,7 @@
-- libgit2 0.21.2