From d700dcacd976f542f8d1251d1186ec67c829b658 Mon Sep 17 00:00:00 2001 From: julio Date: Fri, 16 Aug 2019 18:07:58 +0000 Subject: [PATCH] fixes bug#15167 dev: julio qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@96710 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioDevolucaoBilhetes.java | 84 +++++++++---------- 1 file changed, 41 insertions(+), 43 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java index 4a9176be6..dc7013b5a 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java @@ -590,51 +590,49 @@ public class RelatorioDevolucaoBilhetes extends Relatorio { sql.append(" WHEN BPE.TIPOEVENTO IS NULL AND BPE.CHBPE_SUBSTITUICAO IS NOT NULL AND BPE.TIPOSUBSTITUICAO = '3' THEN 'TRANSFERENCIA/REMARCACAO' ELSE '' END AS TIPO_SIT, "); sql.append(" BPE.CHBPE AS CHBPE, "); sql.append(" '' AS CHBPE_SUBSTITUICAO, "); - sql.append(" COALESCE(BPEORI.CMUNINI, BPE.CMUNINI) AS CMUNINI, "); - sql.append(" COALESCE(BPEORI.CMUNFIM, BPE.CMUNFIM) AS CMUNFIM, "); - sql.append(" COALESCE(BPEORI.UFINI, BPE.UFINI) AS UFINI, "); - sql.append(" COALESCE(BPEORI.UFFIM, BPE.UFFIM) AS UFFIM, "); - sql.append(" COALESCE(BPEORI.NBP, BPE.NBP) AS NBP, "); - sql.append(" COALESCE(BPEORI.DHEMB, BPE.DHEMB) AS DHEMB, "); - sql.append(" COALESCE(BPEORI.CST00, BPE.CST00) AS CST00, "); - sql.append(" COALESCE(BPEORI.CST20, BPE.CST20) AS CST20, "); - sql.append(" COALESCE(BPEORI.CST45, BPE.CST45) AS CST45, "); - sql.append(" COALESCE(BPEORI.CST90, BPE.CST90) AS CST90, "); - sql.append(" COALESCE(BPEORI.CSTOUTRAUF, BPE.CSTOUTRAUF) AS CSTOUTRAUF, "); - sql.append(" COALESCE(BPEORI.CSTSN, BPE.CSTSN) AS CSTSN, "); - sql.append(" COALESCE(BPEORI.VBC00, BPE.VBC00) AS VBC00, "); - sql.append(" COALESCE(BPEORI.PICMS00, BPE.PICMS00) AS PICMS00, "); - sql.append(" COALESCE(BPEORI.VICMS00, BPE.VICMS00) AS VICMS00, "); - sql.append(" COALESCE(BPEORI.VBC20, BPE.VBC20) AS VBC20, "); - sql.append(" COALESCE(BPEORI.PICMS20, BPE.PICMS20) AS PICMS20, "); - sql.append(" COALESCE(BPEORI.VICMS20, BPE.VICMS20) AS VICMS20, "); - sql.append(" COALESCE(BPEORI.VBP, BPE.VBP) AS VBP, "); - sql.append(" COALESCE(BPEORI.VDESCONTO, BPE.VDESCONTO) AS VDESCONTO, "); - sql.append(" COALESCE(BPEORI.VPGTO, BPE.VPGTO) AS VPGTO, "); - sql.append(" COALESCE(BPEORI.TPCOMP01, BPE.TPCOMP01) AS TPCOMP01, "); - sql.append(" COALESCE(BPEORI.TPCOMP02, BPE.TPCOMP02) AS TPCOMP02, "); - sql.append(" COALESCE(BPEORI.TPCOMP03, BPE.TPCOMP03) AS TPCOMP03, "); - sql.append(" COALESCE(BPEORI.TPCOMP04, BPE.TPCOMP04) AS TPCOMP04, "); - sql.append(" COALESCE(BPEORI.TPCOMP05, BPE.TPCOMP05) AS TPCOMP05, "); - sql.append(" COALESCE(BPEORI.TPCOMP06, BPE.TPCOMP06) AS TPCOMP06, "); - sql.append(" COALESCE(BPEORI.TPCOMP99, BPE.TPCOMP99) AS TPCOMP99, "); - sql.append(" COALESCE(BPEORI.VCOMP01, BPE.VCOMP01) AS VCOMP01, "); - sql.append(" COALESCE(BPEORI.VCOMP02, BPE.VCOMP02) AS VCOMP02, "); - sql.append(" COALESCE(BPEORI.VCOMP03, BPE.VCOMP03) AS VCOMP03, "); - sql.append(" COALESCE(BPEORI.VCOMP04, BPE.VCOMP04) AS VCOMP04, "); - sql.append(" COALESCE(BPEORI.VCOMP05, BPE.VCOMP05) AS VCOMP05, "); - sql.append(" COALESCE(BPEORI.VCOMP06, BPE.VCOMP06) AS VCOMP06, "); - sql.append(" COALESCE(BPEORI.VCOMP99, BPE.VCOMP99) AS VCOMP99, "); - sql.append(" COALESCE(BPEORI.PREDBC, BPE.PREDBC) AS PREDBC "); + sql.append(" COALESCE(BPEORI.CMUNINI, BPE.CMUNINI, BPEANT.CMUNINI) AS CMUNINI, "); + sql.append(" COALESCE(BPEORI.CMUNFIM, BPE.CMUNFIM, BPEANT.CMUNFIM) AS CMUNFIM, "); + sql.append(" COALESCE(BPEORI.UFINI, BPE.UFINI, BPEANT.UFINI) AS UFINI, "); + sql.append(" COALESCE(BPEORI.UFFIM, BPE.UFFIM, BPEANT.UFFIM) AS UFFIM, "); + sql.append(" COALESCE(BPEORI.NBP, BPE.NBP, BPEANT.NBP) AS NBP, "); + sql.append(" COALESCE(BPEORI.DHEMB, BPE.DHEMB, BPEANT.DHEMB) AS DHEMB, "); + sql.append(" COALESCE(BPEORI.CST00, BPE.CST00, BPEANT.CST00) AS CST00, "); + sql.append(" COALESCE(BPEORI.CST20, BPE.CST20, BPEANT.CST20) AS CST20, "); + sql.append(" COALESCE(BPEORI.CST45, BPE.CST45, BPEANT.CST45) AS CST45, "); + sql.append(" COALESCE(BPEORI.CST90, BPE.CST90, BPEANT.CST90) AS CST90, "); + sql.append(" COALESCE(BPEORI.CSTOUTRAUF, BPE.CSTOUTRAUF, BPEANT.CSTOUTRAUF) AS CSTOUTRAUF, "); + sql.append(" COALESCE(BPEORI.CSTSN, BPE.CSTSN, BPEANT.CSTSN) AS CSTSN, "); + sql.append(" COALESCE(BPEORI.VBC00, BPE.VBC00, BPEANT.VBC00) AS VBC00, "); + sql.append(" COALESCE(BPEORI.PICMS00, BPE.PICMS00, BPEANT.PICMS00) AS PICMS00, "); + sql.append(" COALESCE(BPEORI.VICMS00, BPE.VICMS00, BPEANT.VICMS00) AS VICMS00, "); + sql.append(" COALESCE(BPEORI.VBC20, BPE.VBC20, BPEANT.VBC20) AS VBC20, "); + sql.append(" COALESCE(BPEORI.PICMS20, BPE.PICMS20, BPEANT.PICMS20) AS PICMS20, "); + sql.append(" COALESCE(BPEORI.VICMS20, BPE.VICMS20, BPEANT.VICMS20) AS VICMS20, "); + sql.append(" COALESCE(BPEORI.VBP, BPE.VBP, BPEANT.VBP) AS VBP, "); + sql.append(" COALESCE(BPEORI.VDESCONTO, BPE.VDESCONTO, BPEANT.VDESCONTO) AS VDESCONTO, "); + sql.append(" COALESCE(BPEORI.VPGTO, BPE.VPGTO, BPEANT.VPGTO) AS VPGTO, "); + sql.append(" COALESCE(BPEORI.TPCOMP01, BPE.TPCOMP01, BPEANT.TPCOMP01) AS TPCOMP01, "); + sql.append(" COALESCE(BPEORI.TPCOMP02, BPE.TPCOMP02, BPEANT.TPCOMP02) AS TPCOMP02, "); + sql.append(" COALESCE(BPEORI.TPCOMP03, BPE.TPCOMP03, BPEANT.TPCOMP03) AS TPCOMP03, "); + sql.append(" COALESCE(BPEORI.TPCOMP04, BPE.TPCOMP04, BPEANT.TPCOMP04) AS TPCOMP04, "); + sql.append(" COALESCE(BPEORI.TPCOMP05, BPE.TPCOMP05, BPEANT.TPCOMP05) AS TPCOMP05, "); + sql.append(" COALESCE(BPEORI.TPCOMP06, BPE.TPCOMP06, BPEANT.TPCOMP06) AS TPCOMP06, "); + sql.append(" COALESCE(BPEORI.TPCOMP99, BPE.TPCOMP99, BPEANT.TPCOMP99) AS TPCOMP99, "); + sql.append(" COALESCE(BPEORI.VCOMP01, BPE.VCOMP01, BPEANT.VCOMP01) AS VCOMP01, "); + sql.append(" COALESCE(BPEORI.VCOMP02, BPE.VCOMP02, BPEANT.VCOMP02) AS VCOMP02, "); + sql.append(" COALESCE(BPEORI.VCOMP03, BPE.VCOMP03, BPEANT.VCOMP03) AS VCOMP03, "); + sql.append(" COALESCE(BPEORI.VCOMP04, BPE.VCOMP04, BPEANT.VCOMP04) AS VCOMP04, "); + sql.append(" COALESCE(BPEORI.VCOMP05, BPE.VCOMP05, BPEANT.VCOMP05) AS VCOMP05, "); + sql.append(" COALESCE(BPEORI.VCOMP06, BPE.VCOMP06, BPEANT.VCOMP06) AS VCOMP06, "); + sql.append(" COALESCE(BPEORI.VCOMP99, BPE.VCOMP99, BPEANT.VCOMP99) AS VCOMP99, "); + sql.append(" COALESCE(BPEORI.PREDBC, BPE.PREDBC, BPEANT.PREDBC) AS PREDBC "); sql.append("FROM BOLETO BORI "); sql.append(" INNER JOIN MARCA M ON M.MARCA_ID = BORI.MARCA_ID AND M.ACTIVO = 1 "); sql.append(" INNER JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID "); - sql.append(" INNER JOIN BPE BPE ON BPE.BOLETO_ID = BORI.BOLETO_ID "); - sql.append(" AND BPE.ACTIVO = (CASE WHEN BORI.MOTIVOCANCELACION_ID = 17 AND BORI.BOLETOORIGINAL_ID IS NULL THEN 0 ELSE 1 END) "); + sql.append(" INNER JOIN BPE BPE ON BPE.BOLETO_ID = BORI.BOLETO_ID AND BPE.ACTIVO = 1 "); sql.append(" INNER JOIN ESTADO EST_BPE ON BPE.UF = EST_BPE.CODIBGE "); sql.append(" LEFT JOIN BOLETO B ON B.BOLETO_ID = (CASE WHEN BORI.MOTIVOCANCELACION_ID = 99 THEN BORI.BOLETOANTERIOR_ID ELSE BORI.BOLETOORIGINAL_ID END) "); - sql.append(" LEFT JOIN BPE BPEORI ON B.BOLETO_ID = BPEORI.BOLETO_ID "); - sql.append(" AND BPEORI.ACTIVO = (CASE WHEN BORI.MOTIVOCANCELACION_ID = 17 AND BORI.BOLETOORIGINAL_ID IS NULL THEN 0 ELSE 1 END) "); + sql.append(" LEFT JOIN BPE BPEORI ON B.BOLETO_ID = BPEORI.BOLETO_ID AND BPEORI.ACTIVO = 1 "); sql.append(" INNER JOIN PUNTO_VENTA PTV ON PTV.PUNTOVENTA_ID = BORI.PUNTOVENTA_ID "); sql.append("JOIN INSCRICAO_ESTADUAL IE ON E.EMPRESA_ID = IE.EMPRESA_ID "); sql.append(" AND IE.ESTADO_ID = EST_BPE.ESTADO_ID AND IE.ACTIVO = 1 "); @@ -642,9 +640,9 @@ public class RelatorioDevolucaoBilhetes extends Relatorio { sql.append(" AND EI.ESTADO_ID =EST_BPE.ESTADO_ID AND EI.ACTIVO = 1 "); sql.append("LEFT JOIN AIDF AIDF ON AIDF.AIDF_ID = B.AIDF_ID AND B.TIPOVENTA_ID = 3 "); sql.append("LEFT JOIN ESTADO ESAIDF ON ESAIDF.ESTADO_ID = AIDF.ESTADO_ID "); - sql.append("LEFT JOIN BOLETO BANT ON BANT.BOLETO_ID = (CASE WHEN BPEORI.TIPOEVENTO IS NOT NULL THEN COALESCE(B.BOLETOANTERIOR_ID, B.BOLETOORIGINAL_ID) ELSE NULL END) "); + sql.append("LEFT JOIN BOLETO BANT ON BANT.BOLETO_ID = (CASE WHEN COALESCE(BPE.TIPOEVENTO, BPEORI.TIPOEVENTO) IS NOT NULL THEN "); + sql.append(" COALESCE(BORI.BOLETOANTERIOR_ID, B.BOLETOANTERIOR_ID) ELSE NULL END) "); sql.append("LEFT JOIN BPE BPEANT ON BPEANT.BOLETO_ID = BANT.BOLETO_ID "); - sql.append(" AND BPEANT.ACTIVO = (CASE WHEN BORI.MOTIVOCANCELACION_ID = 17 AND BORI.BOLETOORIGINAL_ID IS NULL THEN 0 ELSE 1 END) "); sql.append("LEFT JOIN PUNTO_VENTA PTVO ON PTVO.PUNTOVENTA_ID = COALESCE(BANT.PUNTOVENTA_ID, BORI.PUNTOVENTA_ID,B.PTOVTAVENTA_ID) "); sql.append("WHERE "); sql.append(" (BPE.CODSTAT IN ('101','135') AND TO_CHAR(B.FECCREACION, 'MM/YYYY') < TO_CHAR(BORI.FECCREACION, 'MM/YYYY')) "); @@ -664,7 +662,7 @@ public class RelatorioDevolucaoBilhetes extends Relatorio { sql.append(empresaId == null ? "" : "AND E.EMPRESA_ID IN (" + empresaId + ") "); sql.append("ORDER BY NOMB_EMPRESA, ESTADO, UF, FECHOR_DEVOLUCAO, NUMFOLIOSISTEMA"); - + return sql.toString(); }