fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug #6817 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@54379 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2016-03-30 20:36:52 +00:00
parent b0bdd9b167
commit c1b0bfe0c8
11 changed files with 450 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

169
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoFinanceiro.java 100644
View File

@ -0,0 +1,169 @@
package com.rjconsultores.ventaboletos.relatorios.impl;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.apache.log4j.Logger;
import com.rjconsultores.ventaboletos.entidad.Empresa;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
import com.rjconsultores.ventaboletos.utilerias.DateUtil;
import com.rjconsultores.ventaboletos.vo.impressaofiscal.ItemRelatorioFinanceiro;
import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
public class RelatorioAnaliticoFinanceiro extends Relatorio {
private static Logger log = Logger.getLogger(RelatorioAnaliticoFinanceiro.class);
List<ItemRelatorioFinanceiro> listdata = null;
public RelatorioAnaliticoFinanceiro(final Map<String, Object> parametros, Connection conexao) throws Exception {
super(parametros, conexao);
this.setCustomDataSource(new DataSource(this) {
@Override
public void initDados() throws Exception {
try {
Date inicio = (Date) parametros.get("inicio");
Date fim = (Date) parametros.get("fim");
Empresa empresa = (Empresa) parametros.get("empresa");
listdata = buscarMovimentosAnaliticos(inicio, fim, empresa.getEmpresaId());
} catch (SQLException e) {
log.error("", e);
}
}
});
this.setCollectionDataSource(new JRBeanCollectionDataSource(listdata));
}
public List<ItemRelatorioFinanceiro> buscarMovimentosAnaliticos(Date inicio, Date fim, Integer empresaId) throws SQLException {
inicio = DateUtil.inicioFecha(inicio);
fim = DateUtil.fimFecha(fim);
StringBuilder sql = new StringBuilder();
sql.append("select ");
sql.append("'FINANCEIRA' as movimentacao, ");
sql.append("caja.descripcionEmpresa as empresa, ");
sql.append("sum(caja.importe + caja.importeCancelacion) as valorEnCaja, ");
sql.append("case when caja.indstatusboleto = 'E' or caja.tipoVentaId IN (5,12,18) THEN 'VOUCHER' ");
sql.append(" when caja.tipoVentaId = 3 THEN 'MANUAL' ");
sql.append(" when caja.indstatusboleto = 'V' THEN 'NORMAL' ");
sql.append(" when caja.indstatusboleto = 'C' THEN 'CANCELAMENTO' ");
sql.append(" when caja.indstatusboleto = 'T' THEN 'TROCA' ");
sql.append(" ELSE 'OUTRO' END tipoVenta ");
sql.append("from ");
sql.append("( ");
sql.append("select ");
sql.append(" e.NOMBEMPRESA as descripcionEmpresa, ");
sql.append(" c.FECHORVENTA as fechorVenta, ");
sql.append(" case when c.MOTIVOCANCELACION_ID is null then cfp.IMPORTE else 0 end as importe, ");
sql.append(" case when c.MOTIVOCANCELACION_ID is null then 0 else cfp.IMPORTE * -1 end as importeCancelacion, ");
sql.append(" c.INDREIMPRESION as indReimpresion, ");
sql.append(" c.TIPOVENTA_ID as tipoVentaId, ");
sql.append(" c.indstatusboleto as indstatusboleto ");
sql.append("from ");
sql.append(" CAJA c ");
sql.append("inner join CAJA_FORMAPAGO cfp on c.CAJA_ID=cfp.CAJA_ID and cfp.activo = 1 ");
sql.append("inner join FORMA_PAGO fp on cfp.FORMAPAGO_ID=fp.FORMAPAGO_ID ");
sql.append("INNER join EMPRESA e on c.MARCA_ID = e.EMPRESA_ID ");
sql.append(" ");
sql.append("where c.FECHORVENTA BETWEEN ? AND ? ");
sql.append(" and c.TIPOVENTA_ID<> 6 ");
sql.append(" and e.EMPRESA_ID= ? ");
sql.append(" ) caja ");
sql.append("where caja.indReimpresion = 0 ");
sql.append("group by caja.descripcionEmpresa, ");
sql.append("case when caja.indstatusboleto = 'E' or caja.tipoVentaId IN (5,12,18) THEN 'VOUCHER' ");
sql.append(" when caja.tipoVentaId = 3 THEN 'MANUAL' ");
sql.append(" when caja.indstatusboleto = 'V' THEN 'NORMAL' ");
sql.append(" when caja.indstatusboleto = 'C' THEN 'CANCELAMENTO' ");
sql.append(" when caja.indstatusboleto = 'T' THEN 'TROCA' ");
sql.append(" ELSE 'OUTRO' END ");
sql.append(" ");
sql.append(" UNION ");
sql.append(" ");
sql.append("select ");
sql.append("'FISCAL' as movimentacao, ");
sql.append("caja.descripcionEmpresa as empresa, ");
sql.append("sum(caja.importe + caja.importeCancelacion) as valorEnCaja, ");
sql.append("case when caja.indstatusboleto = 'E' or caja.tipoVentaId IN (5,12,18) THEN 'IMPRESSÃO VOUCHER' ");
sql.append(" when caja.tipoVentaId = 3 THEN 'MANUAL' ");
sql.append(" when caja.indstatusboleto = 'V' THEN 'NORMAL' ");
sql.append(" when caja.indstatusboleto = 'C' THEN 'CANCELAMENTO' ");
sql.append(" when caja.indstatusboleto = 'T' THEN 'TROCA' ");
sql.append(" ELSE 'OUTRO' END TIPO_VENDA ");
sql.append("from ");
sql.append("( ");
sql.append("select ");
sql.append(" e.NOMBEMPRESA as descripcionEmpresa, ");
sql.append(" c.FECHORVENTA as fechorVenta, ");
sql.append(" case when c.MOTIVOCANCELACION_ID is null then cfp.IMPORTE else 0 end as importe, ");
sql.append(" case when c.MOTIVOCANCELACION_ID is null then 0 else cfp.IMPORTE * -1 end as importeCancelacion, ");
sql.append(" c.INDREIMPRESION as indReimpresion, ");
sql.append(" c.TIPOVENTA_ID as tipoVentaId, ");
sql.append(" c.indstatusboleto as indstatusboleto ");
sql.append("from ");
sql.append(" CAJA c ");
sql.append("inner join CAJA_FORMAPAGO cfp on c.CAJA_ID=cfp.CAJA_ID and cfp.activo = 1 ");
sql.append("inner join FORMA_PAGO fp on cfp.FORMAPAGO_ID=fp.FORMAPAGO_ID ");
sql.append("INNER join EMPRESA e on c.MARCA_ID = e.EMPRESA_ID ");
sql.append("inner join FISCAL_R4 FR4 ON FR4.CAJA_ID = c.CAJA_ID ");
sql.append(" ");
sql.append("where c.FECHORVENTA BETWEEN ? AND ? ");
sql.append(" and c.TIPOVENTA_ID<>6 ");
sql.append(" and e.EMPRESA_ID= ? ");
sql.append(" ) caja ");
sql.append("group by caja.descripcionEmpresa, ");
sql.append("case when caja.indstatusboleto = 'E' or caja.tipoVentaId IN (5,12,18) THEN 'IMPRESSÃO VOUCHER' ");
sql.append(" when caja.tipoVentaId = 3 THEN 'MANUAL' ");
sql.append(" when caja.indstatusboleto = 'V' THEN 'NORMAL' ");
sql.append(" when caja.indstatusboleto = 'C' THEN 'CANCELAMENTO' ");
sql.append(" when caja.indstatusboleto = 'T' THEN 'TROCA' ");
sql.append(" ELSE 'OUTRO' END ");
sql.append(" order by movimentacao, tipoVenta ");
PreparedStatement stmt = getConexao().prepareStatement(sql.toString());
stmt.setTimestamp(1, new java.sql.Timestamp(inicio.getTime()));
stmt.setTimestamp(2, new java.sql.Timestamp(fim.getTime()));
stmt.setInt(3, empresaId);
stmt.setTimestamp(4, new java.sql.Timestamp(inicio.getTime()));
stmt.setTimestamp(5, new java.sql.Timestamp(fim.getTime()));
stmt.setInt(6, empresaId);
ResultSet rset = stmt.executeQuery();
List<ItemRelatorioFinanceiro> list = new ArrayList<ItemRelatorioFinanceiro>();
while (rset.next()) {
ItemRelatorioFinanceiro item = new ItemRelatorioFinanceiro();
item.setEmpresa(rset.getString("empresa"));
item.setMovimentacao(rset.getString("movimentacao"));
item.setTipoVenta(rset.getString("tipoVenta"));
item.setValorEnCaja(rset.getBigDecimal("valorEnCaja"));
list.add(item);
}
if (!getConexao().isClosed())
getConexao().close();
return list;
}
@Override
protected void processaParametros() throws Exception {
}
}

2
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAnaliticoFinanceiro_es.properties 100644
View File

@ -0,0 +1,2 @@
#geral
msg.noData=Não foi possivel obter dados com os parâmetros informados.

2
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAnaliticoFinanceiro_pt_BR.properties 100644
View File

@ -0,0 +1,2 @@
#geral
msg.noData=Não foi possivel obter dados com os parâmetros informados.

BIN
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAnaliticoFinanceiro.jasper 100644
View File

Binary file not shown.

165
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAnaliticoFinanceiro.jrxml 100644
View File

@ -0,0 +1,165 @@
<?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioAnaliticoFinanceiro" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="0e8aff42-5ba8-48ac-9950-da8178561888">
<property name="ireport.zoom" value="1.0"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
<parameter name="inicio" class="java.util.Date"/>
<parameter name="fim" class="java.util.Date"/>
<field name="empresa" class="java.lang.String"/>
<field name="movimentacao" class="java.lang.String"/>
<field name="tipoVenta" class="java.lang.String"/>
<field name="valorEnCaja" class="java.math.BigDecimal"/>
<variable name="somatorio" class="java.math.BigDecimal" resetType="Group" resetGroup="movimentacao" calculation="Sum">
<variableExpression><![CDATA[$F{valorEnCaja}]]></variableExpression>
</variable>
<group name="movimentacao">
<groupExpression><![CDATA[$F{movimentacao}]]></groupExpression>
<groupHeader>
<band/>
</groupHeader>
<groupFooter>
<band height="22">
<staticText>
<reportElement x="0" y="1" width="407" height="20" uuid="e8af2b08-de05-4002-8806-7764e68ff020"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="10" isBold="true"/>
</textElement>
<text><![CDATA[Resumo:]]></text>
</staticText>
<textField pattern="¤ #,##0.00">
<reportElement x="407" y="1" width="148" height="20" uuid="a1bd63ab-8beb-4f63-bef1-a1aec1c332f7"/>
<textElement textAlignment="Right" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$V{somatorio}]]></textFieldExpression>
</textField>
<line>
<reportElement x="343" y="0" width="212" height="1" uuid="8fd833bc-b3e5-4251-8199-a083d9aab7cf"/>
</line>
</band>
</groupFooter>
</group>
<background>
<band splitType="Stretch"/>
</background>
<title>
<band height="65" splitType="Stretch">
<textField>
<reportElement x="84" y="40" width="471" height="23" uuid="63ce47a3-7e94-42a2-8325-eceef777fbe2"/>
<textElement verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression>
</textField>
<staticText>
<reportElement x="0" y="0" width="276" height="20" uuid="2e2e9caa-4076-4209-bdaf-0017ddf83a56"/>
<textElement verticalAlignment="Middle">
<font size="14" isBold="true"/>
</textElement>
<text><![CDATA[ANALITICO FINANCEIRO]]></text>
</staticText>
<textField pattern="dd/MM/yyyy HH:mm">
<reportElement x="276" y="0" width="279" height="20" uuid="6b4f1375-4f4b-4b80-83b8-7650e62e107e"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
</textField>
<textField>
<reportElement x="0" y="20" width="80" height="20" uuid="3f1d0681-30be-4c3a-ae90-cf34dd4ede3c"/>
<textElement verticalAlignment="Middle">
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA["Período: "]]></textFieldExpression>
</textField>
<staticText>
<reportElement x="0" y="40" width="84" height="23" uuid="cf05ce5a-615b-41ac-b24d-2c45ca1bc60e"/>
<textElement verticalAlignment="Middle">
<font isBold="true"/>
</textElement>
<text><![CDATA[Empresa:]]></text>
</staticText>
<textField pattern="dd/MM/yyyy">
<reportElement x="80" y="20" width="78" height="20" uuid="7f5ee01d-f86d-49a4-a2a1-f1c671621ef0"/>
<textElement textAlignment="Left" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$P{inicio}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="158" y="20" width="28" height="20" uuid="c1dec10a-743d-4569-916d-f1b65d4475b7"/>
<textElement verticalAlignment="Middle">
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[" a "]]></textFieldExpression>
</textField>
<textField pattern="dd/MM/yyyy">
<reportElement x="186" y="20" width="369" height="20" uuid="0b39fe78-5378-404c-b364-8be6ca288e25"/>
<textElement verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$P{fim}]]></textFieldExpression>
</textField>
<line>
<reportElement x="0" y="63" width="555" height="1" uuid="481b2107-ee62-4815-8a89-8435d34384c8"/>
</line>
</band>
</title>
<pageHeader>
<band splitType="Stretch"/>
</pageHeader>
<columnHeader>
<band height="22" splitType="Stretch">
<staticText>
<reportElement x="407" y="0" width="148" height="20" uuid="58727baf-8cf7-43a4-8feb-486a89e1b629"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="12" isBold="true"/>
</textElement>
<text><![CDATA[Valor]]></text>
</staticText>
<staticText>
<reportElement x="0" y="0" width="186" height="20" uuid="99d36c23-170f-482a-acf6-6bffe1511399"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="12" isBold="true"/>
</textElement>
<text><![CDATA[Movimentação]]></text>
</staticText>
<staticText>
<reportElement x="186" y="0" width="221" height="20" uuid="dedacc0a-a1d5-4d61-bf02-e4fcdf903f07"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="12" isBold="true"/>
</textElement>
<text><![CDATA[Tipo de Venta]]></text>
</staticText>
<line>
<reportElement x="2" y="20" width="553" height="1" uuid="cd1b96dd-2097-4af7-a025-7962bc5d7bee"/>
</line>
</band>
</columnHeader>
<detail>
<band height="22" splitType="Stretch">
<textField isBlankWhenNull="true">
<reportElement x="0" y="0" width="186" height="20" uuid="6ef05dfb-fea9-451c-a45a-1dc3f766af84"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="9"/>
</textElement>
<textFieldExpression><![CDATA[$F{movimentacao}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="186" y="0" width="221" height="20" uuid="1ec545f5-b8f3-48cd-bc35-3c5f0c90db2e"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="9"/>
</textElement>
<textFieldExpression><![CDATA[$F{tipoVenta}]]></textFieldExpression>
</textField>
<textField pattern="¤ #,##0.00" isBlankWhenNull="true">
<reportElement x="407" y="0" width="148" height="20" uuid="f9a1f174-373e-45e2-a79e-66cb4e1d2427"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="9"/>
</textElement>
<textFieldExpression><![CDATA[$F{valorEnCaja}]]></textFieldExpression>
</textField>
</band>
</detail>
<columnFooter>
<band splitType="Stretch"/>
</columnFooter>
<pageFooter>
<band splitType="Stretch"/>
</pageFooter>
<summary>
<band height="33" splitType="Stretch"/>
</summary>
</jasperReport>

45
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImportacionFiscalController.java
View File

@ -6,7 +6,9 @@ import java.io.FileNotFoundException;
import java.io.InputStream;
import java.sql.SQLException;
import java.util.Calendar;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.sql.DataSource;
@ -14,6 +16,7 @@ import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller;
import org.zkoss.util.resource.Labels;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.WrongValueException;
@ -24,6 +27,7 @@ import org.zkoss.zul.Datebox;
import org.zkoss.zul.Filedownload;
import com.rjconsultores.ventaboletos.entidad.Empresa;
import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioAnaliticoFinanceiro;
import com.rjconsultores.ventaboletos.service.EmpresaService;
import com.rjconsultores.ventaboletos.service.FiscalService;
import com.rjconsultores.ventaboletos.utilerias.DateUtil;
@ -53,6 +57,7 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose
private Button btnExeImportacionReducaoZ;
private Button btnExeImportacionManual;
private Button btnExeImportacionNaoFiscal;
private Button btnExeRelatorioFinanceiro;
@Override
public void doAfterCompose(Component comp) throws Exception {
@ -98,6 +103,14 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose
} else {
btnExeImportacionNaoFiscal.setVisible(false);
}
boolean isRelatorioFinanceiro = (Boolean) Executions.getCurrent().getArg().get("RELATORIO_FINANCEIRO");
if (isRelatorioFinanceiro) {
btnExeRelatorioFinanceiro.setVisible(true);
} else {
btnExeRelatorioFinanceiro.setVisible(false);
}
}
public void onClick$btnExeImportacionManual(Event ev) throws InterruptedException {
@ -117,7 +130,7 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose
log.error("", e);
}
}
public void onClick$btnExeImportacionEcfCancelados(Event ev) throws InterruptedException {
Empresa empresa = null;
@ -140,7 +153,6 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose
}
}
public void onClick$btnExeImportacionEcf(Event ev) throws InterruptedException {
Empresa empresa = null;
@ -199,6 +211,35 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose
}
}
@SuppressWarnings({ "unchecked", "rawtypes" })
public void onClick$btnExeRelatorioFinanceiro(Event ev) throws InterruptedException {
try {
Empresa empresa = null;
Comboitem itemEmpresa = cmbEmpresa.getSelectedItem();
if (itemEmpresa != null) {
empresa = (Empresa) itemEmpresa.getValue();
}
Map<String, Object> parametros = new HashMap<String, Object>();
parametros.put("inicio", datInicial.getValue());
parametros.put("fim", datFinal.getValue());
parametros.put("empresa", empresa);
RelatorioAnaliticoFinanceiro relatorio = new RelatorioAnaliticoFinanceiro(parametros, dataSourceRead.getConnection());
Map args = new HashMap();
args.put("relatorio", relatorio);
openWindow("/component/reportView.zul",
Labels.getLabel("relatorioAproveitamentoController.window.title"), args, MODAL);
} catch (SQLException e) {
log.error(e.getMessage(), e);
} catch (Exception e) {
log.error(e.getMessage(), e);
}
}
public List<Empresa> getLsEmpresa() {
return lsEmpresa;
}

16
src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/TipoImportacaoFiscal.java
View File

@ -5,7 +5,7 @@ import java.util.HashMap;
public class TipoImportacaoFiscal {
public enum TipoImportacao {
ECF, ECF_CANCELADOS, MANUAL, REDUCAO_Z, NAO_FISCAL;
ECF, ECF_CANCELADOS, MANUAL, REDUCAO_Z, NAO_FISCAL, RELATORIO_FINANCEIRO;
}
public static HashMap<String, Boolean> selecionaTipoImportacao(TipoImportacao tipo, HashMap<String, Boolean> args) {
@ -17,6 +17,7 @@ public class TipoImportacaoFiscal {
map.put(TipoImportacao.MANUAL.toString(), Boolean.FALSE);
map.put(TipoImportacao.REDUCAO_Z.toString(), Boolean.FALSE);
map.put(TipoImportacao.NAO_FISCAL.toString(), Boolean.FALSE);
map.put(TipoImportacao.RELATORIO_FINANCEIRO.toString(), Boolean.FALSE);
}
if (tipo.equals(TipoImportacao.ECF_CANCELADOS)) {
@ -25,6 +26,7 @@ public class TipoImportacaoFiscal {
map.put(TipoImportacao.MANUAL.toString(), Boolean.FALSE);
map.put(TipoImportacao.REDUCAO_Z.toString(), Boolean.FALSE);
map.put(TipoImportacao.NAO_FISCAL.toString(), Boolean.FALSE);
map.put(TipoImportacao.RELATORIO_FINANCEIRO.toString(), Boolean.FALSE);
}
if (tipo.equals(TipoImportacao.MANUAL)) {
@ -33,6 +35,7 @@ public class TipoImportacaoFiscal {
map.put(TipoImportacao.MANUAL.toString(), Boolean.TRUE);
map.put(TipoImportacao.REDUCAO_Z.toString(), Boolean.FALSE);
map.put(TipoImportacao.NAO_FISCAL.toString(), Boolean.FALSE);
map.put(TipoImportacao.RELATORIO_FINANCEIRO.toString(), Boolean.FALSE);
}
if (tipo.equals(TipoImportacao.REDUCAO_Z)) {
@ -41,6 +44,7 @@ public class TipoImportacaoFiscal {
map.put(TipoImportacao.MANUAL.toString(), Boolean.FALSE);
map.put(TipoImportacao.REDUCAO_Z.toString(), Boolean.TRUE);
map.put(TipoImportacao.NAO_FISCAL.toString(), Boolean.FALSE);
map.put(TipoImportacao.RELATORIO_FINANCEIRO.toString(), Boolean.FALSE);
}
if (tipo.equals(TipoImportacao.NAO_FISCAL)) {
@ -49,6 +53,16 @@ public class TipoImportacaoFiscal {
map.put(TipoImportacao.MANUAL.toString(), Boolean.FALSE);
map.put(TipoImportacao.REDUCAO_Z.toString(), Boolean.FALSE);
map.put(TipoImportacao.NAO_FISCAL.toString(), Boolean.TRUE);
map.put(TipoImportacao.RELATORIO_FINANCEIRO.toString(), Boolean.FALSE);
}
if (tipo.equals(TipoImportacao.RELATORIO_FINANCEIRO)) {
map.put(TipoImportacao.ECF.toString(), Boolean.FALSE);
map.put(TipoImportacao.ECF_CANCELADOS.toString(), Boolean.FALSE);
map.put(TipoImportacao.MANUAL.toString(), Boolean.FALSE);
map.put(TipoImportacao.REDUCAO_Z.toString(), Boolean.FALSE);
map.put(TipoImportacao.NAO_FISCAL.toString(), Boolean.FALSE);
map.put(TipoImportacao.RELATORIO_FINANCEIRO.toString(), Boolean.TRUE);
}
return map;

33
src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/relatorios/ItemMenuFiscalRelatorioFinanceiro.java 100644
View File

@ -0,0 +1,33 @@
package com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.impressaofiscal.relatorios;
import java.util.HashMap;
import org.zkoss.util.resource.Labels;
import com.rjconsultores.ventaboletos.web.utilerias.PantallaUtileria;
import com.rjconsultores.ventaboletos.web.utilerias.menu.DefaultItemMenuSistema;
import com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.impressaofiscal.TipoImportacaoFiscal;
import com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.impressaofiscal.TipoImportacaoFiscal.TipoImportacao;
public class ItemMenuFiscalRelatorioFinanceiro extends DefaultItemMenuSistema {
public ItemMenuFiscalRelatorioFinanceiro() {
super("indexController.mniRelatorioFinanceiro.label");
}
@Override
public String getClaveMenu() {
return "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.IMPRESSAOFISCAL.MENU.IMPORTACIONFISCAL";
}
@Override
public void ejecutar() {
@SuppressWarnings("unchecked")
HashMap<String, Boolean> map = TipoImportacaoFiscal.selecionaTipoImportacao(TipoImportacao.RELATORIO_FINANCEIRO, (HashMap<String, Boolean>) getArgs());
PantallaUtileria.openWindow("/gui/impressaofiscal/busquedaImportacionFiscal.zul",
Labels.getLabel("busquedaImportacionFiscalController.window.title"), map, desktop);
}
}

16
src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/relatorios/SubMenuRelatorioFiscalRelatorios.java 100644
View File

@ -0,0 +1,16 @@
package com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.impressaofiscal.relatorios;
import com.rjconsultores.ventaboletos.web.utilerias.menu.DefaultItemMenuSistema;
public class SubMenuRelatorioFiscalRelatorios extends DefaultItemMenuSistema {
public SubMenuRelatorioFiscalRelatorios() {
super("indexController.mnSubMenuRelatorioFiscalRelatorios.label");
}
@Override
public String getClaveMenu() {
return "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.IMPRESSAOFISCAL.MENU.IMPORTACIONFISCAL";
}
}

2
web/WEB-INF/i3-label_pt_BR.label
View File

@ -277,7 +277,7 @@ indexController.mnSubMenuRelatorioImpressaoFiscal.label=Importação Fiscal
indexController.mniTotnaofiscalEmpresa.label=Totalizadoes Não-fiscais
indexController.mniFormapagoEmpresa.label=Formas de Pagamento
indexController.mniRelgerencialEmpresa.label=Relatorio Gerencial
indexController.mnSubMenuRelatorioFiscalRelatorios.label=Relatórios
indexController.mnSubMenuRelatorioFiscalRelatorios.label=Relatórios Analíticos
indexController.mniImportacionFiscalEcf.label=ECF
indexController.mniImportacionFiscalEcfCancelados.label=ECF Cancelados

4
web/gui/impressaofiscal/busquedaImportacionFiscal.zul
View File

@ -59,6 +59,10 @@
<button id="btnExeImportacionNaoFiscal" image="/gui/img/enginer.png"
label="${c:l('busquedaImportacionFiscalController.btnExe.label')}" />
<button id="btnExeRelatorioFinanceiro" image="/gui/img/enginer.png"
label="${c:l('busquedaImportacionFiscalController.btnExe.label')}" />
</toolbar>
</window>