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

fixes bug #8108 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@61637 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2016-10-14 19:48:06 +00:00
parent 7f85427342
commit 20f322e4ad
16 changed files with 239 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java
View File

@ -9,6 +9,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import com.rjconsultores.ventaboletos.enums.LocalEnderecoApanhe;
@ -37,6 +38,8 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio {
private Integer destinoId;
private Integer usuarioId;
private Integer tipoTarifaPacoteId;
private SituacaoVendaPacote situacaoVendaPacote;
private String voucherNotaCredito;
public RelatorioVendasPacotesDetalhado(Map<String, Object> parametros, Connection conexao, final String... nomeSubReporte) throws Exception {
super(parametros, conexao);
@ -53,6 +56,8 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio {
destinoId = parametros.get("destinoId") != null && !parametros.get("destinoId").equals("null") ? Integer.valueOf(parametros.get("destinoId").toString()) : null;
usuarioId = parametros.get("usuarioId") != null && !parametros.get("usuarioId").equals("null") ? Integer.valueOf(parametros.get("usuarioId").toString()) : null;
tipoTarifaPacoteId = parametros.get("tipoTarifaPacoteId") != null && !parametros.get("tipoTarifaPacoteId").equals("null") ? Integer.valueOf(parametros.get("tipoTarifaPacoteId").toString()) : null;
situacaoVendaPacote = parametros.get("situacaoPacoteId") != null && !parametros.get("situacaoPacoteId").equals("null") ? (SituacaoVendaPacote) parametros.get("situacaoPacoteId") : null;
voucherNotaCredito = parametros.get("voucherNotaCredito") != null && !parametros.get("voucherNotaCredito").equals("null") ? parametros.get("voucherNotaCredito").toString() : null;
Connection conexao = this.relatorio.getConexao();
processarVendasPacote(conexao);
@ -98,6 +103,12 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio {
if(tipoTarifaPacoteId != null && tipoTarifaPacoteId > 0) {
stmt.setInt("tipoTarifaPacoteId", tipoTarifaPacoteId);
}
if(situacaoVendaPacote != null) {
stmt.setInt("situacaoVendaPacote", situacaoVendaPacote.getShortValue());
}
if(StringUtils.isNotBlank(voucherNotaCredito)) {
stmt.setLong("voucherNotaCredito", Long.valueOf(voucherNotaCredito));
}
rset = stmt.executeQuery();
@ -129,6 +140,8 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio {
relatorioVendasPacotesDetalhadoItemBean.setSubTotal(rset.getBigDecimal("subtotal"));
relatorioVendasPacotesDetalhadoItemBean.setTotal(rset.getBigDecimal("total"));
relatorioVendasPacotesDetalhadoItemBean.setVendapacoteId(rset.getLong("vendapacote_id"));
relatorioVendasPacotesDetalhadoItemBean.setNumoperacionNotaCreditoPagamento(rset.getString("NUMOPERACION_PAG_NC"));
relatorioVendasPacotesDetalhadoItemBean.setVoucherNotaCredito(rset.getLong("VOUCHER_NOTACREDITO"));
relatorioVendasPacotesDetalhadoItemBean.setSituacaoVendaPacote(SituacaoVendaPacote.getSituacaoVendaPacote(rset.getInt("situacao")));
if(relatorioVendasPacotesBean.getRelatorioVendasPacotesDetalhadoItemBeans() == null) {
@ -163,18 +176,19 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio {
protected String getSqlPacotes() {
StringBuilder sQuery = new StringBuilder();
sQuery.append("SELECT P.PACOTE_ID, VP.VENDAPACOTE_ID, P.NOMPACOTE, VP.NUMOPERACION, VP.DATAVENDA, VP.DATAPACOTE, EA.DESCHOTEL, EA.LOCAL, CP.RAZAO_SOCIAL, U.NOMBUSUARIO, VP.SUBTOTAL, VP.DESCONTO, VP.TOTAL, VP.SITUACAO, COUNT(TVP.TARIFAVENDAPACOTE_ID) AS QTDETARIFAS ")
sQuery.append("SELECT P.PACOTE_ID, VP.VENDAPACOTE_ID, P.NOMPACOTE, VP.NUMOPERACION, VP.DATAVENDA, VP.DATAPACOTE, EA.DESCHOTEL, EA.LOCAL, CP.RAZAO_SOCIAL, ")
.append("NC.NOTACREDITOVENDAPACOTE_ID AS VOUCHER_NOTACREDITO, VPNC.NUMOPERACION AS NUMOPERACION_PAG_NC,U.NOMBUSUARIO, VP.SUBTOTAL,0, NVL(VP.DESCONTO,0) AS DESCONTO, VP.TOTAL, VP.SITUACAO, COUNT(NVL(TVP.TARIFAVENDAPACOTE_ID,0)) AS QTDETARIFAS ")
.append("FROM VENDA_PACOTE VP ")
.append("LEFT JOIN PACOTE P ON P.PACOTE_ID = VP.PACOTE_ID ")
.append("LEFT JOIN TARIFA_VENDA_PACOTE TVP ON TVP.VENDAPACOTE_ID = VP.VENDAPACOTE_ID ")
.append("LEFT JOIN BOLETO B ON B.BOLETO_ID = TVP.BOLETO_ID ")
.append("LEFT JOIN ENDERECO_APANHE EA ON EA.VENDAPACOTE_ID = VP.VENDAPACOTE_ID AND EA.ACTIVO = 1 ")
.append("LEFT JOIN CLIENTE_PACOTE CP ON CP.CLIENTEPACOTE_ID = VP.CLIENTEPACOTE_ID ")
.append("LEFT JOIN USUARIO U ON U.USUARIO_ID = VP.USUARIO_ID ")
.append("LEFT JOIN PACOTE_TARIFA PT ON PT.PACOTETARIFA_ID = TVP.PACOTETARIFA_ID ")
.append("LEFT JOIN TIPO_TARIFA_PACOTE TTP ON TTP.TIPOTARIFAPACOTE_ID = PT.TIPOTARIFAPACOTE_ID ")
.append("WHERE P.ACTIVO = 1 ")
.append("AND (B.BOLETO_ID IS NULL OR (B.ACTIVO = 1 AND B.INDSTATUSBOLETO = 'V' AND B.MOTIVOCANCELACION_ID IS NULL)) ");
.append("LEFT JOIN NOTA_CREDITO_VENDA_PACOTE NC ON NC.VENDAPACOTECANCELAMENTO_ID = VP.VENDAPACOTE_ID ")
.append("LEFT JOIN VENDA_PACOTE VPNC ON NC.VENDAPACOTEPAGAMENTO_ID = VPNC.VENDAPACOTE_ID ")
.append("WHERE P.ACTIVO = 1 ");
if(empresaId != null && empresaId > 0) {
sQuery.append("AND P.EMPRESA_ID = :empresaId ");
@ -208,7 +222,16 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio {
sQuery.append("AND TTP.TIPOTARIFAPACOTE_ID = :tipoTarifaPacoteId ");
}
sQuery.append("GROUP BY P.PACOTE_ID, VP.VENDAPACOTE_ID, P.NOMPACOTE, VP.NUMOPERACION, VP.DATAVENDA, VP.DATAPACOTE, EA.DESCHOTEL, EA.LOCAL, CP.RAZAO_SOCIAL, U.NOMBUSUARIO, VP.SUBTOTAL, VP.DESCONTO, VP.TOTAL, VP.SITUACAO ")
if(situacaoVendaPacote != null) {
sQuery.append("AND VP.SITUACAO = :situacaoVendaPacote ");
}
if(StringUtils.isNotBlank(voucherNotaCredito)) {
sQuery.append("AND NC.NOTACREDITOVENDAPACOTE_ID = :voucherNotaCredito ");
}
sQuery.append("GROUP BY P.PACOTE_ID, VP.VENDAPACOTE_ID, P.NOMPACOTE, VP.NUMOPERACION, VP.DATAVENDA, VP.DATAPACOTE, EA.DESCHOTEL, EA.LOCAL, ")
.append("CP.RAZAO_SOCIAL, U.NOMBUSUARIO, VP.SUBTOTAL, VP.DESCONTO, VP.TOTAL, VP.SITUACAO, NC.NOTACREDITOVENDAPACOTE_ID, VPNC.NUMOPERACION ")
.append("ORDER BY P.NOMPACOTE, VP.DATAPACOTE, VP.DATAVENDA ");
return sQuery.toString();

4
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesResumido.java
View File

@ -166,7 +166,7 @@ public class RelatorioVendasPacotesResumido extends Relatorio {
private String getSqlPacotes() {
StringBuilder sQuery = new StringBuilder();
sQuery.append("SELECT P.PACOTE_ID, P.NOMPACOTE, COUNT(P.PACOTE_ID) AS QTDEPACOTE, SUM(VP.TOTAL) AS TOTALPACOTE ")
sQuery.append("SELECT P.PACOTE_ID, P.NOMPACOTE, COUNT(NVL(P.PACOTE_ID,0)) AS QTDEPACOTE, SUM(NVL(VP.TOTAL,0)) AS TOTALPACOTE ")
.append("FROM VENDA_PACOTE VP ")
.append("LEFT JOIN PACOTE P ON P.PACOTE_ID = VP.PACOTE_ID ")
.append("WHERE P.ACTIVO = 1 ");
@ -191,7 +191,7 @@ public class RelatorioVendasPacotesResumido extends Relatorio {
private String getSqlBoletos() {
StringBuilder sQuery = new StringBuilder();
sQuery.append("SELECT P.PACOTE_ID, P.NOMPACOTE, SUM(TVP.VALOR) AS TOTALBOLETOS ")
sQuery.append("SELECT P.PACOTE_ID, P.NOMPACOTE, SUM(NVL(TVP.VALOR,0)) AS TOTALBOLETOS ")
.append("FROM VENDA_PACOTE VP ")
.append("LEFT JOIN PACOTE P ON P.PACOTE_ID = VP.PACOTE_ID ")
.append("LEFT JOIN TARIFA_VENDA_PACOTE TVP ON TVP.VENDAPACOTE_ID = VP.VENDAPACOTE_ID ")

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

@ -10,3 +10,5 @@ label.subTotal=SubTotal
label.desconto=Desconto
label.total=Total
label.situacao=Situação
label.localizadorNotaCreditoPagamento=Loc. Nota Crédito Pag.
label.voucherNotaCredito=Voucher Nota Crédito

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

@ -10,3 +10,5 @@ label.subTotal=SubTotal
label.desconto=Desconto
label.total=Total
label.situacao=Situação
label.localizadorNotaCreditoPagamento=Loc. Nota Crédito Pag.
label.voucherNotaCredito=Voucher Nota Crédito

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

@ -11,6 +11,8 @@ cabecalho.impressorPor=Impressor por:
cabecalho.pagina=Página
cabecalho.de=de
cabecalho.filtros=Filtros:
cabecalho.situacaoPacote=Situação:
cabecalho.voucherNotaCredito=Voucher Nota Crédito:
label.empresa=Empresa:
label.pacote=Pacote:
cabecalho.origem=Origem:

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

@ -11,6 +11,8 @@ cabecalho.impressorPor=Impressor por:
cabecalho.pagina=Página
cabecalho.de=de
cabecalho.filtros=Filtros:
cabecalho.situacaoPacote=Situação:
cabecalho.voucherNotaCredito=Voucher Nota Crédito:
label.empresa=Empresa:
label.pacote=Pacote:
cabecalho.origem=Origem:

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

Binary file not shown.

18
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhado.jrxml
View File

@ -15,6 +15,8 @@
<parameter name="destino" class="java.lang.String"/>
<parameter name="usuario" class="java.lang.String"/>
<parameter name="tipoTarifaPacote" class="java.lang.String"/>
<parameter name="situacaoPacote" class="java.lang.String"/>
<parameter name="voucherNotaCredito" class="java.lang.String"/>
<queryString>
<![CDATA[]]>
</queryString>
@ -24,7 +26,7 @@
<band splitType="Stretch"/>
</background>
<title>
<band height="142" splitType="Stretch">
<band height="181" splitType="Stretch">
<textField>
<reportElement x="0" y="0" width="637" height="20" uuid="43b2c28d-4760-4890-b00d-25e931e79c74"/>
<textElement markup="none">
@ -81,6 +83,20 @@
</textElement>
<textFieldExpression><![CDATA[$R{cabecalho.origem} + " " + $P{origem} + " " + $R{cabecalho.destino} + " " + $P{destino}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="0" y="140" width="801" height="20" uuid="0081e5f0-0219-4d52-a883-d932296d8764"/>
<textElement>
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{cabecalho.situacaoPacote} + " " + $P{situacaoPacote}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="0" y="160" width="801" height="20" uuid="cc9c448f-3596-46c2-99bf-7ed4dc2cf865"/>
<textElement>
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{cabecalho.voucherNotaCredito} + " " + $P{voucherNotaCredito}]]></textFieldExpression>
</textField>
</band>
</title>
<pageHeader>

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

Binary file not shown.

136
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhadoItem.jrxml
View File

@ -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="RelatorioVendasPacotesDetalhadoItem" pageWidth="802" pageHeight="555" orientation="Landscape" columnWidth="802" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="f17327a0-45d8-4ec1-8350-688df66785dc">
<property name="ireport.zoom" value="1.5"/>
<property name="ireport.x" value="0"/>
<property name="ireport.zoom" value="1.0"/>
<property name="ireport.x" value="18"/>
<property name="ireport.y" value="0"/>
<field name="numoperacion" class="java.lang.String"/>
<field name="nombusuario" class="java.lang.String"/>
@ -14,6 +14,8 @@
<field name="desconto" class="java.math.BigDecimal"/>
<field name="total" class="java.math.BigDecimal"/>
<field name="descSituacaoVendaPacote" class="java.lang.String"/>
<field name="numoperacionNotaCreditoPagamento" class="java.lang.String"/>
<field name="voucherNotaCredito" class="java.lang.Long"/>
<variable name="vTotalSubTotal" class="java.math.BigDecimal" resetType="Column" calculation="Sum">
<variableExpression><![CDATA[$F{subTotal}]]></variableExpression>
</variable>
@ -38,70 +40,70 @@
<columnHeader>
<band height="28" splitType="Stretch">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="1" y="4" width="25" height="20" uuid="479d9abe-f3fa-4903-922f-74be005b310c"/>
<reportElement stretchType="RelativeToTallestObject" x="1" y="4" width="25" height="20" isPrintWhenDetailOverflows="true" uuid="479d9abe-f3fa-4903-922f-74be005b310c"/>
<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.qtde}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="27" y="4" width="68" height="20" uuid="2fcabefe-3c9b-46f4-9885-e37a5ffbed9a"/>
<reportElement stretchType="RelativeToTallestObject" x="27" y="4" width="68" height="20" isPrintWhenDetailOverflows="true" uuid="2fcabefe-3c9b-46f4-9885-e37a5ffbed9a"/>
<textElement verticalAlignment="Top" markup="none">
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.localizador}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="96" y="4" width="100" height="20" uuid="333e8016-8fb3-4652-b7f9-1ff10a0b024e"/>
<reportElement stretchType="RelativeToTallestObject" x="96" y="4" width="79" height="20" isPrintWhenDetailOverflows="true" uuid="333e8016-8fb3-4652-b7f9-1ff10a0b024e"/>
<textElement verticalAlignment="Top" markup="none">
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.usuario}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="199" y="4" width="142" height="20" uuid="eb1aa96a-0759-41b0-bf15-7e4b1b0dc21b"/>
<reportElement stretchType="RelativeToTallestObject" x="177" y="4" width="110" height="20" isPrintWhenDetailOverflows="true" uuid="eb1aa96a-0759-41b0-bf15-7e4b1b0dc21b"/>
<textElement verticalAlignment="Top" markup="none">
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.cliente}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="342" y="4" width="101" height="20" uuid="0cf46847-6160-450a-ad67-6b33fac921cc"/>
<reportElement stretchType="RelativeToTallestObject" x="289" y="4" width="77" height="20" isPrintWhenDetailOverflows="true" uuid="0cf46847-6160-450a-ad67-6b33fac921cc"/>
<textElement verticalAlignment="Top" markup="none">
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.apanhe}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="444" y="4" width="54" height="20" uuid="dc54766b-3e8a-4683-84a0-b50cf8275681"/>
<reportElement stretchType="RelativeToTallestObject" x="367" y="4" width="41" height="20" isPrintWhenDetailOverflows="true" uuid="dc54766b-3e8a-4683-84a0-b50cf8275681"/>
<textElement verticalAlignment="Top" markup="none">
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.dtPacote}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="499" y="4" width="54" height="20" uuid="521c1958-56a8-4bc9-b304-5a8e7ad8941c"/>
<reportElement stretchType="RelativeToTallestObject" x="409" y="4" width="41" height="20" isPrintWhenDetailOverflows="true" uuid="521c1958-56a8-4bc9-b304-5a8e7ad8941c"/>
<textElement verticalAlignment="Top" markup="none">
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.dtVenda}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="555" y="4" width="60" height="20" uuid="eab1b822-2fe4-4d62-87ec-c07e1320950a"/>
<reportElement stretchType="RelativeToTallestObject" x="451" y="4" width="45" height="20" isPrintWhenDetailOverflows="true" uuid="eab1b822-2fe4-4d62-87ec-c07e1320950a"/>
<textElement textAlignment="Right" verticalAlignment="Top" markup="none">
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.subTotal}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="616" y="4" width="60" height="20" uuid="ea742d2b-6cd4-4fd8-aba8-1cd9d23e802a"/>
<reportElement stretchType="RelativeToTallestObject" x="497" y="4" width="45" height="20" isPrintWhenDetailOverflows="true" uuid="ea742d2b-6cd4-4fd8-aba8-1cd9d23e802a"/>
<textElement textAlignment="Right" verticalAlignment="Top" markup="none">
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.desconto}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="678" y="4" width="60" height="20" uuid="199f8b66-2e55-45ee-95e1-f44d55a7a716"/>
<reportElement stretchType="RelativeToTallestObject" x="543" y="4" width="45" height="20" isPrintWhenDetailOverflows="true" uuid="199f8b66-2e55-45ee-95e1-f44d55a7a716"/>
<textElement textAlignment="Right" verticalAlignment="Top" markup="none">
<font fontName="SansSerif" size="5"/>
</textElement>
@ -117,34 +119,34 @@
<reportElement stretchType="RelativeToTallestObject" x="95" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="8bb893f0-9d4c-4ec6-ae79-1bee3a1ff931"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="197" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="e9a787d5-7227-4c4c-b79c-e9f7bc750384"/>
<reportElement stretchType="RelativeToTallestObject" x="175" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="e9a787d5-7227-4c4c-b79c-e9f7bc750384"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="341" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="fe005b59-9df8-40ca-9ac0-4ea262c3187d"/>
<reportElement stretchType="RelativeToTallestObject" x="288" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="fe005b59-9df8-40ca-9ac0-4ea262c3187d"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="443" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="04e8c11f-b6d8-437e-975e-047f43d584db"/>
<reportElement stretchType="RelativeToTallestObject" x="366" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="04e8c11f-b6d8-437e-975e-047f43d584db"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="498" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="93354399-3c94-4a7f-8710-284846ad3630"/>
<reportElement stretchType="RelativeToTallestObject" x="408" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="93354399-3c94-4a7f-8710-284846ad3630"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="554" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="4639047b-3f66-4ce0-8aa1-df467cf58853"/>
<reportElement stretchType="RelativeToTallestObject" x="450" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="4639047b-3f66-4ce0-8aa1-df467cf58853"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="615" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="2ea4dfc3-87b0-4a4b-8b3a-f985805cb96a"/>
<reportElement stretchType="RelativeToTallestObject" x="496" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="2ea4dfc3-87b0-4a4b-8b3a-f985805cb96a"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="677" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="2225826d-acb0-4eb7-99ee-4208efc05b2c"/>
<reportElement stretchType="RelativeToTallestObject" x="542" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="2225826d-acb0-4eb7-99ee-4208efc05b2c"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="0" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="890d0f88-7254-46d6-b5c6-e81c835568f8"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="739" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="955f2ac4-afba-49e3-8e10-f53775ee1a26"/>
<reportElement stretchType="RelativeToTallestObject" x="589" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="955f2ac4-afba-49e3-8e10-f53775ee1a26"/>
</line>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="740" y="4" width="60" height="20" isPrintWhenDetailOverflows="true" uuid="f573134c-9443-45b0-8749-ff939fadfd1c"/>
<reportElement stretchType="RelativeToTallestObject" x="590" y="4" width="60" height="20" isPrintWhenDetailOverflows="true" uuid="f573134c-9443-45b0-8749-ff939fadfd1c"/>
<textElement verticalAlignment="Top" markup="none">
<font fontName="SansSerif" size="5"/>
</textElement>
@ -156,6 +158,26 @@
<line>
<reportElement positionType="Float" x="0" y="2" width="802" height="1" forecolor="#CCCCCC" uuid="1361f507-ce8d-4a97-921a-5b5c23b40b24"/>
</line>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="721" y="4" width="78" height="20" isPrintWhenDetailOverflows="true" uuid="86f1d82f-b084-4cbb-9699-74508ac616a6"/>
<textElement verticalAlignment="Top" markup="none">
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.localizadorNotaCreditoPagamento}]]></textFieldExpression>
</textField>
<line>
<reportElement stretchType="RelativeToTallestObject" x="650" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="23ed435e-1cb2-43f0-95ee-8d20d793ab04"/>
</line>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="651" y="4" width="66" height="20" isPrintWhenDetailOverflows="true" uuid="846af4fb-d9e0-4607-b8ab-971134b937a4"/>
<textElement verticalAlignment="Top" markup="none">
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.voucherNotaCredito}]]></textFieldExpression>
</textField>
<line>
<reportElement stretchType="RelativeToTallestObject" x="719" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="8b28a003-be2d-4ccc-8ce0-aafa854b4ccc"/>
</line>
</band>
</columnHeader>
<detail>
@ -175,56 +197,56 @@
<textFieldExpression><![CDATA[$F{numoperacion}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="96" y="1" width="100" height="20" isPrintWhenDetailOverflows="true" uuid="6964a19b-c6bb-48ed-a061-eed217b33b9b"/>
<reportElement stretchType="RelativeToTallestObject" x="96" y="1" width="79" height="20" isPrintWhenDetailOverflows="true" uuid="6964a19b-c6bb-48ed-a061-eed217b33b9b"/>
<textElement verticalAlignment="Top">
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{nombusuario}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="199" y="1" width="142" height="20" isPrintWhenDetailOverflows="true" uuid="c9813245-6a43-4011-bb01-c6e45c0d6d36"/>
<reportElement stretchType="RelativeToTallestObject" x="177" y="1" width="110" height="20" isPrintWhenDetailOverflows="true" uuid="c9813245-6a43-4011-bb01-c6e45c0d6d36"/>
<textElement verticalAlignment="Top">
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{razaoSocialCliente}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="342" y="1" width="101" height="20" isPrintWhenDetailOverflows="true" uuid="f5632358-41df-437d-821f-fa878a857d5c"/>
<reportElement stretchType="RelativeToTallestObject" x="289" y="1" width="77" height="20" isPrintWhenDetailOverflows="true" uuid="f5632358-41df-437d-821f-fa878a857d5c"/>
<textElement verticalAlignment="Top">
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{descLocalEnderecoApanhe}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="444" y="1" width="54" height="20" isPrintWhenDetailOverflows="true" uuid="ecb1f133-dfd6-46a1-9d3d-3dc84b199c39"/>
<textField isStretchWithOverflow="true" pattern="dd/MM/yy" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="367" y="1" width="41" height="20" isPrintWhenDetailOverflows="true" uuid="ecb1f133-dfd6-46a1-9d3d-3dc84b199c39"/>
<textElement verticalAlignment="Top">
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{datapacote}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="499" y="1" width="54" height="20" isPrintWhenDetailOverflows="true" uuid="78842239-ee2e-45ac-aaa2-ec561feea088"/>
<textField isStretchWithOverflow="true" pattern="dd/MM/yy" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="409" y="1" width="41" height="20" isPrintWhenDetailOverflows="true" uuid="78842239-ee2e-45ac-aaa2-ec561feea088"/>
<textElement verticalAlignment="Top">
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{datavenda}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="555" y="1" width="60" height="20" isPrintWhenDetailOverflows="true" uuid="0be25395-a20f-4e4f-95da-163c13698708"/>
<reportElement stretchType="RelativeToTallestObject" x="451" y="1" width="45" height="20" isPrintWhenDetailOverflows="true" uuid="0be25395-a20f-4e4f-95da-163c13698708"/>
<textElement textAlignment="Right" verticalAlignment="Top">
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{subTotal}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="616" y="1" width="60" height="20" isPrintWhenDetailOverflows="true" uuid="43d71d65-26a3-49dc-b94e-30525147a1d0"/>
<reportElement stretchType="RelativeToTallestObject" x="497" y="1" width="45" height="20" isPrintWhenDetailOverflows="true" uuid="43d71d65-26a3-49dc-b94e-30525147a1d0"/>
<textElement textAlignment="Right" verticalAlignment="Top">
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{desconto}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="678" y="1" width="60" height="20" isPrintWhenDetailOverflows="true" uuid="55433141-fa8f-42b5-b4f7-2a504bec5ceb"/>
<reportElement stretchType="RelativeToTallestObject" x="543" y="1" width="45" height="20" isPrintWhenDetailOverflows="true" uuid="55433141-fa8f-42b5-b4f7-2a504bec5ceb"/>
<textElement textAlignment="Right" verticalAlignment="Top">
<font fontName="SansSerif" size="5"/>
</textElement>
@ -240,34 +262,34 @@
<reportElement stretchType="RelativeToTallestObject" x="95" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="eeba804b-44db-4524-92c1-fda9cd003469"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="197" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="a02ac9fd-63e6-47f5-8d17-95edd06c8037"/>
<reportElement stretchType="RelativeToTallestObject" x="175" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="a02ac9fd-63e6-47f5-8d17-95edd06c8037"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="341" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="3d6f981e-6f53-4945-bbff-f31f7b580507"/>
<reportElement stretchType="RelativeToTallestObject" x="288" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="3d6f981e-6f53-4945-bbff-f31f7b580507"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="443" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="6a406064-40dd-45b2-9d84-f0efda11bcf5"/>
<reportElement stretchType="RelativeToTallestObject" x="366" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="6a406064-40dd-45b2-9d84-f0efda11bcf5"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="498" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="e9d0ffbf-807b-4fd1-8368-831d35f1d67d"/>
<reportElement stretchType="RelativeToTallestObject" x="408" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="e9d0ffbf-807b-4fd1-8368-831d35f1d67d"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="554" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="a7929915-7c3f-4a5d-b148-0d24c69f6914"/>
<reportElement stretchType="RelativeToTallestObject" x="450" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="a7929915-7c3f-4a5d-b148-0d24c69f6914"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="615" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="9bfbdfb0-892a-464c-bf6c-a1566fab0b1e"/>
<reportElement stretchType="RelativeToTallestObject" x="496" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="9bfbdfb0-892a-464c-bf6c-a1566fab0b1e"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="677" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="0aaf6982-7014-447b-bb4f-51aa08f0e11e"/>
<reportElement stretchType="RelativeToTallestObject" x="542" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="0aaf6982-7014-447b-bb4f-51aa08f0e11e"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="110f4b1c-f29c-4a96-890a-2776ed939d53"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="739" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="f8d781df-2513-4c15-a7ea-49043bef03d0"/>
<reportElement stretchType="RelativeToTallestObject" x="589" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="f8d781df-2513-4c15-a7ea-49043bef03d0"/>
</line>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="740" y="1" width="60" height="20" isPrintWhenDetailOverflows="true" uuid="9fbcbcf4-72a6-4248-9fc6-f5b746775193"/>
<reportElement stretchType="RelativeToTallestObject" x="590" y="1" width="60" height="20" isPrintWhenDetailOverflows="true" uuid="9fbcbcf4-72a6-4248-9fc6-f5b746775193"/>
<textElement verticalAlignment="Top">
<font fontName="SansSerif" size="5"/>
</textElement>
@ -276,26 +298,46 @@
<line>
<reportElement stretchType="RelativeToTallestObject" x="801" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="16e1bf28-b7fc-4709-b985-4f72e0d5548d"/>
</line>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="721" y="1" width="78" height="20" isPrintWhenDetailOverflows="true" uuid="ea729153-17e2-4fd3-bf56-a99964d52008"/>
<textElement verticalAlignment="Top" markup="none">
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{numoperacionNotaCreditoPagamento}]]></textFieldExpression>
</textField>
<line>
<reportElement stretchType="RelativeToTallestObject" x="650" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="bbf8834a-45ac-4dbf-bb49-53806f4de50f"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="719" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="4566d55b-82ee-4438-9a83-41d1b7ad5b36"/>
</line>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="651" y="1" width="66" height="20" isPrintWhenDetailOverflows="true" uuid="675aca84-513f-4479-a9fb-4cb0b79caaf5"/>
<textElement verticalAlignment="Top">
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{voucherNotaCredito}]]></textFieldExpression>
</textField>
</band>
</detail>
<columnFooter>
<band height="24" splitType="Stretch">
<textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="555" y="2" width="60" height="20" uuid="c143a4c0-043f-4742-911d-b543c971e26d"/>
<reportElement x="451" y="2" width="45" height="20" uuid="c143a4c0-043f-4742-911d-b543c971e26d"/>
<textElement textAlignment="Right" verticalAlignment="Top">
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$V{vTotalSubTotal}]]></textFieldExpression>
</textField>
<textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="616" y="2" width="60" height="20" uuid="533968db-d01a-48e9-a273-f4388c10bc0c"/>
<reportElement x="497" y="2" width="45" height="20" uuid="533968db-d01a-48e9-a273-f4388c10bc0c"/>
<textElement textAlignment="Right" verticalAlignment="Top">
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$V{vTotalDesconto}]]></textFieldExpression>
</textField>
<textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="678" y="2" width="60" height="20" uuid="7d9be2b0-855e-442e-b96c-24d0b8ab47dd"/>
<reportElement x="543" y="2" width="45" height="20" uuid="7d9be2b0-855e-442e-b96c-24d0b8ab47dd"/>
<textElement textAlignment="Right" verticalAlignment="Top">
<font fontName="SansSerif" size="5"/>
</textElement>
@ -315,19 +357,19 @@
<reportElement positionType="Float" x="0" y="23" width="802" height="1" forecolor="#CCCCCC" uuid="bc27bd15-2e9c-4fd5-b207-4abb5b0a5b5f"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="677" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="a6ff630b-8eae-4312-9b46-0048fcfe1d4d"/>
<reportElement stretchType="RelativeToTallestObject" x="542" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="a6ff630b-8eae-4312-9b46-0048fcfe1d4d"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="615" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="c1817cb0-8447-461e-8982-571c2ed5330b"/>
<reportElement stretchType="RelativeToTallestObject" x="496" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="c1817cb0-8447-461e-8982-571c2ed5330b"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="554" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="265e716b-196b-4a4e-a6b1-1b8ee2094e77"/>
<reportElement stretchType="RelativeToTallestObject" x="450" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="265e716b-196b-4a4e-a6b1-1b8ee2094e77"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="13158cfa-c640-4827-93c4-622f008576a5"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="739" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="8a596ce5-8b1d-4d7b-836e-05343728e5d6"/>
<reportElement stretchType="RelativeToTallestObject" x="589" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="8a596ce5-8b1d-4d7b-836e-05343728e5d6"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="801" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="ef5e295d-c708-4979-a8ef-d6f57e394f47"/>

