bug#11600

dev: julio
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@84241 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2018-08-14 20:30:28 +00:00
parent 186b8b1312
commit 1ac6456977
3 changed files with 23 additions and 19 deletions

View File

@ -94,7 +94,10 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
DevolucaoBilhetes db = new DevolucaoBilhetes();
db.setAidf((String) rset.getObject("AIDF"));
db.setNumFolioSistema((String) rset.getObject("NUMFOLIOSISTEMA"));
db.setSerieSubSerie((String) rset.getObject("SERIE_SUBSERIE"));
// db.setSerieSubSerie((String) rset.getObject("SERIE_SUBSERIE"));
db.setSerieSubSerie(isBpe ? (String) rset.getObject("TIPO_SIT") : (String) rset.getObject("SERIE_SUBSERIE"));
db.setFolio((String) rset.getObject("FOLIO"));
db.setUf((String) rset.getObject("UF"));
db.setEstado((String) rset.getObject("ESTADO"));
@ -227,7 +230,7 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
sql.append("SELECT DISTINCT ");
sql.append(" COALESCE(AIDF.DOCFISCAL, COALESCE(BORI.SERIEIMPFISCALORIGINAL, B.SERIEIMPFISCALORIGINAL), ");
sql.append(" COALESCE(BORI.SERIEIMPFISCAL, B.SERIEIMPFISCAL)) AS AIDF, ");
sql.append(" COALESCE(B.NUMFOLIOSISTEMA, B.NUMOPERACION) AS NUMFOLIOSISTEMA, ");
sql.append(" COALESCE(B.NUM_BPE, B.NUMFOLIOSISTEMA, B.NUMOPERACION) AS NUMFOLIOSISTEMA, ");
sql.append(" CASE WHEN COALESCE(BORI.SERIEIMPFISCALORIGINAL,BORI.SERIEIMPFISCAL) IS NOT NULL THEN NULL ");
sql.append(" ELSE AIDF.SERIE || COALESCE(AIDF.SUBSERIE, '') END AS SERIE_SUBSERIE, ");
sql.append(" B.NUMFOLIOPREIMPRESO AS FOLIO, ");
@ -256,6 +259,9 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
sql.append(" NVL(B.PRECIOPAGADO,0) + NVL(B.IMPORTEOUTROS,0) + NVL(B.IMPORTEPEDAGIO,0) + NVL(B.IMPORTESEGURO,0) + NVL(B.IMPORTETAXAEMBARQUE,0) AS TOTAL ");
sql.append(isBpe ? ", BPE.CHBPE AS CHBPE " : " ");
sql.append(isBpe ? ", BPE.CHBPE_SUBSTITUICAO as CHBPE_SUBSTITUICAO " : " ");
sql.append(isBpe ? ", CASE WHEN BPE.TIPOEVENTO = 110115 THEN 'NÃO EMBARQUE' " : " ");
sql.append(isBpe ? " WHEN BPE.TIPOEVENTO = 110111 THEN 'CANCELAMENTO' " : " ");
sql.append(isBpe ? " WHEN BPE.TIPOEVENTO IS NULL AND BPE.CHBPE_SUBSTITUICAO IS NOT NULL THEN 'TROCA/TRANSFERENCIA' ELSE 'RECUSA SEFAZ' END AS TIPO_SIT " : " ");
sql.append("FROM BOLETO B ");
sql.append("INNER JOIN MARCA M ON M.MARCA_ID = B.MARCA_ID AND M.ACTIVO = 1 ");
sql.append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID ");

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="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.6500000000000004"/>
<property name="ireport.x" value="0"/>
<property name="ireport.x" value="267"/>
<property name="ireport.y" value="7"/>
<style name="bpeStyle" isDefault="true" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false">
<conditionalStyle>
@ -420,17 +420,12 @@
<pen lineWidth="0.5"/>
</graphicElement>
</line>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="215" y="1" width="113" height="14" isPrintWhenDetailOverflows="true" uuid="1835789f-f3ff-4d8d-ba10-12c6d693b270"/>
<textElement textAlignment="Center" verticalAlignment="Middle" markup="none"/>
<textFieldExpression><![CDATA[$F{chbpe} != null ? $R{label.chaveBpe} : $R{label.aidf}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="487" y="1" width="40" height="14" isPrintWhenDetailOverflows="true" uuid="d6813bb4-94c3-4f9b-af61-54e3676c31bb"/>
<textElement verticalAlignment="Middle" markup="none">
<font size="6" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.serieSubs}]]></textFieldExpression>
<textFieldExpression><![CDATA[$F{chbpe} != null ? "Tipo/Sub." : $R{label.serieSubs}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="578" y="1" width="37" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="0b598d85-e93d-4916-b9a1-c80e694aabb6"/>
@ -468,7 +463,7 @@
<textElement verticalAlignment="Middle" markup="none">
<font size="6" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.numeroBilhete}]]></textFieldExpression>
<textFieldExpression><![CDATA[$F{chbpe} != null ? "Num Bpe" : $R{label.numeroBilhete}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="1" y="1" width="65" height="14" isPrintWhenDetailOverflows="true" uuid="3aab51ae-d4cf-4b3d-9849-df02db28f2bf"/>
@ -492,7 +487,7 @@
<textFieldExpression><![CDATA[$R{label.numpuntoventaOrigem}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="155" y="1" width="60" height="14" isPrintWhenDetailOverflows="true" uuid="fc142d15-a328-4187-89dc-9d8d4f3dd270"/>
<reportElement stretchType="RelativeToTallestObject" x="155" y="1" width="57" height="14" isPrintWhenDetailOverflows="true" uuid="fc142d15-a328-4187-89dc-9d8d4f3dd270"/>
<textElement verticalAlignment="Middle" markup="none">
<font size="6" isBold="true"/>
</textElement>
@ -515,26 +510,29 @@
<textFieldExpression><![CDATA[$R{label.outras}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="328" y="1" width="105" height="14" isPrintWhenDetailOverflows="true" uuid="ba1b92a2-ea24-4e4d-b265-dab785c370b0"/>
<reportElement stretchType="RelativeToTallestObject" x="322" y="1" width="110" height="14" isPrintWhenDetailOverflows="true" uuid="ba1b92a2-ea24-4e4d-b265-dab785c370b0"/>
<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
<font size="6" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$F{chbpe} != null ? $R{label.chaveSubstituicaoBpe} : ""]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="212" y="0" width="110" height="15" isPrintWhenDetailOverflows="true" uuid="1835789f-f3ff-4d8d-ba10-12c6d693b270"/>
<textElement textAlignment="Center" verticalAlignment="Middle" markup="none"/>
<textFieldExpression><![CDATA[$F{chbpe} != null ? $R{label.chaveBpe} : $R{label.aidf}]]></textFieldExpression>
</textField>
</band>
</columnHeader>
<detail>
<band height="14">
<textField isBlankWhenNull="true">
<reportElement style="bpeStyle" x="215" y="0" width="113" height="14" uuid="a34502fa-62b7-44b6-9218-90034054b7ac"/>
<textElement textAlignment="Justified" verticalAlignment="Middle">
</textElement>
<reportElement style="bpeStyle" x="212" y="0" width="110" height="14" uuid="a34502fa-62b7-44b6-9218-90034054b7ac"/>
<textElement textAlignment="Justified" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{chbpe} != null ? $F{chbpe} : $F{aidf}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="487" y="0" width="40" height="14" uuid="73fc6712-d370-49e2-ac39-55e2fa5ce9e2"/>
<reportElement style="bpeStyle" x="487" y="0" width="40" height="14" uuid="73fc6712-d370-49e2-ac39-55e2fa5ce9e2"/>
<textElement verticalAlignment="Middle">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{serieSubSerie}]]></textFieldExpression>
</textField>
@ -595,7 +593,7 @@
<textFieldExpression><![CDATA[$F{numpuntoventaOrigem}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="true">
<reportElement x="155" y="0" width="60" height="14" uuid="c7b4a542-1cfc-4646-a423-53c5ea12d4f3"/>
<reportElement x="155" y="0" width="57" height="14" uuid="c7b4a542-1cfc-4646-a423-53c5ea12d4f3"/>
<textElement verticalAlignment="Middle">
<font size="6"/>
</textElement>
@ -616,7 +614,7 @@
<textFieldExpression><![CDATA[$F{valorOutras}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="328" y="0" width="105" height="14" uuid="55b3e473-a704-4928-a52a-f71221094b21"/>
<reportElement x="322" y="0" width="110" height="14" uuid="55b3e473-a704-4928-a52a-f71221094b21"/>
<textElement textAlignment="Justified" verticalAlignment="Middle">
<font size="4"/>
</textElement>