fixes bug#12079

dev:Fabio
qua:Renato


git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@85416 d1611594-4594-4d17-8e1d-87c2c4800839
master
aristides 2018-09-14 18:52:17 +00:00
parent 636cb94317
commit 993a4bef4f
6 changed files with 232 additions and 93 deletions

View File

@ -21,7 +21,6 @@ import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
*/ */
public class RelatorioVendasBilheteiroSintetico extends Relatorio { public class RelatorioVendasBilheteiroSintetico extends Relatorio {
public RelatorioVendasBilheteiroSintetico(Map<String, Object> parametros, Connection conexao) throws Exception { public RelatorioVendasBilheteiroSintetico(Map<String, Object> parametros, Connection conexao) throws Exception {
super(parametros, conexao); super(parametros, conexao);
@ -31,23 +30,80 @@ public class RelatorioVendasBilheteiroSintetico extends Relatorio {
Connection conexao = this.relatorio.getConexao(); Connection conexao = this.relatorio.getConexao();
Map<String, Object> parametros = this.relatorio.getParametros(); Map<String, Object> parametros = this.relatorio.getParametros();
StringBuilder sql = new StringBuilder(); StringBuilder sql = new StringBuilder();
sql.append("select "); sql.append("select ");
sql.append(" pv.NUMPUNTOVENTA, us.cveusuario , us.NOMBUSUARIO, tpv.DESCTIPO,"); sql.append(" pv.NUMPUNTOVENTA, us.cveusuario , us.NOMBUSUARIO, tpv.DESCTIPO,");
sql.append(" sum (case when ca.motivocancelacion_id is null then 1 else 0 end) qtdVendas, "); sql.append(" sum (case when ca.motivocancelacion_id is null then 1 else 0 end) qtdVendas, ");
sql.append(" sum (case when ca.motivocancelacion_id is null then "); sql.append(" sum (case when ca.motivocancelacion_id is null then ");
sql.append(" (coalesce(ca.preciopagado,0) ");
sql.append(" + coalesce(ca.importepedagio,0) ");
sql.append(" + coalesce(ca.importetaxaembarque,0) "); Boolean soma = false;
sql.append(" + coalesce(ca.importeseguro,0) ) else 0 end ) vlrVendas, "); sql.append(" (");
if (parametros.get("TARIFA") != null) {
soma = true;
sql.append(" coalesce(ca.preciopagado,0) ");
}
if (parametros.get("PEDAGIO") != null) {
if (soma) {
sql.append(" + coalesce(ca.importepedagio,0) ");
} else {
sql.append(" coalesce(ca.importepedagio,0) ");
soma = true;
}
}
if (parametros.get("TAXADEEMBARQUE") != null) {
if (soma) {
sql.append(" + coalesce(ca.importetaxaembarque,0) ");
} else {
sql.append(" coalesce(ca.importetaxaembarque,0) ");
soma = true;
}
}
if (parametros.get("SEGURO") != null) {
if (soma) {
sql.append(" + coalesce(ca.importeseguro,0) ");
} else {
sql.append(" coalesce(ca.importeseguro,0) ");
}
}
sql.append(" ) else 0 end ) vlrVendas, ");
sql.append(" sum (case when ca.motivocancelacion_id is not null then 1 else 0 end) qtdCancelados, "); sql.append(" sum (case when ca.motivocancelacion_id is not null then 1 else 0 end) qtdCancelados, ");
sql.append(" sum (case when ca.motivocancelacion_id is not null then "); sql.append(" sum (case when ca.motivocancelacion_id is not null then ");
sql.append(" (coalesce(ca.preciopagado,0) ");
sql.append(" + coalesce(ca.importepedagio,0) "); soma = false;
sql.append(" + coalesce(ca.importetaxaembarque,0) "); sql.append(" (");
sql.append(" + coalesce(ca.importeseguro,0) ) else 0 end ) vlrCancelados "); if (parametros.get("TARIFA") != null) {
sql.append(" coalesce(ca.preciopagado,0) ");
soma = true;
}
if (parametros.get("PEDAGIO") != null) {
if (soma) {
sql.append(" + coalesce(ca.importepedagio,0) ");
} else {
sql.append(" coalesce(ca.importepedagio,0) ");
soma = true;
}
}
if (parametros.get("TAXADEEMBARQUE") != null) {
if (soma) {
sql.append(" + coalesce(ca.importetaxaembarque,0) ");
} else {
sql.append(" coalesce(ca.importetaxaembarque,0) ");
soma = true;
}
}
if (parametros.get("SEGURO") != null) {
if (soma) {
sql.append(" + coalesce(ca.importeseguro,0) ");
} else {
sql.append(" coalesce(ca.importeseguro,0) ");
}
}
sql.append(" ) else 0 end ) vlrCancelados ");
sql.append("from "); sql.append("from ");
sql.append(" caja ca "); sql.append(" caja ca ");
sql.append(" inner join usuario us on us.usuario_id = ca.usuario_id "); sql.append(" inner join usuario us on us.usuario_id = ca.usuario_id ");
@ -58,31 +114,30 @@ public class RelatorioVendasBilheteiroSintetico extends Relatorio {
sql.append(" ca.indreimpresion = 0 "); sql.append(" ca.indreimpresion = 0 ");
sql.append(" and ca.feccorte >= :DATA_INICIAL "); sql.append(" and ca.feccorte >= :DATA_INICIAL ");
sql.append(" and ca.feccorte <= :DATA_FINAL "); sql.append(" and ca.feccorte <= :DATA_FINAL ");
if(parametros.get("EMPRESA_ID") != null){ if (parametros.get("EMPRESA_ID") != null) {
sql.append(" and m.EMPRESA_ID = :EMPRESA_ID"); sql.append(" and m.EMPRESA_ID = :EMPRESA_ID");
} }
if (parametros.get("NUMPUNTOVENTA") != null) { if (parametros.get("NUMPUNTOVENTA") != null) {
sql.append(" and ca.puntoventa_id IN (" + parametros.get("NUMPUNTOVENTA").toString() + ")"); sql.append(" and ca.puntoventa_id IN (" + parametros.get("NUMPUNTOVENTA").toString() + ")");
} }
if(parametros.get("TIPOPUNTOVENTA_ID") != null && !parametros.get("TIPOPUNTOVENTA_ID").toString().equals("-1") ){ if (parametros.get("TIPOPUNTOVENTA_ID") != null && !parametros.get("TIPOPUNTOVENTA_ID").toString().equals("-1")) {
sql.append(" and pv.TIPOPTOVTA_ID = :TIPOPUNTOVENTA_ID "); sql.append(" and pv.TIPOPTOVTA_ID = :TIPOPUNTOVENTA_ID ");
} }
sql.append(" group by pv.NUMPUNTOVENTA, us.cveusuario, us.NOMBUSUARIO , tpv.DESCTIPO "); sql.append(" group by pv.NUMPUNTOVENTA, us.cveusuario, us.NOMBUSUARIO , tpv.DESCTIPO ");
sql.append(" order by pv.NUMPUNTOVENTA, us.NOMBUSUARIO "); sql.append(" order by pv.NUMPUNTOVENTA, us.NOMBUSUARIO ");
NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql.toString()); NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql.toString());
if(parametros.get("EMPRESA_ID") != null){ if (parametros.get("EMPRESA_ID") != null) {
stmt.setInt("EMPRESA_ID", Integer.valueOf(parametros.get("EMPRESA_ID").toString())); stmt.setInt("EMPRESA_ID", Integer.valueOf(parametros.get("EMPRESA_ID").toString()));
} }
stmt.setTimestamp("DATA_INICIAL", new Timestamp(DateUtil.inicioFecha((Date) parametros.get("DATA_INICIAL")).getTime())); stmt.setTimestamp("DATA_INICIAL", new Timestamp(DateUtil.inicioFecha((Date) parametros.get("DATA_INICIAL")).getTime()));
stmt.setTimestamp("DATA_FINAL", new Timestamp(DateUtil.fimFecha((Date) parametros.get("DATA_FINAL")).getTime())); stmt.setTimestamp("DATA_FINAL", new Timestamp(DateUtil.fimFecha((Date) parametros.get("DATA_FINAL")).getTime()));
if(parametros.get("TIPOPUNTOVENTA_ID") != null && !parametros.get("TIPOPUNTOVENTA_ID").toString().equals("-1") ){ if (parametros.get("TIPOPUNTOVENTA_ID") != null && !parametros.get("TIPOPUNTOVENTA_ID").toString().equals("-1")) {
stmt.setInt("TIPOPUNTOVENTA_ID", Integer.valueOf(parametros.get("TIPOPUNTOVENTA_ID").toString())); stmt.setInt("TIPOPUNTOVENTA_ID", Integer.valueOf(parametros.get("TIPOPUNTOVENTA_ID").toString()));
} }
ResultSet rset = stmt.executeQuery(); ResultSet rset = stmt.executeQuery();
while (rset.next()) { while (rset.next()) {

View File

@ -2,7 +2,7 @@
<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="RelatorioVendasBilheteiro" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="b92fb063-a827-4619-8a69-5c78e3afbb8c"> <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="RelatorioVendasBilheteiro" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="b92fb063-a827-4619-8a69-5c78e3afbb8c">
<property name="ireport.zoom" value="1.5"/> <property name="ireport.zoom" value="1.5"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.1" value="pageHeader"/> <property name="net.sf.jasperreports.export.xls.exclude.origin.band.1" value="pageHeader"/>
<property name="ireport.x" value="165"/> <property name="ireport.x" value="26"/>
<property name="ireport.y" value="0"/> <property name="ireport.y" value="0"/>
<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/> <style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
<style name="table"> <style name="table">
@ -53,13 +53,19 @@
<variable name="qtdVendasTotal" class="java.lang.Integer" calculation="Sum"> <variable name="qtdVendasTotal" class="java.lang.Integer" calculation="Sum">
<variableExpression><![CDATA[$F{QTDVENDAS}]]></variableExpression> <variableExpression><![CDATA[$F{QTDVENDAS}]]></variableExpression>
</variable> </variable>
<variable name="vlrTotal" class="java.math.BigDecimal" incrementType="Column">
<variableExpression><![CDATA[$F{VLRVENDAS}.subtract($F{VLRCANCELADOS})]]></variableExpression>
</variable>
<variable name="vlrTotalCompleto" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$V{vlrTotal}]]></variableExpression>
</variable>
<background> <background>
<band splitType="Stretch"/> <band splitType="Stretch"/>
</background> </background>
<pageHeader> <pageHeader>
<band height="53" splitType="Stretch"> <band height="53" splitType="Stretch">
<textField pattern="dd/MM/yyyy" isBlankWhenNull="false"> <textField pattern="dd/MM/yyyy" isBlankWhenNull="false">
<reportElement mode="Transparent" x="43" y="14" width="69" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="42796e20-405c-441f-9fd9-b26238bc7cdb"/> <reportElement uuid="42796e20-405c-441f-9fd9-b26238bc7cdb" mode="Transparent" x="43" y="14" width="69" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
<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"/>
@ -67,7 +73,7 @@
<textFieldExpression><![CDATA[$P{DATA_INICIAL}]]></textFieldExpression> <textFieldExpression><![CDATA[$P{DATA_INICIAL}]]></textFieldExpression>
</textField> </textField>
<textField pattern="" isBlankWhenNull="false"> <textField pattern="" isBlankWhenNull="false">
<reportElement mode="Transparent" x="0" y="0" width="257" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="d2973779-79dc-4cc8-937a-e9167c42bab0"/> <reportElement uuid="d2973779-79dc-4cc8-937a-e9167c42bab0" mode="Transparent" x="0" y="0" width="257" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
<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"/>
@ -75,7 +81,7 @@
<textFieldExpression><![CDATA[$P{NOME_RELATORIO}]]></textFieldExpression> <textFieldExpression><![CDATA[$P{NOME_RELATORIO}]]></textFieldExpression>
</textField> </textField>
<textField pattern="dd/MM/yyyy" isBlankWhenNull="false"> <textField pattern="dd/MM/yyyy" isBlankWhenNull="false">
<reportElement mode="Transparent" x="122" y="14" width="84" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="8730e85b-d436-42cd-beb6-1a881bad2478"/> <reportElement uuid="8730e85b-d436-42cd-beb6-1a881bad2478" mode="Transparent" x="122" y="14" width="84" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
<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"/>
@ -83,7 +89,7 @@
<textFieldExpression><![CDATA[$P{DATA_FINAL}]]></textFieldExpression> <textFieldExpression><![CDATA[$P{DATA_FINAL}]]></textFieldExpression>
</textField> </textField>
<textField pattern="" isBlankWhenNull="false"> <textField pattern="" isBlankWhenNull="false">
<reportElement mode="Transparent" x="0" y="14" width="44" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="26bbd310-5e59-4975-a47f-b0048e80b1b6"/> <reportElement uuid="26bbd310-5e59-4975-a47f-b0048e80b1b6" mode="Transparent" x="0" y="14" width="44" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
<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"/>
@ -91,17 +97,17 @@
<textFieldExpression><![CDATA[$R{cabecalho.periodo}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{cabecalho.periodo}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="44" y="39" width="511" height="14" uuid="c486add3-94d7-419f-9f37-04f6a6da879e"/> <reportElement uuid="c486add3-94d7-419f-9f37-04f6a6da879e" x="44" y="39" width="511" height="14"/>
<textElement verticalAlignment="Middle"> <textElement verticalAlignment="Middle">
<font size="8"/> <font size="8"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression> <textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression>
</textField> </textField>
<line> <line>
<reportElement x="0" y="39" width="555" height="1" uuid="a179c478-4014-4b4a-abf0-4655e7588bf7"/> <reportElement uuid="a179c478-4014-4b4a-abf0-4655e7588bf7" x="0" y="39" width="555" height="1"/>
</line> </line>
<textField pattern="" isBlankWhenNull="false"> <textField pattern="" isBlankWhenNull="false">
<reportElement mode="Transparent" x="0" y="39" width="45" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="9630a784-5f92-4abe-805c-fd175e4f8241"/> <reportElement uuid="9630a784-5f92-4abe-805c-fd175e4f8241" mode="Transparent" x="0" y="39" width="45" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none"> <textElement textAlignment="Left" verticalAlignment="Middle" 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"/>
@ -109,7 +115,7 @@
<textFieldExpression><![CDATA[$R{cabecalho.filtros}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{cabecalho.filtros}]]></textFieldExpression>
</textField> </textField>
<textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false"> <textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false">
<reportElement mode="Transparent" x="464" y="1" width="89" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="91cded42-c53d-469a-abc7-6eb0d59f69af"/> <reportElement uuid="91cded42-c53d-469a-abc7-6eb0d59f69af" mode="Transparent" x="464" y="1" width="89" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
<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"/>
@ -117,7 +123,7 @@
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
</textField> </textField>
<textField pattern="" isBlankWhenNull="false"> <textField pattern="" isBlankWhenNull="false">
<reportElement mode="Transparent" x="434" y="29" width="119" height="12" forecolor="#000000" backcolor="#FFFFFF" uuid="62f6ba6e-1aaf-4449-aef6-2e9d6e541856"/> <reportElement uuid="62f6ba6e-1aaf-4449-aef6-2e9d6e541856" mode="Transparent" x="434" y="29" width="119" height="12" forecolor="#000000" backcolor="#FFFFFF"/>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <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"/> <font fontName="SansSerif" size="7" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/> <paragraph lineSpacing="Single"/>
@ -125,7 +131,7 @@
<textFieldExpression><![CDATA[$R{cabecalho.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{cabecalho.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression>
</textField> </textField>
<textField evaluationTime="Report" pattern="" isBlankWhenNull="false"> <textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
<reportElement mode="Transparent" x="538" y="15" width="15" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="985f839c-258a-47eb-b72b-bec819b7bdbb"/> <reportElement uuid="985f839c-258a-47eb-b72b-bec819b7bdbb" mode="Transparent" x="538" y="15" width="15" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
<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"/>
@ -133,7 +139,7 @@
<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
</textField> </textField>
<textField pattern="" isBlankWhenNull="false"> <textField pattern="" isBlankWhenNull="false">
<reportElement mode="Transparent" x="434" y="15" width="105" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="ba831a24-59f4-4f8f-888f-fd69711018e9"/> <reportElement uuid="ba831a24-59f4-4f8f-888f-fd69711018e9" mode="Transparent" x="434" y="15" width="105" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
<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"/>
@ -141,14 +147,14 @@
<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> <textField>
<reportElement x="385" y="1" width="80" height="15" uuid="5cbb57ef-bd5e-4d1b-a077-d0ff398df801"/> <reportElement uuid="5cbb57ef-bd5e-4d1b-a077-d0ff398df801" x="385" y="1" width="80" height="15"/>
<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="" isBlankWhenNull="false"> <textField pattern="" isBlankWhenNull="false">
<reportElement mode="Transparent" x="112" y="14" width="10" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="6d6ab075-006c-4796-98d5-f047ae963876"/> <reportElement uuid="6d6ab075-006c-4796-98d5-f047ae963876" mode="Transparent" x="112" y="14" width="10" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
<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"/>
@ -156,35 +162,35 @@
<textFieldExpression><![CDATA[$R{cabecalho.periodoA}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{cabecalho.periodoA}]]></textFieldExpression>
</textField> </textField>
<line> <line>
<reportElement x="0" y="52" width="555" height="1" uuid="06344ed1-e586-42b1-826e-f9008a2ee107"/> <reportElement uuid="06344ed1-e586-42b1-826e-f9008a2ee107" x="0" y="52" width="555" height="1"/>
</line> </line>
</band> </band>
</pageHeader> </pageHeader>
<columnHeader> <columnHeader>
<band height="13" splitType="Stretch"> <band height="13" splitType="Stretch">
<staticText> <staticText>
<reportElement x="122" y="0" width="68" height="11" uuid="9fc7e58e-8625-41c4-a8ee-6454f6382d46"/> <reportElement uuid="9fc7e58e-8625-41c4-a8ee-6454f6382d46" x="122" y="0" width="56" height="11"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Left" verticalAlignment="Middle">
<font size="7" isBold="true"/> <font size="7" isBold="true"/>
</textElement> </textElement>
<text><![CDATA[Bilheteiro]]></text> <text><![CDATA[Bilheteiro]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement x="0" y="0" width="58" height="11" uuid="3766fa33-6281-4576-a9d1-3b984e1976d3"/> <reportElement uuid="3766fa33-6281-4576-a9d1-3b984e1976d3" x="0" y="0" width="58" height="11"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Left" verticalAlignment="Middle">
<font size="7" isBold="true"/> <font size="7" isBold="true"/>
</textElement> </textElement>
<text><![CDATA[Num. Agência]]></text> <text><![CDATA[Num. Agência]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement x="262" y="0" width="64" height="11" uuid="7e1f6b82-8a1f-4719-b942-41f0d7027aa8"/> <reportElement uuid="7e1f6b82-8a1f-4719-b942-41f0d7027aa8" x="241" y="0" width="57" height="11"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Left" verticalAlignment="Middle">
<font size="7" isBold="true"/> <font size="7" isBold="true"/>
</textElement> </textElement>
<text><![CDATA[QTD. Vendas]]></text> <text><![CDATA[QTD. Vendas]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement mode="Transparent" x="326" y="0" width="76" height="11" forecolor="#000000" backcolor="#FFFFFF" uuid="6adaca80-9b5a-4a03-a80b-5eeed4894d7f"/> <reportElement uuid="6adaca80-9b5a-4a03-a80b-5eeed4894d7f" mode="Transparent" x="298" y="0" width="60" height="11" forecolor="#000000" backcolor="#FFFFFF"/>
<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none"> <textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
<font fontName="SansSerif" size="7" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <font fontName="SansSerif" size="7" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/> <paragraph lineSpacing="Single"/>
@ -192,7 +198,7 @@
<text><![CDATA[VLR. Vendas]]></text> <text><![CDATA[VLR. Vendas]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement mode="Transparent" x="475" y="0" width="80" height="11" forecolor="#000000" backcolor="#FFFFFF" uuid="a39ab8f3-becb-44e3-b4f5-b7c43889508c"/> <reportElement uuid="a39ab8f3-becb-44e3-b4f5-b7c43889508c" mode="Transparent" x="434" y="0" width="63" height="11" forecolor="#000000" backcolor="#FFFFFF"/>
<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none"> <textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
<font fontName="SansSerif" size="7" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <font fontName="SansSerif" size="7" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/> <paragraph lineSpacing="Single"/>
@ -200,14 +206,14 @@
<text><![CDATA[VLR.Cancelados]]></text> <text><![CDATA[VLR.Cancelados]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement x="58" y="0" width="64" height="11" uuid="8a5e97db-9b05-4fa5-9663-7795869b6b90"/> <reportElement uuid="8a5e97db-9b05-4fa5-9663-7795869b6b90" x="58" y="0" width="51" height="11"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Left" verticalAlignment="Middle">
<font size="7" isBold="true"/> <font size="7" isBold="true"/>
</textElement> </textElement>
<text><![CDATA[Login]]></text> <text><![CDATA[Login]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement mode="Transparent" x="402" y="0" width="73" height="11" forecolor="#000000" backcolor="#FFFFFF" uuid="c0542d93-dde4-448d-932c-453d6a4a6882"/> <reportElement uuid="c0542d93-dde4-448d-932c-453d6a4a6882" mode="Transparent" x="358" y="0" width="76" height="11" forecolor="#000000" backcolor="#FFFFFF"/>
<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none"> <textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
<font fontName="SansSerif" size="7" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <font fontName="SansSerif" size="7" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/> <paragraph lineSpacing="Single"/>
@ -215,87 +221,109 @@
<text><![CDATA[QTD. Cancelados]]></text> <text><![CDATA[QTD. Cancelados]]></text>
</staticText> </staticText>
<line> <line>
<reportElement x="0" y="11" width="555" height="1" uuid="8ef1fe89-c398-4c2d-a263-68d3c0dc91ab"/> <reportElement uuid="8ef1fe89-c398-4c2d-a263-68d3c0dc91ab" x="0" y="11" width="555" height="1"/>
</line> </line>
<staticText> <staticText>
<reportElement x="193" y="0" width="69" height="11" uuid="e6e0b0a7-cca5-4d73-ac88-b893f47b8b40"/> <reportElement uuid="e6e0b0a7-cca5-4d73-ac88-b893f47b8b40" x="178" y="0" width="63" height="11"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Left" verticalAlignment="Middle">
<font size="7" isBold="true"/> <font size="7" isBold="true"/>
</textElement> </textElement>
<text><![CDATA[Canal Venda]]></text> <text><![CDATA[Canal Venda]]></text>
</staticText> </staticText>
<staticText>
<reportElement uuid="9f165dc7-f56f-473e-8fca-de263b98198e" mode="Transparent" x="497" y="0" width="56" height="11" forecolor="#000000" backcolor="#FFFFFF"/>
<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
<font fontName="SansSerif" size="7" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
</textElement>
<text><![CDATA[VLR.TOTAL]]></text>
</staticText>
</band> </band>
</columnHeader> </columnHeader>
<detail> <detail>
<band height="15" splitType="Stretch"> <band height="15" splitType="Stretch">
<textField> <textField>
<reportElement x="0" y="0" width="58" height="15" uuid="01ee8c0d-6a68-45ea-a4e1-165a48cc89d4"/> <reportElement uuid="01ee8c0d-6a68-45ea-a4e1-165a48cc89d4" x="0" y="0" width="58" height="15"/>
<textElement/>
<textFieldExpression><![CDATA[$F{NUMPUNTOVENTA}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{NUMPUNTOVENTA}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="58" y="0" width="64" height="15" uuid="152742f7-1799-4416-a180-3f55ebd20eb0"/> <reportElement uuid="152742f7-1799-4416-a180-3f55ebd20eb0" x="58" y="0" width="51" height="15"/>
<textElement/>
<textFieldExpression><![CDATA[$F{CVEUSUARIO}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{CVEUSUARIO}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="122" y="0" width="68" height="15" uuid="7456c2e1-eb6f-48ba-8097-3ebc40c96bcd"/> <reportElement uuid="7456c2e1-eb6f-48ba-8097-3ebc40c96bcd" x="109" y="0" width="69" height="15"/>
<textElement/>
<textFieldExpression><![CDATA[$F{NOMBUSUARIO}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{NOMBUSUARIO}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="262" y="0" width="64" height="15" uuid="0debe4a0-072f-46ed-957b-635c73d4c92c"/> <reportElement uuid="0debe4a0-072f-46ed-957b-635c73d4c92c" x="241" y="0" width="57" height="15"/>
<textElement/>
<textFieldExpression><![CDATA[$F{QTDVENDAS}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{QTDVENDAS}]]></textFieldExpression>
</textField> </textField>
<textField>
<reportElement x="402" y="0" width="73" height="15" uuid="cb0241c1-c8ed-446d-accf-36af4a4ab540"/>
<textFieldExpression><![CDATA[$F{QTDCANCELADOS}]]></textFieldExpression>
</textField>
<textField pattern=" #,##0.00"> <textField pattern=" #,##0.00">
<reportElement x="475" y="0" width="80" height="15" uuid="de74b2a9-67c4-415c-abca-fa3549d9b0a7"/> <reportElement uuid="de74b2a9-67c4-415c-abca-fa3549d9b0a7" x="434" y="0" width="63" height="15"/>
<textElement/>
<textFieldExpression><![CDATA[$F{VLRCANCELADOS}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{VLRCANCELADOS}]]></textFieldExpression>
</textField> </textField>
<textField pattern=" #,##0.00"> <textField pattern=" #,##0.00">
<reportElement x="326" y="0" width="76" height="15" uuid="da9cc79b-499f-4b9f-b1fd-7de995071fea"/> <reportElement uuid="da9cc79b-499f-4b9f-b1fd-7de995071fea" x="298" y="0" width="60" height="15"/>
<textElement/>
<textFieldExpression><![CDATA[$F{VLRVENDAS}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{VLRVENDAS}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="190" y="0" width="72" height="15" uuid="49206373-b1d1-4c3e-8475-705c707b8286"/> <reportElement uuid="49206373-b1d1-4c3e-8475-705c707b8286" x="178" y="0" width="63" height="15"/>
<textElement/>
<textFieldExpression><![CDATA[$F{DESCTIPO}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{DESCTIPO}]]></textFieldExpression>
</textField> </textField>
<textField pattern=" #,##0.00">
<reportElement uuid="c338d2a3-b762-47b8-9d83-99f3ecb20e15" x="497" y="0" width="56" height="15"/>
<textElement/>
<textFieldExpression><![CDATA[$V{vlrTotal}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="cb0241c1-c8ed-446d-accf-36af4a4ab540" x="358" y="0" width="76" height="15"/>
<textElement/>
<textFieldExpression><![CDATA[$F{QTDCANCELADOS}]]></textFieldExpression>
</textField>
</band> </band>
</detail> </detail>
<lastPageFooter> <lastPageFooter>
<band height="22"> <band height="22">
<textField pattern=" #,##0.00"> <textField pattern=" #,##0.00">
<reportElement x="326" y="0" width="76" height="20" uuid="4fe96ddc-d868-49b8-8da6-819532f96884"/> <reportElement uuid="4fe96ddc-d868-49b8-8da6-819532f96884" x="298" y="0" width="60" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$V{vlrVendaTotal}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{vlrVendaTotal}]]></textFieldExpression>
</textField> </textField>
<textField pattern=" #,##0.00"> <textField pattern=" #,##0.00">
<reportElement x="475" y="0" width="80" height="20" uuid="04a540b3-e38f-47ca-85fe-3501dbc6c6a3"/> <reportElement uuid="04a540b3-e38f-47ca-85fe-3501dbc6c6a3" x="434" y="0" width="63" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$V{vlrCanceladosTotal}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{vlrCanceladosTotal}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="402" y="0" width="73" height="20" uuid="1d047de8-99d1-4293-924e-68e503c9e3bb"/> <reportElement uuid="1d047de8-99d1-4293-924e-68e503c9e3bb" x="358" y="0" width="76" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$V{qtdCanceladosTotal}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{qtdCanceladosTotal}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="262" y="0" width="64" height="20" uuid="8635b7a5-3642-4e3c-83d0-61f00680f2e1"/> <reportElement uuid="8635b7a5-3642-4e3c-83d0-61f00680f2e1" x="241" y="0" width="57" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$V{qtdVendasTotal}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{qtdVendasTotal}]]></textFieldExpression>
</textField> </textField>
<staticText> <staticText>
<reportElement x="190" y="0" width="72" height="20" uuid="4b21c6f2-7b3a-4ff4-b3d3-714ece376255"/> <reportElement uuid="4b21c6f2-7b3a-4ff4-b3d3-714ece376255" x="123" y="0" width="118" height="20"/>
<textElement textAlignment="Right"/> <textElement textAlignment="Right"/>
<text><![CDATA[Totais:]]></text> <text><![CDATA[Totais:]]></text>
</staticText> </staticText>
<textField pattern=" #,##0.00">
<reportElement uuid="ee93037d-feb2-42ec-96f7-af8d2d61f13d" x="497" y="2" width="56" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$V{vlrTotalCompleto}]]></textFieldExpression>
</textField>
</band> </band>
</lastPageFooter> </lastPageFooter>
<noData> <noData>
<band height="50"> <band height="50"/>
<textField>
<reportElement x="109" y="15" width="530" height="20" uuid="995c4c61-6291-4e5f-8d92-b75502a10466"/>
<textElement markup="none">
<font size="11" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
</textField>
</band>
</noData> </noData>
</jasperReport> </jasperReport>

View File

@ -20,6 +20,7 @@ import org.zkoss.zhtml.Messagebox;
import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.Event;
import org.zkoss.zul.Bandbox; import org.zkoss.zul.Bandbox;
import org.zkoss.zul.Checkbox;
import org.zkoss.zul.Comboitem; import org.zkoss.zul.Comboitem;
import org.zkoss.zul.Datebox; import org.zkoss.zul.Datebox;
import org.zkoss.zul.Paging; import org.zkoss.zul.Paging;
@ -60,7 +61,7 @@ public class RelatorioVendasBilheteiroSinteticoController extends MyGenericForwa
@Autowired @Autowired
private EmpresaService empresaService; private EmpresaService empresaService;
@Autowired @Autowired
private TipoPuntoVentaService tipoPuntoVentaService; private TipoPuntoVentaService tipoPuntoVentaService;
@ -69,7 +70,7 @@ public class RelatorioVendasBilheteiroSinteticoController extends MyGenericForwa
private MyComboboxEstandar cmbEmpresa; private MyComboboxEstandar cmbEmpresa;
private List<Empresa> lsEmpresa; private List<Empresa> lsEmpresa;
private MyComboboxEstandar cmbTipoPuntoVenta; private MyComboboxEstandar cmbTipoPuntoVenta;
private List<TipoPuntoVenta> lsTipoPuntoVenta; private List<TipoPuntoVenta> lsTipoPuntoVenta;
@ -85,6 +86,11 @@ public class RelatorioVendasBilheteiroSinteticoController extends MyGenericForwa
private MyTextbox txtBilheteiro; private MyTextbox txtBilheteiro;
private Checkbox checkboxTarifa;
private Checkbox checkboxImportepedagio;
private Checkbox checkboxImportetaxaembarque;
private Checkbox checkboxImporteseguro;
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
lsEmpresa = empresaService.obtenerTodos(); lsEmpresa = empresaService.obtenerTodos();
@ -93,6 +99,11 @@ public class RelatorioVendasBilheteiroSinteticoController extends MyGenericForwa
puntoVentaList.setItemRenderer(new RenderRelatorioVendasBilheteiroSintetico()); puntoVentaList.setItemRenderer(new RenderRelatorioVendasBilheteiroSintetico());
puntoVentaSelList.setItemRenderer(new RenderRelatorioVendasBilheteiroSinteticoSelecionados()); puntoVentaSelList.setItemRenderer(new RenderRelatorioVendasBilheteiroSinteticoSelecionados());
checkboxTarifa.setChecked(true);
checkboxImportepedagio.setChecked(true);
checkboxImportetaxaembarque.setChecked(true);
checkboxImporteseguro.setChecked(true);
} }
@ -105,8 +116,7 @@ public class RelatorioVendasBilheteiroSinteticoController extends MyGenericForwa
} }
private void executarPesquisa() { private void executarPesquisa() {
HibernateSearchObject<PuntoVenta> puntoVentaBusqueda = HibernateSearchObject<PuntoVenta> puntoVentaBusqueda = new HibernateSearchObject<PuntoVenta>(PuntoVenta.class, pagingPuntoVenta.getPageSize());
new HibernateSearchObject<PuntoVenta>(PuntoVenta.class, pagingPuntoVenta.getPageSize());
puntoVentaBusqueda.addFilterILike("nombpuntoventa", "%" + txtNombrePuntoVenta.getValue() + "%"); puntoVentaBusqueda.addFilterILike("nombpuntoventa", "%" + txtNombrePuntoVenta.getValue() + "%");
puntoVentaBusqueda.addFilterEqual("activo", Boolean.TRUE); puntoVentaBusqueda.addFilterEqual("activo", Boolean.TRUE);
@ -161,6 +171,34 @@ public class RelatorioVendasBilheteiroSinteticoController extends MyGenericForwa
Relatorio relatorio; Relatorio relatorio;
Map<String, Object> parametros = new HashMap<String, Object>(); Map<String, Object> parametros = new HashMap<String, Object>();
StringBuilder filtro = new StringBuilder(); StringBuilder filtro = new StringBuilder();
Boolean composicaoDoPreco = false;
if (checkboxTarifa.isChecked()) {
parametros.put("TARIFA", "true");
composicaoDoPreco = true;
}
if (checkboxImportepedagio.isChecked()) {
parametros.put("PEDAGIO", "true");
composicaoDoPreco = true;
}
if (checkboxImportetaxaembarque.isChecked()) {
parametros.put("TAXADEEMBARQUE", "true");
composicaoDoPreco = true;
}
if (checkboxImporteseguro.isChecked()) {
parametros.put("SEGURO", "true");
composicaoDoPreco = true;
}
if(!composicaoDoPreco){
Messagebox.show(Labels.getLabel("relatorioVendasBilheteiroSinteticoController.erroSemComponenteDePreco"),
Labels.getLabel("relatorioVendasBilheteiroSinteticoController.window.title"),
Messagebox.OK, Messagebox.ERROR);
return;
}
filtro.append("Agência: "); filtro.append("Agência: ");
String puntoVentaIds = ""; String puntoVentaIds = "";
@ -199,7 +237,7 @@ public class RelatorioVendasBilheteiroSinteticoController extends MyGenericForwa
} else { } else {
filtro.append(" Todas;"); filtro.append(" Todas;");
} }
filtro.append(" Canal Vendas: "); filtro.append(" Canal Vendas: ");
Comboitem itemTipoPuntoVenda = cmbTipoPuntoVenta.getSelectedItem(); Comboitem itemTipoPuntoVenda = cmbTipoPuntoVenta.getSelectedItem();
if (itemTipoPuntoVenda != null) { if (itemTipoPuntoVenda != null) {
@ -237,5 +275,5 @@ public class RelatorioVendasBilheteiroSinteticoController extends MyGenericForwa
public void setLsTipoPuntoVenta(List<TipoPuntoVenta> lsTipoPuntoVenta) { public void setLsTipoPuntoVenta(List<TipoPuntoVenta> lsTipoPuntoVenta) {
this.lsTipoPuntoVenta = lsTipoPuntoVenta; this.lsTipoPuntoVenta = lsTipoPuntoVenta;
} }
} }

View File

@ -784,6 +784,8 @@ relatorioVendasBilheteiroSinteticoController.btnLimpar.label = Limpar
relatorioVendasBilheteiroSinteticoController.lbNumero.value = Número Agência relatorioVendasBilheteiroSinteticoController.lbNumero.value = Número Agência
relatorioVendasBilheteiroSinteticoController.lbBilheteiro.value = Bilheteiro relatorioVendasBilheteiroSinteticoController.lbBilheteiro.value = Bilheteiro
relatorioVendasBilheteiroSinteticoController.lbCanalVendas.value = Canal Vendas relatorioVendasBilheteiroSinteticoController.lbCanalVendas.value = Canal Vendas
relatorioVendasBilheteiroSinteticoController.erroSemComponenteDePreco = Escolha um componente de preço
#relatório de cancelamento automático ECF #relatório de cancelamento automático ECF
relatorioCancelamentoAutomaticoECFController.window.title = Relatório de Cancelamento Automatico ECF relatorioCancelamentoAutomaticoECFController.window.title = Relatório de Cancelamento Automatico ECF

View File

@ -4,44 +4,61 @@
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" arg0="winFiltroRelatorioVendasBilheteiroSintetico"?> <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" arg0="winFiltroRelatorioVendasBilheteiroSintetico"?>
<?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?> <?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
<zk xmlns="http://www.zkoss.org/2005/zul"> <zk xmlns="http://www.zkoss.org/2005/zul">
<window id="winFiltroRelatorioVendasBilheteiroSintetico" <window id="winFiltroRelatorioVendasBilheteiroSintetico"
apply="${relatorioVendasBilheteiroSinteticoController}" apply="${relatorioVendasBilheteiroSinteticoController}"
contentStyle="overflow:auto" height="320px" width="600px" contentStyle="overflow:auto" height="320px" width="600px"
border="normal"> border="normal">
<grid fixedLayout="true"> <grid fixedLayout="true">
<columns> <columns>
<column width="20%"/> <column width="20%" />
<column width="30%"/> <column width="30%" />
<column width="20%"/> <column width="20%" />
<column width="30%"/> <column width="30%" />
</columns> </columns>
<rows> <rows>
<row> <row>
<label <label
value="${c:l('relatorioVendasBilheteiroSinteticoController.lbDatInicial.value')}" /> value="${c:l('relatorioVendasBilheteiroSinteticoController.lbDatInicial.value')}" />
<datebox id="datInicial" width="90%" <datebox id="datInicial" width="90%"
format="dd/MM/yyyy" constraint="no empty" format="dd/MM/yyyy" constraint="no empty" maxlength="10" />
maxlength="10" />
<label <label
value="${c:l('relatorioVendasBilheteiroSinteticoController.lbDatFinal.value')}" /> value="${c:l('relatorioVendasBilheteiroSinteticoController.lbDatFinal.value')}" />
<datebox id="datFinal" width="90%" <datebox id="datFinal" width="90%"
format="dd/MM/yyyy" constraint="no empty" format="dd/MM/yyyy" constraint="no empty" maxlength="10" />
maxlength="10" />
</row> </row>
</rows> </rows>
</grid> </grid>
<grid fixedLayout="true"> <grid fixedLayout="true">
<columns> <columns>
<column width="20%"/> <column width="25%" />
<column width="80%"/> <column width="15%" />
<column width="15%" />
<column width="30%" />
<column width="15%" />
</columns>
<rows>
<row>
<label value="Composição do Preço:"></label>
<checkbox id="checkboxTarifa" label="Tarifa" />
<checkbox id="checkboxImportepedagio"
label="Pedágio" />
<checkbox id="checkboxImportetaxaembarque"
label="Taxa de Embarque" />
<checkbox id="checkboxImporteseguro" label="Seguro" />
</row>
</rows>
</grid>
<grid fixedLayout="true">
<columns>
<column width="20%" />
<column width="80%" />
</columns> </columns>
<rows> <rows>
<row spans="1,1,2"> <row spans="1,1,2">
<label <label
value="${c:l('relatorioVendasBilheteiroSinteticoController.lbEmpresa.value')}" /> value="${c:l('relatorioVendasBilheteiroSinteticoController.lbEmpresa.value')}" />
<combobox id="cmbEmpresa" <combobox id="cmbEmpresa" buttonVisible="true"
buttonVisible="true"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
model="@{winFiltroRelatorioVendasBilheteiroSintetico$composer.lsEmpresa}" model="@{winFiltroRelatorioVendasBilheteiroSintetico$composer.lsEmpresa}"
width="98%" /> width="98%" />
@ -49,15 +66,14 @@
<row spans="1,1,2"> <row spans="1,1,2">
<label <label
value="${c:l('relatorioVendasBilheteiroSinteticoController.lbCanalVendas.value')}" /> value="${c:l('relatorioVendasBilheteiroSinteticoController.lbCanalVendas.value')}" />
<combobox id="cmbTipoPuntoVenta" <combobox id="cmbTipoPuntoVenta"
buttonVisible="true" buttonVisible="true"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
model="@{winFiltroRelatorioVendasBilheteiroSintetico$composer.lsTipoPuntoVenta}" model="@{winFiltroRelatorioVendasBilheteiroSintetico$composer.lsTipoPuntoVenta}"
width="98%" /> width="98%" />
</row> </row>
<row spans="1,3"> <row spans="1,3">
<label <label value="Agencia" />
value="Agencia" />
<bandbox id="bbPesquisaPuntoVenta" width="98%" <bandbox id="bbPesquisaPuntoVenta" width="98%"
mold="rounded" readonly="true"> mold="rounded" readonly="true">
<bandpopup> <bandpopup>
@ -111,11 +127,11 @@
<paging id="pagingSelPuntoVenta" pageSize="10" /> <paging id="pagingSelPuntoVenta" pageSize="10" />
</row> </row>
</rows> </rows>
</grid> </grid>
<toolbar> <toolbar>
<button id="btnExecutarRelatorio" image="/gui/img/find.png" <button id="btnExecutarRelatorio" image="/gui/img/find.png"
label="${c:l('relatorio.lb.btnExecutarRelatorio')}" /> label="${c:l('relatorio.lb.btnExecutarRelatorio')}" />
</toolbar> </toolbar>
</window> </window>
</zk> </zk>