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

fixes bug #8369 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@64309 d1611594-4594-4d17-8e1d-87c2c4800839
master
igor.rodrigo 2016-12-29 17:45:02 +00:00
parent a8370ee5a6
commit bab961aa99
11 changed files with 390 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,8 +46,8 @@ public class RelatorioDescontos extends Relatorio {
}
if(codconvenio != null && !codconvenio.isEmpty()) {
statement.setString("codconvenio", codconvenio);
}
}
ResultSet resultSet = statement.executeQuery();
preencherDadosRelatorio(resultSet);
@ -70,6 +70,10 @@ public class RelatorioDescontos extends Relatorio {
singleData.put("tarifaComDesconto", resultSet.getDouble("tarifaComDesconto"));
singleData.put("tut", resultSet.getDouble("tut"));
singleData.put("pedagio", resultSet.getDouble("pedagio"));
singleData.put("nomepassageiro", resultSet.getString("nomepassageiro"));
singleData.put("documento", resultSet.getString("documento"));
singleData.put("bilheteiro", resultSet.getString("bilheteiro"));
singleData.put("empresacorrida", resultSet.getString("empresacorrida"));
dadosRelatorio.add(singleData);
}
@ -82,7 +86,7 @@ public class RelatorioDescontos extends Relatorio {
String query = " SELECT "
+ " CONV.CVECONVENIO AS codConvenio, "
+ " (CONV.CVECONVENIO || ' - ' || CONV.DESCCONVENIO) AS codConvenio, "
+ " PUNT_V.NOMBPUNTOVENTA AS nomeAgencia, "
+ " BOL.FECHORVENTA AS dataEmissao, "
+ " BOL.FECHORVIAJE AS dataViagem, "
@ -91,20 +95,27 @@ public class RelatorioDescontos extends Relatorio {
+ " DEST.CVEPARADA AS codDestino, "
+ " BOL.PRECIOPAGADO AS tarifaComDesconto, "
+ " BOL.IMPORTETAXAEMBARQUE AS tut, "
+ " BOL.IMPORTEPEDAGIO AS pedagio "
+ " BOL.IMPORTEPEDAGIO AS pedagio, "
+ " BOL.NOMBPASAJERO AS nomepassageiro, "
+ " BOL.NUMIDENTIFICACION AS documento,"
+ " U.CVEUSUARIO AS bilheteiro, "
+ " BOL.EMPRESACORRIDA_ID AS empresacorrida"
+ " FROM BOLETO BOL "
+ " JOIN CONVENIO_DET CONV_D ON CONV_D.CONVENIODET_ID = BOL.CONVENIODET_ID "
+ " JOIN CONVENIO CONV ON CONV.CONVENIO_ID = CONV_D.CONVENIO_ID "
+ " JOIN PUNTO_VENTA PUNT_V ON PUNT_V.PUNTOVENTA_ID = BOL.PUNTOVENTA_ID "
+ " JOIN PARADA ORIG ON ORIG.PARADA_ID = BOL.ORIGEN_ID "
+ " JOIN PARADA DEST ON DEST.PARADA_ID = BOL.DESTINO_ID "
+ " INNER JOIN USUARIO U ON U.USUARIO_ID = BOL.USUARIO_ID "
+ " WHERE "
+ " BOL.INDSTATUSOPERACION = 'F' "
+ " AND BOL.ACTIVO = 1 "
+ " AND BOL.FECHORVENTA BETWEEN :fecVentaInicial AND :fecVentaFinal ";
if(!((String)parametros.get("EMPRESAIDS")).equals("")){
query +=" AND BOL.EMPRESACORRIDA_ID IN ( " + (String)parametros.get("EMPRESAIDS") + ")" ;
}
if(idPuntoVenta != null) {
query += " AND (BOL.PUNTOVENTA_ID = :idPuntoVenta) ";
}
@ -112,7 +123,13 @@ public class RelatorioDescontos extends Relatorio {
query += " AND (CONV.CVECONVENIO = :codconvenio)";
}
query += " ORDER BY CONV.CVECONVENIO ";
query += " GROUP BY (CONV.CVECONVENIO || ' - ' || CONV.DESCCONVENIO), BOL.EMPRESACORRIDA_ID, PUNT_V.NOMBPUNTOVENTA, ";
query += " BOL.FECHORVENTA, BOL.FECHORVIAJE, BOL.CORRIDA_ID, ORIG.CVEPARADA, DEST.CVEPARADA, BOL.PRECIOPAGADO, " ;
query += " BOL.IMPORTETAXAEMBARQUE, BOL.IMPORTEPEDAGIO, BOL.NOMBPASAJERO, BOL.NUMIDENTIFICACION, U.CVEUSUARIO " ;
query += " ORDER BY (CONV.CVECONVENIO || ' - ' || CONV.DESCCONVENIO), BOL.EMPRESACORRIDA_ID, PUNT_V.NOMBPUNTOVENTA, ";
query += " BOL.FECHORVENTA, BOL.FECHORVIAJE, BOL.CORRIDA_ID, ORIG.CVEPARADA, DEST.CVEPARADA, BOL.PRECIOPAGADO, " ;
query += " BOL.IMPORTETAXAEMBARQUE, BOL.IMPORTEPEDAGIO, BOL.NOMBPASAJERO, BOL.NUMIDENTIFICACION, U.CVEUSUARIO " ;
return query;
}

5
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDescontos_es.properties
View File

@ -19,4 +19,7 @@ label.pedagio = Ped
label.totalPorConvenio = Total deste Convênio
label.totalGeral = Total Geral
label.total = Total
msg.noData = Não foi possivel obter dados com os parâmetros informados.
msg.noData = Não foi possivel obter dados com os parâmetros informados.
label.bilheteiro = Bilheteiro
label.nomepassageiro = Passageiro
label.documentopassageiro = Doc. P.

5
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDescontos_pt_BR.properties
View File

@ -19,4 +19,7 @@ label.pedagio = Ped
label.totalPorConvenio = Total deste Convênio
label.totalGeral = Total Geral
label.total = Total
msg.noData = Não foi possivel obter dados com os parâmetros informados.
msg.noData = Não foi possivel obter dados com os parâmetros informados.
label.bilheteiro = Bilheteiro
label.nomepassageiro = Passageiro
label.documentopassageiro = Doc. P.

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

Binary file not shown.

172
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDescontos.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="RelatorioDescontos" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="6d46a2d2-555e-4b7f-944f-b25c672e5feb">
<property name="ireport.zoom" value="1.2396694214876032"/>
<property name="ireport.x" value="0"/>
<property name="ireport.x" value="25"/>
<property name="ireport.y" value="0"/>
<parameter name="fecVentaInicial" class="java.util.Date"/>
<parameter name="fecVentaFinal" class="java.util.Date"/>
@ -19,6 +19,10 @@
<field name="tarifaComDesconto" class="java.lang.Double"/>
<field name="tut" class="java.lang.Double"/>
<field name="pedagio" class="java.lang.Double"/>
<field name="nomepassageiro" class="java.lang.String"/>
<field name="documento" class="java.lang.String"/>
<field name="bilheteiro" class="java.lang.String"/>
<field name="empresacorrida" class="java.lang.String"/>
<variable name="sumTarifaComDesconto" class="java.lang.Double" resetType="Group" resetGroup="ConvenioGroup" calculation="Sum">
<variableExpression><![CDATA[$F{tarifaComDesconto}]]></variableExpression>
</variable>
@ -44,7 +48,8 @@
<variableExpression><![CDATA[new Double($F{tarifaComDesconto} + $F{tut} + $F{pedagio})]]></variableExpression>
</variable>
<group name="ConvenioGroup">
<groupExpression><![CDATA[$F{codConvenio}]]></groupExpression>
<groupExpression><![CDATA[$F{codConvenio}
]]></groupExpression>
<groupHeader>
<band height="22">
<textField>
@ -72,140 +77,170 @@
<textFieldExpression><![CDATA[$R{label.codigo}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="c614f11f-5e39-45d5-ba3b-d94dfb313fb5" x="14" y="12" width="118" height="10"/>
<reportElement uuid="c614f11f-5e39-45d5-ba3b-d94dfb313fb5" x="1" y="12" width="91" height="10"/>
<box>
<topPen lineWidth="0.0"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
</box>
<textElement>
<font size="7" isBold="true" pdfFontName="Helvetica-Bold"/>
<font size="6" isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.nomeAgencia}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="46d51dbb-8f53-4afa-8e8a-ddba45ddd4b7" x="132" y="12" width="50" height="10"/>
<reportElement uuid="46d51dbb-8f53-4afa-8e8a-ddba45ddd4b7" x="247" y="12" width="40" height="10"/>
<box>
<bottomPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center">
<font size="7" isBold="true" pdfFontName="Helvetica-Bold"/>
<font size="6" isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.dataEmissao}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="b8b25bb5-75a0-4780-b2a1-8e02c42590bb" x="182" y="12" width="50" height="10"/>
<reportElement uuid="b8b25bb5-75a0-4780-b2a1-8e02c42590bb" x="287" y="12" width="44" height="10"/>
<box>
<bottomPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center">
<font size="7" isBold="true" pdfFontName="Helvetica-Bold"/>
<font size="6" isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.dataViagem}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="3a6335ef-979e-4232-ba62-f7113e8b6c89" x="232" y="12" width="55" height="10"/>
<reportElement uuid="3a6335ef-979e-4232-ba62-f7113e8b6c89" x="331" y="12" width="41" height="10"/>
<box>
<bottomPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center">
<font size="7" isBold="true" pdfFontName="Helvetica-Bold"/>
<font size="6" isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.codServico}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="b3792e14-b26f-47a8-8da2-f35d3fc0f4fb" x="287" y="12" width="37" height="10"/>
<reportElement uuid="b3792e14-b26f-47a8-8da2-f35d3fc0f4fb" x="371" y="12" width="27" height="10"/>
<box>
<bottomPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center">
<font size="7" isBold="true" pdfFontName="Helvetica-Bold"/>
<font size="6" isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.codOrigem}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="2122af46-a40b-476a-ac4c-dd9c0a5a3413" x="324" y="12" width="37" height="10"/>
<reportElement uuid="2122af46-a40b-476a-ac4c-dd9c0a5a3413" x="396" y="12" width="30" height="10"/>
<box>
<bottomPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center">
<font size="7" isBold="true" pdfFontName="Helvetica-Bold"/>
<font size="6" isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.codDestino}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="ad5b6c97-a125-4e41-b08a-1c70642ae66e" x="361" y="12" width="53" height="10"/>
<reportElement uuid="ad5b6c97-a125-4e41-b08a-1c70642ae66e" x="425" y="12" width="40" height="10"/>
<box>
<bottomPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Right">
<font size="7" isBold="true" pdfFontName="Helvetica-Bold"/>
<font size="6" isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.tarifaComDesconto}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="aebfcc06-37c4-4f7f-a8ed-ad8011c55658" x="414" y="12" width="45" height="10"/>
<reportElement uuid="aebfcc06-37c4-4f7f-a8ed-ad8011c55658" x="464" y="12" width="28" height="10"/>
<box>
<bottomPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Right">
<font size="7" isBold="true" pdfFontName="Helvetica-Bold"/>
<font size="6" isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.tut}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="aa6a57f1-ea6d-4449-90d4-44a753fea7fe" x="459" y="12" width="45" height="10"/>
<reportElement uuid="aa6a57f1-ea6d-4449-90d4-44a753fea7fe" x="492" y="12" width="32" height="10"/>
<box>
<topPen lineWidth="0.0"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.0"/>
</box>
<textElement textAlignment="Right">
<font size="7" isBold="true" pdfFontName="Helvetica-Bold"/>
<font size="6" isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.pedagio}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="85672596-8266-4500-bf8d-3f2c757c4226" x="504" y="12" width="51" height="10"/>
<reportElement uuid="85672596-8266-4500-bf8d-3f2c757c4226" x="524" y="12" width="30" height="10"/>
<box>
<topPen lineWidth="0.0"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Right">
<font size="7" isBold="true" pdfFontName="Helvetica-Bold"/>
<font size="6" isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.total}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="b29e15c3-facb-4dc0-bac7-66d8068ffc8b" x="92" y="12" width="58" height="10"/>
<box>
<bottomPen lineWidth="0.5"/>
</box>
<textElement>
<font size="6" isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.bilheteiro}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="dcfb9cb1-125f-4a27-a071-3245e508827b" x="150" y="12" width="58" height="10"/>
<box>
<bottomPen lineWidth="0.5"/>
</box>
<textElement>
<font size="6" isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.nomepassageiro}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="11473a35-c133-4f7d-a313-4bc4c4cffdd1" x="208" y="12" width="40" height="10"/>
<box>
<bottomPen lineWidth="0.5"/>
</box>
<textElement>
<font size="6" isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.documentopassageiro}]]></textFieldExpression>
</textField>
</band>
</groupHeader>
<groupFooter>
<band height="18">
<textField>
<reportElement uuid="21939498-3964-4b50-b792-c810057ca04b" x="269" y="6" width="100" height="12"/>
<reportElement uuid="21939498-3964-4b50-b792-c810057ca04b" x="312" y="6" width="100" height="12"/>
<textElement>
<font size="7" isBold="true" pdfFontName="Helvetica-Bold"/>
<font size="6" isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.totalPorConvenio}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement uuid="e383a185-7fe9-4b2c-ae23-65db33ee1790" x="369" y="6" width="45" height="12"/>
<reportElement uuid="e383a185-7fe9-4b2c-ae23-65db33ee1790" x="426" y="6" width="39" height="12"/>
<textElement textAlignment="Right">
<font size="7"/>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$V{sumTarifaComDesconto}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement uuid="7e0997ce-bffa-431c-8d8b-7a4e2d7168c6" x="414" y="6" width="45" height="12"/>
<reportElement uuid="7e0997ce-bffa-431c-8d8b-7a4e2d7168c6" x="464" y="6" width="29" height="12"/>
<textElement textAlignment="Right">
<font size="7"/>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$V{SumTut}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement uuid="14a07a9d-75a5-4296-87ac-036461e44d68" x="459" y="6" width="45" height="12"/>
<reportElement uuid="14a07a9d-75a5-4296-87ac-036461e44d68" x="493" y="6" width="31" height="12"/>
<textElement textAlignment="Right">
<font size="7"/>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$V{sumPedagio}]]></textFieldExpression>
</textField>
@ -216,9 +251,9 @@
</graphicElement>
</line>
<textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement uuid="6d37f5dd-12a3-44b8-aac7-a430eb53143c" x="504" y="6" width="51" height="12" isPrintWhenDetailOverflows="true"/>
<reportElement uuid="6d37f5dd-12a3-44b8-aac7-a430eb53143c" x="524" y="6" width="31" height="12" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Right">
<font size="7"/>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$V{sumRow}]]></textFieldExpression>
</textField>
@ -356,77 +391,98 @@
</band>
</pageHeader>
<detail>
<band height="10" splitType="Stretch">
<band height="11" splitType="Stretch">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="ad1ffaa8-6c48-4316-ba3c-ea68579af300" x="14" y="0" width="118" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
<reportElement uuid="ad1ffaa8-6c48-4316-ba3c-ea68579af300" x="1" y="0" width="91" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
<textElement>
<font size="7"/>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{nomeAgencia}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement uuid="cf354725-73cd-4ec9-b10e-4aadc6c27e57" x="132" y="0" width="50" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
<reportElement uuid="cf354725-73cd-4ec9-b10e-4aadc6c27e57" x="248" y="0" width="39" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Center">
<font size="7"/>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{dataEmissao}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement uuid="8351ad8e-e02b-4f89-8655-091bec145801" x="182" y="0" width="50" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
<reportElement uuid="8351ad8e-e02b-4f89-8655-091bec145801" x="287" y="0" width="44" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Center">
<font size="7"/>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{dataViagem}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="0b904fc9-5da8-42df-86e7-0749839574b6" x="232" y="0" width="55" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
<reportElement uuid="0b904fc9-5da8-42df-86e7-0749839574b6" x="331" y="0" width="41" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Center">
<font size="7"/>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{codServico}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="2dd64398-024e-4ce0-a8a8-2c93dec6182d" x="287" y="0" width="37" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
<reportElement uuid="2dd64398-024e-4ce0-a8a8-2c93dec6182d" x="371" y="0" width="27" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Center">
<font size="7"/>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{codOrigem}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="b8655897-1818-4afc-be13-cf15abb85f41" x="324" y="0" width="37" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
<reportElement uuid="b8655897-1818-4afc-be13-cf15abb85f41" x="396" y="0" width="30" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Center">
<font size="7"/>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{codDestino}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement uuid="a2f90f64-e8eb-45b8-828b-53c01e7258a0" x="361" y="0" width="53" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
<reportElement uuid="a2f90f64-e8eb-45b8-828b-53c01e7258a0" x="425" y="0" width="40" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Right">
<font size="7"/>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{tarifaComDesconto}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement uuid="e17967ac-cb7c-4907-98f5-bb3212cec2eb" x="414" y="0" width="45" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
<reportElement uuid="e17967ac-cb7c-4907-98f5-bb3212cec2eb" x="464" y="0" width="28" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Right">
<font size="7"/>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{tut}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement uuid="584271a9-2bf3-4c50-a4cf-6615c17bf989" x="459" y="0" width="45" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
<reportElement uuid="584271a9-2bf3-4c50-a4cf-6615c17bf989" x="493" y="0" width="31" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Right">
<font size="7"/>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{pedagio}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement uuid="e7415c92-58d7-482c-a830-06708116c9d5" x="504" y="0" width="51" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
<reportElement uuid="e7415c92-58d7-482c-a830-06708116c9d5" x="524" y="0" width="30" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Right">
<font size="7"/>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[new Double($F{pedagio} + $F{tarifaComDesconto} + $F{tut})]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement uuid="546f445d-2263-4cdc-a1d7-681d40f311e4" x="92" y="0" width="58" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
<textElement>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{bilheteiro}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement uuid="eba09120-e3ae-4119-af20-8ff20c45d935" x="150" y="0" width="58" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
<textElement>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{nomepassageiro}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement uuid="374795a6-5fae-417c-93d9-ae0c9e12829a" x="209" y="0" width="39" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
<textElement>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{documento}]]></textFieldExpression>
</textField>
</band>
</detail>
<columnFooter>
@ -438,7 +494,7 @@
<summary>
<band height="26" splitType="Stretch">
<textField>
<reportElement uuid="bb9ab283-7cb9-445b-b741-29a6e5c931e9" x="269" y="14" width="100" height="12"/>
<reportElement uuid="bb9ab283-7cb9-445b-b741-29a6e5c931e9" x="312" y="14" width="100" height="12"/>
<textElement>
<font size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
@ -451,28 +507,28 @@
</graphicElement>
</line>
<textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement uuid="d4dac747-8ca0-4b61-9216-ba38d252bc60" x="369" y="14" width="45" height="12" isPrintWhenDetailOverflows="true"/>
<reportElement uuid="d4dac747-8ca0-4b61-9216-ba38d252bc60" x="433" y="14" width="34" height="12" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$V{sumTarifaComDescontoGeral}]]></textFieldExpression>
</textField>
<textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement uuid="d58a5fb0-6276-459b-9b9c-c698a36dcb0d" x="414" y="14" width="45" height="12" isPrintWhenDetailOverflows="true"/>
<reportElement uuid="d58a5fb0-6276-459b-9b9c-c698a36dcb0d" x="465" y="14" width="29" height="12" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$V{SumTutGeral}]]></textFieldExpression>
</textField>
<textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement uuid="29281cf5-8f96-4169-b413-affb15dee8c1" x="459" y="14" width="45" height="12" isPrintWhenDetailOverflows="true"/>
<reportElement uuid="29281cf5-8f96-4169-b413-affb15dee8c1" x="494" y="14" width="31" height="12" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$V{sumPedagioGeral}]]></textFieldExpression>
</textField>
<textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement uuid="232a2a0f-d134-418d-8b95-c3425802c153" x="504" y="14" width="51" height="12" isPrintWhenDetailOverflows="true"/>
<reportElement uuid="232a2a0f-d134-418d-8b95-c3425802c153" x="524" y="14" width="31" height="12" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Right">
<font size="8"/>
</textElement>

135
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDescontosController.java
View File

@ -1,6 +1,9 @@
package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.sql.DataSource;
@ -10,16 +13,24 @@ import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller;
import org.zkoss.util.resource.Labels;
import org.zkoss.zhtml.Messagebox;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zul.Datebox;
import org.zkoss.zul.Paging;
import org.zkoss.zul.Textbox;
import com.rjconsultores.ventaboletos.entidad.Empresa;
import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioDescontos;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta;
import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
import com.rjconsultores.ventaboletos.web.utilerias.paginacion.HibernateSearchObject;
import com.rjconsultores.ventaboletos.web.utilerias.paginacion.PagedListWrapper;
import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRelatorioDescontos;
import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRelatorioDescontosEmpresasSel;
@Controller("relatorioDescontosController")
@Scope("prototype")
@ -29,10 +40,25 @@ public class RelatorioDescontosController extends MyGenericForwardComposer {
@Autowired
private DataSource dataSourceRead;
@Autowired
private transient PagedListWrapper<Empresa> plwEmpresa;
private MyComboboxPuntoVenta cmbAgencia;
private Datebox fecVentaInicial;
private Datebox fecVentaFinal;
private Textbox txtCodConvenio;
private Textbox txtNombreEmpresa;
private Paging pagingEmpresa;
private Paging pagingEmpresaSel;
private MyListbox empresaList;
private MyListbox empresaSelList;
@Override
public void doAfterCompose(Component comp) throws Exception {
super.doAfterCompose(comp);
empresaList.setItemRenderer(new RenderRelatorioDescontos());
empresaSelList.setItemRenderer(new RenderRelatorioDescontosEmpresasSel());
}
public void onClick$btnExecutarRelatorio(Event ev) throws Exception {
validarAntesImpressao();
@ -74,6 +100,17 @@ public class RelatorioDescontosController extends MyGenericForwardComposer {
parametros.put("puntoVenta", puntoVenta.getPuntoventaId() + " - " + puntoVenta.getNombpuntoventa());
}
StringBuilder empresaIds = new StringBuilder();
List<Empresa> lsEmpresasSelecionadas = new ArrayList(Arrays.asList(empresaSelList.getData()));
for (int i = 0; i < lsEmpresasSelecionadas.size(); i++) {
Empresa empresa = lsEmpresasSelecionadas.get(i);
if(empresaIds.length() > 0) {
empresaIds.append(",");
}
empresaIds.append(empresa.getEmpresaId());
}
parametros.put("EMPRESAIDS", empresaIds.toString());
Relatorio relatorio = new RelatorioDescontos(parametros, dataSourceRead.getConnection());
Map<String, Object> args = new HashMap<String, Object>();
args.put("relatorio", relatorio);
@ -82,6 +119,47 @@ public class RelatorioDescontosController extends MyGenericForwardComposer {
}
private void executarPesquisa() {
HibernateSearchObject<Empresa> empresaBusqueda =
new HibernateSearchObject<Empresa>(Empresa.class, pagingEmpresa.getPageSize());
empresaBusqueda.addFilterILike("nombempresa", "%" + txtNombreEmpresa.getValue() + "%");
empresaBusqueda.addFilterEqual("activo", Boolean.TRUE);
empresaBusqueda.addSortAsc("nombempresa");
plwEmpresa.init(empresaBusqueda, empresaList, pagingEmpresa);
if (empresaList.getData().length == 0) {
try {
Messagebox.show(Labels.getLabel("MSG.ningunRegistro"),
Labels.getLabel("relatorioDescontosController.window.title"),
Messagebox.OK, Messagebox.INFORMATION);
} catch (InterruptedException ex) {
ex.printStackTrace();
}
}
}
public void onClick$btnPesquisa(Event ev) {
executarPesquisa();
}
public void onClick$btnLimpar(Event ev) {
empresaList.setData(new ArrayList<Empresa>());
txtNombreEmpresa.setText("");
}
public void onDoubleClick$empresaList(Event ev) {
Empresa empresa = (Empresa) empresaList.getSelected();
empresaSelList.addItemNovo(empresa);
}
public void onDoubleClick$empresaSelList(Event ev) {
Empresa empresa = (Empresa) empresaSelList.getSelected();
empresaSelList.removeItem(empresa);
}
public MyComboboxPuntoVenta getCmbAgencia() {
return cmbAgencia;
}
@ -106,5 +184,60 @@ public class RelatorioDescontosController extends MyGenericForwardComposer {
}
public void setTxtCodConvenio(Textbox txtCodConvenio) {
this.txtCodConvenio = txtCodConvenio;
}
}
public Textbox getTxtNombreEmpresa() {
return txtNombreEmpresa;
}
public void setTxtNombreEmpresa(Textbox txtNombreEmpresa) {
this.txtNombreEmpresa = txtNombreEmpresa;
}
public PagedListWrapper<Empresa> getPlwEmpresa() {
return plwEmpresa;
}
public void setPlwEmpresa(PagedListWrapper<Empresa> plwEmpresa) {
this.plwEmpresa = plwEmpresa;
}
public Paging getPagingEmpresa() {
return pagingEmpresa;
}
public void setPagingEmpresa(Paging pagingEmpresa) {
this.pagingEmpresa = pagingEmpresa;
}
public MyListbox getPuntoVentaList() {
return empresaList;
}
public void setPuntoVentaList(MyListbox puntoVentaList) {
this.empresaList = puntoVentaList;
}
public MyListbox getEmpresaSelList() {
return empresaSelList;
}
public void setEmpresaSelList(MyListbox empresaSelList) {
this.empresaSelList = empresaSelList;
}
public Paging getPagingEmpresaSel() {
return pagingEmpresaSel;
}
public void setPagingEmpresaSel(Paging pagingEmpresaSel) {
this.pagingEmpresaSel = pagingEmpresaSel;
}
public MyListbox getEmpresaList() {
return empresaList;
}
public void setEmpresaList(MyListbox empresaList) {
this.empresaList = empresaList;
}
}

27
src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRelatorioDescontos.java 100644
View File

@ -0,0 +1,27 @@
/**
*
*/
package com.rjconsultores.ventaboletos.web.utilerias.render;
import org.zkoss.zul.Listcell;
import org.zkoss.zul.Listitem;
import org.zkoss.zul.ListitemRenderer;
import com.rjconsultores.ventaboletos.entidad.Empresa;
public class RenderRelatorioDescontos implements ListitemRenderer {
@Override
public void render(Listitem lstm, Object o) throws Exception {
Empresa empresa = (Empresa) o;
Listcell lc = new Listcell(empresa.getEmpresaId().toString());
lc.setParent(lstm);
lc = new Listcell(empresa.getNombempresa());
lc.setParent(lstm);
lstm.setAttribute("data", empresa);
}
}

27
src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRelatorioDescontosEmpresasSel.java 100644
View File

@ -0,0 +1,27 @@
/**
*
*/
package com.rjconsultores.ventaboletos.web.utilerias.render;
import org.zkoss.zul.Listcell;
import org.zkoss.zul.Listitem;
import org.zkoss.zul.ListitemRenderer;
import com.rjconsultores.ventaboletos.entidad.Empresa;
public class RenderRelatorioDescontosEmpresasSel implements ListitemRenderer {
@Override
public void render(Listitem lstm, Object o) throws Exception {
Empresa empresa = (Empresa) o;
Listcell lc = new Listcell(empresa.getEmpresaId().toString());
lc.setParent(lstm);
lc = new Listcell(empresa.getNombempresa());
lc.setParent(lstm);
lstm.setAttribute("data", empresa);
}
}

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

@ -6173,6 +6173,10 @@ relatorioDescontosController.lbPeriodoVendaInicial.value = Fecha Venta Inicial
relatorioDescontosController.lbPeriodoVendaFinal.value = Fecha Venta Final
relatorioDescontosController.info.fecVentaInicial = Informe la Fecha de Venta Inicial
relatorioDescontosController.info.fecVentaFinal = Informe la Fecha de Venta Final
relatorioDescontosController.lbEmpresa.value = Empresa
relatorioDescontosController.btnPesquisa.label = Buscar
relatorioDescontosController.btnLimpar.label = Limpar
relatorioDescontosController.lbIdEmpresa.value = Id
# Filtro Relatorio de Agências Não Importadas
filtroRelatorioAgenciasNaoImportadas.lbDataIni.value = Fecha Inicio

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

@ -6289,6 +6289,11 @@ relatorioDescontosController.lbPeriodoVendaFinal.value = Data Venda Final
relatorioDescontosController.info.fecVentaInicial = Informe a Data Venda Inicial
relatorioDescontosController.info.fecVentaFinal = Informe a Data Venda Final
relatorioDescontosController.lbEmpresa.value = Empresa
relatorioDescontosController.btnPesquisa.label = Buscar
relatorioDescontosController.btnLimpar.label = Limpar
relatorioDescontosController.lbIdEmpresa.value = Id
indexController.mniRelatorioAgenciaFechamento.label= Resumo Venda por Agencia
integracion.totvs=ERRO ao fazer integração com a TOTVS