22
src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioVendasPacotesDetalhadoBean.java
View File

@ -4,8 +4,6 @@ import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import oracle.net.aso.s;
import org.apache.commons.lang.StringUtils;
import com.rjconsultores.ventaboletos.enums.LocalEnderecoApanhe;
@ -81,6 +79,8 @@ public class RelatorioVendasPacotesDetalhadoBean {
private String nombusuario;
private String razaoSocialCliente;
private SituacaoVendaPacote situacaoVendaPacote;
private String numoperacionNotaCreditoPagamento;
private Long voucherNotaCredito;
public Long getVendapacoteId() {
return vendapacoteId;
@ -219,6 +219,24 @@ public class RelatorioVendasPacotesDetalhadoBean {
this.situacaoVendaPacote = situacaoVendaPacote;
}
public String getNumoperacionNotaCreditoPagamento() {
return numoperacionNotaCreditoPagamento;
}
public void setNumoperacionNotaCreditoPagamento(String numoperacionNotaCreditoPagamento) {
this.numoperacionNotaCreditoPagamento = numoperacionNotaCreditoPagamento;
}
public Long getVoucherNotaCredito() {
return voucherNotaCredito;
}
public void setVoucherNotaCredito(Long voucherNotaCredito) {
if(voucherNotaCredito != null && !voucherNotaCredito.equals(0l)) {
this.voucherNotaCredito = voucherNotaCredito;
}
}
}
}

