From 1ca6364bc08ae1f22fdc946a6d295dec72b2f745 Mon Sep 17 00:00:00 2001 From: julio Date: Thu, 24 Aug 2017 01:41:17 +0000 Subject: [PATCH] fixes bug #9608 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@73018 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioFolioRmd.java | 28 ++--------- .../templates/RelatorioImpressaoRmd.jasper | Bin 32617 -> 32779 bytes .../templates/RelatorioImpressaoRmd.jrxml | 46 +++++++++--------- .../templates/RelatorioImpressaoRmdBpr.jasper | Bin 33324 -> 33320 bytes .../templates/RelatorioImpressaoRmdBpr.jrxml | 44 ++++++++--------- .../BusquedaImpressaoRMDController.java | 41 +++++++++++++--- .../impressaofiscal/busquedaImpressaoRMD.zul | 4 +- 7 files changed, 86 insertions(+), 77 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java index 673052d1b..80bb28c22 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java @@ -79,32 +79,10 @@ public class RelatorioFolioRmd extends Relatorio { } private String getSqlRMDReporte() { + StringBuilder sql = new StringBuilder(); - sql.append("select foliormd as foliormd, "); - sql.append(" 'IMPRESSO' as status, "); - sql.append(" coalesce(r4.datamov, to_char(b.fechorventa, 'yyyymmdd')) as fechorfolio, "); - sql.append(" e.nombempresa as empresa, "); - sql.append(" eo.cveestado as uf, "); - sql.append(" eo.nombestado as estado, "); - sql.append(" ai.docfiscal as doc, "); - sql.append(" case when b.tipoventa_id <> 3 then 'ECF' else 'BPR' end as tipo "); - sql.append("from boleto b "); - sql.append(" left join fiscal_r4 r4 on r4.boleto_id = b.boleto_id "); - sql.append(" inner join aidf ai on b.rmd_id = ai.aidf_id and ai.aidfesp_id = 3 "); - sql.append(" inner join marca m on b.marca_id = m.marca_id and ai.empresa_id = m.empresa_id "); - sql.append(" inner join empresa e on e.empresa_id = m.empresa_id "); - sql.append(" inner join parada po on po.parada_id = b.origen_id "); - sql.append(" inner join ciudad co on co.ciudad_id = po.ciudad_id and co.estado_id = ai.estado_id "); - sql.append(" join estado eo on eo.estado_id = co.estado_id "); - sql.append("where ai.empresa_id = :empresaId and ai.aidf_id = :rmdId and ai.estado_id = :estadoId "); - sql.append("group by foliormd, "); - sql.append("coalesce( r4.datamov, to_char(b.fechorventa, 'yyyymmdd')), e.nombempresa, eo.cveestado,eo.nombestado, "); - sql.append("ai.docfiscal, case when b.tipoventa_id <> 3 then 'ECF' else 'BPR' end "); - sql.append(" "); - sql.append("union "); - sql.append(" "); sql.append("select f.folio as foliormd, "); - sql.append(" case when f.indcancelacion = 1 then 'CANCELADO' else 'INATIVO' end as status, "); + sql.append(" case when f.indcancelacion = 1 then 'CANCELADO' else 'IMPRESSO' end as status, "); sql.append(" to_char(f.fechorfolio, 'yyyymmdd') as fechorfolio, "); sql.append(" e.nombempresa as empresa, "); sql.append(" eo.cveestado as uf, "); @@ -116,7 +94,7 @@ public class RelatorioFolioRmd extends Relatorio { sql.append("inner join empresa e on e.empresa_id = f.empresa_id "); sql.append("join estado eo on eo.estado_id = f.estado_id "); sql.append("where f.empresa_id = :empresaId and f.rmd_id = :rmdId and f.estado_id = :estadoId "); - sql.append(" "); + sql.append(" and f.indinactivo <> 1 and f.activo = 1 "); sql.append("order by foliormd "); return sql.toString(); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jasper index 97c12ca69fef3335912bcfa05185fbe5bfbc2f3f..0d89fda7593376d04f23b1a4fff150e220f61344 100644 GIT binary patch delta 4664 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml index ad0334b28..12f325723 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml @@ -1,6 +1,6 @@ - + @@ -43,49 +43,49 @@ - + - + - + - + - + - + - + @@ -100,70 +100,70 @@ - + - + - + - + - + - + - + - + - + - + @@ -174,35 +174,35 @@ - + - + - + - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jasper index 15bdd168c202d3d9ba270b5e5864d15edfdc8782..fc9c47fcb1ec6941dedaf8230439a0d062fc5b2a 100644 GIT binary patch delta 93 zcmZ3}!nC4=X+w}S4|hmrZfdb^P=0P=-sFYWqMOU5b)Cdajg1YAEltf0;>`>V4Gb*U j85kKEbS4+F%1q`mPg0nOqMM7Qb)5tZ3=B++4NMFS<1G!$ b42{h;Z-_Nk5k?m+VKAC($SyNks7VX}g!~v` diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml index f7e4a6312..4a932ff1f 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml @@ -43,49 +43,49 @@ - + - + - + - + - + - + - + @@ -100,7 +100,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -126,49 +126,49 @@ - + - + - + - + - + - + - + @@ -179,35 +179,35 @@ - + - + - + - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java index 604569238..a67875953 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java @@ -1,6 +1,7 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.impressaofiscal; import java.sql.SQLException; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -70,6 +71,7 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer { private Datebox datInicial; private Datebox datFinal; private MyTextbox folioInicial; + private MyTextbox folioFim; private MyComboboxEstandar cmbEmpresa; private MyComboboxEstandar cmbEstado; @@ -153,35 +155,48 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer { return; } - String folio = folioInicial.getValue(); - if (StringUtils.isBlank(folio)) { + String inicioRmd = folioInicial.getValue(); + if (StringUtils.isBlank(inicioRmd)) { Messagebox.show( Labels.getLabel("busquedaImpressaoRMDController.select.RMD"), Labels.getLabel("busquedaImpressaoRMDController.mnImpressaoRMD.label"), Messagebox.OK, Messagebox.INFORMATION); return; + } else if (!(isCancelarRmd || isInativarRmd) && !aidfService.vaidaRMDUtilizado(aidf.getAidfId(), empresa.getEmpresaId(), estado.getEstadoId(), inicioRmd)) { + Messagebox.show( + "Folio já utilizado.", + Labels.getLabel("busquedaImpressaoRMDController.mnImpressaoRMD.label"), + Messagebox.OK, Messagebox.INFORMATION); + return; } List list = null; if (!isCancelarRmd && !isInativarRmd && radBPR.isChecked()) { list = fiscalService.getRegistroImpressaoRMDTipoBPR(datInicial.getValue(), datFinal.getValue(), - empresa, estado, rmd, folio); + empresa, estado, rmd, inicioRmd); } else if (!isCancelarRmd && !isInativarRmd && radECF.isChecked()) { list = fiscalService.getRegistroImpressaoRMDTipoECF(datInicial.getValue(), datFinal.getValue(), - empresa, estado, rmd, folio); + empresa, estado, rmd, inicioRmd); } if (isExecutarRmd) - fiscalService.gravarRMDBoleto(list, aidf, folio); + fiscalService.gravarRMDBoleto(list, aidf, inicioRmd, empresa, estado, radECF.isChecked(), radBPR.isChecked()); + String fimRmd = folioFim == null ? null : folioFim.getValue(); if (isCancelarRmd || isInativarRmd) { - fiscalService.cancelarRMDBoleto(datInicial.getValue(), datFinal.getValue(), empresa, estado, aidf, folio, + + if (StringUtils.isBlank(fimRmd)) + fimRmd = inicioRmd; + + fiscalService.cancelarRMDBoleto(datInicial.getValue(), datFinal.getValue(), empresa, estado, aidf, inicioRmd, fimRmd, isCancelarRmd, isInativarRmd, radECF.isChecked(), radBPR.isChecked()); Messagebox.show( Labels.getLabel("busquedaImpressaoRMDController.cancel.msg"), Labels.getLabel("busquedaImpressaoRMDController.mnImpressaoRMD.label"), Messagebox.OK, Messagebox.INFORMATION); + + limparFiltro(); return; } @@ -203,6 +218,9 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer { Labels.getLabel("indexController.mnImpressaoRMD.label"), args, MODAL); } + if (isExecutarRmd) + limparFiltro(); + } catch (InterruptedException e) { log.error("", e); } catch (WrongValueException e) { @@ -256,6 +274,17 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer { executarImpressao(false, false, false, true); } + private void limparFiltro() { + folioInicial.setValue(null); + folioFim.setValue(null); + + cmbEmpresa.setSelectedItem(null); + cmbEstado.setSelectedItem(null); + cmbAidf.setSelectedItem(null); + + lsAidf = new ArrayList(); + } + public List getLsEmpresa() { return lsEmpresa; } diff --git a/web/gui/impressaofiscal/busquedaImpressaoRMD.zul b/web/gui/impressaofiscal/busquedaImpressaoRMD.zul index c419b9864..9a15aab40 100644 --- a/web/gui/impressaofiscal/busquedaImpressaoRMD.zul +++ b/web/gui/impressaofiscal/busquedaImpressaoRMD.zul @@ -73,11 +73,13 @@ label="Layout Novo" /> - +