diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRMD.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRMD.jasper index 21c786082..97394e7f0 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 2890abc43..15eef2366 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRMD.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRMD.jrxml @@ -1,7 +1,7 @@ - - + + @@ -39,131 +39,131 @@ - <band height="102" splitType="Stretch"> + <band splitType="Stretch"/> + + + - + - + - + - + - + - + - + - - - - + - + - + - + - + - + - + - + - + - + - + @@ -175,37 +175,37 @@ - + - + - + - + - + - + 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 81339e8ea..45716b095 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 @@ -65,7 +65,7 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer { private Datebox datInicial; private Datebox datFinal; - + private MyTextbox folioInicial; private MyComboboxEstandar cmbEmpresa; @@ -112,43 +112,34 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer { }; cmbAidf.setItemRenderer(aidfRenderer); cmbAidf.setModel(new BindingListModelList(lsAidf, true)); - } @SuppressWarnings({ "rawtypes", "unchecked" }) - public void onClick$btnExecutar(Event ev) throws InterruptedException { + private void executarImpressao(boolean isView, boolean isExecutarRmd, boolean isCancelarRmd) throws InterruptedException { + Empresa empresa = cmbEmpresa.getSelectedItem() == null ? null : (Empresa) cmbEmpresa.getSelectedItem().getValue(); Estado estado = cmbEstado.getSelectedItem() == null ? null : (Estado) cmbEstado.getSelectedItem().getValue(); Aidf aidf = cmbAidf.getSelectedItem() == null ? null : (Aidf) cmbAidf.getSelectedItem().getValue(); - int respAidf = Messagebox.NO; - if (empresa != null && estado != null) { try { String rmd = null; if (aidf != null) { - rmd = aidf.getDocfiscal(); - respAidf = Messagebox.show( - Labels.getLabel("busquedaImpressaoRMDController.MSG.gravarRMDPergunta"), - Labels.getLabel("busquedaImpressaoRMDController.mnImpressaoRMD.label"), - Messagebox.YES | Messagebox.NO, Messagebox.QUESTION); - // closeWindow(); - } else { Messagebox.show(Labels.getLabel("busquedaImpressaoRMDController.select.RMD"), Labels.getLabel("busquedaImpressaoRMDController.mnImpressaoRMD.label"), Messagebox.OK, Messagebox.INFORMATION); + return; } - - + String folio = folioInicial.getValue(); if (folio == null) { - respAidf = Messagebox.show( + Messagebox.show( Labels.getLabel("busquedaImpressaoRMDController.select.RMD"), Labels.getLabel("busquedaImpressaoRMDController.mnImpressaoRMD.label"), Messagebox.OK, Messagebox.INFORMATION); - return; + return; } List list = null; @@ -162,21 +153,25 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer { datInicial.getValue(), datFinal.getValue(), empresa, estado, rmd, folio); } - if (respAidf == Messagebox.YES) { - fiscalService.gravarRMDBoleto(dataSourceRead.getConnection(), list, aidf); + if (isExecutarRmd) + fiscalService.gravarRMDBoleto(dataSourceRead.getConnection(), list, aidf, folio); + + if (isCancelarRmd) + fiscalService.cancelarRMDBoleto(dataSourceRead.getConnection(), datInicial.getValue(), datFinal.getValue(), empresa, estado, aidf, folio); + + if (!isCancelarRmd) { + Map parametros = new HashMap(); + parametros.put("list", list); + + Relatorio relatorio = new RelatorioImpressaoRMD(parametros, dataSourceRead.getConnection()); + + Map args = new HashMap(); + args.put("relatorio", relatorio); + + openWindow("/component/reportView.zul", + Labels.getLabel("indexController.mnImpressaoRMD.label"), args, MODAL); } - Map parametros = new HashMap(); - parametros.put("list", list); - - Relatorio relatorio = new RelatorioImpressaoRMD(parametros, dataSourceRead.getConnection()); - - Map args = new HashMap(); - args.put("relatorio", relatorio); - - openWindow("/component/reportView.zul", - Labels.getLabel("indexController.mnImpressaoRMD.label"), args, MODAL); - } catch (InterruptedException e) { log.error("", e); } catch (WrongValueException e) { @@ -191,7 +186,18 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer { Messagebox.OK, Messagebox.INFORMATION); } } + } + public void onClick$btnView(Event ev) throws InterruptedException { + executarImpressao(true, false, false); + } + + public void onClick$btnExecutar(Event ev) throws InterruptedException { + executarImpressao(false, true, false); + } + + public void onClick$btnCancelar(Event ev) throws InterruptedException { + executarImpressao(false, false, true); } public List getLsEmpresa() { diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyAppInit.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyAppInit.java index d9ea00965..84142c6d6 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyAppInit.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyAppInit.java @@ -8,6 +8,7 @@ import javax.servlet.ServletContext; import javax.sql.DataSource; import org.apache.log4j.Logger; +import org.flywaydb.core.Flyway; import org.quartz.JobDetail; import org.quartz.Scheduler; import org.quartz.SchedulerException; @@ -85,23 +86,23 @@ public class MyAppInit implements org.zkoss.zk.ui.util.WebAppInit { FlyWay.getInstance().defineDataSource(getDataSoure()); FlyWay.getInstance().start(); -// log.info("Executando Flyway..."); -// -// try{ -// final Flyway flyway = new Flyway(); -// -// flyway.setDataSource(getDataSoure()); -// flyway.setValidateOnMigrate(false); -// flyway.setIgnoreFutureMigrations(true); -// flyway.setOutOfOrder(true); -// flyway.setBaselineOnMigrate(true); -// -// flyway.migrate(); -// }catch(Throwable t){ -// log.error("Erro ao executar o flyway",t); -// } -// -// log.info("Flyway executado."); + log.info("Executando Flyway..."); + + try{ + final Flyway flyway = new Flyway(); + + flyway.setDataSource(getDataSoure()); + flyway.setValidateOnMigrate(false); + flyway.setIgnoreFutureMigrations(true); + flyway.setOutOfOrder(true); + flyway.setBaselineOnMigrate(true); + + flyway.migrate(); + }catch(Throwable t){ + log.error("Erro ao executar o flyway",t); + } + + log.info("Flyway executado."); } private boolean ipBloqueadoGeracaoServico() { diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 3dc4a7870..dda0489f7 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -6513,7 +6513,9 @@ busquedaImportacionFiscalController.btnExe.label = Executar Importação #busquedaImportacionFiscalController.btnExeNaoFiscal.label = Importação Não Fiscal #busquedaImportacionFiscalController.btnExeImportacionReducaoZ.label = Importação Fiscal Redução Z -busquedaExportacaoFiscalController.btnExe.label = Executar Exportação +busquedaExportacaoFiscalController.btnView.label = Visualização +busquedaExportacaoFiscalController.btnExe.label = Executar Exportação +busquedaExportacaoFiscalController.btnCancel.label = Cancelar/Inativar 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 acd9dbd83..71b623800 100644 --- a/web/gui/impressaofiscal/busquedaImpressaoRMD.zul +++ b/web/gui/impressaofiscal/busquedaImpressaoRMD.zul @@ -72,12 +72,8 @@ - @@ -85,8 +81,14 @@ +