7
src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioVendasPacotesResumidoBean.java
View File

@ -10,6 +10,13 @@ public class RelatorioVendasPacotesResumidoBean {
private BigDecimal totalBoletos;
private BigDecimal totalPacotes;
public RelatorioVendasPacotesResumidoBean() {
super();
this.qtdePacotes = 0l;
this.totalBoletos = BigDecimal.ZERO;
this.totalPacotes = BigDecimal.ZERO;
}
public Long getPacoteId() {
return pacoteId;
}

34
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasPacotesDetalhadoController.java
View File

@ -9,9 +9,7 @@ import java.util.Map;
import javax.sql.DataSource;
import net.sf.jasperreports.engine.JasperReport;
import net.sf.jasperreports.engine.util.JRLoader;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller;
@ -21,12 +19,14 @@ import org.zkoss.zk.ui.event.Event;
import org.zkoss.zul.Comboitem;
import org.zkoss.zul.ComboitemRenderer;
import org.zkoss.zul.Datebox;
import org.zkoss.zul.Radio;
import com.rjconsultores.ventaboletos.entidad.Empresa;
import com.rjconsultores.ventaboletos.entidad.Pacote;
import com.rjconsultores.ventaboletos.entidad.Parada;
import com.rjconsultores.ventaboletos.entidad.TipoTarifaPacote;
import com.rjconsultores.ventaboletos.entidad.Usuario;
import com.rjconsultores.ventaboletos.enums.SituacaoVendaPacote;
import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioVendasPacotesDetalhado;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
import com.rjconsultores.ventaboletos.service.EmpresaService;
@ -37,6 +37,10 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada;
import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParadaCve;
import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxUsuario;
import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox;
import net.sf.jasperreports.engine.JasperReport;
import net.sf.jasperreports.engine.util.JRLoader;
@Controller("relatorioVendasPacotesDetalhadoController")
@Scope("prototype")
@ -64,12 +68,17 @@ public class RelatorioVendasPacotesDetalhadoController extends MyGenericForwardC
private MyComboboxEstandar cmbEmpresa;
private MyComboboxEstandar cmbPacote;
private MyComboboxEstandar cmbTipoTarifaPacote;
private MyTextbox txtVoucherNotaCredito;
private MyComboboxParada cmbParadaOrigem;
private MyComboboxParadaCve cmbParadaOrigemCve;
private MyComboboxParada cmbParadaDestino;
private MyComboboxParadaCve cmbParadaDestinoCve;
private MyComboboxUsuario cmbUsuario;
private Radio rTodos;
private Radio rPagos;
private Radio rReservados;
private Radio rCancelados;
public List<Empresa> getLsEmpresa() {
return lsEmpresa;
@ -128,6 +137,8 @@ public class RelatorioVendasPacotesDetalhadoController extends MyGenericForwardC
}
public void onClick$btnExecutarRelatorio(Event ev) throws Exception {
txtVoucherNotaCredito.getValue();
SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
Date dataDe = dataInicial.getValue();
Date dataAte = dataFinal.getValue();
@ -188,6 +199,23 @@ public class RelatorioVendasPacotesDetalhadoController extends MyGenericForwardC
parametros.put("tipoTarifaPacote", tipoTarifaPacote.getDesctipotarifa());
}
parametros.put("situacaoPacote", "Todos");
if(rPagos.isChecked()) {
parametros.put("situacaoPacote", "Pagos");
parametros.put("situacaoPacoteId", SituacaoVendaPacote.PAGO);
} else if(rReservados.isChecked()) {
parametros.put("situacaoPacote", "Reservados");
parametros.put("situacaoPacoteId", SituacaoVendaPacote.RESERVA);
} else if(rCancelados.isChecked()) {
parametros.put("situacaoPacote", "Cancelados");
parametros.put("situacaoPacoteId", SituacaoVendaPacote.CANCELADO);
}
parametros.put("voucherNotaCredito", "");
if (StringUtils.isNotBlank(txtVoucherNotaCredito.getValue())) {
parametros.put("voucherNotaCredito", txtVoucherNotaCredito.getValue());
}
JasperReport subRelatorioVendasPacotesDetalhadoItens = (JasperReport) JRLoader.loadObject(this.getClass().getResourceAsStream("/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhadoItem.jasper"));
parametros.put("subreporte", subRelatorioVendasPacotesDetalhadoItens);

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

@ -6170,6 +6170,12 @@ relatorioVendasPacotesDetalhadoController.lblTipoTarifaPacote.value = Tipo Tarif
relatorioVendasPacotesDetalhadoController.lblOrigem.value = Origen
relatorioVendasPacotesDetalhadoController.lblDestino.value = Destino
relatorioVendasPacotesDetalhadoController.lblUsuario.value = Usuário
relatorioVendasPacotesDetalhadoController.lblSituacao.value = Situacion
relatorioVendasPacotesDetalhadoController.lblSituacaoTodos.value = Todos
relatorioVendasPacotesDetalhadoController.lblSituacaoPagos.value = Pagos
relatorioVendasPacotesDetalhadoController.lblSituacaoReservados.value = Reservados
relatorioVendasPacotesDetalhadoController.lblSituacaoCancelados.value = Cancelados
relatorioVendasPacotesDetalhadoController.lblVoucherNotaCredito=Voucher Nota Crédito
# Relatorio Vendas Pacotes Pasajes
relatorioVendasPacotesBoletosController.window.title = Reporte Ventas de Paquetes - Pasajes

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

@ -6359,6 +6359,12 @@ relatorioVendasPacotesDetalhadoController.lblTipoTarifaPacote.value = Tipo Tarif
relatorioVendasPacotesDetalhadoController.lblOrigem.value = Origem
relatorioVendasPacotesDetalhadoController.lblDestino.value = Destino
relatorioVendasPacotesDetalhadoController.lblUsuario.value = Usuário
relatorioVendasPacotesDetalhadoController.lblSituacao.value = Situação
relatorioVendasPacotesDetalhadoController.lblSituacaoTodos.value = Todos
relatorioVendasPacotesDetalhadoController.lblSituacaoPagos.value = Pagos
relatorioVendasPacotesDetalhadoController.lblSituacaoReservados.value = Reservados
relatorioVendasPacotesDetalhadoController.lblSituacaoCancelados.value = Cancelados
relatorioVendasPacotesDetalhadoController.lblVoucherNotaCredito=Voucher Nota Crédito
# Relatorio Vendas Pacotes Boletos
relatorioVendasPacotesBoletosController.window.title = Relatório Vendas de Pacotes - Bilhetes

22
web/gui/relatorios/filtroRelatorioVendasPacotesDetalhado.zul
View File

@ -88,6 +88,28 @@
format="dd/MM/yyyy" lenient="false" constraint="no empty"
maxlength="10" />
</row>
<row spans="1,3">
<label
value="${c:l('relatorioVendasPacotesDetalhadoController.lblSituacao.value')}" />
<radiogroup>
<radio id="rTodos"
label="${c:l('relatorioVendasPacotesDetalhadoController.lblSituacaoTodos.value')}"
checked="true"/>
<radio id="rPagos"
label="${c:l('relatorioVendasPacotesDetalhadoController.lblSituacaoPagos.value')}"/>
<radio id="rReservados"
label="${c:l('relatorioVendasPacotesDetalhadoController.lblSituacaoReservados.value')}"/>
<radio id="rCancelados"
label="${c:l('relatorioVendasPacotesDetalhadoController.lblSituacaoCancelados.value')}"/>
</radiogroup>
</row>
<row spans="1,3">
<label value="${c:l('relatorioVendasPacotesDetalhadoController.lblVoucherNotaCredito')}"/>
<textbox id="txtVoucherNotaCredito"
width="200px"
use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox"/>
</row>
</rows>
</grid>
<toolbar>