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

Merge pull request 'fixes bug#AL-3859' (!404) from AL-3859 into master 

Reviewed-on: adm/VentaBoletosAdm#404
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
master
wallace 2024-02-23 22:42:18 +00:00
parent ba4b3b518d d10ea1010d
commit 54005252df
7 changed files with 113 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java
View File

@ -2,12 +2,15 @@ package com.rjconsultores.ventaboletos.relatorios.impl;
import java.sql.Connection; import java.sql.Connection;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.rjconsultores.ventaboletos.enums.EnumTipoVenda; import com.rjconsultores.ventaboletos.enums.EnumTipoVenda;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
import com.rjconsultores.ventaboletos.utilerias.DateUtil;
import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
public class RelatorioEstoque extends Relatorio { public class RelatorioEstoque extends Relatorio {
@ -22,6 +25,16 @@ public class RelatorioEstoque extends Relatorio {
String sql = getSql(); String sql = getSql();
NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql); NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql);
Date dtInicio = (Date) parametros.get("DATA_INICIO");
Date dtFim = (Date) parametros.get("DATA_FIM");
if(dtInicio != null && dtFim != null) {
stmt.setString("dataInicio", DateUtil.getStringDate(dtInicio, "dd/MM/yyyy") + " 00:00:00");
stmt.setString("dataFinal", DateUtil.getStringDate(dtFim, "dd/MM/yyyy") + " 23:59:59");
}else if(dtInicio != null) {
stmt.setString("dataInicio", DateUtil.getStringDate(dtInicio, "dd/MM/yyyy") + " 00:00:00");
}
ResultSet rset = stmt.executeQuery(); ResultSet rset = stmt.executeQuery();
@ -55,6 +68,8 @@ public class RelatorioEstoque extends Relatorio {
} }
} }
dataResult.put("dataVencimento", rset.getDate("dataVencimento"));
dataResult.put("dataAquicision", rset.getDate("dataAquicision"));
dataResult.put("aidf", rset.getString("aidf")); dataResult.put("aidf", rset.getString("aidf"));
dataResult.put("empresa", rset.getString("nombempresa")); dataResult.put("empresa", rset.getString("nombempresa"));
dataResult.put("estacao", rset.getString("estacao")); dataResult.put("estacao", rset.getString("estacao"));
@ -64,6 +79,7 @@ public class RelatorioEstoque extends Relatorio {
dataResult.put("formfinal", formfinal); dataResult.put("formfinal", formfinal);
dataResult.put("estado", rset.getString("nombestado")); dataResult.put("estado", rset.getString("nombestado"));
dataResult.put("tipo", rset.getString("tipo")); dataResult.put("tipo", rset.getString("tipo"));
this.dados.add(dataResult); this.dados.add(dataResult);
} }
@ -78,7 +94,7 @@ public class RelatorioEstoque extends Relatorio {
private String getSql() { private String getSql() {
StringBuilder sql = new StringBuilder(); StringBuilder sql = new StringBuilder();
sql.append("SELECT dab.aidf_id AS aidf, "); sql.append("SELECT ai.fecvencimiento as dataVencimento, ai.fecadquisicion as dataAquicision, dab.aidf_id AS aidf, ");
sql.append(" e.nombempresa, "); sql.append(" e.nombempresa, ");
sql.append(" p.nombpuntoventa, "); sql.append(" p.nombpuntoventa, ");
sql.append(" dab.NUMSERIEPREIMPRESA AS serie, "); sql.append(" dab.NUMSERIEPREIMPRESA AS serie, ");
@ -116,7 +132,7 @@ public class RelatorioEstoque extends Relatorio {
sql.append(" INNER JOIN det_abasto_boleto dab ON ( dab.abastoboleto_id = ab.abastoboleto_id and dab.ACTIVO = 1 )"); sql.append(" INNER JOIN det_abasto_boleto dab ON ( dab.abastoboleto_id = ab.abastoboleto_id and dab.ACTIVO = 1 )");
sql.append(" INNER JOIN punto_venta p ON ( p.puntoventa_id = ab.puntoventa_id and p.ACTIVO = 1 )"); sql.append(" INNER JOIN punto_venta p ON ( p.puntoventa_id = ab.puntoventa_id and p.ACTIVO = 1 )");
sql.append(" LEFT JOIN TIPO_PTOVTA tp ON ( tp.TIPOPTOVTA_ID = p.TIPOPTOVTA_ID and tp.ACTIVO = 1 )"); sql.append(" LEFT JOIN TIPO_PTOVTA tp ON ( tp.TIPOPTOVTA_ID = p.TIPOPTOVTA_ID and tp.ACTIVO = 1 )");
sql.append(" INNER JOIN estacion es ON ( es.ESTACION_ID = ab.ESTACION_ID )"); sql.append(" LEFT JOIN estacion es ON ( es.ESTACION_ID = ab.ESTACION_ID )");
sql.append(" INNER JOIN ARTICULO ar ON ( ar.ARTICULO_ID = ab.ARTICULO_ID )"); sql.append(" INNER JOIN ARTICULO ar ON ( ar.ARTICULO_ID = ab.ARTICULO_ID )");
sql.append(" LEFT JOIN FOLIO_PREIMPRESO fp ON ( fp.AIDF_ID = dab.AIDF_ID and fp.EMPRESA_ID = e.EMPRESA_ID and fp.ESTACION_ID = ab.ESTACION_ID and fp.activo = 1 )"); sql.append(" LEFT JOIN FOLIO_PREIMPRESO fp ON ( fp.AIDF_ID = dab.AIDF_ID and fp.EMPRESA_ID = e.EMPRESA_ID and fp.ESTACION_ID = ab.ESTACION_ID and fp.activo = 1 )");
sql.append(" INNER JOIN aidf ai ON ( ai.aidf_id =dab.aidf_id )"); sql.append(" INNER JOIN aidf ai ON ( ai.aidf_id =dab.aidf_id )");
@ -130,6 +146,11 @@ public class RelatorioEstoque extends Relatorio {
if (parametros.get("NUMPUNTOVENTA") != null) { if (parametros.get("NUMPUNTOVENTA") != null) {
sql.append(" AND ab.puntoventa_id in(").append(parametros.get("NUMPUNTOVENTA")).append(") "); sql.append(" AND ab.puntoventa_id in(").append(parametros.get("NUMPUNTOVENTA")).append(") ");
} }
if(parametros.get("DATA_INICIO") != null && parametros.get("DATA_FIM") != null) {
sql.append(" AND fecadquisicion BETWEEN TO_DATE(:dataInicio,'dd/mm/yyyy hh24:mi:ss') AND TO_DATE(:dataFinal,'dd/mm/yyyy hh24:mi:ss') ");
}else if(parametros.get("DATA_INICIO") != null) {
sql.append(" AND fecadquisicion >= TO_DATE(:dataInicio,'dd/mm/yyyy hh24:mi:ss') ");
}
sql.append(" ORDER BY e.nombempresa, p.nombpuntoventa,es.descestacion, ar.descarticulo, forminicial"); sql.append(" ORDER BY e.nombempresa, p.nombpuntoventa,es.descestacion, ar.descarticulo, forminicial");
return sql.toString(); return sql.toString();

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

Binary file not shown.

96
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstoque.jrxml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-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="RelatorioEstoque" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" resourceBundle="/ventaboletosadm/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAidfDetalhado_es_BR" uuid="c092ef85-9334-4225-93d7-1acb7cf4d021"> <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="RelatorioEstoque" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" resourceBundle="/ventaboletosadm/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAidfDetalhado_es_BR" uuid="c092ef85-9334-4225-93d7-1acb7cf4d021">
<property name="ireport.zoom" value="1.6105100000000032"/> <property name="ireport.zoom" value="9.849732675807681"/>
<property name="ireport.x" value="658"/> <property name="ireport.x" value="6655"/>
<property name="ireport.y" value="0"/> <property name="ireport.y" value="1143"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="pageHeader"/> <property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="pageHeader"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.1" value="columnHeader"/> <property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.1" value="columnHeader"/>
<parameter name="NOME_RELATORIO" class="java.lang.String"/> <parameter name="NOME_RELATORIO" class="java.lang.String"/>
@ -25,13 +25,17 @@
<field name="estacao" class="java.lang.String"/> <field name="estacao" class="java.lang.String"/>
<field name="tipo" class="java.lang.String"/> <field name="tipo" class="java.lang.String"/>
<field name="estado" class="java.lang.String"/> <field name="estado" class="java.lang.String"/>
<field name="dataAquicision" class="java.util.Date">
<fieldDescription><![CDATA[fecadquisicionFinal]]></fieldDescription>
</field>
<field name="dataVencimento" class="java.util.Date"/>
<background> <background>
<band splitType="Stretch"/> <band splitType="Stretch"/>
</background> </background>
<pageHeader> <pageHeader>
<band height="82" splitType="Stretch"> <band height="82" splitType="Stretch">
<textField pattern="" isBlankWhenNull="false"> <textField pattern="" isBlankWhenNull="false">
<reportElement uuid="136a5066-d141-4362-af36-0780f0d16542" mode="Transparent" x="0" y="0" width="457" height="41" forecolor="#000000" backcolor="#FFFFFF"/> <reportElement mode="Transparent" x="0" y="0" width="457" height="41" forecolor="#000000" backcolor="#FFFFFF" uuid="136a5066-d141-4362-af36-0780f0d16542"/>
<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/> <paragraph lineSpacing="Single"/>
@ -39,14 +43,14 @@
<textFieldExpression><![CDATA[$P{NOME_RELATORIO}]]></textFieldExpression> <textFieldExpression><![CDATA[$P{NOME_RELATORIO}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="a9d471fb-1e1d-4d9a-9783-bbf988931192" x="513" y="0" width="185" height="25"/> <reportElement x="513" y="0" width="185" height="25" uuid="a9d471fb-1e1d-4d9a-9783-bbf988931192"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font size="9" isBold="true"/> <font size="9" isBold="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression>
</textField> </textField>
<textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false"> <textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false">
<reportElement uuid="0d200750-aabf-4c7e-b27b-c0e7af4802a9" mode="Transparent" x="698" y="0" width="104" height="25" forecolor="#000000" backcolor="#FFFFFF"/> <reportElement mode="Transparent" x="698" y="0" width="104" height="25" forecolor="#000000" backcolor="#FFFFFF" uuid="0d200750-aabf-4c7e-b27b-c0e7af4802a9"/>
<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/> <paragraph lineSpacing="Single"/>
@ -54,10 +58,10 @@
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
</textField> </textField>
<line> <line>
<reportElement uuid="bbf33a72-515f-42fc-8c79-e859aebca31d" x="0" y="57" width="802" height="1"/> <reportElement x="0" y="57" width="802" height="1" uuid="bbf33a72-515f-42fc-8c79-e859aebca31d"/>
</line> </line>
<textField pattern="" isBlankWhenNull="false"> <textField pattern="" isBlankWhenNull="false">
<reportElement uuid="bae9bec6-8c42-4bee-a070-34b0a7f1aee4" mode="Transparent" x="513" y="25" width="267" height="16" forecolor="#000000" backcolor="#FFFFFF"/> <reportElement mode="Transparent" x="513" y="25" width="267" height="16" forecolor="#000000" backcolor="#FFFFFF" uuid="bae9bec6-8c42-4bee-a070-34b0a7f1aee4"/>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <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"/> <font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/> <paragraph lineSpacing="Single"/>
@ -65,7 +69,7 @@
<textFieldExpression><![CDATA[$R{cabecalho.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{cabecalho.de}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{cabecalho.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{cabecalho.de}]]></textFieldExpression>
</textField> </textField>
<textField evaluationTime="Report" pattern="" isBlankWhenNull="false"> <textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
<reportElement uuid="314e312c-8f24-42de-8354-3c1f7241a985" mode="Transparent" x="781" y="25" width="21" height="16" forecolor="#000000" backcolor="#FFFFFF"/> <reportElement mode="Transparent" x="781" y="25" width="21" height="16" forecolor="#000000" backcolor="#FFFFFF" uuid="314e312c-8f24-42de-8354-3c1f7241a985"/>
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/> <paragraph lineSpacing="Single"/>
@ -73,7 +77,7 @@
<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
</textField> </textField>
<textField pattern="" isBlankWhenNull="false"> <textField pattern="" isBlankWhenNull="false">
<reportElement uuid="4e030613-9cee-443e-9eaa-b19fa3090976" mode="Transparent" x="698" y="42" width="104" height="15" forecolor="#000000" backcolor="#FFFFFF"/> <reportElement mode="Transparent" x="698" y="42" width="104" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="4e030613-9cee-443e-9eaa-b19fa3090976"/>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <font fontName="SansSerif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/> <paragraph lineSpacing="Single"/>
@ -81,10 +85,10 @@
<textFieldExpression><![CDATA[$R{cabecalho.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{cabecalho.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression>
</textField> </textField>
<line> <line>
<reportElement uuid="6ca45088-a58d-43b3-b196-8fc26e128fbf" x="0" y="77" width="802" height="1"/> <reportElement x="0" y="77" width="802" height="1" uuid="6ca45088-a58d-43b3-b196-8fc26e128fbf"/>
</line> </line>
<textField> <textField>
<reportElement uuid="b29d0494-2695-420b-bdc1-b13c08bdbcda" x="0" y="58" width="803" height="15"/> <reportElement x="0" y="58" width="803" height="15" uuid="b29d0494-2695-420b-bdc1-b13c08bdbcda"/>
<textElement verticalAlignment="Middle"> <textElement verticalAlignment="Middle">
<font size="10"/> <font size="10"/>
</textElement> </textElement>
@ -95,84 +99,98 @@
<columnHeader> <columnHeader>
<band height="35" splitType="Stretch"> <band height="35" splitType="Stretch">
<line> <line>
<reportElement uuid="a11636cc-5ee1-44cc-8cd1-cbe2ebc47abb" x="1" y="34" width="801" height="1"/> <reportElement x="1" y="34" width="801" height="1" uuid="a11636cc-5ee1-44cc-8cd1-cbe2ebc47abb"/>
</line> </line>
<staticText> <staticText>
<reportElement uuid="d60cb698-201c-4315-bec2-498effeea474" x="131" y="15" width="139" height="19"/> <reportElement x="63" y="16" width="85" height="18" uuid="d60cb698-201c-4315-bec2-498effeea474"/>
<textElement textAlignment="Center" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10" isBold="true"/> <font size="10" isBold="true"/>
</textElement> </textElement>
<text><![CDATA[Agência]]></text> <text><![CDATA[Agência]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="a26b9060-8bd5-4586-af31-e01b0ccf88f9" x="380" y="15" width="77" height="20"/> <reportElement x="246" y="16" width="49" height="19" uuid="a26b9060-8bd5-4586-af31-e01b0ccf88f9"/>
<textElement textAlignment="Center" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10" isBold="true"/> <font size="10" isBold="true"/>
</textElement> </textElement>
<text><![CDATA[De]]></text> <text><![CDATA[De]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="fcf366c0-0f13-44f7-84de-38ae1122b647" x="513" y="15" width="102" height="20"/> <reportElement x="350" y="16" width="102" height="18" uuid="fcf366c0-0f13-44f7-84de-38ae1122b647"/>
<textElement textAlignment="Center" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10" isBold="true"/> <font size="10" isBold="true"/>
</textElement> </textElement>
<text><![CDATA[Tipo]]></text> <text><![CDATA[Tipo]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="6db7e341-bc01-4843-8be5-fe74d78b7529" x="1" y="15" width="130" height="19"/> <reportElement x="1" y="16" width="62" height="18" uuid="6db7e341-bc01-4843-8be5-fe74d78b7529"/>
<textElement textAlignment="Center" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10" isBold="true"/> <font size="10" isBold="true"/>
</textElement> </textElement>
<text><![CDATA[Empresa]]></text> <text><![CDATA[Empresa]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="ed0c0a45-151a-400e-a30c-fd8afa88438b" x="270" y="15" width="65" height="19"/> <reportElement x="148" y="16" width="55" height="18" uuid="ed0c0a45-151a-400e-a30c-fd8afa88438b"/>
<textElement textAlignment="Center" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10" isBold="true"/> <font size="10" isBold="true"/>
</textElement> </textElement>
<text><![CDATA[AIDF]]></text> <text><![CDATA[AIDF]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="0bc3df3b-544b-4e68-ace9-f725d4541781" x="336" y="15" width="44" height="19"/> <reportElement x="203" y="16" width="43" height="18" uuid="0bc3df3b-544b-4e68-ace9-f725d4541781"/>
<textElement textAlignment="Center" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10" isBold="true"/> <font size="10" isBold="true"/>
</textElement> </textElement>
<text><![CDATA[Série]]></text> <text><![CDATA[Série]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="dbf9b898-7cb2-4271-84f3-32aa65056b5d" x="457" y="15" width="56" height="20"/> <reportElement x="295" y="16" width="55" height="18" uuid="dbf9b898-7cb2-4271-84f3-32aa65056b5d"/>
<textElement textAlignment="Center" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10" isBold="true"/> <font size="10" isBold="true"/>
</textElement> </textElement>
<text><![CDATA[Até]]></text> <text><![CDATA[Até]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="ea11f3f2-8b0d-4fc9-a87b-c190b8dab51f" x="615" y="15" width="83" height="20"/> <reportElement x="452" y="16" width="83" height="18" uuid="ea11f3f2-8b0d-4fc9-a87b-c190b8dab51f"/>
<textElement textAlignment="Center" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10" isBold="true"/> <font size="10" isBold="true"/>
</textElement> </textElement>
<text><![CDATA[Estação]]></text> <text><![CDATA[Estação]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="e8f84740-2a73-4631-a584-349b7c263496" x="698" y="15" width="104" height="20"/> <reportElement x="535" y="16" width="68" height="18" uuid="e8f84740-2a73-4631-a584-349b7c263496"/>
<textElement textAlignment="Center" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10" isBold="true"/> <font size="10" isBold="true"/>
</textElement> </textElement>
<text><![CDATA[Estado]]></text> <text><![CDATA[Estado]]></text>
</staticText> </staticText>
<staticText>
<reportElement x="603" y="16" width="104" height="18" uuid="05254957-d41e-4996-8c5d-ccf9786f1f8a"/>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10" isBold="true"/>
</textElement>
<text><![CDATA[Data Aquisição]]></text>
</staticText>
<staticText>
<reportElement x="707" y="16" width="95" height="18" uuid="8ad497bf-a305-41d2-a412-40dd3a7d6b88"/>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10" isBold="true"/>
</textElement>
<text><![CDATA[Data Vencimento ]]></text>
</staticText>
</band> </band>
</columnHeader> </columnHeader>
<detail> <detail>
<band height="22" splitType="Stretch"> <band height="22" splitType="Stretch">
<textField> <textField>
<reportElement uuid="c35afacb-b160-4ace-b7be-c2e2f54ac1c0" x="131" y="2" width="139" height="18"/> <reportElement x="63" y="2" width="85" height="18" uuid="c35afacb-b160-4ace-b7be-c2e2f54ac1c0"/>
<textElement textAlignment="Center"> <textElement textAlignment="Center">
<font size="8" isBold="false" isItalic="false"/> <font size="8" isBold="false" isItalic="false"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{agencia}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{agencia}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
<reportElement uuid="3dbaaef7-dae9-402d-89d4-a8055462f563" mode="Transparent" x="380" y="2" width="77" height="18" forecolor="#000000" backcolor="#FFFFFF"/> <reportElement mode="Transparent" x="246" y="2" width="49" height="18" forecolor="#000000" backcolor="#FFFFFF" uuid="3dbaaef7-dae9-402d-89d4-a8055462f563"/>
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <font fontName="SansSerif" size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/> <paragraph lineSpacing="Single"/>
@ -180,28 +198,28 @@
<textFieldExpression><![CDATA[$F{forminicio}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{forminicio}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="f1e52aa0-f61d-4c94-bb09-e51cde37f2cc" x="513" y="2" width="102" height="18"/> <reportElement x="350" y="2" width="102" height="18" uuid="f1e52aa0-f61d-4c94-bb09-e51cde37f2cc"/>
<textElement textAlignment="Center"> <textElement textAlignment="Center">
<font size="8"/> <font size="8"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{tipo}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{tipo}]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isBlankWhenNull="true">
<reportElement uuid="73582b2a-b21b-4637-990c-aff7423a8e27" x="1" y="2" width="130" height="18"/> <reportElement x="1" y="2" width="62" height="18" uuid="73582b2a-b21b-4637-990c-aff7423a8e27"/>
<textElement textAlignment="Center"> <textElement textAlignment="Center">
<font size="8" isBold="false" isItalic="false"/> <font size="8" isBold="false" isItalic="false"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression>
</textField> </textField>
<textField pattern="dd/MM/yyyy"> <textField pattern="dd/MM/yyyy">
<reportElement uuid="bfb9d635-bbc1-4e92-890a-df8299bc8daa" x="270" y="2" width="66" height="18"/> <reportElement x="148" y="2" width="55" height="18" uuid="bfb9d635-bbc1-4e92-890a-df8299bc8daa"/>
<textElement textAlignment="Center"> <textElement textAlignment="Center">
<font size="8" isBold="false" isItalic="false"/> <font size="8" isBold="false" isItalic="false"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{aidf}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{aidf}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement uuid="29ae3fa8-9db1-46c8-bcf7-cb9aa7bc6eb3" mode="Transparent" x="336" y="2" width="44" height="18" forecolor="#000000" backcolor="#FFFFFF"/> <reportElement mode="Transparent" x="203" y="2" width="43" height="18" forecolor="#000000" backcolor="#FFFFFF" uuid="29ae3fa8-9db1-46c8-bcf7-cb9aa7bc6eb3"/>
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <font fontName="SansSerif" size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/> <paragraph lineSpacing="Single"/>
@ -209,7 +227,7 @@
<textFieldExpression><![CDATA[$F{serie}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{serie}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
<reportElement uuid="117054b3-9ee6-488b-ae15-0de5362e939e" mode="Transparent" x="457" y="2" width="56" height="18" forecolor="#000000" backcolor="#FFFFFF"/> <reportElement mode="Transparent" x="295" y="2" width="55" height="18" forecolor="#000000" backcolor="#FFFFFF" uuid="117054b3-9ee6-488b-ae15-0de5362e939e"/>
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <font fontName="SansSerif" size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/> <paragraph lineSpacing="Single"/>
@ -217,19 +235,33 @@
<textFieldExpression><![CDATA[$F{formfinal}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{formfinal}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="a0ee8a4d-39ef-458a-895d-b12b794876d9" x="615" y="2" width="83" height="18"/> <reportElement x="452" y="2" width="83" height="18" uuid="a0ee8a4d-39ef-458a-895d-b12b794876d9"/>
<textElement textAlignment="Center"> <textElement textAlignment="Center">
<font size="8"/> <font size="8"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{estacao}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{estacao}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="ecc06a2b-2970-4bd0-abf0-e4f4ad0063fd" x="698" y="2" width="104" height="18"/> <reportElement x="535" y="2" width="68" height="18" uuid="ecc06a2b-2970-4bd0-abf0-e4f4ad0063fd"/>
<textElement textAlignment="Center"> <textElement textAlignment="Center">
<font size="8"/> <font size="8"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{estado}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{estado}]]></textFieldExpression>
</textField> </textField>
<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement x="603" y="2" width="104" height="18" uuid="3cebea71-ec6a-4b99-a775-ed36a59d94ea"/>
<textElement textAlignment="Center">
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{dataAquicision}]]></textFieldExpression>
</textField>
<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement x="707" y="2" width="95" height="18" uuid="efb76809-2760-4e07-abd7-182d252318a0"/>
<textElement textAlignment="Center">
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{dataVencimento}]]></textFieldExpression>
</textField>
</band> </band>
</detail> </detail>
<summary> <summary>
@ -238,7 +270,7 @@
<noData> <noData>
<band height="50"> <band height="50">
<textField> <textField>
<reportElement uuid="6f13c961-dd50-4e44-ba73-65e0752b8b83" x="1" y="24" width="575" height="26"/> <reportElement x="1" y="24" width="575" height="26" uuid="6f13c961-dd50-4e44-ba73-65e0752b8b83"/>
<textElement markup="none"> <textElement markup="none">
<font size="11" isBold="true"/> <font size="11" isBold="true"/>
</textElement> </textElement>

3
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAidfDetalhadoController.java
View File

@ -111,7 +111,8 @@ public class RelatorioAidfDetalhadoController extends MyGenericForwardComposer {
parametros.put("NOME_RELATORIO", Labels.getLabel("relatorioAidfDetalhadoController.window.title")); parametros.put("NOME_RELATORIO", Labels.getLabel("relatorioAidfDetalhadoController.window.title"));
parametros.put("USUARIO", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString()); parametros.put("USUARIO", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString());
parametros.put("USUARIO_NOME", UsuarioLogado.getUsuarioLogado().getNombusuario()); parametros.put("USUARIO_NOME", UsuarioLogado.getUsuarioLogado().getNombusuario());
parametros.put("DATA_INICIO", datInicial.getValue());
parametros.put("DATA_FIM", datFinal.getValue());
filtro.append("Empresa: "); filtro.append("Empresa: ");
Comboitem itemEmpresa = cmbEmpresa.getSelectedItem(); Comboitem itemEmpresa = cmbEmpresa.getSelectedItem();
if (itemEmpresa != null) { if (itemEmpresa != null) {

10
web/WEB-INF/i3-label_es_MX.label
View File

@ -1066,14 +1066,14 @@ relatorioAidfController.lbEmpresa.value = Empresa
relatorioAidfController.lbSerie.value = Série relatorioAidfController.lbSerie.value = Série
#Relatorio Aidf Detalhado #Relatorio Aidf Detalhado
relatorioAidfDetalhadoController.window.title = Relatório Aidf Detalhado relatorioAidfDetalhadoController.window.title = Relatório Estoque
relatorioAidfDetalhadoController.datainicial.value = Data Inicial relatorioAidfDetalhadoController.datainicial.value = Data Inicial Aquisição
relatorioAidfDetalhadoController.dataFinal.value = Data Final relatorioAidfDetalhadoController.dataFinal.value = Data Final Aquisição
relatorioAidfDetalhadoController.lbEmpresa.value = Empresa relatorioAidfDetalhadoController.lbEmpresa.value = Empresa
relatorioAidfDetalhadoController.lbSerie.value = Série relatorioAidfDetalhadoController.lbAidf.value = AIDF/Série/SubSerie
relatorioAidfDetalhadoController.lbAidf.value = AIDF
relatorioAidfDetalhadoController.lbFormInicial.value = Form. Inicial relatorioAidfDetalhadoController.lbFormInicial.value = Form. Inicial
relatorioAidfDetalhadoController.lbFormFinal.value = Form. Final relatorioAidfDetalhadoController.lbFormFinal.value = Form. Final
relatorioAidfDetalhadoController.msg.agencia.obrigatorio = Uma Agência deve ser selecionada
#Relatório de Vendas PTA #Relatório de Vendas PTA
relatorioVendasPTAController.window.title = Reporte de Ventas PTA relatorioVendasPTAController.window.title = Reporte de Ventas PTA

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

@ -1213,8 +1213,8 @@ relatorioAidfController.lbSerie.value = Série
#Relatorio Aidf Detalhado #Relatorio Aidf Detalhado
relatorioAidfDetalhadoController.window.title = Relatório Estoque relatorioAidfDetalhadoController.window.title = Relatório Estoque
relatorioAidfDetalhadoController.datainicial.value = Data Inicial relatorioAidfDetalhadoController.datainicial.value = Data Inicial Aquisição
relatorioAidfDetalhadoController.dataFinal.value = Data Final relatorioAidfDetalhadoController.dataFinal.value = Data Final Aquisição
relatorioAidfDetalhadoController.lbEmpresa.value = Empresa relatorioAidfDetalhadoController.lbEmpresa.value = Empresa
relatorioAidfDetalhadoController.lbAidf.value = AIDF/Série/SubSerie relatorioAidfDetalhadoController.lbAidf.value = AIDF/Série/SubSerie
relatorioAidfDetalhadoController.lbFormInicial.value = Form. Inicial relatorioAidfDetalhadoController.lbFormInicial.value = Form. Inicial

19
web/gui/relatorios/filtroRelatorioAidfDetalhado.zul
View File

@ -7,15 +7,25 @@
<zk xmlns="http://www.zkoss.org/2005/zul"> <zk xmlns="http://www.zkoss.org/2005/zul">
<window id="winFiltroRelatorioAidfDetalhado" apply="${relatorioAidfDetalhadoController}" <window id="winFiltroRelatorioAidfDetalhado" apply="${relatorioAidfDetalhadoController}"
contentStyle="overflow:auto" contentStyle="overflow:auto"
height="280px" width="538px" border="normal"> height="300px" width="738px" border="normal">
<grid fixedLayout="true"> <grid fixedLayout="true">
<columns> <columns>
<column width="25%" /> <column width="25%" />
<column width="30%" /> <column width="25%" />
<column width="15%" /> <column width="25%" />
<column width="30%" /> <column width="25%" />
</columns> </columns>
<rows> <rows>
<row>
<label
value="${c:l('relatorioAidfDetalhadoController.datainicial.value')}" />
<datebox id="datInicial" width="90%"
format="dd/MM/yyyy" maxlength="10" />
<label
value="${c:l('relatorioAidfDetalhadoController.dataFinal.value')}" />
<datebox id="datFinal" width="90%"
format="dd/MM/yyyy" maxlength="10" />
</row>
<row spans="1,3"> <row spans="1,3">
<label <label
value="${c:l('relatorioAidfDetalhadoController.lbEmpresa.value')}" /> value="${c:l('relatorioAidfDetalhadoController.lbEmpresa.value')}" />
@ -80,6 +90,7 @@
</listbox> </listbox>
<paging id="pagingSelPuntoVenta" pageSize="10" /> <paging id="pagingSelPuntoVenta" pageSize="10" />
</row> </row>
</rows> </rows>
</grid> </grid>
<toolbar> <toolbar>