47
web/gui/relatorios/filtroRelatorioDescontos.zul
View File

@ -5,7 +5,7 @@
<?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
<zk xmlns="http://www.zkoss.org/2005/zul">
<window id="winFiltroRelatorioDescontos" apply="${relatorioDescontosController}" contentStyle="overflow:auto" height="225px" width="550px" border="normal">
<window id="winFiltroRelatorioDescontos" apply="${relatorioDescontosController}" contentStyle="overflow:auto" height="340px" width="570px" border="normal">
<grid fixedLayout="true">
<columns>
<column width="30%" />
@ -29,6 +29,51 @@
<combobox id="cmbAgencia" width="100%" maxlength="60" mold="rounded" buttonVisible="true"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta"/>
</row>
<row>
<label value="${c:l('relatorioDescontosController.lbEmpresa.value')}"/>
<bandbox id="bbPesquisaEmpresa" width="100%" mold="rounded" readonly="true">
<bandpopup>
<vbox>
<hbox>
<label
value="${c:l('relatorioDescontosController.lbEmpresa.value')}" />
<textbox id="txtNombreEmpresa"
use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox"
width="300px" mold="rounded" />
<button id="btnPesquisa"
image="/gui/img/find.png"
label="${c:l('relatorioDescontosController.btnPesquisa.label')}" />
<button id="btnLimpar"
image="/gui/img/eraser.png"
label="${c:l('relatorioDescontosController.btnLimpar.label')}" />
</hbox>
<paging id="pagingEmpresa" pageSize="10" />
<listbox id="empresaList"
mold="paging"
use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
vflex="true" height="100%" width="700px">
<listhead>
<listheader width="10%"
label="${c:l('relatorioDescontosController.lbIdEmpresa.value')}" />
<listheader width="90%"
label="${c:l('relatorioDescontosController.lbEmpresa.value')}" />
</listhead>
</listbox>
</vbox>
</bandpopup>
</bandbox>
</row>
<row spans="2">
<listbox id="empresaSelList" mold="paging"
use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
vflex="true" height="100px" width="100%">
<listhead>
<listheader width="10%" label="${c:l('relatorioDescontosController.lbIdEmpresa.value')}" />
<listheader width="90%" label="${c:l('relatorioDescontosController.lbEmpresa.value')}" />
</listhead>
</listbox>
<paging id="pagingEmpresaSel" pageSize="10" />
</row>
</rows>
</grid>
<toolbar>