diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioImpressaoRMD.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioImpressaoRmd.java similarity index 82% rename from src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioImpressaoRMD.java rename to src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioImpressaoRmd.java index eeef0e547..cbc37190d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioImpressaoRMD.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioImpressaoRmd.java @@ -9,10 +9,10 @@ import com.rjconsultores.ventaboletos.utilerias.impressaormd.vo.ImpressaoRMD; import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; -public class RelatorioImpressaoRMD extends Relatorio { +public class RelatorioImpressaoRmd extends Relatorio { @SuppressWarnings("unchecked") - public RelatorioImpressaoRMD(final Map parametros, Connection conexao) throws Exception { + public RelatorioImpressaoRmd(final Map parametros, Connection conexao) throws Exception { super(parametros, conexao); List list = (List) parametros.get("list"); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioImpressaoRmdBpr.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioImpressaoRmdBpr.java new file mode 100644 index 000000000..d0aa544c0 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioImpressaoRmdBpr.java @@ -0,0 +1,27 @@ +package com.rjconsultores.ventaboletos.relatorios.impl; + +import java.sql.Connection; +import java.util.List; +import java.util.Map; + +import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.utilerias.impressaormd.vo.ImpressaoRMD; + +import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; + +public class RelatorioImpressaoRmdBpr extends Relatorio { + + @SuppressWarnings("unchecked") + public RelatorioImpressaoRmdBpr(final Map parametros, Connection conexao) throws Exception { + super(parametros, conexao); + + List list = (List) parametros.get("list"); + + this.setCollectionDataSource(new JRBeanCollectionDataSource(list)); + } + + @Override + protected void processaParametros() throws Exception { + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioImpressaoRMD_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioImpressaoRmdBpr_es.properties similarity index 100% rename from src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioImpressaoRMD_es.properties rename to src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioImpressaoRmdBpr_es.properties diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioImpressaoRMD_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioImpressaoRmdBpr_pt_BR.properties similarity index 100% rename from src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioImpressaoRMD_pt_BR.properties rename to src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioImpressaoRmdBpr_pt_BR.properties diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioImpressaoRmd_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioImpressaoRmd_es.properties new file mode 100644 index 000000000..99c440382 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioImpressaoRmd_es.properties @@ -0,0 +1,2 @@ +#geral +msg.noData=No se pudo obtener datos con los parámetros reportados. \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioImpressaoRmd_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioImpressaoRmd_pt_BR.properties new file mode 100644 index 000000000..57daa3700 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioImpressaoRmd_pt_BR.properties @@ -0,0 +1,2 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jasper new file mode 100644 index 000000000..7a75d12c7 Binary files /dev/null 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 new file mode 100644 index 000000000..09789c638 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml @@ -0,0 +1,222 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band splitType="Stretch"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jasper new file mode 100644 index 000000000..8e90bbc83 Binary files /dev/null and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml new file mode 100644 index 000000000..e32def3bd --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band splitType="Stretch"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 4553399cd..dbb2ae0a6 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 @@ -18,6 +18,7 @@ import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.WrongValueException; import org.zkoss.zk.ui.event.Event; import org.zkoss.zkplus.databind.BindingListModelList; +import org.zkoss.zul.Checkbox; import org.zkoss.zul.Comboitem; import org.zkoss.zul.ComboitemRenderer; import org.zkoss.zul.Datebox; @@ -26,7 +27,8 @@ import org.zkoss.zul.Radio; import com.rjconsultores.ventaboletos.entidad.Aidf; import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.Estado; -import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioImpressaoRMD; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioImpressaoRmd; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioImpressaoRmdBpr; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.service.AidfService; import com.rjconsultores.ventaboletos.service.EmpresaService; @@ -72,6 +74,7 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer { private MyComboboxEstandar cmbAidf; private Radio radBPR; + private Checkbox tipoLayout; @Override public void doAfterCompose(Component comp) throws Exception { @@ -151,7 +154,7 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer { List list = null; if (radBPR.isChecked()) { - list = fiscalService.getRegistroImpressaoRMDTipoDVB(datInicial.getValue(), datFinal.getValue(), empresa, estado, rmd, folio); + list = fiscalService.getRegistroImpressaoRMDTipoBPR(datInicial.getValue(), datFinal.getValue(), empresa, estado, rmd, folio); } else { list = fiscalService.getRegistroImpressaoRMDTipoECF(datInicial.getValue(), datFinal.getValue(), empresa, estado, rmd, folio); } @@ -159,14 +162,26 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer { if (isExecutarRmd) fiscalService.gravarRMDBoleto(list, aidf, folio); - if (isCancelarRmd) + if (isCancelarRmd) { fiscalService.cancelarRMDBoleto(datInicial.getValue(), datFinal.getValue(), empresa, estado, aidf, folio); + Messagebox.show( + Labels.getLabel("busquedaImpressaoRMDController.cancel.msg"), + Labels.getLabel("busquedaImpressaoRMDController.mnImpressaoRMD.label"), + Messagebox.OK, Messagebox.INFORMATION); + return; + } + if (!isCancelarRmd) { Map parametros = new HashMap(); parametros.put("list", list); - Relatorio relatorio = new RelatorioImpressaoRMD(parametros, dataSourceRead.getConnection()); + Relatorio relatorio = null; + if (tipoLayout.isChecked()) { + relatorio = new RelatorioImpressaoRmd(parametros, dataSourceRead.getConnection()); + } else { + relatorio = new RelatorioImpressaoRmdBpr(parametros, dataSourceRead.getConnection()); + } Map args = new HashMap(); args.put("relatorio", relatorio); diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index b5f26e9ee..048951f98 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -6534,6 +6534,7 @@ busquedaImportacionFiscalController.btnExe.label = Executar Importação busquedaExportacaoFiscalController.btnView.label = Visualização busquedaExportacaoFiscalController.btnExe.label = Executar Exportação busquedaExportacaoFiscalController.btnCancel.label = Cancelar/Inativar +busquedaImpressaoRMDController.cancel.msg = O Cancelamento/Inativação do folio foi realizado com sucesso. editarRelgerencialEmpresaController.MSG.suscribirOK=Relatorio Gerencial gravado com sucesso! editarRelgerencialEmpresaController.window.title=Impressão Fiscal :: Editar Relatorio Gerencial diff --git a/web/gui/impressaofiscal/busquedaImpressaoRMD.zul b/web/gui/impressaofiscal/busquedaImpressaoRMD.zul index 71b623800..499ef8308 100644 --- a/web/gui/impressaofiscal/busquedaImpressaoRMD.zul +++ b/web/gui/impressaofiscal/busquedaImpressaoRMD.zul @@ -59,22 +59,21 @@ model="@{winBusquedaImpressaoRMD$composer.lsAidf}" /> - -