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

fixes bug #9392 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@73067 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2017-08-25 00:40:08 +00:00
parent 140630097d
commit ebb5d70d54
13 changed files with 277 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOCDNaoResgatadaEmpresa.java
View File

@ -116,6 +116,7 @@ public class RelatorioOCDNaoResgatadaEmpresa extends Relatorio {
ocdBean.setNumfoliosistema(rset.getString("NUMFOLIOSISTEMA")); ocdBean.setNumfoliosistema(rset.getString("NUMFOLIOSISTEMA"));
ocdBean.setFeccorrida(rset.getDate("FECCORRIDA")); ocdBean.setFeccorrida(rset.getDate("FECCORRIDA"));
ocdBean.setOcdId(rset.getLong("OCD_ID")); ocdBean.setOcdId(rset.getLong("OCD_ID"));
ocdBean.setMotivocancelacionId(rset.getInt("MOTIVOCANCELACION_ID"));
ocdBean.setTotalBilhete(rset.getBigDecimal("TOTAL_BILHETE")); ocdBean.setTotalBilhete(rset.getBigDecimal("TOTAL_BILHETE"));
ocdBean.setNumoperacion(OcdUtil.generaLocalizadorOCD(ocdBean.getNumoperacion(), ocdBean.getOcdId())); ocdBean.setNumoperacion(OcdUtil.generaLocalizadorOCD(ocdBean.getNumoperacion(), ocdBean.getOcdId()));
lsDadosRelatorio.add(ocdBean); lsDadosRelatorio.add(ocdBean);
@ -146,7 +147,7 @@ public class RelatorioOCDNaoResgatadaEmpresa extends Relatorio {
sql.append("SELECT O.OCD_ID, O.NUMOPERACION, E.NOMBEMPRESA, B.NUMFOLIOSISTEMA, "); sql.append("SELECT O.OCD_ID, O.NUMOPERACION, E.NOMBEMPRESA, B.NUMFOLIOSISTEMA, ");
sql.append("O.FECINC, PVO.NOMBPUNTOVENTA AS PV_OCD, O.PENALIZACION, (CASE O.VALOR_TARJETA WHEN 0 THEN O.VALOR_PAGAR ELSE O.VALOR_TARJETA END) AS VALOR_OCD, "); sql.append("O.FECINC, PVO.NOMBPUNTOVENTA AS PV_OCD, O.PENALIZACION, (CASE O.VALOR_TARJETA WHEN 0 THEN O.VALOR_PAGAR ELSE O.VALOR_TARJETA END) AS VALOR_OCD, ");
sql.append("PVV.NOMBPUNTOVENTA AS PV_VENDA, B.FECHORVENTA, B.FECCORRIDA, ORI.DESCPARADA AS ORIGEM, DES.DESCPARADA AS DESTINO, B.NUMASIENTO, "); sql.append("PVV.NOMBPUNTOVENTA AS PV_VENDA, B.FECHORVENTA, B.FECCORRIDA, ORI.DESCPARADA AS ORIGEM, DES.DESCPARADA AS DESTINO, B.NUMASIENTO, ");
sql.append("(CASE O.VALOR_TARJETA WHEN 0 THEN 'DINHEIRO' ELSE 'CARTAO' END) AS FORMAPAGO, "); sql.append("(CASE O.VALOR_TARJETA WHEN 0 THEN 'DINHEIRO' ELSE 'CARTAO' END) AS FORMAPAGO, B.MOTIVOCANCELACION_ID, ");
sql.append("PVP.NOMBPUNTOVENTA AS PV_PAGO, O.FECPAGO, UP.CVEUSUARIO AS USUARIOPAGO, UI.CVEUSUARIO AS USUARIOINC, "); sql.append("PVP.NOMBPUNTOVENTA AS PV_PAGO, O.FECPAGO, UP.CVEUSUARIO AS USUARIOPAGO, UI.CVEUSUARIO AS USUARIOINC, ");
sql.append("(CASE O.INDPAGO WHEN 1 THEN (CASE O.VALOR_TARJETA WHEN 0 THEN O.VALOR_PAGAR ELSE O.VALOR_TARJETA END) ELSE NULL END) AS VALOR_PAGO, "); sql.append("(CASE O.INDPAGO WHEN 1 THEN (CASE O.VALOR_TARJETA WHEN 0 THEN O.VALOR_PAGAR ELSE O.VALOR_TARJETA END) ELSE NULL END) AS VALOR_PAGO, ");
sql.append("NVL(B.PRECIOPAGADO,0) + NVL(B.IMPORTETAXAEMBARQUE,0) + NVL(B.IMPORTEOUTROS,0) + NVL(B.IMPORTEPEDAGIO,0) + NVL(B.IMPORTESEGURO,0) AS TOTAL_BILHETE "); sql.append("NVL(B.PRECIOPAGADO,0) + NVL(B.IMPORTETAXAEMBARQUE,0) + NVL(B.IMPORTEOUTROS,0) + NVL(B.IMPORTEPEDAGIO,0) + NVL(B.IMPORTESEGURO,0) AS TOTAL_BILHETE ");

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

@ -21,6 +21,8 @@ detail.fecpago=Fecha Pago
detail.fecvenda=Fecha Venta detail.fecvenda=Fecha Venta
detail.valorOcd=Valor OCD detail.valorOcd=Valor OCD
detail.penalizacion=Penalizacion detail.penalizacion=Penalizacion
detail.multa=Multa
detail.motivo=Motivo
detail.nombusuarioinc=Usuário Inc. detail.nombusuarioinc=Usuário Inc.
detail.fecinc=Fecha OCD detail.fecinc=Fecha OCD

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

@ -21,6 +21,8 @@ detail.fecpago=Data Pagamento
detail.fecvenda=Data Venda detail.fecvenda=Data Venda
detail.valorOcd=Valor OCD detail.valorOcd=Valor OCD
detail.penalizacion=Penalização detail.penalizacion=Penalização
detail.multa=Multa
detail.motivo=Motivo
detail.nombusuarioinc=Usuário Geração detail.nombusuarioinc=Usuário Geração
detail.fecinc=Data OCD detail.fecinc=Data OCD

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

Binary file not shown.

15
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioDevolucaoBilhetes" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2"> <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioDevolucaoBilhetes" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
<property name="ireport.zoom" value="1.5"/> <property name="ireport.zoom" value="1.5"/>
<property name="ireport.x" value="470"/> <property name="ireport.x" value="485"/>
<property name="ireport.y" value="124"/> <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">
<box> <box>
@ -375,12 +375,12 @@
<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="602" y="17" width="199" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="4b6e9016-c490-4abc-a659-fc73eb24a93a"/> <reportElement mode="Transparent" x="602" y="17" width="179" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="4b6e9016-c490-4abc-a659-fc73eb24a93a"/>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/> <paragraph lineSpacing="Single"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{label.de}+" "+$V{PAGE_NUMBER}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{label.de}]]></textFieldExpression>
</textField> </textField>
<textField pattern="" isBlankWhenNull="false"> <textField pattern="" isBlankWhenNull="false">
<reportElement mode="Transparent" x="602" y="33" width="199" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="12e51d0a-4fd5-4dff-95f5-762d8e3bf1f0"/> <reportElement mode="Transparent" x="602" y="33" width="199" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="12e51d0a-4fd5-4dff-95f5-762d8e3bf1f0"/>
@ -397,6 +397,13 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.dataHora}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.dataHora}]]></textFieldExpression>
</textField> </textField>
<textField evaluationTime="Report">
<reportElement x="782" y="17" width="19" height="15" uuid="0a561700-92b8-4653-9830-3ee2f983cbee"/>
<textElement>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
</textField>
</band> </band>
</pageHeader> </pageHeader>
<columnHeader> <columnHeader>

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

Binary file not shown.

13
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetesConsolidado.jrxml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioDevolucaoBilhetesConsolidado" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2"> <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioDevolucaoBilhetesConsolidado" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
<property name="ireport.zoom" value="1.0"/> <property name="ireport.zoom" value="2.0"/>
<property name="ireport.x" value="37"/> <property name="ireport.x" value="916"/>
<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">
@ -256,7 +256,7 @@
<textFieldExpression><![CDATA[$R{label.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression>
</textField> </textField>
<textField pattern="" isBlankWhenNull="false"> <textField pattern="" isBlankWhenNull="false">
<reportElement mode="Transparent" x="603" y="17" width="198" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="88758926-3726-42c1-8aa5-32889c8a0d35"/> <reportElement mode="Transparent" x="603" y="17" width="175" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="88758926-3726-42c1-8aa5-32889c8a0d35"/>
<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"/>
@ -278,6 +278,13 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.dataHora}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.dataHora}]]></textFieldExpression>
</textField> </textField>
<textField evaluationTime="Report">
<reportElement x="782" y="17" width="19" height="15" uuid="8e2fe7e4-27b1-494b-942f-9681e515d5af"/>
<textElement>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
</textField>
</band> </band>
</pageHeader> </pageHeader>
<columnHeader> <columnHeader>

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

Binary file not shown.

13
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetesFinanceiro.jrxml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioDevolucaoBilhetesFinanceiro" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2"> <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioDevolucaoBilhetesFinanceiro" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
<property name="ireport.zoom" value="2.0"/> <property name="ireport.zoom" value="2.0"/>
<property name="ireport.x" value="738"/> <property name="ireport.x" value="916"/>
<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">
@ -227,12 +227,12 @@
<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="603" y="17" width="199" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="4b6e9016-c490-4abc-a659-fc73eb24a93a"/> <reportElement mode="Transparent" x="603" y="17" width="176" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="4b6e9016-c490-4abc-a659-fc73eb24a93a"/>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/> <paragraph lineSpacing="Single"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{label.de}+" "+$V{PAGE_NUMBER}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{label.de}]]></textFieldExpression>
</textField> </textField>
<textField pattern="" isBlankWhenNull="false"> <textField pattern="" isBlankWhenNull="false">
<reportElement mode="Transparent" x="603" y="33" width="199" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="12e51d0a-4fd5-4dff-95f5-762d8e3bf1f0"/> <reportElement mode="Transparent" x="603" y="33" width="199" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="12e51d0a-4fd5-4dff-95f5-762d8e3bf1f0"/>
@ -249,6 +249,13 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.dataHora}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.dataHora}]]></textFieldExpression>
</textField> </textField>
<textField evaluationTime="Report">
<reportElement x="782" y="17" width="19" height="15" uuid="eed23f0c-3b83-4d3b-80b1-d188ccb7501b"/>
<textElement>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
</textField>
</band> </band>
</pageHeader> </pageHeader>
<columnHeader> <columnHeader>

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

Binary file not shown.

387
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOCDNaoResgatadaEmpresa.jrxml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioOCDNaoResgatadaEmpresa" pageWidth="1650" pageHeight="594" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1610" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" resourceBundle="RelatorioOCDNaoResgatadaEmpresa" whenResourceMissingType="Empty" uuid="94834362-0ecc-46da-b0a2-5cdee355da3e"> <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="RelatorioOCDNaoResgatadaEmpresa" pageWidth="1800" pageHeight="594" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1760" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" resourceBundle="RelatorioOCDNaoResgatadaEmpresa" whenResourceMissingType="Empty" uuid="94834362-0ecc-46da-b0a2-5cdee355da3e">
<property name="ireport.zoom" value="1.5"/> <property name="ireport.zoom" value="1.5"/>
<property name="ireport.x" value="1697"/> <property name="ireport.x" value="1379"/>
<property name="ireport.y" value="23"/> <property name="ireport.y" value="30"/>
<parameter name="fecInicio" class="java.lang.String"> <parameter name="fecInicio" class="java.lang.String">
<defaultValueExpression><![CDATA[]]></defaultValueExpression> <defaultValueExpression><![CDATA[]]></defaultValueExpression>
</parameter> </parameter>
@ -38,9 +38,8 @@
<field name="totalBilhete" class="java.math.BigDecimal"/> <field name="totalBilhete" class="java.math.BigDecimal"/>
<field name="valorPago" class="java.math.BigDecimal"/> <field name="valorPago" class="java.math.BigDecimal"/>
<field name="numfoliosistema" class="java.lang.String"/> <field name="numfoliosistema" class="java.lang.String"/>
<variable name="vPenalizacion" class="java.math.BigDecimal" calculation="Sum"> <field name="motivo" class="java.lang.String"/>
<variableExpression><![CDATA[$F{penalizacion}]]></variableExpression> <field name="multa" class="java.math.BigDecimal"/>
</variable>
<variable name="vValorOcd" class="java.math.BigDecimal" calculation="Sum"> <variable name="vValorOcd" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{valorOcd}]]></variableExpression> <variableExpression><![CDATA[$F{valorOcd}]]></variableExpression>
</variable> </variable>
@ -50,10 +49,13 @@
<variable name="vTotalBilhete" class="java.math.BigDecimal" calculation="Sum"> <variable name="vTotalBilhete" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{totalBilhete}]]></variableExpression> <variableExpression><![CDATA[$F{totalBilhete}]]></variableExpression>
</variable> </variable>
<variable name="vMulta" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{multa}]]></variableExpression>
</variable>
<group name="empresa" isReprintHeaderOnEachPage="true"> <group name="empresa" isReprintHeaderOnEachPage="true">
<groupExpression><![CDATA[$F{empresa}]]></groupExpression> <groupExpression><![CDATA[$F{empresa}]]></groupExpression>
<groupHeader> <groupHeader>
<band height="56" splitType="Stretch"> <band height="61" splitType="Stretch">
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="0" y="1" width="590" height="17" uuid="09306494-79f1-44dd-9eed-c39684384bbf"/> <reportElement x="0" y="1" width="590" height="17" uuid="09306494-79f1-44dd-9eed-c39684384bbf"/>
<textElement verticalAlignment="Middle"> <textElement verticalAlignment="Middle">
@ -62,181 +64,195 @@
<textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression>
</textField> </textField>
<line> <line>
<reportElement x="0" y="0" width="1610" height="1" uuid="c274c839-42a9-4922-aa19-515055e260e5"/> <reportElement x="0" y="0" width="1760" height="1" uuid="c274c839-42a9-4922-aa19-515055e260e5"/>
</line> </line>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="380" y="37" width="65" height="17" uuid="edd89ef1-92d6-4b5f-b249-851532fad9df"/> <reportElement positionType="Float" stretchType="RelativeToTallestObject" x="1" y="39" width="116" height="17" uuid="e8355048-a037-4837-866b-e6cf7a3e90ed"/>
<textElement textAlignment="Right" markup="none"> <textElement textAlignment="Left" verticalAlignment="Top" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.penalizacion}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="1247" y="36" width="120" height="17" uuid="ee67d732-f227-43e9-ae81-bf7e0148bd10"/>
<textElement textAlignment="Left" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.nombpuntoventapago}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="1523" y="37" width="91" height="17" uuid="632ff254-23c5-49d5-9745-a71991042c8c"/>
<textElement textAlignment="Left" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.nombusuariopago}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="1181" y="37" width="63" height="17" uuid="9bd12984-c4fa-4782-a7a5-d3c55ef70bdd"/>
<textElement>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.formaPago1}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="979" y="37" width="90" height="17" uuid="67815fb4-e060-4cb0-b1a0-be93ce07a99c"/>
<textElement textAlignment="Left" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.destino}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="889" y="37" width="90" height="17" uuid="22d447b0-6ca8-4b5b-832e-0ec939e4109e"/>
<textElement textAlignment="Left" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.origem}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="729" y="37" width="80" height="17" uuid="8c7fbc35-dbfc-4658-955c-8ac560a022d0"/>
<textElement textAlignment="Left" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.fecvenda}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="1069" y="37" width="40" height="17" uuid="0c52c1e9-31d1-4ec6-8eb9-48eab3fc38b5"/>
<textElement textAlignment="Center" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.asiento}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="445" y="37" width="70" height="17" uuid="569add1e-cb73-4278-b800-fa44631527f6"/>
<textElement textAlignment="Right" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.valorOcd}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="1367" y="37" width="80" height="17" uuid="e799ef17-4e56-4c7d-b8d2-1143db4073c5"/>
<textElement textAlignment="Left" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.fecpago}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="0" y="37" width="117" height="17" uuid="e8355048-a037-4837-866b-e6cf7a3e90ed"/>
<textElement textAlignment="Left" markup="none">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{detail.numoperacion}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{detail.numoperacion}]]></textFieldExpression>
</textField> </textField>
<line> <line>
<reportElement x="0" y="35" width="1610" height="1" uuid="effe0475-3353-4fa6-b092-117faf5720f0"/> <reportElement x="0" y="38" width="1760" height="1" uuid="effe0475-3353-4fa6-b092-117faf5720f0"/>
</line> </line>
<line> <line>
<reportElement positionType="Float" x="0" y="54" width="1610" height="1" uuid="4fc49c16-4e8e-426f-88d7-899f985beab2"/> <reportElement stretchType="RelativeToTallestObject" x="1391" y="19" width="1" height="17" isPrintWhenDetailOverflows="true" uuid="ee1ab24d-cffb-48ce-91b7-b70c6e5365cf"/>
</line>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="180" y="37" width="80" height="17" uuid="4b9458fc-7871-46e5-8d36-8b3a7cb99326"/>
<textElement textAlignment="Left" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.fecinc}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="260" y="37" width="120" height="17" uuid="00be1f62-ab3e-4171-aa54-e509a741e1c2"/>
<textElement textAlignment="Left" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.nombpuntoventainc}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="609" y="37" width="120" height="17" uuid="ed034848-e46c-4160-b68a-d14b1d043690"/>
<textElement markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.nombpuntoventa}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="809" y="37" width="80" height="17" uuid="4a3fa818-000c-4d0c-b736-fa9ebc052209"/>
<textElement textAlignment="Left" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.feccorrida}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="1109" y="37" width="71" height="17" uuid="bc0cb2a8-c2d5-4617-9395-03848ea93797"/>
<textElement textAlignment="Right" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.totalBilhete}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="521" y="37" width="85" height="17" uuid="64bb08fe-bab3-40c6-8bb3-ddc20b4f052d"/>
<textElement textAlignment="Left" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.nombusuario}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="1447" y="37" width="70" height="17" uuid="f28e71df-9397-4d0c-a79f-31e31bb45e77"/>
<textElement textAlignment="Right" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.valorPago}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="117" y="37" width="63" height="17" uuid="8aa2134b-9de0-47cc-af24-506f49ee30dc"/>
<textElement textAlignment="Left" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.numfoliosistema}]]></textFieldExpression>
</textField>
<line>
<reportElement stretchType="RelativeToTallestObject" x="1245" y="18" width="1" height="17" isPrintWhenDetailOverflows="true" uuid="ee1ab24d-cffb-48ce-91b7-b70c6e5365cf"/>
</line> </line>
<line> <line>
<reportElement x="0" y="17" width="1610" height="1" uuid="bf554b75-fcd8-4ec4-b22b-feba28af1121"/> <reportElement x="1" y="18" width="1760" height="1" uuid="bf554b75-fcd8-4ec4-b22b-feba28af1121"/>
</line> </line>
<line> <line>
<reportElement stretchType="RelativeToTallestObject" x="607" y="18" width="1" height="17" uuid="ce5f4c0a-2708-4579-93d9-abbf86bcc233"/> <reportElement stretchType="RelativeToTallestObject" x="753" y="19" width="1" height="17" uuid="ce5f4c0a-2708-4579-93d9-abbf86bcc233"/>
</line> </line>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="0" y="18" width="606" height="17" uuid="1fe5ca9e-e6e9-4df2-aacc-005c2f28e693"/> <reportElement positionType="Float" stretchType="RelativeToTallestObject" x="0" y="20" width="751" height="17" uuid="1fe5ca9e-e6e9-4df2-aacc-005c2f28e693"/>
<textElement textAlignment="Center" markup="none"> <textElement textAlignment="Center" markup="none">
<font size="6" isBold="true"/> <font size="6" isBold="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{detail.dadosOcd}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{detail.dadosOcd}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="609" y="18" width="635" height="17" uuid="4cbf0ac8-539a-419f-8b3a-04c65e9e12b6"/> <reportElement positionType="Float" stretchType="RelativeToTallestObject" x="755" y="20" width="635" height="17" uuid="4cbf0ac8-539a-419f-8b3a-04c65e9e12b6"/>
<textElement textAlignment="Center" markup="none"> <textElement textAlignment="Center" markup="none">
<font size="6" isBold="true"/> <font size="6" isBold="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{detail.dadosVenda}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{detail.dadosVenda}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="1247" y="18" width="362" height="17" uuid="8df7e98f-ea60-4266-927e-a26b7c4392cc"/> <reportElement positionType="Float" stretchType="RelativeToTallestObject" x="1393" y="20" width="367" height="17" uuid="8df7e98f-ea60-4266-927e-a26b7c4392cc"/>
<textElement textAlignment="Center" markup="none"> <textElement textAlignment="Center" markup="none">
<font size="6" isBold="true"/> <font size="6" isBold="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{detail.dadosPagamento}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{detail.dadosPagamento}]]></textFieldExpression>
</textField> </textField>
<line>
<reportElement positionType="FixRelativeToBottom" x="0" y="60" width="1760" height="1" uuid="3e8dcfa1-5b79-47ef-9574-e2e281799206"/>
</line>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="117" y="39" width="63" height="17" uuid="649dd349-256f-4fe7-a9f1-808de180a1ab"/>
<textElement textAlignment="Left" verticalAlignment="Top" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.numfoliosistema}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="180" y="39" width="80" height="17" uuid="da2cd81f-cb67-48b6-be99-86ff55a07d34"/>
<textElement textAlignment="Left" verticalAlignment="Top" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.fecinc}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="260" y="39" width="120" height="17" uuid="c8628b7b-0e19-43b7-9f98-389d17e5a282"/>
<textElement textAlignment="Left" verticalAlignment="Top" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.nombpuntoventainc}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="380" y="39" width="65" height="17" uuid="eb2ccbfe-c2fb-4ce8-b761-9b0f8345ff69"/>
<textElement textAlignment="Right" verticalAlignment="Top" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.penalizacion}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="445" y="39" width="65" height="17" uuid="71d0b0b6-6d01-4a2f-8b98-1a84c228f71a"/>
<textElement textAlignment="Right" verticalAlignment="Top" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.multa}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="510" y="39" width="78" height="17" uuid="7c50e28f-a386-4198-8d7b-f8ebbb1e511d"/>
<textElement textAlignment="Right" verticalAlignment="Top" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.valorOcd}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="590" y="39" width="76" height="17" uuid="bf29febc-9749-47dd-ab2f-1aade759ba55"/>
<textElement verticalAlignment="Top" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.motivo}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="666" y="39" width="85" height="17" uuid="3b9cbef3-2245-4a64-a15f-dd10dd9eb71c"/>
<textElement verticalAlignment="Top" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.nombusuarioinc}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="755" y="39" width="120" height="17" uuid="966df6cf-5e89-4cf7-9e74-d080e1a20287"/>
<textElement verticalAlignment="Top" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.nombpuntoventa}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="875" y="39" width="80" height="17" uuid="59c4bcbf-cfac-4174-8bfa-53f32c6487fe"/>
<textElement verticalAlignment="Top" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.fecvenda}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="955" y="39" width="80" height="17" uuid="00106961-62a1-476e-add9-1e3ab30d3dbd"/>
<textElement verticalAlignment="Top" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.feccorrida}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="1035" y="39" width="90" height="17" uuid="287d9c50-50a1-424d-bdd3-f43feb98f966"/>
<textElement verticalAlignment="Top" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.origem}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="1125" y="39" width="90" height="17" uuid="c9774dae-3bea-4319-9ce1-c129b9c7c183"/>
<textElement verticalAlignment="Top" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.destino}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="1215" y="39" width="40" height="17" uuid="eabdff4f-be15-4d8c-9adf-fac8acf4bfac"/>
<textElement verticalAlignment="Top" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.asiento}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="1255" y="39" width="71" height="17" uuid="fd50b974-6842-4748-8632-28c4246740b0"/>
<textElement textAlignment="Right" verticalAlignment="Top" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.totalBilhete}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="1328" y="39" width="63" height="17" uuid="033cdefb-7eed-44ab-9998-171c64cb13be"/>
<textElement verticalAlignment="Top" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.formaPago}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="1393" y="39" width="120" height="17" uuid="1bc24d64-bdc3-4ef4-b231-5f518b0c878d"/>
<textElement verticalAlignment="Top" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.nombpuntoventapago}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="1513" y="39" width="80" height="17" uuid="b5b172ee-cb45-44f2-a744-bc70dcfbd50c"/>
<textElement verticalAlignment="Top" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.fecpago}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="1593" y="39" width="70" height="17" uuid="fc818daf-484a-41fd-b1a9-2d8796c96af0"/>
<textElement verticalAlignment="Top" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.valorPago}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="1669" y="39" width="91" height="17" uuid="2c53bd34-6be3-419c-9c70-6e0d6c048220"/>
<textElement verticalAlignment="Top" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.nombusuariopago}]]></textFieldExpression>
</textField>
</band> </band>
</groupHeader> </groupHeader>
<groupFooter> <groupFooter>
<band/> <band splitType="Stretch"/>
</groupFooter> </groupFooter>
</group> </group>
<background> <background>
@ -245,18 +261,18 @@
<pageHeader> <pageHeader>
<band height="78" splitType="Stretch"> <band height="78" splitType="Stretch">
<textField> <textField>
<reportElement x="1410" y="0" width="107" height="20" uuid="66b2d0f6-2bf1-4bc7-9ec0-a34444e04d60"/> <reportElement x="1559" y="0" width="107" height="20" uuid="66b2d0f6-2bf1-4bc7-9ec0-a34444e04d60"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.dataHora}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.dataHora}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="1410" y="20" width="200" height="20" uuid="be1692e9-f130-4d08-9173-6ca3e4699030"/> <reportElement x="1559" y="20" width="179" height="20" uuid="be1692e9-f130-4d08-9173-6ca3e4699030"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.pagina}+ " "+$V{PAGE_NUMBER}+ " "+ $R{label.de} +" "+$V{PAGE_NUMBER}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.pagina}+ " "+$V{PAGE_NUMBER}+ " "+ $R{label.de}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="0" y="0" width="661" height="20" uuid="652312bd-292a-424d-a234-5f157e3699c6"/> <reportElement x="0" y="0" width="661" height="20" uuid="652312bd-292a-424d-a234-5f157e3699c6"/>
@ -266,14 +282,14 @@
<textFieldExpression><![CDATA[$P{TITULO}]]></textFieldExpression> <textFieldExpression><![CDATA[$P{TITULO}]]></textFieldExpression>
</textField> </textField>
<textField pattern="dd/MM/yyyy HH:mm"> <textField pattern="dd/MM/yyyy HH:mm">
<reportElement x="1517" y="0" width="93" height="20" uuid="6f671365-868e-41a6-81ee-a308d1d91e1d"/> <reportElement x="1666" y="0" width="93" height="20" uuid="6f671365-868e-41a6-81ee-a308d1d91e1d"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<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="1410" y="40" width="199" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="67707009-6d28-47b1-a56f-90988944ebe9"/> <reportElement mode="Transparent" x="1559" y="40" width="199" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="67707009-6d28-47b1-a56f-90988944ebe9"/>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/> <paragraph lineSpacing="Single"/>
@ -375,6 +391,13 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.filtros}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.filtros}]]></textFieldExpression>
</textField> </textField>
<textField evaluationTime="Report">
<reportElement x="1740" y="20" width="19" height="20" uuid="ad9def9c-3df2-429c-af5b-904cacbf592e"/>
<textElement>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
</textField>
</band> </band>
</pageHeader> </pageHeader>
<columnHeader> <columnHeader>
@ -383,21 +406,21 @@
<detail> <detail>
<band height="17" splitType="Stretch"> <band height="17" splitType="Stretch">
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="889" y="0" width="90" height="17" uuid="b8ce6eb6-8b05-4936-9980-6a5e83806e36"/> <reportElement stretchType="RelativeToTallestObject" x="1035" y="0" width="90" height="17" uuid="b8ce6eb6-8b05-4936-9980-6a5e83806e36"/>
<textElement> <textElement>
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{origem}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{origem}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="1523" y="0" width="91" height="17" uuid="f008db4d-9791-4c96-aa15-1c9f0e73f11a"/> <reportElement stretchType="RelativeToTallestObject" x="1669" y="0" width="91" height="17" uuid="f008db4d-9791-4c96-aa15-1c9f0e73f11a"/>
<textElement textAlignment="Left" markup="none"> <textElement textAlignment="Left" markup="none">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{nombusuariopago}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{nombusuariopago}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="1247" y="0" width="120" height="17" uuid="35602dab-1999-4ae5-a7d1-e38665a9f994"/> <reportElement stretchType="RelativeToTallestObject" x="1393" y="0" width="120" height="17" uuid="35602dab-1999-4ae5-a7d1-e38665a9f994"/>
<textElement textAlignment="Left" markup="none"> <textElement textAlignment="Left" markup="none">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
@ -411,21 +434,21 @@
<textFieldExpression><![CDATA[$F{penalizacion}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{penalizacion}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="1181" y="0" width="63" height="17" uuid="623040d8-73ae-49d2-86bb-bd57f5e6effd"/> <reportElement stretchType="RelativeToTallestObject" x="1328" y="0" width="63" height="17" uuid="623040d8-73ae-49d2-86bb-bd57f5e6effd"/>
<textElement> <textElement>
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{formaPago1}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{formaPago1}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="979" y="0" width="90" height="17" uuid="0a25139e-ca2e-404a-aad0-fece352398b5"/> <reportElement stretchType="RelativeToTallestObject" x="1125" y="0" width="90" height="17" uuid="0a25139e-ca2e-404a-aad0-fece352398b5"/>
<textElement> <textElement>
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{destino}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{destino}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="729" y="0" width="80" height="17" uuid="0a3ebc26-ba0f-4b3a-9d61-88db7600e339"/> <reportElement stretchType="RelativeToTallestObject" x="875" y="0" width="80" height="17" uuid="0a3ebc26-ba0f-4b3a-9d61-88db7600e339"/>
<textElement> <textElement>
<font size="6"/> <font size="6"/>
</textElement> </textElement>
@ -439,14 +462,14 @@
<textFieldExpression><![CDATA[$F{numoperacion}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{numoperacion}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="445" y="0" width="70" height="17" uuid="c328f3f3-1a66-4982-93b4-b0e362cb61b5"/> <reportElement stretchType="RelativeToTallestObject" x="510" y="0" width="78" height="17" uuid="c328f3f3-1a66-4982-93b4-b0e362cb61b5"/>
<textElement textAlignment="Right" markup="none"> <textElement textAlignment="Right" markup="none">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{valorOcd}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{valorOcd}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="1367" y="0" width="80" height="17" uuid="d7502c86-2676-4410-ba9a-55ebadb6b4df"/> <reportElement stretchType="RelativeToTallestObject" x="1513" y="0" width="80" height="17" uuid="d7502c86-2676-4410-ba9a-55ebadb6b4df"/>
<textElement textAlignment="Left" markup="none"> <textElement textAlignment="Left" markup="none">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
@ -467,42 +490,42 @@
<textFieldExpression><![CDATA[$F{nombpuntoventainc}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{nombpuntoventainc}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="609" y="0" width="120" height="17" uuid="144ab2b8-ee60-44cf-8f5c-afe0f4c7637e"/> <reportElement stretchType="RelativeToTallestObject" x="755" y="0" width="120" height="17" uuid="144ab2b8-ee60-44cf-8f5c-afe0f4c7637e"/>
<textElement textAlignment="Left" markup="none"> <textElement textAlignment="Left" markup="none">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{nombpuntoventa}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{nombpuntoventa}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="809" y="0" width="80" height="17" uuid="b7a9e1e0-9dbb-4bce-bdae-4c30531459d7"/> <reportElement stretchType="RelativeToTallestObject" x="955" y="0" width="80" height="17" uuid="b7a9e1e0-9dbb-4bce-bdae-4c30531459d7"/>
<textElement> <textElement>
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{feccorrida}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{feccorrida}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="1069" y="0" width="40" height="17" uuid="ff5e5392-4eab-4156-b84d-fdfac82f4894"/> <reportElement stretchType="RelativeToTallestObject" x="1215" y="0" width="40" height="17" uuid="ff5e5392-4eab-4156-b84d-fdfac82f4894"/>
<textElement textAlignment="Center"> <textElement textAlignment="Center">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{asiento}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{asiento}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="1109" y="0" width="71" height="17" uuid="b5f027c0-7c01-419c-9fdf-177f572bd8d7"/> <reportElement stretchType="RelativeToTallestObject" x="1255" y="0" width="71" height="17" uuid="b5f027c0-7c01-419c-9fdf-177f572bd8d7"/>
<textElement textAlignment="Right" markup="none"> <textElement textAlignment="Right" markup="none">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{totalBilhete}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{totalBilhete}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="521" y="0" width="85" height="17" uuid="46aef176-b305-445b-ae66-5742f2137410"/> <reportElement stretchType="RelativeToTallestObject" x="666" y="0" width="85" height="17" uuid="46aef176-b305-445b-ae66-5742f2137410"/>
<textElement textAlignment="Left" markup="none"> <textElement textAlignment="Left" markup="none">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{nombusuarioinc}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{nombusuarioinc}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="1447" y="0" width="70" height="17" uuid="c041aa5f-dc75-492d-a011-5627ae88bd99"/> <reportElement stretchType="RelativeToTallestObject" x="1593" y="0" width="70" height="17" uuid="c041aa5f-dc75-492d-a011-5627ae88bd99"/>
<textElement textAlignment="Right" markup="none"> <textElement textAlignment="Right" markup="none">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
@ -515,50 +538,64 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{numfoliosistema}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{numfoliosistema}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="590" y="0" width="76" height="17" uuid="31a8246e-0538-47df-a63f-0133cbcf3261"/>
<textElement textAlignment="Left" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{motivo}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="445" y="0" width="65" height="17" uuid="934ac7ca-2106-4d7c-b94f-4d27537992da"/>
<textElement textAlignment="Right" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{multa}]]></textFieldExpression>
</textField>
</band> </band>
</detail> </detail>
<columnFooter> <summary>
<band height="18"> <band height="18">
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="260" y="1" width="120" height="17" uuid="77b4e176-4bb8-43ed-9613-8fca4f220283"/> <reportElement positionType="Float" stretchType="RelativeToTallestObject" x="325" y="1" width="120" height="17" uuid="77b4e176-4bb8-43ed-9613-8fca4f220283"/>
<textElement textAlignment="Right" markup="none"> <textElement textAlignment="Right" markup="none">
<font size="6" isBold="true"/> <font size="6" isBold="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{detail.total}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{detail.total}]]></textFieldExpression>
</textField> </textField>
<line> <line>
<reportElement x="0" y="0" width="1610" height="1" uuid="a59c2ca7-4e06-4b21-8a48-afc891b7477c"/> <reportElement x="0" y="0" width="1760" height="1" uuid="a59c2ca7-4e06-4b21-8a48-afc891b7477c"/>
</line> </line>
<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="380" y="1" width="65" height="17" uuid="1e9d6567-f7b6-42b1-9047-a0ca627dfafb"/> <reportElement stretchType="RelativeToTallestObject" x="445" y="1" width="65" height="17" uuid="1e9d6567-f7b6-42b1-9047-a0ca627dfafb"/>
<textElement textAlignment="Right" markup="none"> <textElement textAlignment="Right" markup="none">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{vPenalizacion}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{vMulta}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="445" y="1" width="70" height="17" uuid="c2abd914-b7a9-4ecd-91c1-94bd9066d0c8"/> <reportElement stretchType="RelativeToTallestObject" x="510" y="1" width="78" height="17" uuid="c2abd914-b7a9-4ecd-91c1-94bd9066d0c8"/>
<textElement textAlignment="Right" markup="none"> <textElement textAlignment="Right" markup="none">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{vValorOcd}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{vValorOcd}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="1109" y="1" width="71" height="17" uuid="f2e744b8-edda-48cf-858d-cbfadaa79049"/> <reportElement stretchType="RelativeToTallestObject" x="1255" y="1" width="71" height="17" uuid="f2e744b8-edda-48cf-858d-cbfadaa79049"/>
<textElement textAlignment="Right" markup="none"> <textElement textAlignment="Right" markup="none">
<font size="6" isBold="true"/> <font size="6" isBold="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{vTotalBilhete}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{vTotalBilhete}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="1447" y="1" width="70" height="17" uuid="7d8dc46e-ca77-46cf-84bd-20749b39d245"/> <reportElement stretchType="RelativeToTallestObject" x="1593" y="1" width="70" height="17" uuid="7d8dc46e-ca77-46cf-84bd-20749b39d245"/>
<textElement textAlignment="Right" markup="none"> <textElement textAlignment="Right" markup="none">
<font size="6" isBold="true"/> <font size="6" isBold="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{vValorPago}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{vValorPago}]]></textFieldExpression>
</textField> </textField>
</band> </band>
</columnFooter> </summary>
<noData> <noData>
<band height="20"> <band height="20">
<textField> <textField>

27
src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioOCDBean.java
View File

@ -3,6 +3,8 @@ package com.rjconsultores.ventaboletos.relatorios.utilitarios;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import com.rjconsultores.ventaboletos.constantes.Constantes;
public class RelatorioOCDBean { public class RelatorioOCDBean {
private Long ocdId; private Long ocdId;
@ -39,6 +41,8 @@ public class RelatorioOCDBean {
private Date feccorrida; private Date feccorrida;
private BigDecimal totalBilhete; private BigDecimal totalBilhete;
private Integer motivocancelacionId;
public Long getOcdId() { public Long getOcdId() {
return ocdId; return ocdId;
} }
@ -231,5 +235,28 @@ public class RelatorioOCDBean {
this.numfoliosistema = numfoliosistema; this.numfoliosistema = numfoliosistema;
} }
public BigDecimal getMulta() {
if(motivocancelacionId != null && Constantes.MVO_CANCEL_GERACAO_OCD.intValue() == motivocancelacionId.intValue()) {
return getTotalBilhete().subtract(getValorOcd());
}
return BigDecimal.ZERO;
}
public Integer getMotivocancelacionId() {
return motivocancelacionId;
}
public void setMotivocancelacionId(Integer motivocancelacionId) {
this.motivocancelacionId = motivocancelacionId;
}
public String getMotivo() {
if(motivocancelacionId != null && Constantes.MVO_CANCEL_GERACAO_OCD.intValue() == motivocancelacionId.intValue()) {
return "Geração OCD";
} else if(motivocancelacionId != null && Constantes.MVO_CANCEL_TRANSFERENCIA.intValue() == motivocancelacionId.intValue()) {
return "Transferência";
} else if(motivocancelacionId != null && Constantes.MVO_CANCEL_TROCA.intValue() == motivocancelacionId.intValue()) {
return "Troca";
}
return null;
}
} }

9
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioOCDController.java
View File

@ -16,7 +16,6 @@ import org.zkoss.util.resource.Labels;
import org.zkoss.zhtml.Messagebox; 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.Combobox; import org.zkoss.zul.Combobox;
import org.zkoss.zul.Comboitem; import org.zkoss.zul.Comboitem;
import org.zkoss.zul.Datebox; import org.zkoss.zul.Datebox;
@ -29,7 +28,6 @@ import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioOCDNaoResgatadaEmpresa; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioOCDNaoResgatadaEmpresa;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.IndOrdenacion; import com.rjconsultores.ventaboletos.relatorios.utilitarios.IndOrdenacion;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
import com.rjconsultores.ventaboletos.service.EmpresaService;
import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
@ -46,9 +44,6 @@ public class RelatorioOCDController extends MyGenericForwardComposer {
@Autowired @Autowired
private DataSource dataSourceRead; private DataSource dataSourceRead;
@Autowired
private EmpresaService empresaService;
@Autowired @Autowired
private transient PagedListWrapper<PuntoVenta> plwPuntoVenta; private transient PagedListWrapper<PuntoVenta> plwPuntoVenta;
@ -62,7 +57,6 @@ public class RelatorioOCDController extends MyGenericForwardComposer {
private Radio radPagos; private Radio radPagos;
private Radio radTodos; private Radio radTodos;
private Paging pagingPuntoVenta; private Paging pagingPuntoVenta;
private Bandbox bbPesquisaPuntoVenta;
private Textbox txtPalavraPesquisa; private Textbox txtPalavraPesquisa;
private Radio radBoleto; private Radio radBoleto;
@ -190,9 +184,8 @@ public class RelatorioOCDController extends MyGenericForwardComposer {
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
lsEmpresas = empresaService.obtenerTodos();
super.doAfterCompose(comp); super.doAfterCompose(comp);
lsEmpresas = UsuarioLogado.getUsuarioLogado().getEmpresa();
} }
public Combobox getCmbEmpresa() { public Combobox getCmbEmpresa() {