diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRMD.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRMD.jasper index 6a54cd2fd..3e65321a6 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRMD.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRMD.jasper differ 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')}" /> + + + +