From f9feeab65c36dc41cdfa3e241f6a0d242a3b0f06 Mon Sep 17 00:00:00 2001 From: julio Date: Tue, 16 May 2017 20:44:17 +0000 Subject: [PATCH] bug #8977 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@68912 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../templates/RelatorioImpressaoRMD.jasper | Bin 30457 -> 31087 bytes .../templates/RelatorioImpressaoRMD.jrxml | 79 +++++++++--------- .../BusquedaImpressaoRMDController.java | 25 ++++-- web/WEB-INF/i3-label_pt_BR.label | 2 + .../impressaofiscal/busquedaImpressaoRMD.zul | 11 +++ 5 files changed, 70 insertions(+), 47 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRMD.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRMD.jasper index 6a54cd2fdc8039ad2aadd3b773f67f3ef9b0e52c..3e65321a63a10632a70963ccba60e7f7e16d89ab 100644 GIT binary patch delta 10220 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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 98bdf58cb..94907804b 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 @@ - - + + @@ -19,6 +19,7 @@ + @@ -75,14 +76,14 @@ - + - + - + @@ -91,80 +92,80 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -174,39 +175,39 @@ - + - + - + - + - + - + - + - + - + - + - + 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 11d3dc9da..533792ad1 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 @@ -35,6 +35,7 @@ import com.rjconsultores.ventaboletos.service.FiscalService; import com.rjconsultores.ventaboletos.utilerias.impressaormd.vo.ImpressaoRMD; import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; @Controller("busquedaImpressaoRMDController") @Scope("prototype") @@ -64,6 +65,8 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer { private Datebox datInicial; private Datebox datFinal; + + private MyTextbox folioInicial; private MyComboboxEstandar cmbEmpresa; private MyComboboxEstandar cmbEstado; @@ -100,10 +103,7 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer { public void render(Comboitem item, Object data) { if (data instanceof Aidf) { Aidf aidf = (Aidf) data; - String label = (aidf.getAidfId() == null ? "" : aidf.getAidfId().toString() + " - ") + - aidf.getSerie() + - (aidf.getSubserie() == null ? "" : "-" + aidf.getSubserie()); - item.setLabel(label); + item.setLabel(aidf.getDocfiscal()); } else { item.setLabel(Objects.toString(data)); } @@ -128,12 +128,11 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer { String rmd = null; if (aidf != null) { - rmd = aidf.getSerie() + (aidf.getSubserie() == null ? "" : "-" + aidf.getSubserie()); + rmd = aidf.getDocfiscal(); respAidf = Messagebox.show( Labels.getLabel("busquedaImpressaoRMDController.MSG.gravarRMDPergunta"), Labels.getLabel("busquedaImpressaoRMDController.mnImpressaoRMD.label"), Messagebox.YES | Messagebox.NO, Messagebox.QUESTION); - // closeWindow(); } else { @@ -141,16 +140,26 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer { Labels.getLabel("busquedaImpressaoRMDController.mnImpressaoRMD.label"), Messagebox.OK, Messagebox.INFORMATION); } + + + String folio = folioInicial.getValue(); + if (folio == null) { + respAidf = Messagebox.show( + Labels.getLabel("busquedaImpressaoRMDController.select.RMD"), + Labels.getLabel("busquedaImpressaoRMDController.mnImpressaoRMD.label"), + Messagebox.OK, Messagebox.INFORMATION); + return; + } List list = null; if (radBPR.isChecked()) { list = fiscalService.getRegistroImpressaoRMDTipoDVB(dataSourceRead.getConnection(), - datInicial.getValue(), datFinal.getValue(), empresa, estado, rmd); + datInicial.getValue(), datFinal.getValue(), empresa, estado, rmd, folio); } else { list = fiscalService.getRegistroImpressaoRMDTipoECF(dataSourceRead.getConnection(), - datInicial.getValue(), datFinal.getValue(), empresa, estado, rmd); + datInicial.getValue(), datFinal.getValue(), empresa, estado, rmd, folio); } if (respAidf == Messagebox.YES) { diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index de8dae058..f5b394b2b 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -530,6 +530,8 @@ busquedaImpressaoRMDController.labelRadio.radBPR = BPR busquedaImpressaoRMDController.labelRadio.radECF = ECF busquedaImpressaoRMDController.select.RMD = É necessario selecionar um RMD busquedaImpressaoRMDController.MSG.gravarRMDPergunta = Deseja gravar nos registros de vendas, o vínculo com o numero de RMD selecionado? +busquedaImpressaoRMDController.labelfolio.RMD = Nº Controle de Formulário: +busquedaImpressaoRMDController.labelfolio.RMD.fim = Até #Devolução de Bilhetes relatorioDevolucaoBilhetesAgenciaController.window.title = Relatório de Devolução de Bilhetes diff --git a/web/gui/impressaofiscal/busquedaImpressaoRMD.zul b/web/gui/impressaofiscal/busquedaImpressaoRMD.zul index d86ae5318..acd9dbd83 100644 --- a/web/gui/impressaofiscal/busquedaImpressaoRMD.zul +++ b/web/gui/impressaofiscal/busquedaImpressaoRMD.zul @@ -70,6 +70,17 @@ label="${c:l('busquedaImpressaoRMDController.labelRadio.radECF')}" /> + + + +