diff --git a/cit-almoxarifado-api/src/main/java/br/com/centralit/api/dao/RequisicaoConsumoDao.java b/cit-almoxarifado-api/src/main/java/br/com/centralit/api/dao/RequisicaoConsumoDao.java index dd8c7bb..3fcf122 100644 --- a/cit-almoxarifado-api/src/main/java/br/com/centralit/api/dao/RequisicaoConsumoDao.java +++ b/cit-almoxarifado-api/src/main/java/br/com/centralit/api/dao/RequisicaoConsumoDao.java @@ -9,7 +9,6 @@ import br.com.centralit.api.model.MaterialConsumo; import br.com.centralit.api.model.RequisicaoConsumo; import br.com.centralit.api.viewHelper.RequisicaoVH; import br.com.centralit.framework.dao.arquitetura.CitGenericDAO; -import br.com.centralit.framework.model.Dominio; /** *

diff --git a/cit-almoxarifado-api/src/main/java/br/com/centralit/api/dao/impl/RequisicaoConsumoDaoHibernate.java b/cit-almoxarifado-api/src/main/java/br/com/centralit/api/dao/impl/RequisicaoConsumoDaoHibernate.java index b06f27a..103860d 100644 --- a/cit-almoxarifado-api/src/main/java/br/com/centralit/api/dao/impl/RequisicaoConsumoDaoHibernate.java +++ b/cit-almoxarifado-api/src/main/java/br/com/centralit/api/dao/impl/RequisicaoConsumoDaoHibernate.java @@ -19,7 +19,6 @@ import br.com.centralit.api.model.RequisicaoConsumoItem; import br.com.centralit.api.viewHelper.RequisicaoVH; import br.com.centralit.framework.dao.arquitetura.CitGenericDAOImpl; import br.com.centralit.framework.dao.arquitetura.SearchSeven; -import br.com.centralit.framework.model.Dominio; import br.com.centralit.framework.util.UtilColecao; import br.com.centralit.framework.util.UtilObjeto; import br.com.centralit.framework.util.UtilString; diff --git a/cit-almoxarifado-web/src/main/java/br/com/centralit/controller/BeanRequisicaoSubReport.java b/cit-almoxarifado-web/src/main/java/br/com/centralit/controller/BeanRequisicaoSubReport.java index 5dbedff..5c23a8b 100644 --- a/cit-almoxarifado-web/src/main/java/br/com/centralit/controller/BeanRequisicaoSubReport.java +++ b/cit-almoxarifado-web/src/main/java/br/com/centralit/controller/BeanRequisicaoSubReport.java @@ -14,7 +14,9 @@ public class BeanRequisicaoSubReport { private String atendidaEm; private String cadEm; private String centroCustos; + private Boolean isAsterisco; private JRBeanCollectionDataSource materiais; + private JRBeanCollectionDataSource resumoContabil; public BeanRequisicaoSubReport(Object[] objArray) { this.numeroRequisicao = (String) objArray[0]; @@ -69,5 +71,22 @@ public class BeanRequisicaoSubReport { public void setMateriais(JRBeanCollectionDataSource materiais) { this.materiais = materiais; - } + } + + public Boolean getIsAsterisco() { + return isAsterisco; + } + + public void setIsAsterisco(Boolean isAsterisco) { + this.isAsterisco = isAsterisco; + } + + public JRBeanCollectionDataSource getResumoContabil() { + return resumoContabil; + } + + public void setResumoContabil(JRBeanCollectionDataSource resumoContabil) { + this.resumoContabil = resumoContabil; + } + } diff --git a/cit-almoxarifado-web/src/main/java/br/com/centralit/controller/ReportGuiaRemessaAtendimentoConsumoController.java b/cit-almoxarifado-web/src/main/java/br/com/centralit/controller/ReportGuiaRemessaAtendimentoConsumoController.java index 12e6d77..ea4f946 100644 --- a/cit-almoxarifado-web/src/main/java/br/com/centralit/controller/ReportGuiaRemessaAtendimentoConsumoController.java +++ b/cit-almoxarifado-web/src/main/java/br/com/centralit/controller/ReportGuiaRemessaAtendimentoConsumoController.java @@ -122,15 +122,14 @@ public class ReportGuiaRemessaAtendimentoConsumoController extends GenericContro */ @RequestMapping(method = RequestMethod.GET, value = "/imprimirRelatorio") @ResponseBody - public void gerarPdfConsumoPorPeriodo(@RequestParam(value = "idsRequisicao", required = false) Long requisicaoId, + public void gerarPdfConsumoPorPeriodo(@RequestParam(value = "requisicaoIds", required = false) Long[] requisicaoIds, @RequestParam(value = "download") boolean download, HttpServletResponse response) throws SQLException, JRException, IOException { - + ByteArrayOutputStream baos = null; InputStream input = null; InputStream inputSub = null; try { is_FIFO = configuracaoParametroSistemaService.getParametro("TIPO_AVALIACAO_MONETARIA_ESTOQUE").getValor().equals(FIFO); - final boolean isFinalizada = requisicaoConsumoService.findtipoStatusRequisicaoPorMaterial(requisicaoId).equals("FINALIZADA"); Usuario usuarioLogado = (Usuario) usuarioService.find(((Usuario) SecurityContextHolder.getContext().getAuthentication().getPrincipal() ).getId()); Long organizacaoId = usuarioLogado.getOrganizacao().getId(); @@ -145,7 +144,6 @@ public class ReportGuiaRemessaAtendimentoConsumoController extends GenericContro JasperReport jasperReportSub = JasperCompileManager.compileReport(jasperDesignSub); Map parameters = new HashMap(); - Map parametersSubReport = new HashMap(); parameters.put("TITULO", titulo); parameters.put("SUBREPORT_DIR", jasperReportSub); @@ -158,23 +156,23 @@ public class ReportGuiaRemessaAtendimentoConsumoController extends GenericContro List beanReqSubList = new ArrayList(); - BeanRequisicaoSubReport beanSubReport = new BeanRequisicaoSubReport(requisicaoConsumoService.getRequisicaoForReport(requisicaoId)); - beanSubReport.setMateriais(getMateriais(requisicaoId)); - beanReqSubList.add(beanSubReport); + for(Long reqId : requisicaoIds){ + boolean isFinalizada = requisicaoConsumoService.findtipoStatusRequisicaoPorMaterial(reqId).equals("FINALIZADA"); + + BeanRequisicaoSubReport beanSubReport = new BeanRequisicaoSubReport(requisicaoConsumoService.getRequisicaoForReport(reqId)); + beanSubReport.setMateriais(getMateriais(reqId)); + if(isFinalizada) + beanSubReport.setResumoContabil(getResumoContabil(reqId)); + + beanSubReport.setIsAsterisco(!isFinalizada); + + beanReqSubList.add(beanSubReport); + } parameters.put("BEAN_SUB_REPORT",new JRBeanCollectionDataSource(beanReqSubList)); - if(isFinalizada) - parametersSubReport.put("REQ_CONSUMO", getResumoContabil(requisicaoId)); - - parametersSubReport.put("is_asterisco",!isFinalizada); - - parameters.put("SUBREPORT_PARAMETERS_MAP",parametersSubReport); - - List beans = new ArrayList(); beans.add(bean); - JasperPrint jasperPrint = JasperFillManager.fillReport(jasperReport, parameters, new JRBeanCollectionDataSource(beans)); // Responsavel por verificar a presenca de dados no relatorio diff --git a/cit-almoxarifado-web/src/main/resources/reports/guiaRemessaAtendimentoConsumoMaterial.jrxml b/cit-almoxarifado-web/src/main/resources/reports/guiaRemessaAtendimentoConsumoMaterial.jrxml index f266b50..129b3ca 100644 --- a/cit-almoxarifado-web/src/main/resources/reports/guiaRemessaAtendimentoConsumoMaterial.jrxml +++ b/cit-almoxarifado-web/src/main/resources/reports/guiaRemessaAtendimentoConsumoMaterial.jrxml @@ -75,7 +75,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -98,8 +98,6 @@ - - @@ -113,11 +111,13 @@ + + - + @@ -125,7 +125,7 @@ - + @@ -320,7 +320,7 @@ - + @@ -340,7 +340,7 @@ - + @@ -363,7 +363,7 @@ - + @@ -507,11 +507,11 @@ - + - - + + @@ -593,7 +593,7 @@ - + diff --git a/cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/AtendimentoRequisicaoConsumoListController.js b/cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/AtendimentoRequisicaoConsumoListController.js index 0339ca6..446181c 100644 --- a/cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/AtendimentoRequisicaoConsumoListController.js +++ b/cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/AtendimentoRequisicaoConsumoListController.js @@ -87,5 +87,27 @@ citApp.controller('AtendimentoRequisicaoConsumoListController', ['$scope', 'Aten $scope.iniciarAtendimento = function(){ angular.element('#editAtendimentoRequisicaoConsumo').scope().prepararAtendimentoRequisicoes($scope.listaSelecionados); }; + + //METODO REFERENTE AO RELATORIO + $scope.gerar = function() { + + if($scope.listaSelecionados.length == 0 || $scope.listaSelecionados.length > 1) + $scope.showAlert("warning", $translate.instant("MSG.SELECIONE_UM_ITEM_PARA_RELATORIO") + " ", false ); + else{ + var ids = ''; + for(var i=0 ; i < $scope.listaSelecionados.length ; i++){ + ids += $scope.listaSelecionados[i].id; + if(i < ($scope.listaSelecionados.length -1)) + ids +=','; + } + + + ids = ids.split(','); + + $scope.url = '/cit-almoxarifado-web/rest/guiaRemessa/imprimirRelatorio?requisicaoIds='+ ids; + + $scope.visualizarRelatorio($scope.url, $translate.instant("ALMOXARIFADO.LABEL.RELATORIO_GUIA_REMESSA")); + } + }; }]); \ No newline at end of file diff --git a/cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/RequisicaoConsumoListController.js b/cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/RequisicaoConsumoListController.js index 74edcb7..2be90da 100644 --- a/cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/RequisicaoConsumoListController.js +++ b/cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/RequisicaoConsumoListController.js @@ -84,17 +84,17 @@ citApp.controller('RequisicaoConsumoListController', ['$scope', 'RequisicaoConsu //METODO REFERENTE AO RELATORIO $scope.gerar = function() { - if(!$scope.requisicaoConsumoChecked){ + if(!$scope.requisicaoConsumoChecked){ - $scope.showAlert("warning", $translate.instant("MSG.SELECIONE_UM_ITEM_PARA_RELATORIO") + " ", false ); + $scope.showAlert("warning", $translate.instant("MSG.SELECIONE_UM_ITEM_PARA_RELATORIO") + " ", false ); - } else{ + } else{ + + $scope.url = '/cit-almoxarifado-web/rest/guiaRemessa/imprimirRelatorio?requisicaoIds='+ $scope.requisicaoConsumoChecked.id; - $scope.url = '/cit-almoxarifado-web/rest/guiaRemessa/imprimirRelatorio?idsRequisicao='+ $scope.requisicaoConsumoChecked.id; + $scope.visualizarRelatorio($scope.url, $translate.instant("ALMOXARIFADO.LABEL.RELATORIO_GUIA_REMESSA")); - $scope.visualizarRelatorio($scope.url, $translate.instant("ALMOXARIFADO.LABEL.RELATORIO_GUIA_REMESSA")); - - } + } }; }]); \ No newline at end of file diff --git a/cit-almoxarifado-web/src/main/webapp/html/atendimentoRequisicaoConsumo/atendimentoRequisicaoConsumoList.html b/cit-almoxarifado-web/src/main/webapp/html/atendimentoRequisicaoConsumo/atendimentoRequisicaoConsumoList.html index 5e1276c..7708800 100644 --- a/cit-almoxarifado-web/src/main/webapp/html/atendimentoRequisicaoConsumo/atendimentoRequisicaoConsumoList.html +++ b/cit-almoxarifado-web/src/main/webapp/html/atendimentoRequisicaoConsumo/atendimentoRequisicaoConsumoList.html @@ -8,6 +8,14 @@ ALMOXARIFADO.LABEL.INICIAR_ATENDIMENTO + + -