fixes bug #9447
git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@73308 d1611594-4594-4d17-8e1d-87c2c4800839master
walace
parent
2bf736f732
commit
30d7180d93
|
|
@ -82,6 +82,8 @@ public class RelatorioRemarcacaoPassagensTransferencia extends Relatorio {
|
|||
bean.setBilheteiroRemarcado((String) rset.getObject("BILHETEIRO_REMARCADO"));
|
||||
bean.setStatus((String) rset.getObject("STATUS"));
|
||||
bean.setDocumentoRemarcado((String) rset.getObject("DOCUMENTO_REMARCADO"));
|
||||
|
||||
bean.setDiferenca(bean.getTarifaVenda() == null ? new BigDecimal("0") : bean.getTarifaVenda().subtract(bean.getMulta()));
|
||||
lsDadosRelatorio.add(bean);
|
||||
}
|
||||
|
||||
|
|
@ -175,7 +177,7 @@ public class RelatorioRemarcacaoPassagensTransferencia extends Relatorio {
|
|||
sql.append(" AND ((B.MOTIVOCANCELACION_ID = 23 AND B.INDSTATUSBOLETO IN('T','V')) ");
|
||||
sql.append(" OR (B.MOTIVOCANCELACION_ID IS NULL AND B.INDSTATUSBOLETO IN('T'))) ");
|
||||
sql.append(empresaId.equals("-1") ? "" : " AND C.EMPRESACORRIDA_ID= " + empresaId + " ");
|
||||
sql.append(puntoVentasId == null || puntoVentasId.equals("-1") ? "" : " AND C.PUNTOVENTA_ID in(" + puntoVentasId + ") ");
|
||||
sql.append(puntoVentasId == null || puntoVentasId.equals("-1") ? "" : " AND C.PUNTOVENTA_ID in(" + puntoVentasId + ") ");
|
||||
sql.append("ORDER BY C.NUMFOLIOSISTEMA, C.CAJA_ID");
|
||||
|
||||
return sql.toString();
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@ cabecalho.puntoventa=Ag
|
|||
cabecalho.usuario=Usuário:
|
||||
label.nomeVendaAgencia=Agência Atendimento
|
||||
label.nomeAgenciaEmissao=Agência Emissão
|
||||
label.documento=Documento
|
||||
label.documento=Doc.
|
||||
label.dataRemarcacao=Data Remarcac
|
||||
label.dataVenda=Data Venda
|
||||
label.dataServico=Data Serv.
|
||||
label.origem= Origem
|
||||
label.destino=Destino
|
||||
label.formaPagamento=Forma Pag.
|
||||
label.servico=Servico
|
||||
label.servico=Servi.
|
||||
label.poltrona= Poltrona
|
||||
label.dataInicial=Data Inicial:
|
||||
label.dataFinal=Data Final:
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,8 +1,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="Relatorio Remarcação Passagens Transferência" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="6d46a2d2-555e-4b7f-944f-b25c672e5feb">
|
||||
<property name="ireport.zoom" value="1.9965000000000126"/>
|
||||
<property name="ireport.x" value="0"/>
|
||||
<property name="ireport.y" value="24"/>
|
||||
<property name="ireport.zoom" value="2.6573415000000176"/>
|
||||
<property name="ireport.x" value="1267"/>
|
||||
<property name="ireport.y" value="143"/>
|
||||
<parameter name="DATA_INICIAL" class="java.util.Date"/>
|
||||
<parameter name="DATA_FINAL" class="java.util.Date"/>
|
||||
<parameter name="codconvenio" class="java.lang.String"/>
|
||||
|
|
@ -42,6 +42,8 @@
|
|||
<field name="servicoVenda" class="java.lang.String"/>
|
||||
<field name="servicoRemarcado" class="java.lang.String"/>
|
||||
<field name="clienteRemarcado" class="java.lang.String"/>
|
||||
<field name="multa" class="java.math.BigDecimal"/>
|
||||
<field name="formaPagamentoVenda" class="java.lang.String"/>
|
||||
<group name="status" isReprintHeaderOnEachPage="true">
|
||||
<groupExpression><![CDATA[$F{status}]]></groupExpression>
|
||||
<groupHeader>
|
||||
|
|
@ -165,7 +167,7 @@
|
|||
<textFieldExpression><![CDATA[$R{label.cliente}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="" isBlankWhenNull="true">
|
||||
<reportElement mode="Transparent" x="713" y="17" width="41" height="12" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="05de4474-7d01-499f-bd5d-4d99fc628431"/>
|
||||
<reportElement mode="Transparent" x="713" y="17" width="28" height="12" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="05de4474-7d01-499f-bd5d-4d99fc628431"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="8" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
|
|
@ -173,7 +175,7 @@
|
|||
<textFieldExpression><![CDATA[$R{label.servico}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="" isBlankWhenNull="true">
|
||||
<reportElement mode="Transparent" x="754" y="17" width="45" height="12" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="ebe8fdd6-b0c1-4370-a827-d1aa8d2169db"/>
|
||||
<reportElement mode="Transparent" x="741" y="17" width="27" height="12" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="ebe8fdd6-b0c1-4370-a827-d1aa8d2169db"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="8" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
|
|
@ -188,6 +190,14 @@
|
|||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{status}.equals("VENDIDO") ? $R{label.bilheteOriginal} : $R{label.bilheteRemarcado}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="" isBlankWhenNull="true">
|
||||
<reportElement mode="Transparent" x="768" y="18" width="31" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="a45075d4-30c9-4e03-9c56-734c7f565ec1"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="8" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{status}.equals("VENDIDO") ? $R{label.formaPagamento} : ""]]></textFieldExpression>
|
||||
</textField>
|
||||
</band>
|
||||
</groupHeader>
|
||||
</group>
|
||||
|
|
@ -251,7 +261,7 @@
|
|||
<textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
|
||||
<reportElement mode="Transparent" x="551" y="4" width="14" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="17bc8d21-5221-4757-ade1-9b3d1b4c10ce"/>
|
||||
<reportElement mode="Transparent" x="551" y="4" width="37" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="17bc8d21-5221-4757-ade1-9b3d1b4c10ce"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
|
|
@ -322,35 +332,35 @@
|
|||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{status}.equals("VENDIDO") ? $F{bilheteVenda} : $F{bilheteRemarcado}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement x="483" y="-1" width="37" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="bc16d8c8-114a-4ad9-a0c5-8cf00d5d8d00"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{status}.equals("VENDIDO") ? $F{bilheteVenda} : $F{bilheteRemarcado}]]></textFieldExpression>
|
||||
<textFieldExpression><![CDATA[$F{status}.equals("VENDIDO") ? $F{multa} : $F{multa}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement x="520" y="-1" width="37" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="9867507c-a05b-4313-ba1d-0842f790cff6"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{status}.equals("VENDIDO") ? $F{tarifaVenda} : $F{tarifaRemarcado}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement x="557" y="-1" width="37" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="e32342d7-c1fa-424f-8865-e80e667788d7"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{status}.equals("VENDIDO") ? $F{seguroVenda} : $F{seguroRemarcado}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="false">
|
||||
<reportElement x="594" y="-1" width="37" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="0b436521-6f5b-4b54-bc27-e6a321c8a0d4"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{status}.equals("VENDIDO") ? $F{pedagioVenda} : $F{pedagioRemarcado}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement x="631" y="-1" width="41" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="ab471822-7832-464e-9c93-ae3b8530acb9"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="8"/>
|
||||
|
|
@ -365,7 +375,7 @@
|
|||
<textFieldExpression><![CDATA[$F{status}.equals("VENDIDO") ? $F{clienteVenda} : $F{clienteRemarcado}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
|
||||
<reportElement x="713" y="-1" width="41" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="7f663aad-933d-4217-9376-15c7adf053b2"/>
|
||||
<reportElement x="713" y="-1" width="28" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="7f663aad-933d-4217-9376-15c7adf053b2"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
|
|
@ -378,6 +388,13 @@
|
|||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{status}.equals("VENDIDO") ? $F{agenciaVenda} : $F{agenciaRemarcado}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
|
||||
<reportElement x="768" y="0" width="31" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="966a9b85-5cc2-4baa-a2f0-3609d5b29518"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{status}.equals("VENDIDO") ? $F{formaPagamentoVenda} : ""]]></textFieldExpression>
|
||||
</textField>
|
||||
</band>
|
||||
</detail>
|
||||
<columnFooter>
|
||||
|
|
@ -388,36 +405,9 @@
|
|||
</pageFooter>
|
||||
<summary>
|
||||
<band height="39" splitType="Stretch">
|
||||
<textField>
|
||||
<reportElement x="0" y="5" width="91" height="14" uuid="25ee1dfc-86be-4ed3-a15b-1b88311553d3"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="10" isBold="false" pdfFontName="Helvetica-Bold"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{label.total}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="0" y="19" width="91" height="14" uuid="77ae1865-5196-4f91-ab72-716ce1d52a74"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="10" isBold="false" pdfFontName="Helvetica-Bold"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{label.saldo}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="91" y="19" width="54" height="14" uuid="36e218b6-49e0-4b1b-a473-ec3f2e79fde3"/>
|
||||
<textElement textAlignment="Center"/>
|
||||
<textFieldExpression><![CDATA[$P{SALDO}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="91" y="5" width="52" height="14" uuid="f4ce69ee-521c-4f17-9b7f-d7028d2f355a"/>
|
||||
<textElement textAlignment="Center"/>
|
||||
<textFieldExpression><![CDATA[$P{TOTAL}]]></textFieldExpression>
|
||||
</textField>
|
||||
<line>
|
||||
<reportElement x="0" y="3" width="800" height="1" uuid="6dc831c6-bfb2-4350-aa40-edc3dacd8b2c"/>
|
||||
</line>
|
||||
<line>
|
||||
<reportElement x="0" y="35" width="802" height="1" uuid="5ab0d28f-17af-469c-a9da-9aab6e0b4b50"/>
|
||||
</line>
|
||||
</band>
|
||||
</summary>
|
||||
<noData>
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ public class RelatorioRemarcacaoPassagensTransferenciaBean {
|
|||
private String bilheteVenda;
|
||||
private String bilheteRemarcado;
|
||||
private BigDecimal multa;
|
||||
private BigDecimal diferenca;
|
||||
private String codOrigemVenda;
|
||||
private String descOrigemVenda;
|
||||
private String codDestinoVenda;
|
||||
|
|
@ -375,4 +376,12 @@ public class RelatorioRemarcacaoPassagensTransferenciaBean {
|
|||
this.servicoRemarcado = servicoRemarcado;
|
||||
}
|
||||
|
||||
public BigDecimal getDiferenca() {
|
||||
return diferenca;
|
||||
}
|
||||
|
||||
public void setDiferenca(BigDecimal diferenca) {
|
||||
this.diferenca = diferenca;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue