fixes bug #6378
git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@45038 d1611594-4594-4d17-8e1d-87c2c4800839master
wilian
parent
f2621e3a96
commit
5c22acc2d2
|
|
@ -96,7 +96,6 @@ public class RelatorioVendasPacotesBoletos extends Relatorio {
|
|||
relatorioVendasPacotesBoletosItemBean.setSimportepedagio(rset.getBigDecimal("simportepedagio"));
|
||||
relatorioVendasPacotesBoletosItemBean.setSimporteoutros(rset.getBigDecimal("simporteoutros"));
|
||||
relatorioVendasPacotesBoletosItemBean.setSimporteseguro(rset.getBigDecimal("simporteseguro"));
|
||||
relatorioVendasPacotesBoletosItemBean.setSpreciopagado(rset.getBigDecimal("spreciopagado"));
|
||||
relatorioVendasPacotesBoletosItemBean.setSpreciobase(rset.getBigDecimal("spreciobase"));
|
||||
relatorioVendasPacotesBoletosItemBean.setDesconto(rset.getBigDecimal("desconto"));
|
||||
|
||||
|
|
@ -134,8 +133,7 @@ public class RelatorioVendasPacotesBoletos extends Relatorio {
|
|||
|
||||
sQuery.append("SELECT ORI.DESCPARADA AS ORIGEM, DES.DESCPARADA AS DESTINO, TVP.NOMCONVENIO, TTP.DESCTIPOTARIFA, ")
|
||||
.append("COUNT(TVP.TARIFAVENDAPACOTE_ID) AS QTDE, SUM(B.IMPORTETAXAEMBARQUE) AS SIMPORTETAXAEMBARQUE, SUM(B.IMPORTEPEDAGIO) AS SIMPORTEPEDAGIO, ")
|
||||
.append("SUM(B.IMPORTEOUTROS) AS SIMPORTEOUTROS, SUM(B.IMPORTESEGURO) AS SIMPORTESEGURO, SUM(B.PRECIOBASE) AS SPRECIOBASE, SUM(B.PRECIOBASE - B.PRECIOPAGADO) AS DESCONTO, ")
|
||||
.append("SUM(B.PRECIOPAGADO) AS SPRECIOPAGADO ")
|
||||
.append("SUM(B.IMPORTEOUTROS) AS SIMPORTEOUTROS, SUM(B.IMPORTESEGURO) AS SIMPORTESEGURO, SUM(B.PRECIOBASE) AS SPRECIOBASE, SUM(B.PRECIOBASE - B.PRECIOPAGADO) AS DESCONTO ")
|
||||
.append("FROM VENDA_PACOTE VP ")
|
||||
.append("LEFT JOIN PACOTE P ON P.PACOTE_ID = VP.PACOTE_ID ")
|
||||
.append("LEFT JOIN TARIFA_VENDA_PACOTE TVP ON TVP.VENDAPACOTE_ID = VP.VENDAPACOTE_ID ")
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioVendasPacotesDetalhadoItem" pageWidth="802" pageHeight="555" orientation="Landscape" columnWidth="802" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="f17327a0-45d8-4ec1-8350-688df66785dc">
|
||||
<property name="ireport.zoom" value="1.0"/>
|
||||
<property name="ireport.x" value="36"/>
|
||||
<property name="ireport.zoom" value="0.75"/>
|
||||
<property name="ireport.x" value="0"/>
|
||||
<property name="ireport.y" value="0"/>
|
||||
<field name="nomconvenio" class="java.lang.String"/>
|
||||
<field name="desctipotarifa" class="java.lang.String"/>
|
||||
|
|
@ -52,70 +52,70 @@
|
|||
</pageHeader>
|
||||
<columnHeader>
|
||||
<band height="21" splitType="Stretch">
|
||||
<textField>
|
||||
<textField isStretchWithOverflow="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="0" y="1" width="75" height="20" isPrintWhenDetailOverflows="true" uuid="ca0cfce0-945a-41b6-a2b6-07b599432260"/>
|
||||
<textElement verticalAlignment="Middle" markup="none">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{label.desctipotarifa}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<textField isStretchWithOverflow="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="75" y="1" width="119" height="20" isPrintWhenDetailOverflows="true" uuid="16b05797-4914-43d4-8ef5-1e999e6ee7eb"/>
|
||||
<textElement verticalAlignment="Middle" markup="none">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{label.nomconvenio}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<textField isStretchWithOverflow="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="194" y="1" width="47" height="20" isPrintWhenDetailOverflows="true" uuid="bc16a571-d1f3-4574-a521-3c6076317b8f"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{label.qtde}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<textField isStretchWithOverflow="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="241" y="1" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="74894a72-7acf-43bc-abc7-a3ca0931f1c0"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle" markup="none">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{label.spreciobase}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<textField isStretchWithOverflow="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="321" y="1" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="60d565a0-f9c1-4648-87a5-0acd7bcc95cb"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle" markup="none">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{label.simporteseguro}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<textField isStretchWithOverflow="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="401" y="1" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="7351b458-41bf-4cf3-839a-9b17860cd029"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle" markup="none">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{label.simportetaxaembarque}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<textField isStretchWithOverflow="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="481" y="1" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="b40f5fec-8d0e-47c6-9a02-c6b9f4f4cf40"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle" markup="none">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{label.simporteoutros}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<textField isStretchWithOverflow="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="721" y="1" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="7f2d56a0-8755-4192-be26-3c082bcde27f"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle" markup="none">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{label.spreciopagado}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<textField isStretchWithOverflow="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="641" y="1" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="637d297c-7275-4094-9f67-e6d36eff60a2"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle" markup="none">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{label.desconto}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<textField isStretchWithOverflow="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="561" y="1" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="0d9ab795-d305-44a6-b12a-e0445e36613a"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle" markup="none">
|
||||
<font size="8"/>
|
||||
|
|
@ -126,70 +126,70 @@
|
|||
</columnHeader>
|
||||
<detail>
|
||||
<band height="21" splitType="Stretch">
|
||||
<textField isBlankWhenNull="true">
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="0" y="1" width="75" height="20" isPrintWhenDetailOverflows="true" uuid="ebc048fd-2106-47f2-88f5-ff3710ec047e"/>
|
||||
<textElement verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{desctipotarifa}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="75" y="1" width="119" height="20" isPrintWhenDetailOverflows="true" uuid="9d3ec869-4da6-45a1-b59b-6e374b36a929"/>
|
||||
<textElement verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{nomconvenio}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="194" y="1" width="47" height="20" isPrintWhenDetailOverflows="true" uuid="be19e5aa-b241-4d2d-bd96-47b2e271cdf4"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{qtde}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="241" y="1" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="5e343619-3254-4481-a3d3-00a33e144145"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{spreciobase}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="321" y="1" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="43d5475f-18ce-4427-b971-8f374a01e9b1"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{simporteseguro}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="401" y="1" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="e47fb86e-b5b3-4f8f-9200-3fc950e6631d"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{simportetaxaembarque}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="481" y="1" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="3f5483a5-9c57-4510-b040-24b0267396d8"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{simporteoutros}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="721" y="1" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="3348c997-2b2d-401f-a5d6-2a9e1e7abd51"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{spreciopagado}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="641" y="1" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="d81fe2cf-b81c-4f65-939c-6c7d54559360"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{desconto}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="561" y="1" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="010f06dc-7915-4d18-ace5-b0262e54c9e3"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
|
|
@ -206,56 +206,56 @@
|
|||
<line>
|
||||
<reportElement positionType="Float" x="0" y="3" width="802" height="1" uuid="2c1bf6b9-f6f3-442b-a6ca-2c668a8e603a"/>
|
||||
</line>
|
||||
<textField pattern="" isBlankWhenNull="true">
|
||||
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
|
||||
<reportElement x="194" y="4" width="47" height="20" isPrintWhenDetailOverflows="true" uuid="01e3adbf-f994-4e68-8909-370ff62d5fc2"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{vQtde}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement x="241" y="4" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="1e428984-8f32-401e-98cc-fb8058170b8b"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{vSpreciobase}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement x="321" y="4" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="0e5c22ef-c516-4077-bb87-4ecaac0c2527"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{vSimporteseguro}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement x="401" y="4" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="45d16415-14dc-4d11-bbdf-03947bc31864"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{vSimportetaxaembarque}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement x="481" y="4" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="0cf0ae52-7f31-4e4f-b30f-2714b1e7e4ba"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{vSimporteoutros}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement x="561" y="4" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="92daa21e-386c-4731-943c-0a925d98f38f"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{vSpreciototal}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement x="641" y="4" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="e83dea1b-ebc3-497d-bc18-44a13a3e103c"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{vDesconto}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement x="721" y="4" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="0ce3d768-3e6d-4a7b-b3b0-706e811e2d26"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="8" isBold="true"/>
|
||||
|
|
|
|||
|
|
@ -44,7 +44,6 @@ public class RelatorioVendasPacotesBoletosBean {
|
|||
private BigDecimal simporteoutros;
|
||||
private BigDecimal simporteseguro;
|
||||
private BigDecimal desconto;
|
||||
private BigDecimal spreciopagado;
|
||||
private BigDecimal spreciobase;
|
||||
|
||||
public String getNomconvenio() {
|
||||
|
|
@ -112,13 +111,13 @@ public class RelatorioVendasPacotesBoletosBean {
|
|||
}
|
||||
|
||||
public BigDecimal getSpreciopagado() {
|
||||
BigDecimal spreciopagado = BigDecimal.ZERO;
|
||||
spreciopagado = getSpreciototal();
|
||||
spreciopagado = desconto != null ? spreciopagado.subtract(desconto) : spreciopagado;
|
||||
|
||||
return spreciopagado;
|
||||
}
|
||||
|
||||
public void setSpreciopagado(BigDecimal spreciopagado) {
|
||||
this.spreciopagado = spreciopagado;
|
||||
}
|
||||
|
||||
public BigDecimal getSpreciototal() {
|
||||
BigDecimal spreciototal = BigDecimal.ZERO;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue