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

Fixes Bug #0009446 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@75086 d1611594-4594-4d17-8e1d-87c2c4800839
master
alexandre.lima 2017-10-17 18:29:45 +00:00
parent 6d4d722b8a
commit db6eba50bf
4 changed files with 43 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java
View File

@ -132,7 +132,8 @@ public class RelatorioGratuidade extends Relatorio {
gratuidadeBean.setUtr(rset.getBigDecimal("importetaxaembarque")); gratuidadeBean.setUtr(rset.getBigDecimal("importetaxaembarque"));
gratuidadeBean.setRg(rset.getString("DESCNUMDOC")); gratuidadeBean.setRg(rset.getString("DESCNUMDOC"));
gratuidadeBean.setStatus(rset.getString("INDSTATUSBOLETO")); gratuidadeBean.setStatus(rset.getString("INDSTATUSBOLETO"));
//gratuidadeBean.setDataMd(rset.getDate("")); gratuidadeBean.setCodOrigem(rset.getString("codOrigem"));
gratuidadeBean.setCodDestino(rset.getString("codDestino"));
lsDadosRelatorio.add(gratuidadeBean); lsDadosRelatorio.add(gratuidadeBean);
} }
@ -159,7 +160,7 @@ public class RelatorioGratuidade extends Relatorio {
sql.append("SELECT b.feccorrida, ori.cveparada origen, des.cveparada destino, ori.descparada descorigen, des.descparada descdestino, b.numkmviaje, "); sql.append("SELECT b.feccorrida, ori.cveparada origen, des.cveparada destino, ori.descparada descorigen, des.descparada descdestino, b.numkmviaje, ");
sql.append("r.descruta, b.corrida_id, b.fechorviaje, b.numasiento, b.numfoliosistema, tv.desctipoventa, b.nombpasajero, b.descnumdoc, tar.preciooriginal, "); sql.append("r.descruta, b.corrida_id, b.fechorviaje, b.numasiento, b.numfoliosistema, tv.desctipoventa, b.nombpasajero, b.descnumdoc, tar.preciooriginal, ");
sql.append("b.porccategoria, b.preciopagado, u.cveusuario, ag.nombpuntoventa, e.nombempresa, C.cvecategoria, ti.DESCTIPO, "); sql.append("b.porccategoria, b.preciopagado, u.cveusuario, ag.nombpuntoventa, e.nombempresa, C.cvecategoria, ti.DESCTIPO, ");
sql.append("c.DESCCATEGORIA, tar.IMPORTEPEDAGIO, tar.IMPORTESEGURO, tar.IMPORTETAXAEMBARQUE, b.DESCNUMDOC, b.INDSTATUSBOLETO "); sql.append("c.DESCCATEGORIA, tar.IMPORTEPEDAGIO, tar.IMPORTESEGURO, tar.IMPORTETAXAEMBARQUE, b.DESCNUMDOC, b.INDSTATUSBOLETO, ori.CVEPARADA codOrigem, des.CVEPARADA codDestino ");
sql.append("FROM boleto b "); sql.append("FROM boleto b ");
sql.append("JOIN categoria c ON b.categoria_id = c.categoria_id "); sql.append("JOIN categoria c ON b.categoria_id = c.categoria_id ");
sql.append("JOIN parada ori ON ori.parada_id = b.origen_id "); sql.append("JOIN parada ori ON ori.parada_id = b.origen_id ");

3
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_pt_BR.properties
View File

@ -41,7 +41,8 @@ detail.utr=UTR
detail.pedagio=Pedágio detail.pedagio=Pedágio
detail.rg=RG detail.rg=RG
detail.status=Status detail.status=Status
detail.codOrigem=Cod. Origem
detail.codDestino=Cod. Destino
detail.total=Total Quantidade: detail.total=Total Quantidade:
linhas=Linhas linhas=Linhas

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

Binary file not shown.

46
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.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="RelatorioEmpresaCorrida" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="822" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" resourceBundle="RelatorioEmpresaCorrida" 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="RelatorioEmpresaCorrida" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="822" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" resourceBundle="RelatorioEmpresaCorrida" whenResourceMissingType="Empty" uuid="94834362-0ecc-46da-b0a2-5cdee355da3e">
<property name="ireport.zoom" value="2.1961500000000127"/> <property name="ireport.zoom" value="2.1961500000000127"/>
<property name="ireport.x" value="1071"/> <property name="ireport.x" value="0"/>
<property name="ireport.y" value="192"/> <property name="ireport.y" value="0"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/> <property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/>
<parameter name="fecInicioViagem" class="java.lang.String"> <parameter name="fecInicioViagem" class="java.lang.String">
<defaultValueExpression><![CDATA[]]></defaultValueExpression> <defaultValueExpression><![CDATA[]]></defaultValueExpression>
@ -47,6 +47,8 @@
<field name="rg" class="java.lang.String"/> <field name="rg" class="java.lang.String"/>
<field name="status" class="java.lang.String"/> <field name="status" class="java.lang.String"/>
<field name="dataMd" class="java.lang.String"/> <field name="dataMd" class="java.lang.String"/>
<field name="codOrigem" class="java.lang.String"/>
<field name="codDestino" class="java.lang.String"/>
<variable name="qtde" class="java.lang.Integer" calculation="Count"> <variable name="qtde" class="java.lang.Integer" calculation="Count">
<variableExpression><![CDATA[$F{km}]]></variableExpression> <variableExpression><![CDATA[$F{km}]]></variableExpression>
</variable> </variable>
@ -68,21 +70,21 @@
<textFieldExpression><![CDATA[$F{nombempresa}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{nombempresa}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="d08e6683-5388-4505-9e47-fc3d501c62b9" x="0" y="40" width="34" height="27"/> <reportElement uuid="d08e6683-5388-4505-9e47-fc3d501c62b9" x="0" y="40" width="17" height="27"/>
<textElement> <textElement>
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{detail.data}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{detail.data}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="2c09f3ff-c554-4ce2-886e-eaab93fa15eb" x="34" y="40" width="35" height="27"/> <reportElement uuid="2c09f3ff-c554-4ce2-886e-eaab93fa15eb" x="34" y="40" width="25" height="27"/>
<textElement> <textElement>
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{detail.origen}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{detail.origen}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="e18edb89-17f4-417e-8041-664f11245cbd" x="69" y="40" width="44" height="27"/> <reportElement uuid="e18edb89-17f4-417e-8041-664f11245cbd" x="82" y="40" width="31" height="27"/>
<textElement> <textElement>
<font size="6"/> <font size="6"/>
</textElement> </textElement>
@ -257,6 +259,20 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{detail.pedagio}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{detail.pedagio}]]></textFieldExpression>
</textField> </textField>
<textField>
<reportElement uuid="aed6f61a-6566-451b-ba78-6964fb2c9f4e" x="17" y="40" width="17" height="27"/>
<textElement>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.codOrigem}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="2f7626c2-fbea-4cb7-808c-2d7dbbd18ee2" x="59" y="40" width="23" height="27"/>
<textElement>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.codDestino}]]></textFieldExpression>
</textField>
</band> </band>
</groupHeader> </groupHeader>
</group> </group>
@ -351,7 +367,7 @@
<textFieldExpression><![CDATA[$F{linha}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{linha}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yy" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="dd/MM/yy" isBlankWhenNull="true">
<reportElement uuid="9f731da4-307a-4409-a8d5-28b2c4c40fce" stretchType="RelativeToBandHeight" x="0" y="0" width="34" height="23"/> <reportElement uuid="9f731da4-307a-4409-a8d5-28b2c4c40fce" stretchType="RelativeToBandHeight" x="0" y="0" width="17" height="23"/>
<textElement textAlignment="Left"> <textElement textAlignment="Left">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
@ -407,14 +423,14 @@
<textFieldExpression><![CDATA[$F{nombpuntoventa}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{nombpuntoventa}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true"> <textField isStretchWithOverflow="true">
<reportElement uuid="3343aea7-212b-4bd5-a29c-8dcab3cb7568" stretchType="RelativeToBandHeight" x="69" y="0" width="44" height="23"/> <reportElement uuid="3343aea7-212b-4bd5-a29c-8dcab3cb7568" stretchType="RelativeToBandHeight" x="82" y="0" width="31" height="23"/>
<textElement textAlignment="Left"> <textElement textAlignment="Left">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{descdestino}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{descdestino}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement uuid="b36dbddb-2fa9-48a5-809e-0e15ad54c529" stretchType="RelativeToBandHeight" x="34" y="0" width="35" height="23"/> <reportElement uuid="b36dbddb-2fa9-48a5-809e-0e15ad54c529" stretchType="RelativeToBandHeight" x="34" y="0" width="25" height="23"/>
<textElement textAlignment="Left"> <textElement textAlignment="Left">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
@ -504,6 +520,20 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{dataMd}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{dataMd}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement uuid="8bdcad97-d2f3-443d-b2bb-2292e060a68e" stretchType="RelativeToBandHeight" x="17" y="0" width="17" height="23"/>
<textElement textAlignment="Left">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{codOrigem}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement uuid="1c2892df-b5e0-4ef7-a4f2-3479e022d73c" stretchType="RelativeToBandHeight" x="59" y="0" width="23" height="23"/>
<textElement textAlignment="Left">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{codDestino}]]></textFieldExpression>
</textField>
</band> </band>
</detail> </detail>
<summary> <summary>