fixes bug #9387
git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@72625 d1611594-4594-4d17-8e1d-87c2c4800839master
parent
6cf4eae6a9
commit
01bd34c77d
|
@ -16,6 +16,7 @@ import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
|
|||
import com.rjconsultores.ventaboletos.relatorios.utilitarios.DevolucaoBilhetes;
|
||||
import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
|
||||
import com.rjconsultores.ventaboletos.utilerias.DateUtil;
|
||||
import com.rjconsultores.ventaboletos.utilerias.UtiliteriasFiscal;
|
||||
import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
|
||||
|
||||
import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
|
||||
|
@ -42,6 +43,7 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
|
|||
Date dataVendaFinal = parametros.get("dataVendaFinal") == null ? null : (Date) parametros.get("dataVendaFinal");
|
||||
Date dataDevolucaoInicial = parametros.get("dataDevolucaoInicial") == null ? null : (Date) parametros.get("dataDevolucaoInicial");
|
||||
Date dataDevolucaoFinal = parametros.get("dataDevolucaoFinal") == null ? null : (Date) parametros.get("dataDevolucaoFinal");
|
||||
Boolean isApenasBilhetesImpressos = parametros.get("isApenasBilhetesImpressos") == null ? Boolean.FALSE : Boolean.valueOf(parametros.get("isApenasBilhetesImpressos").toString());
|
||||
|
||||
String puntoVentas = null;
|
||||
for (PuntoVenta pv : lsPuntoVenta) {
|
||||
|
@ -61,7 +63,7 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
|
|||
}
|
||||
}
|
||||
|
||||
String sql = getSql(empresaId, puntoVentas, estados, dataVendaInicial, dataVendaFinal, dataDevolucaoInicial, dataDevolucaoFinal);
|
||||
String sql = getSql(empresaId, puntoVentas, estados, dataVendaInicial, dataVendaFinal, dataDevolucaoInicial, dataDevolucaoFinal, isApenasBilhetesImpressos);
|
||||
log.debug(sql);
|
||||
|
||||
NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql);
|
||||
|
@ -98,37 +100,85 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
|
|||
db.setEstadoId(rset.getInt("ESTADO_ID"));
|
||||
db.setFechorVenta((String) rset.getObject("FECHOR_VENTA"));
|
||||
db.setFechorDevolucao((String) rset.getObject("FECHOR_DEVOLUCAO"));
|
||||
db.setIcms((BigDecimal) rset.getObject("ICMS"));
|
||||
db.setPrecioBase((BigDecimal) rset.getObject("PRECIOBASE"));
|
||||
db.setPrecioPagado((BigDecimal) rset.getObject("PRECIOPAGADO"));
|
||||
db.setIcms(rset.getBigDecimal("ICMS"));
|
||||
db.setPorcredbaseicms(rset.getBigDecimal("PORCREDBASEICMS"));
|
||||
db.setPrecioBase(rset.getBigDecimal("PRECIOBASE"));
|
||||
db.setPrecioPagado(rset.getBigDecimal("PRECIOPAGADO"));
|
||||
db.setImporteoutros(rset.getBigDecimal("IMPORTEOUTROS"));
|
||||
db.setImportepedagio(rset.getBigDecimal("IMPORTEPEDAGIO"));
|
||||
db.setImporteseguro(rset.getBigDecimal("IMPORTESEGURO"));
|
||||
db.setImportetaxaembarque(rset.getBigDecimal("IMPORTETAXAEMBARQUE"));
|
||||
|
||||
db.setIndPedagioMunicipal(rset.getInt("INDPEDAGIOMUNICIPAL") == 1);
|
||||
db.setIndSeguroMunicipal(rset.getInt("INDSEGUROMUNICIPAL") == 1);
|
||||
db.setIndTarifaMunicipal(rset.getInt("INDTARIFAMUNICIPAL") == 1);
|
||||
db.setIndTxEmbarqueMunicipal(rset.getInt("INDTXEMBARQUEMUNICIPAL") == 1);
|
||||
|
||||
db.setIndPedadioEstdual(rset.getInt("INDPEDAGIOESTDUAL") == 1);
|
||||
db.setIndSeguroEstadual(rset.getInt("INDSEGUROESTADUAL") == 1);
|
||||
db.setIndTarifaEstadual(rset.getInt("INDTARIFAESTADUAL") == 1);
|
||||
db.setIndTxEmbarqueEstadual(rset.getInt("INDTXEMBARQUEESTADUAL") == 1);
|
||||
|
||||
db.setEmpresaId(rset.getObject("EMPRESA_ID") == null ? null : ((BigDecimal) rset.getObject("EMPRESA_ID")).intValue());
|
||||
db.setEmpresa((String) rset.getObject("NOMB_EMPRESA"));
|
||||
db.setNumpuntoventa((String) rset.getObject("NUMPUNTOVENTA"));
|
||||
db.setNumpuntoventaOrigem((String) rset.getObject("NUMPUNTOVENTAORIGEM"));
|
||||
db.setIsenta(rset.getInt("ISENTA") == 1);
|
||||
db.setTotalBilhete(rset.getBigDecimal("TOTAL"));
|
||||
db.setValorContabil(db.getTotalBilhete());
|
||||
|
||||
db.setValorIcms(BigDecimal.ZERO);
|
||||
db.setValorIsenta(BigDecimal.ZERO);
|
||||
|
||||
boolean isEstadual = rset.getInt("IS_ESTADUAL") == 1;
|
||||
|
||||
BigDecimal valorContabil = BigDecimal.ZERO;
|
||||
if(isEstadual) {
|
||||
if(db.getIndPedadioEstdual()) {
|
||||
valorContabil = valorContabil.add(db.getImportepedagio());
|
||||
}
|
||||
if(db.getIndSeguroEstadual()) {
|
||||
valorContabil = valorContabil.add(db.getImporteseguro());
|
||||
}
|
||||
if(db.getIndTarifaEstadual()) {
|
||||
valorContabil = valorContabil.add(db.getPrecioPagado());
|
||||
}
|
||||
if(db.getIndTxEmbarqueEstadual()) {
|
||||
valorContabil = valorContabil.add(db.getImportetaxaembarque());
|
||||
}
|
||||
} else {
|
||||
if(db.getIndPedagioMunicipal()) {
|
||||
valorContabil = valorContabil.add(db.getImportepedagio());
|
||||
}
|
||||
if(db.getIndSeguroMunicipal()) {
|
||||
valorContabil = valorContabil.add(db.getImporteseguro());
|
||||
}
|
||||
if(db.getIndTarifaMunicipal()) {
|
||||
valorContabil = valorContabil.add(db.getPrecioPagado());
|
||||
}
|
||||
if(db.getIndTxEmbarqueMunicipal()) {
|
||||
valorContabil = valorContabil.add(db.getImportetaxaembarque());
|
||||
}
|
||||
}
|
||||
db.setValorContabil(valorContabil);
|
||||
|
||||
BigDecimal valorIcms = BigDecimal.ZERO;
|
||||
valorIcms = db.getPrecioPagado().multiply(db.getIcms().divide(BigDecimal.valueOf(100)));
|
||||
valorIcms = db.getValorContabil().multiply(db.getIcms().divide(UtiliteriasFiscal.CEM));
|
||||
//valorIcms = valorIcms.multiply(db.getPorcredbaseicms().divide(UtiliteriasFiscal.CEM));
|
||||
if(db.isIsenta()) {
|
||||
db.setValorIsenta(valorIcms);
|
||||
} else {
|
||||
db.setValorIcms(valorIcms);
|
||||
}
|
||||
|
||||
db.setPorcMunicipal(rset.getObject("PORC_MUNICIPAL") == null ? BigDecimal.ZERO : (BigDecimal) rset.getObject("PORC_MUNICIPAL"));
|
||||
db.setPorcEstadual(rset.getObject("PORC_ESTADUAL") == null ? BigDecimal.ZERO : (BigDecimal) rset.getObject("PORC_ESTADUAL"));
|
||||
db.setPorcMunicipal(rset.getBigDecimal("PORC_MUNICIPAL"));
|
||||
db.setPorcEstadual(rset.getBigDecimal("PORC_ESTADUAL"));
|
||||
|
||||
boolean isEstadual = rset.getInt("IS_ESTADUAL") == 1;
|
||||
BigDecimal estornoMunicipal = BigDecimal.ZERO;
|
||||
BigDecimal estornoEstadual = BigDecimal.ZERO;
|
||||
if (isEstadual) {
|
||||
estornoEstadual = valorIcms.multiply(db.getPorcEstadual().divide(BigDecimal.valueOf(100)));
|
||||
estornoEstadual = valorIcms.multiply(db.getPorcEstadual().divide(UtiliteriasFiscal.CEM));
|
||||
} else {
|
||||
estornoMunicipal = valorIcms.multiply(db.getPorcMunicipal().divide(BigDecimal.valueOf(100)));
|
||||
estornoMunicipal = valorIcms.multiply(db.getPorcMunicipal().divide(UtiliteriasFiscal.CEM));
|
||||
}
|
||||
db.setEstornoMunicipal(estornoMunicipal);
|
||||
db.setEstornoEstadual(estornoEstadual);
|
||||
|
@ -146,14 +196,13 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
|
|||
this.setCollectionDataSource(new JRBeanCollectionDataSource(lsDev));
|
||||
}
|
||||
|
||||
private String getSql(Integer empresaId, String puntoVentas, String estados, Date dataVendaInicial, Date dataVendaFinal, Date dataDevolucaoInicial, Date dataDevolucaoFinal) {
|
||||
private String getSql(Integer empresaId, String puntoVentas, String estados, Date dataVendaInicial, Date dataVendaFinal, Date dataDevolucaoInicial, Date dataDevolucaoFinal, Boolean isApenasBilhetesImpressos) {
|
||||
|
||||
StringBuilder sql = new StringBuilder();
|
||||
sql.append("SELECT COALESCE(AIDF.ACFISCAL,SUBSTR(R4.NUMSERIE20, -6, 7)) AS AIDF, ");
|
||||
sql.append(" COALESCE(B.NUMFOLIOSISTEMA, B.NUMOPERACION) AS NUMFOLIOSISTEMA, ");
|
||||
sql.append(" CASE WHEN R4.NUMSERIE20 IS NULL THEN B.NUMSERIEPREIMPRESA ELSE NULL END AS SERIE_SUBSERIE, ");
|
||||
sql.append(" B.NUMFOLIOPREIMPRESO AS FOLIO, ");
|
||||
sql.append(" B.PRECIOPAGADO AS PRECIOPAGADO, ");
|
||||
sql.append(" B.PRECIOBASE AS PRECIOBASE, ");
|
||||
sql.append(" E.NOMBEMPRESA AS NOMB_EMPRESA, ");
|
||||
sql.append(" E.EMPRESA_ID AS EMPRESA_ID, ");
|
||||
|
@ -162,13 +211,17 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
|
|||
sql.append(" EST.NOMBESTADO AS ESTADO, ");
|
||||
sql.append(" EST.CVEESTADO AS UF, ");
|
||||
sql.append(" NVL(EST.ESTADO_ID,0) AS ESTADO_ID, ");
|
||||
sql.append(" NVL(EI.PORCREDBASEICMS,0) AS ICMS, ");
|
||||
sql.append(" NVL(EI.ICMS,0) AS ICMS, ");
|
||||
sql.append(" NVL(EI.PORCREDBASEICMS,0) AS PORCREDBASEICMS, ");
|
||||
sql.append(" TO_CHAR(BORI.FECHORVENTA, 'DD/MM/YYYY') AS FECHOR_VENTA, ");
|
||||
sql.append(" TO_CHAR(B.FECHORVENTA, 'DD/MM/YYYY') AS FECHOR_DEVOLUCAO, ");
|
||||
sql.append(" (CASE WHEN CO.ESTADO_ID <> CD.ESTADO_ID THEN 1 ELSE 0 END) IS_ESTADUAL, ");
|
||||
sql.append(" EI.PORCREDMUNICIPAL AS PORC_MUNICIPAL, ");
|
||||
sql.append(" EI.PORCREDESTADUAL AS PORC_ESTADUAL, ");
|
||||
sql.append(" NVL(EI.PORCREDMUNICIPAL,0) AS PORC_MUNICIPAL, ");
|
||||
sql.append(" NVL(EI.PORCREDESTADUAL,0) AS PORC_ESTADUAL, ");
|
||||
sql.append(" (CASE WHEN NVL(ORI.REGIONMETROPOLITANA_ID ,-1) = NVL(DES.REGIONMETROPOLITANA_ID,-2) THEN 1 ELSE 0 END) as ISENTA, ");
|
||||
sql.append(" NVL(B.PRECIOPAGADO,0) AS PRECIOPAGADO, NVL(B.IMPORTEOUTROS,0) AS IMPORTEOUTROS, NVL(B.IMPORTEPEDAGIO,0) AS IMPORTEPEDAGIO, NVL(B.IMPORTESEGURO,0) AS IMPORTESEGURO, NVL(B.IMPORTETAXAEMBARQUE,0) AS IMPORTETAXAEMBARQUE, ");
|
||||
sql.append(" NVL(EI.INDTARIFAMUNICIPAL,0) AS INDTARIFAMUNICIPAL, NVL(EI.INDSEGUROMUNICIPAL,0) AS INDSEGUROMUNICIPAL, NVL(EI.INDTXEMBARQUEMUNICIPAL,0) AS INDTXEMBARQUEMUNICIPAL, NVL(EI.INDPEDAGIOMUNICIPAL,0) AS INDPEDAGIOMUNICIPAL, ");
|
||||
sql.append(" NVL(EI.INDTARIFAESTADUAL,0) AS INDTARIFAESTADUAL, NVL(EI.INDSEGUROESTADUAL,0) AS INDSEGUROESTADUAL, NVL(EI.INDTXEMBARQUEESTADUAL,0) AS INDTXEMBARQUEESTADUAL, NVL(EI.INDPEDAGIOESTDUAL,0) AS INDPEDAGIOESTDUAL, ");
|
||||
sql.append(" NVL(B.PRECIOPAGADO,0) + NVL(B.IMPORTEOUTROS,0) + NVL(B.IMPORTEPEDAGIO,0) + NVL(B.IMPORTESEGURO,0) + NVL(B.IMPORTETAXAEMBARQUE,0) AS TOTAL ");
|
||||
sql.append("FROM BOLETO B ");
|
||||
sql.append("INNER JOIN MARCA M ON M.MARCA_ID = B.MARCA_ID AND M.ACTIVO = 1 ");
|
||||
|
@ -190,6 +243,10 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
|
|||
sql.append("AND B.INDSTATUSBOLETO = 'C' ");
|
||||
sql.append("AND B.INDCANCELACION = 1 ");
|
||||
|
||||
if(isApenasBilhetesImpressos) {
|
||||
sql.append("AND B.NUMFOLIOPREIMPRESO IS NOT NULL ");
|
||||
}
|
||||
|
||||
if(dataVendaInicial != null) {
|
||||
sql.append("AND BORI.FECHORVENTA >= TO_DATE(:dataVendaInicial,'DD/MM/YYYY HH24:MI') ");
|
||||
}
|
||||
|
|
|
@ -42,6 +42,7 @@ public class RelatorioDevolucaoBilhetesConsolidado extends Relatorio {
|
|||
Date dataVendaFinal = parametros.get("dataVendaFinal") == null ? null : (Date) parametros.get("dataVendaFinal");
|
||||
Date dataDevolucaoInicial = parametros.get("dataDevolucaoInicial") == null ? null : (Date) parametros.get("dataDevolucaoInicial");
|
||||
Date dataDevolucaoFinal = parametros.get("dataDevolucaoFinal") == null ? null : (Date) parametros.get("dataDevolucaoFinal");
|
||||
Boolean isApenasBilhetesImpressos = parametros.get("isApenasBilhetesImpressos") == null ? Boolean.FALSE : Boolean.valueOf(parametros.get("isApenasBilhetesImpressos").toString());
|
||||
|
||||
String puntoVentas = null;
|
||||
for (PuntoVenta pv : lsPuntoVenta) {
|
||||
|
@ -61,7 +62,7 @@ public class RelatorioDevolucaoBilhetesConsolidado extends Relatorio {
|
|||
}
|
||||
}
|
||||
|
||||
String sql = getSql(empresaId, puntoVentas, estados, dataVendaInicial, dataVendaFinal, dataDevolucaoInicial, dataDevolucaoFinal);
|
||||
String sql = getSql(empresaId, puntoVentas, estados, dataVendaInicial, dataVendaFinal, dataDevolucaoInicial, dataDevolucaoFinal, isApenasBilhetesImpressos);
|
||||
log.debug(sql);
|
||||
|
||||
NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql);
|
||||
|
@ -117,14 +118,14 @@ public class RelatorioDevolucaoBilhetesConsolidado extends Relatorio {
|
|||
this.setCollectionDataSource(new JRBeanCollectionDataSource(lsDev));
|
||||
}
|
||||
|
||||
private String getSql(Integer empresaId, String puntoVentas, String estados, Date dataVendaInicial, Date dataVendaFinal, Date dataDevolucaoInicial, Date dataDevolucaoFinal) {
|
||||
private String getSql(Integer empresaId, String puntoVentas, String estados, Date dataVendaInicial, Date dataVendaFinal, Date dataDevolucaoInicial, Date dataDevolucaoFinal, Boolean isApenasBilhetesImpressos) {
|
||||
|
||||
StringBuilder sql = new StringBuilder();
|
||||
sql.append("SELECT E.NOMBEMPRESA AS NOMB_EMPRESA, ");
|
||||
sql.append(" E.EMPRESA_ID AS EMPRESA_ID, ");
|
||||
sql.append(" PTV.NUMPUNTOVENTA AS NUMPUNTOVENTA, ");
|
||||
sql.append(" PTV.NOMBPUNTOVENTA AS NOMBPUNTOVENTA, ");
|
||||
sql.append(" NVL(EI.ICMS,0) AS ICMS, ");
|
||||
sql.append(" NVL(EI.PORCREDBASEICMS,0) AS ICMS, ");
|
||||
sql.append(" TO_CHAR(BORI.FECHORVENTA, 'DD/MM/YYYY') AS FECHOR_VENTA, ");
|
||||
sql.append(" SUM(NVL(B.PRECIOBASE,0)) AS PRECIOBASE, ");
|
||||
sql.append(" SUM(NVL(B.PRECIOPAGADO,0)) AS PRECIOPAGADO, ");
|
||||
|
@ -149,6 +150,10 @@ public class RelatorioDevolucaoBilhetesConsolidado extends Relatorio {
|
|||
sql.append("AND B.INDSTATUSBOLETO = 'C' ");
|
||||
sql.append("AND B.INDCANCELACION = 1 ");
|
||||
|
||||
if(isApenasBilhetesImpressos) {
|
||||
sql.append("AND B.NUMFOLIOPREIMPRESO IS NOT NULL ");
|
||||
}
|
||||
|
||||
if(dataVendaInicial != null) {
|
||||
sql.append("AND BORI.FECHORVENTA >= TO_DATE(:dataVendaInicial,'DD/MM/YYYY HH24:MI') ");
|
||||
}
|
||||
|
@ -173,8 +178,8 @@ public class RelatorioDevolucaoBilhetesConsolidado extends Relatorio {
|
|||
sql.append(" E.EMPRESA_ID, ");
|
||||
sql.append(" PTV.NUMPUNTOVENTA, ");
|
||||
sql.append(" PTV.NOMBPUNTOVENTA, ");
|
||||
sql.append(" NVL(EI.ICMS,0), ");
|
||||
sql.append(" TO_CHAR(B.FECHORVENTA, 'DD/MM/YYYY') ");
|
||||
sql.append(" NVL(EI.PORCREDBASEICMS,0), ");
|
||||
sql.append(" TO_CHAR(BORI.FECHORVENTA, 'DD/MM/YYYY') ");
|
||||
sql.append("ORDER BY NOMB_EMPRESA, FECHOR_VENTA ");
|
||||
|
||||
return sql.toString();
|
||||
|
|
|
@ -42,6 +42,7 @@ public class RelatorioDevolucaoBilhetesFinanceiro extends Relatorio {
|
|||
Date dataVendaFinal = parametros.get("dataVendaFinal") == null ? null : (Date) parametros.get("dataVendaFinal");
|
||||
Date dataDevolucaoInicial = parametros.get("dataDevolucaoInicial") == null ? null : (Date) parametros.get("dataDevolucaoInicial");
|
||||
Date dataDevolucaoFinal = parametros.get("dataDevolucaoFinal") == null ? null : (Date) parametros.get("dataDevolucaoFinal");
|
||||
Boolean isApenasBilhetesImpressos = parametros.get("isApenasBilhetesImpressos") == null ? Boolean.FALSE : Boolean.valueOf(parametros.get("isApenasBilhetesImpressos").toString());
|
||||
|
||||
String puntoVentas = null;
|
||||
for (PuntoVenta pv : lsPuntoVenta) {
|
||||
|
@ -61,7 +62,7 @@ public class RelatorioDevolucaoBilhetesFinanceiro extends Relatorio {
|
|||
}
|
||||
}
|
||||
|
||||
String sql = getSql(empresaId, puntoVentas, estados, dataVendaInicial, dataVendaFinal, dataDevolucaoInicial, dataDevolucaoFinal);
|
||||
String sql = getSql(empresaId, puntoVentas, estados, dataVendaInicial, dataVendaFinal, dataDevolucaoInicial, dataDevolucaoFinal, isApenasBilhetesImpressos);
|
||||
log.debug(sql);
|
||||
|
||||
NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql);
|
||||
|
@ -115,7 +116,7 @@ public class RelatorioDevolucaoBilhetesFinanceiro extends Relatorio {
|
|||
this.setCollectionDataSource(new JRBeanCollectionDataSource(lsDev));
|
||||
}
|
||||
|
||||
private String getSql(Integer empresaId, String puntoVentas, String estados, Date dataVendaInicial, Date dataVendaFinal, Date dataDevolucaoInicial, Date dataDevolucaoFinal) {
|
||||
private String getSql(Integer empresaId, String puntoVentas, String estados, Date dataVendaInicial, Date dataVendaFinal, Date dataDevolucaoInicial, Date dataDevolucaoFinal, Boolean isApenasBilhetesImpressos) {
|
||||
|
||||
StringBuilder sql = new StringBuilder();
|
||||
sql.append("SELECT E.NOMBEMPRESA AS NOMB_EMPRESA, ");
|
||||
|
@ -136,6 +137,8 @@ public class RelatorioDevolucaoBilhetesFinanceiro extends Relatorio {
|
|||
sql.append("INNER JOIN PUNTO_VENTA PTV ON PTV.PUNTOVENTA_ID = B.PUNTOVENTA_ID ");
|
||||
sql.append("INNER JOIN PARADA ORI ON (B.ORIGEN_ID = ORI.PARADA_ID ) ");
|
||||
sql.append("INNER JOIN PARADA DES ON (B.DESTINO_ID = DES.PARADA_ID ) ");
|
||||
sql.append("INNER JOIN CIUDAD CO ON (CO.CIUDAD_ID = ORI.CIUDAD_ID ) ");
|
||||
sql.append("INNER JOIN ESTADO EST ON EST.ESTADO_ID = CO.ESTADO_ID ");
|
||||
sql.append("LEFT JOIN PUNTO_VENTA PTVO ON PTVO.PUNTOVENTA_ID = B.PTOVTAVENTA_ID ");
|
||||
sql.append("LEFT JOIN BOLETO BORI ON BORI.BOLETO_ID = B.BOLETOORIGINAL_ID ");
|
||||
sql.append("JOIN USUARIO U ON U.USUARIO_ID = B.USUARIO_ID ");
|
||||
|
@ -143,6 +146,10 @@ public class RelatorioDevolucaoBilhetesFinanceiro extends Relatorio {
|
|||
sql.append("AND B.INDSTATUSBOLETO = 'C' ");
|
||||
sql.append("AND B.INDCANCELACION = 1 ");
|
||||
|
||||
if(isApenasBilhetesImpressos) {
|
||||
sql.append("AND B.NUMFOLIOPREIMPRESO IS NOT NULL ");
|
||||
}
|
||||
|
||||
if(dataVendaInicial != null) {
|
||||
sql.append("AND BORI.FECHORVENTA >= TO_DATE(:dataVendaInicial,'DD/MM/YYYY HH24:MI') ");
|
||||
}
|
||||
|
|
|
@ -7,8 +7,8 @@ label.periodo=Per
|
|||
label.ate=até
|
||||
label.de=de
|
||||
label.filtros=Fitros:
|
||||
label.aidf=AIDF(Bilhetes Manuais)
|
||||
label.serieSubs=Série/Subs.(ECF)
|
||||
label.aidf=AIDF
|
||||
label.serieSubs=Série/Subs.
|
||||
label.numero=Número
|
||||
label.vrContabil=Vr. Contábil
|
||||
label.baseCalc=Base Calc.
|
||||
|
|
|
@ -7,8 +7,8 @@ label.periodo=Per
|
|||
label.ate=até
|
||||
label.de=de
|
||||
label.filtros=Fitros:
|
||||
label.aidf=AIDF(Bilhetes Manuais)
|
||||
label.serieSubs=Série/Subs.(ECF)
|
||||
label.aidf=AIDF
|
||||
label.serieSubs=Série/Subs.
|
||||
label.numero=Número
|
||||
label.vrContabil=Vr. Contábil
|
||||
label.baseCalc=Base Calc.
|
||||
|
|
|
@ -7,8 +7,8 @@ label.periodo=Per
|
|||
label.ate=até
|
||||
label.de=de
|
||||
label.filtros=Fitros:
|
||||
label.aidf=AIDF(Bilhetes Manuais)
|
||||
label.serieSubs=Série/Subs.(ECF)
|
||||
label.aidf=AIDF
|
||||
label.serieSubs=Série/Subs.
|
||||
label.numero=Número
|
||||
label.vrContabil=Vr. Contábil
|
||||
label.baseCalc=Base Calc.
|
||||
|
|
|
@ -7,8 +7,8 @@ label.periodo=Per
|
|||
label.ate=até
|
||||
label.de=de
|
||||
label.filtros=Fitros:
|
||||
label.aidf=AIDF(Bilhetes Manuais)
|
||||
label.serieSubs=Série/Subs.(ECF)
|
||||
label.aidf=AIDF
|
||||
label.serieSubs=Série/Subs.
|
||||
label.numero=Número
|
||||
label.vrContabil=Vr. Contábil
|
||||
label.baseCalc=Base Calc.
|
||||
|
|
Binary file not shown.
|
@ -1,8 +1,8 @@
|
|||
<?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="RelatorioDevolucaoBilhetes" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
|
||||
<property name="ireport.zoom" value="2.0"/>
|
||||
<property name="ireport.x" value="0"/>
|
||||
<property name="ireport.y" value="138"/>
|
||||
<property name="ireport.zoom" value="1.0"/>
|
||||
<property name="ireport.x" value="47"/>
|
||||
<property name="ireport.y" value="0"/>
|
||||
<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
|
||||
<style name="table">
|
||||
<box>
|
||||
|
@ -208,14 +208,14 @@
|
|||
<groupFooter>
|
||||
<band height="15">
|
||||
<textField pattern="###0.00" isBlankWhenNull="true">
|
||||
<reportElement x="593" y="1" width="45" height="14" uuid="67bdceb4-d6ed-42c5-871f-d809ffec832b"/>
|
||||
<reportElement x="584" y="1" width="45" height="14" uuid="67bdceb4-d6ed-42c5-871f-d809ffec832b"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{vSubTotalContabil}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="###0.00" isBlankWhenNull="true">
|
||||
<reportElement x="543" y="1" width="50" height="14" uuid="943bc881-8248-4da5-999a-62b2f67a573a"/>
|
||||
<reportElement x="534" y="1" width="50" height="14" uuid="943bc881-8248-4da5-999a-62b2f67a573a"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
|
@ -225,7 +225,7 @@
|
|||
<reportElement x="1" y="0" width="800" height="1" uuid="eb29c074-35dc-47d8-855b-78b95676b7ae"/>
|
||||
</line>
|
||||
<textField pattern="###0.00" isBlankWhenNull="true">
|
||||
<reportElement x="681" y="1" width="40" height="14" uuid="6e65196e-b844-4c3d-9697-44aadad52344"/>
|
||||
<reportElement x="672" y="1" width="40" height="14" uuid="6e65196e-b844-4c3d-9697-44aadad52344"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
|
@ -239,21 +239,21 @@
|
|||
<textFieldExpression><![CDATA["Subtotal - " + $F{fechorVenta}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="###0.00" isBlankWhenNull="true">
|
||||
<reportElement x="479" y="1" width="64" height="14" uuid="49c16eb0-9d9d-4e17-a1a7-20391bde4035"/>
|
||||
<reportElement x="470" y="1" width="64" height="14" uuid="49c16eb0-9d9d-4e17-a1a7-20391bde4035"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{vSubTotalBilhete}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern=" ###0.00" isBlankWhenNull="true">
|
||||
<reportElement x="721" y="1" width="40" height="14" uuid="dd9cdc1b-7478-467b-ab0c-c6b491790a34"/>
|
||||
<reportElement x="712" y="1" width="45" height="14" uuid="dd9cdc1b-7478-467b-ab0c-c6b491790a34"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{vSubTotalIsenta}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern=" ###0.00" isBlankWhenNull="true">
|
||||
<reportElement x="761" y="1" width="40" height="14" uuid="3a9f3181-f27b-4978-9a0b-16ad6c20032a"/>
|
||||
<reportElement x="757" y="1" width="45" height="14" uuid="3a9f3181-f27b-4978-9a0b-16ad6c20032a"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
|
@ -372,7 +372,7 @@
|
|||
<textFieldExpression><![CDATA[$P{dataDevolucaoFinal}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false">
|
||||
<reportElement mode="Transparent" x="712" y="1" width="89" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="b8a3345b-03b7-4bfd-8cab-31c07f3e0efa"/>
|
||||
<reportElement mode="Transparent" x="684" y="1" width="117" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="b8a3345b-03b7-4bfd-8cab-31c07f3e0efa"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
|
@ -380,7 +380,7 @@
|
|||
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="" isBlankWhenNull="false">
|
||||
<reportElement mode="Transparent" x="684" y="17" width="116" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="4b6e9016-c490-4abc-a659-fc73eb24a93a"/>
|
||||
<reportElement mode="Transparent" x="602" y="17" width="199" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="4b6e9016-c490-4abc-a659-fc73eb24a93a"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
|
@ -388,7 +388,7 @@
|
|||
<textFieldExpression><![CDATA[$R{label.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{label.de}+" "+$V{PAGE_NUMBER}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="" isBlankWhenNull="false">
|
||||
<reportElement mode="Transparent" x="701" y="33" width="100" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="12e51d0a-4fd5-4dff-95f5-762d8e3bf1f0"/>
|
||||
<reportElement mode="Transparent" x="602" y="33" width="199" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="12e51d0a-4fd5-4dff-95f5-762d8e3bf1f0"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
|
@ -396,7 +396,7 @@
|
|||
<textFieldExpression><![CDATA[$R{label.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="630" y="1" width="82" height="15" uuid="4ac1cdfd-5dfa-4ce7-b9dd-2f193149c8c2"/>
|
||||
<reportElement x="602" y="1" width="82" height="15" uuid="4ac1cdfd-5dfa-4ce7-b9dd-2f193149c8c2"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
|
@ -426,21 +426,21 @@
|
|||
<textFieldExpression><![CDATA[$R{label.aidf}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="360" y="1" width="74" height="14" isPrintWhenDetailOverflows="true" uuid="d6813bb4-94c3-4f9b-af61-54e3676c31bb"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" x="360" y="1" width="65" height="14" isPrintWhenDetailOverflows="true" uuid="d6813bb4-94c3-4f9b-af61-54e3676c31bb"/>
|
||||
<textElement verticalAlignment="Middle" markup="none">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{label.serieSubs}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="434" y="1" width="45" height="14" isPrintWhenDetailOverflows="true" uuid="60cc6a71-4f40-49de-9f78-08b65931d16d"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" x="425" y="1" width="45" height="14" isPrintWhenDetailOverflows="true" uuid="60cc6a71-4f40-49de-9f78-08b65931d16d"/>
|
||||
<textElement verticalAlignment="Middle" markup="none">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{label.numero}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="593" y="1" width="45" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="0b598d85-e93d-4916-b9a1-c80e694aabb6"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="584" y="1" width="45" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="0b598d85-e93d-4916-b9a1-c80e694aabb6"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
|
@ -448,7 +448,7 @@
|
|||
<textFieldExpression><![CDATA[$R{label.baseCalc}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="638" y="1" width="43" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="e647ff9e-f7e2-4c90-a75f-d831980391b6"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="629" y="1" width="43" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="e647ff9e-f7e2-4c90-a75f-d831980391b6"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
|
@ -456,7 +456,7 @@
|
|||
<textFieldExpression><![CDATA[$R{label.aliquota}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="681" y="1" width="40" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="a1a4be94-54f7-42f0-bdd3-5b0b2d6a37c4"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="672" y="1" width="40" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="a1a4be94-54f7-42f0-bdd3-5b0b2d6a37c4"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
|
@ -464,14 +464,14 @@
|
|||
<textFieldExpression><![CDATA[$R{label.icms}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="543" y="1" width="50" height="14" isPrintWhenDetailOverflows="true" uuid="ed400846-62e0-4199-8c0d-c4b7741d934c"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" x="534" y="1" width="50" height="14" isPrintWhenDetailOverflows="true" uuid="ed400846-62e0-4199-8c0d-c4b7741d934c"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle" markup="none">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{label.vrContabil}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="479" y="1" width="64" height="14" isPrintWhenDetailOverflows="true" uuid="2b804e18-71b2-44b5-89c3-4393430c94f3"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" x="470" y="1" width="64" height="14" isPrintWhenDetailOverflows="true" uuid="2b804e18-71b2-44b5-89c3-4393430c94f3"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle" markup="none">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
|
@ -513,7 +513,7 @@
|
|||
<textFieldExpression><![CDATA[$R{label.fechorDevolucao}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="721" y="1" width="40" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="a77ed233-da19-434c-b3d9-e7a418acaf00"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="712" y="1" width="45" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="a77ed233-da19-434c-b3d9-e7a418acaf00"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
|
@ -521,7 +521,7 @@
|
|||
<textFieldExpression><![CDATA[$R{label.isenta}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="761" y="1" width="40" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="8dc706f6-dd2d-4b71-acf0-fa8dcd5c4f8d"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="757" y="1" width="45" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="8dc706f6-dd2d-4b71-acf0-fa8dcd5c4f8d"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
|
@ -540,49 +540,49 @@
|
|||
<textFieldExpression><![CDATA[$F{aidf}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement x="360" y="0" width="74" height="14" uuid="73fc6712-d370-49e2-ac39-55e2fa5ce9e2"/>
|
||||
<reportElement x="360" y="0" width="65" height="14" uuid="73fc6712-d370-49e2-ac39-55e2fa5ce9e2"/>
|
||||
<textElement verticalAlignment="Middle">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{serieSubSerie}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern=" ###0.00">
|
||||
<reportElement x="543" y="0" width="50" height="14" uuid="b14dbaab-e9a1-4aae-a12c-6305da9d2f80"/>
|
||||
<reportElement x="534" y="0" width="50" height="14" uuid="b14dbaab-e9a1-4aae-a12c-6305da9d2f80"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{precioPagado}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern=" ###0.00">
|
||||
<reportElement x="479" y="0" width="64" height="14" uuid="a1bcec7c-0ca6-4f9f-a4c7-9757842b1b4f"/>
|
||||
<reportElement x="470" y="0" width="64" height="14" uuid="a1bcec7c-0ca6-4f9f-a4c7-9757842b1b4f"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{totalBilhete}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="###0.00">
|
||||
<reportElement x="638" y="0" width="43" height="14" uuid="3285bf53-66f1-4dc2-b3db-d12875efa546"/>
|
||||
<reportElement x="629" y="0" width="43" height="14" uuid="3285bf53-66f1-4dc2-b3db-d12875efa546"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{icms}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="###0.00">
|
||||
<reportElement x="593" y="0" width="45" height="14" uuid="6772d6a9-3611-4cb6-9c3b-f78dc3fb5dc0"/>
|
||||
<reportElement x="584" y="0" width="45" height="14" uuid="6772d6a9-3611-4cb6-9c3b-f78dc3fb5dc0"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{valorContabil}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern=" ###0.00" isBlankWhenNull="true">
|
||||
<reportElement x="681" y="0" width="40" height="14" uuid="e948b0e2-03c4-47c9-91f1-90d3a3fc4bf4"/>
|
||||
<reportElement x="672" y="0" width="40" height="14" uuid="e948b0e2-03c4-47c9-91f1-90d3a3fc4bf4"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{valorIcms}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement x="434" y="0" width="45" height="14" uuid="755796e0-1c3a-470a-a226-35e01d006653"/>
|
||||
<reportElement x="425" y="0" width="45" height="14" uuid="755796e0-1c3a-470a-a226-35e01d006653"/>
|
||||
<textElement verticalAlignment="Middle">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
|
@ -624,14 +624,14 @@
|
|||
<textFieldExpression><![CDATA[$F{fechorDevolucao}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern=" ###0.00" isBlankWhenNull="true">
|
||||
<reportElement x="721" y="0" width="40" height="14" uuid="cdc6fee6-76ba-4cd9-95ee-0ad7fe34c515"/>
|
||||
<reportElement x="712" y="0" width="45" height="14" uuid="cdc6fee6-76ba-4cd9-95ee-0ad7fe34c515"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{valorIsenta}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern=" ###0.00" isBlankWhenNull="true">
|
||||
<reportElement x="761" y="0" width="40" height="14" uuid="4b5bd414-7154-4d27-9be3-5764b19cd5d9"/>
|
||||
<reportElement x="757" y="0" width="45" height="14" uuid="4b5bd414-7154-4d27-9be3-5764b19cd5d9"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
|
@ -669,42 +669,42 @@
|
|||
<reportElement positionType="Float" x="1" y="15" width="800" height="1" uuid="ff50b0f9-831b-428e-9177-b264920c542b"/>
|
||||
</line>
|
||||
<textField pattern="###0.00">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="543" y="1" width="50" height="14" uuid="5bb73e4d-a51b-4a04-bed0-8fa3eb7f8553"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" x="534" y="1" width="50" height="14" uuid="5bb73e4d-a51b-4a04-bed0-8fa3eb7f8553"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{precioPagado_total}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="###0.00">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="593" y="1" width="45" height="14" uuid="7c3ce565-f549-48d2-815d-9b4d7a39b1ca"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" x="584" y="1" width="45" height="14" uuid="7c3ce565-f549-48d2-815d-9b4d7a39b1ca"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{vTotalContabil}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="###0.00">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="681" y="1" width="40" height="14" uuid="7a2dbe9b-868e-46db-b3b3-6e759d4dba98"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" x="672" y="1" width="40" height="14" uuid="7a2dbe9b-868e-46db-b3b3-6e759d4dba98"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{valorIcms_total}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="###0.00" isBlankWhenNull="false">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="479" y="1" width="64" height="14" uuid="80bddbda-0eec-4839-9510-35800aa6d742"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" x="470" y="1" width="64" height="14" uuid="80bddbda-0eec-4839-9510-35800aa6d742"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{vTotalBilhete}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern=" ###0.00" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="761" y="1" width="40" height="14" uuid="fba9c1d7-5a33-4229-9371-31aacc2a9fbb"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" x="757" y="1" width="45" height="14" uuid="fba9c1d7-5a33-4229-9371-31aacc2a9fbb"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{vTotalOutras}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern=" ###0.00" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="721" y="1" width="40" height="14" uuid="e6928dff-a4be-42a7-bb7e-281a23110d3a"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" x="712" y="1" width="45" height="14" uuid="e6928dff-a4be-42a7-bb7e-281a23110d3a"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
|
|
Binary file not shown.
|
@ -1,7 +1,7 @@
|
|||
<?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="RelatorioDevolucaoBilhetesConsolidado" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
|
||||
<property name="ireport.zoom" value="2.0"/>
|
||||
<property name="ireport.x" value="0"/>
|
||||
<property name="ireport.x" value="926"/>
|
||||
<property name="ireport.y" value="0"/>
|
||||
<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
|
||||
<style name="table">
|
||||
|
@ -262,7 +262,7 @@
|
|||
<textFieldExpression><![CDATA[$P{dataDevolucaoInicial}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="" isBlankWhenNull="false">
|
||||
<reportElement mode="Transparent" x="701" y="33" width="100" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="d0446296-1d50-4558-92a4-34148b90576d"/>
|
||||
<reportElement mode="Transparent" x="603" y="33" width="199" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="d0446296-1d50-4558-92a4-34148b90576d"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="7" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
|
@ -270,7 +270,7 @@
|
|||
<textFieldExpression><![CDATA[$R{label.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="" isBlankWhenNull="false">
|
||||
<reportElement mode="Transparent" x="684" y="17" width="116" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="88758926-3726-42c1-8aa5-32889c8a0d35"/>
|
||||
<reportElement mode="Transparent" x="603" y="17" width="198" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="88758926-3726-42c1-8aa5-32889c8a0d35"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
|
@ -278,7 +278,7 @@
|
|||
<textFieldExpression><![CDATA[$R{label.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{label.de}+" "+$V{PAGE_NUMBER}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false">
|
||||
<reportElement mode="Transparent" x="712" y="1" width="89" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="c4521e46-0f76-43a0-9008-49dd4327caf6"/>
|
||||
<reportElement mode="Transparent" x="685" y="1" width="116" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="c4521e46-0f76-43a0-9008-49dd4327caf6"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
|
@ -286,7 +286,7 @@
|
|||
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="630" y="1" width="82" height="15" uuid="c11c9c4a-b95e-4f81-8f4b-21ef9c6e7f48"/>
|
||||
<reportElement x="603" y="1" width="82" height="15" uuid="c11c9c4a-b95e-4f81-8f4b-21ef9c6e7f48"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="9" isBold="true"/>
|
||||
</textElement>
|
||||
|
|
Binary file not shown.
|
@ -1,7 +1,7 @@
|
|||
<?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="RelatorioDevolucaoBilhetesFinanceiro" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
|
||||
<property name="ireport.zoom" value="2.0"/>
|
||||
<property name="ireport.x" value="0"/>
|
||||
<property name="ireport.x" value="926"/>
|
||||
<property name="ireport.y" value="0"/>
|
||||
<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
|
||||
<style name="table">
|
||||
|
@ -219,7 +219,7 @@
|
|||
<textFieldExpression><![CDATA[$P{dataDevolucaoFinal}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false">
|
||||
<reportElement mode="Transparent" x="712" y="1" width="89" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="b8a3345b-03b7-4bfd-8cab-31c07f3e0efa"/>
|
||||
<reportElement mode="Transparent" x="685" y="1" width="116" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="b8a3345b-03b7-4bfd-8cab-31c07f3e0efa"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
|
@ -227,7 +227,7 @@
|
|||
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="" isBlankWhenNull="false">
|
||||
<reportElement mode="Transparent" x="684" y="17" width="116" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="4b6e9016-c490-4abc-a659-fc73eb24a93a"/>
|
||||
<reportElement mode="Transparent" x="603" y="17" width="199" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="4b6e9016-c490-4abc-a659-fc73eb24a93a"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
|
@ -235,7 +235,7 @@
|
|||
<textFieldExpression><![CDATA[$R{label.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{label.de}+" "+$V{PAGE_NUMBER}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="" isBlankWhenNull="false">
|
||||
<reportElement mode="Transparent" x="701" y="33" width="100" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="12e51d0a-4fd5-4dff-95f5-762d8e3bf1f0"/>
|
||||
<reportElement mode="Transparent" x="603" y="33" width="199" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="12e51d0a-4fd5-4dff-95f5-762d8e3bf1f0"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
|
@ -243,7 +243,7 @@
|
|||
<textFieldExpression><![CDATA[$R{label.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="630" y="1" width="82" height="15" uuid="4ac1cdfd-5dfa-4ce7-b9dd-2f193149c8c2"/>
|
||||
<reportElement x="603" y="1" width="82" height="15" uuid="4ac1cdfd-5dfa-4ce7-b9dd-2f193149c8c2"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
|
|
|
@ -10,6 +10,10 @@ public class DevolucaoBilhetes {
|
|||
private String folio;
|
||||
private BigDecimal precioPagado;
|
||||
private BigDecimal precioBase;
|
||||
private BigDecimal importeoutros;
|
||||
private BigDecimal importepedagio;
|
||||
private BigDecimal importeseguro;
|
||||
private BigDecimal importetaxaembarque;
|
||||
private String empresa;
|
||||
private Integer empresaId;
|
||||
private Integer estadoId;
|
||||
|
@ -17,6 +21,7 @@ public class DevolucaoBilhetes {
|
|||
private String uf;
|
||||
private BigDecimal icms;
|
||||
private BigDecimal valorIcms;
|
||||
private BigDecimal porcredbaseicms;
|
||||
private String fechorVenta;
|
||||
private String fechorDevolucao;
|
||||
private String numpuntoventa;
|
||||
|
@ -37,6 +42,15 @@ public class DevolucaoBilhetes {
|
|||
private BigDecimal totalBilhete;
|
||||
private Integer totalQtdeBilhetes;
|
||||
|
||||
private Boolean indTarifaMunicipal;
|
||||
private Boolean indSeguroMunicipal;
|
||||
private Boolean indTxEmbarqueMunicipal;
|
||||
private Boolean indPedagioMunicipal;
|
||||
private Boolean indTarifaEstadual;
|
||||
private Boolean indSeguroEstadual;
|
||||
private Boolean indTxEmbarqueEstadual;
|
||||
private Boolean indPedadioEstdual;
|
||||
|
||||
public String getAidf() {
|
||||
return aidf;
|
||||
}
|
||||
|
@ -289,4 +303,108 @@ public class DevolucaoBilhetes {
|
|||
return valorContabil.subtract(precioPagado);
|
||||
}
|
||||
|
||||
public Boolean getIndTarifaMunicipal() {
|
||||
return indTarifaMunicipal;
|
||||
}
|
||||
|
||||
public void setIndTarifaMunicipal(Boolean indTarifaMunicipal) {
|
||||
this.indTarifaMunicipal = indTarifaMunicipal;
|
||||
}
|
||||
|
||||
public Boolean getIndSeguroMunicipal() {
|
||||
return indSeguroMunicipal;
|
||||
}
|
||||
|
||||
public void setIndSeguroMunicipal(Boolean indSeguroMunicipal) {
|
||||
this.indSeguroMunicipal = indSeguroMunicipal;
|
||||
}
|
||||
|
||||
public Boolean getIndTxEmbarqueMunicipal() {
|
||||
return indTxEmbarqueMunicipal;
|
||||
}
|
||||
|
||||
public void setIndTxEmbarqueMunicipal(Boolean indTxEmbarqueMunicipal) {
|
||||
this.indTxEmbarqueMunicipal = indTxEmbarqueMunicipal;
|
||||
}
|
||||
|
||||
public Boolean getIndPedagioMunicipal() {
|
||||
return indPedagioMunicipal;
|
||||
}
|
||||
|
||||
public void setIndPedagioMunicipal(Boolean indPedagioMunicipal) {
|
||||
this.indPedagioMunicipal = indPedagioMunicipal;
|
||||
}
|
||||
|
||||
public Boolean getIndTarifaEstadual() {
|
||||
return indTarifaEstadual;
|
||||
}
|
||||
|
||||
public void setIndTarifaEstadual(Boolean indTarifaEstadual) {
|
||||
this.indTarifaEstadual = indTarifaEstadual;
|
||||
}
|
||||
|
||||
public Boolean getIndSeguroEstadual() {
|
||||
return indSeguroEstadual;
|
||||
}
|
||||
|
||||
public void setIndSeguroEstadual(Boolean indSeguroEstadual) {
|
||||
this.indSeguroEstadual = indSeguroEstadual;
|
||||
}
|
||||
|
||||
public Boolean getIndTxEmbarqueEstadual() {
|
||||
return indTxEmbarqueEstadual;
|
||||
}
|
||||
|
||||
public void setIndTxEmbarqueEstadual(Boolean indTxEmbarqueEstadual) {
|
||||
this.indTxEmbarqueEstadual = indTxEmbarqueEstadual;
|
||||
}
|
||||
|
||||
public Boolean getIndPedadioEstdual() {
|
||||
return indPedadioEstdual;
|
||||
}
|
||||
|
||||
public void setIndPedadioEstdual(Boolean indPedadioEstdual) {
|
||||
this.indPedadioEstdual = indPedadioEstdual;
|
||||
}
|
||||
|
||||
public BigDecimal getPorcredbaseicms() {
|
||||
return porcredbaseicms;
|
||||
}
|
||||
|
||||
public void setPorcredbaseicms(BigDecimal porcredbaseicms) {
|
||||
this.porcredbaseicms = porcredbaseicms;
|
||||
}
|
||||
|
||||
public BigDecimal getImporteoutros() {
|
||||
return importeoutros;
|
||||
}
|
||||
|
||||
public void setImporteoutros(BigDecimal importeoutros) {
|
||||
this.importeoutros = importeoutros;
|
||||
}
|
||||
|
||||
public BigDecimal getImportepedagio() {
|
||||
return importepedagio;
|
||||
}
|
||||
|
||||
public void setImportepedagio(BigDecimal importepedagio) {
|
||||
this.importepedagio = importepedagio;
|
||||
}
|
||||
|
||||
public BigDecimal getImporteseguro() {
|
||||
return importeseguro;
|
||||
}
|
||||
|
||||
public void setImporteseguro(BigDecimal importeseguro) {
|
||||
this.importeseguro = importeseguro;
|
||||
}
|
||||
|
||||
public BigDecimal getImportetaxaembarque() {
|
||||
return importetaxaembarque;
|
||||
}
|
||||
|
||||
public void setImportetaxaembarque(BigDecimal importetaxaembarque) {
|
||||
this.importetaxaembarque = importetaxaembarque;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
@ -19,6 +20,7 @@ import org.zkoss.zhtml.Messagebox;
|
|||
import org.zkoss.zk.ui.Component;
|
||||
import org.zkoss.zk.ui.event.Event;
|
||||
import org.zkoss.zul.Bandbox;
|
||||
import org.zkoss.zul.Checkbox;
|
||||
import org.zkoss.zul.Combobox;
|
||||
import org.zkoss.zul.Comboitem;
|
||||
import org.zkoss.zul.Datebox;
|
||||
|
@ -82,6 +84,8 @@ public class RelatorioDevolucaoBilhetesController extends MyGenericForwardCompos
|
|||
private Radio rFinanceiro;
|
||||
private Radio rConsolidado;
|
||||
|
||||
private Checkbox chkApenasBilhetesImpressos;
|
||||
|
||||
private void executarPesquisa() {
|
||||
HibernateSearchObject<PuntoVenta> puntoVentaBusqueda = new HibernateSearchObject<PuntoVenta>(PuntoVenta.class,
|
||||
pagingPuntoVenta.getPageSize());
|
||||
|
@ -106,6 +110,8 @@ public class RelatorioDevolucaoBilhetesController extends MyGenericForwardCompos
|
|||
|
||||
private void executarRelatorio() throws Exception {
|
||||
|
||||
chkApenasBilhetesImpressos.getValue();
|
||||
|
||||
Map<String, Object> parametros = new HashMap<String, Object>();
|
||||
StringBuilder filtro = new StringBuilder();
|
||||
|
||||
|
@ -121,6 +127,9 @@ public class RelatorioDevolucaoBilhetesController extends MyGenericForwardCompos
|
|||
if(this.datDevolucaoFinal.getValue() != null) {
|
||||
parametros.put("dataDevolucaoFinal", DateUtil.fimFecha(this.datDevolucaoFinal.getValue()));
|
||||
}
|
||||
if(chkApenasBilhetesImpressos.isChecked()) {
|
||||
parametros.put("isApenasBilhetesImpressos", Boolean.TRUE);
|
||||
}
|
||||
|
||||
parametros.put("USUARIO", UsuarioLogado.getUsuarioLogado().getClaveUsuario());
|
||||
|
||||
|
@ -197,9 +206,45 @@ public class RelatorioDevolucaoBilhetesController extends MyGenericForwardCompos
|
|||
}
|
||||
|
||||
public void onClick$btnExecutarRelatorio(Event ev) throws Exception {
|
||||
if(this.datInicial.getValue() == null &&
|
||||
this.datFinal.getValue() == null &&
|
||||
this.datDevolucaoInicial.getValue() == null &&
|
||||
this.datDevolucaoFinal.getValue() == null) {
|
||||
Messagebox.show(Labels.getLabel("relatorioDevolucaoBilhetesAgenciaController.msg.nenhumaDataInformada"),
|
||||
Labels.getLabel("relatorioDevolucaoBilhetesAgenciaController.window.title"),
|
||||
Messagebox.OK, Messagebox.EXCLAMATION);
|
||||
return;
|
||||
}
|
||||
|
||||
if(!validarDatas(this.datInicial.getValue(), this.datFinal.getValue())) {
|
||||
Messagebox.show(Labels.getLabel("relatorioDevolucaoBilhetesAgenciaController.msg.dataInicialFinal"),
|
||||
Labels.getLabel("relatorioDevolucaoBilhetesAgenciaController.window.title"),
|
||||
Messagebox.OK, Messagebox.EXCLAMATION);
|
||||
return;
|
||||
}
|
||||
|
||||
if(!validarDatas(this.datDevolucaoInicial.getValue(), this.datDevolucaoFinal.getValue())) {
|
||||
Messagebox.show(Labels.getLabel("relatorioDevolucaoBilhetesAgenciaController.msg.dataInicialFinal"),
|
||||
Labels.getLabel("relatorioDevolucaoBilhetesAgenciaController.window.title"),
|
||||
Messagebox.OK, Messagebox.EXCLAMATION);
|
||||
return;
|
||||
}
|
||||
|
||||
executarRelatorio();
|
||||
}
|
||||
|
||||
private boolean validarDatas(Date dataInicial, Date dataFinal) {
|
||||
boolean isDataInicial = dataInicial != null;
|
||||
boolean isDataFinal = dataFinal != null;
|
||||
if(isDataInicial && isDataFinal) {
|
||||
return true;
|
||||
}
|
||||
if(!isDataInicial && !isDataFinal) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public void onDoubleClick$puntoVentaList(Event ev) {
|
||||
|
||||
PuntoVenta puntoVentaSel = (PuntoVenta) puntoVentaList.getSelected();
|
||||
|
|
|
@ -543,6 +543,9 @@ relatorioDevolucaoBilhetesAgenciaController.tipo.lbTipo = Tipo
|
|||
relatorioDevolucaoBilhetesAgenciaController.tipo.lbFiscal = Fiscal
|
||||
relatorioDevolucaoBilhetesAgenciaController.tipo.lbFinanceiro = Financeiro
|
||||
relatorioDevolucaoBilhetesAgenciaController.tipo.lbConsolidado = Consolidado
|
||||
relatorioDevolucaoBilhetesAgenciaController.lbApenasBilhetesImpressos = Apenas bilhetes impressos
|
||||
relatorioDevolucaoBilhetesAgenciaController.msg.nenhumaDataInformada = Nenhuma data foi informada
|
||||
relatorioDevolucaoBilhetesAgenciaController.msg.dataInicialFinal = Informar data inicial e final
|
||||
|
||||
#Reporte Acompanhamento Equivalentes
|
||||
relatorioAcompanhamentoEquivalentesController.window.title = Reporte de acompañamiento de equivalentes
|
||||
|
|
|
@ -609,6 +609,9 @@ relatorioDevolucaoBilhetesAgenciaController.tipo.lbTipo = Tipo
|
|||
relatorioDevolucaoBilhetesAgenciaController.tipo.lbFiscal = Fiscal
|
||||
relatorioDevolucaoBilhetesAgenciaController.tipo.lbFinanceiro = Financeiro
|
||||
relatorioDevolucaoBilhetesAgenciaController.tipo.lbConsolidado = Consolidado
|
||||
relatorioDevolucaoBilhetesAgenciaController.lbApenasBilhetesImpressos = Apenas bilhetes impressos
|
||||
relatorioDevolucaoBilhetesAgenciaController.msg.nenhumaDataInformada = Nenhuma data foi informada
|
||||
relatorioDevolucaoBilhetesAgenciaController.msg.dataInicialFinal = Informar data inicial e final
|
||||
|
||||
#Relatório Acompanhamento Equivalentes
|
||||
relatorioAcompanhamentoEquivalentesController.window.title = Relatório de Acompanhamento de Equivalentes
|
||||
|
|
|
@ -20,12 +20,12 @@
|
|||
<label
|
||||
value="${c:l('relatorioDevolucaoBilhetesAgenciaController.lbDataVendaIni.value')}" />
|
||||
<datebox id="datInicial" width="90%"
|
||||
format="dd/MM/yyyy" constraint="no empty"
|
||||
format="dd/MM/yyyy"
|
||||
maxlength="10" />
|
||||
<label
|
||||
value="${c:l('relatorioDevolucaoBilhetesAgenciaController.lbDataVendaFin.value')}" />
|
||||
<datebox id="datFinal" width="90%"
|
||||
format="dd/MM/yyyy" constraint="no empty"
|
||||
format="dd/MM/yyyy"
|
||||
maxlength="10" />
|
||||
</row>
|
||||
|
||||
|
@ -130,6 +130,12 @@
|
|||
</radiogroup>
|
||||
</row>
|
||||
|
||||
<row spans="1,4">
|
||||
<label
|
||||
value="${c:l('relatorioDevolucaoBilhetesAgenciaController.lbApenasBilhetesImpressos')}" />
|
||||
<checkbox id="chkApenasBilhetesImpressos"/>
|
||||
</row>
|
||||
|
||||
</rows>
|
||||
</grid>
|
||||
<toolbar>
|
||||
|
|
Loading…
Reference in New Issue