From 1a48f1b8dddba707a3b7a2508268cf03a7ce63ac Mon Sep 17 00:00:00 2001 From: julio Date: Wed, 15 Aug 2018 12:51:00 +0000 Subject: [PATCH] bug#11600 dev: julio qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@84264 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioDevolucaoBilhetes.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java index 383d70901..9a84e39d1 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java @@ -259,9 +259,8 @@ 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(isBpe ? ", CASE WHEN BPE.TIPOEVENTO = 110111 THEN 'CANCELAMENTO' " : " "); + sql.append(isBpe ? " WHEN BPE.TIPOEVENTO IS NULL AND BPE.CHBPE_SUBSTITUICAO IS NOT NULL THEN 'SUBTITUIÇÃO' ELSE 'RECUSA' 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 "); @@ -294,8 +293,10 @@ public class RelatorioDevolucaoBilhetes extends Relatorio { sql.append(isBpe ? "INNER JOIN ESTADO EST_BPE ON BPE.UF = EST_BPE.CODIBGE " : ""); sql.append("WHERE "); sql.append(isBpe ? " " : " B.MOTIVOCANCELACION_ID IN (31,32,10,37,99,36) AND B.INDSTATUSBOLETO = 'C' AND B.INDCANCELACION = 1 "); - sql.append(isBpe ? " ( (BPE.CODSTAT = 135 AND BPE.TIPOEVENTO = 110115) OR BPE.CHBPE_SUBSTITUICAO IS NOT NULL " - + "OR (BPE.CODSTAT = 135 AND TO_CHAR(BORI.FECHORVENTA, 'MM/YYYY') < TO_CHAR(B.FECHORVENTA, 'MM/YYYY')) )" : " "); + sql.append(isBpe ? " ( BPE.CHBPE_SUBSTITUICAO IS NOT NULL OR (BPE.CODSTAT = 135 AND TO_CHAR(BORI.FECHORVENTA, 'MM/YYYY') < TO_CHAR(B.FECHORVENTA, 'MM/YYYY'))) " : " "); + + sql.append(isBpe ? " AND (BPE.TIPOEVENTO <> 110115 OR BPE.TIPOEVENTO IS NULL) " : " "); + if (isApenasBilhetesImpressos) { sql.append("AND B.NUMFOLIOPREIMPRESO IS NOT NULL ");