diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java index 19dfa3fd7..4bf5c694c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java @@ -451,15 +451,15 @@ public class RelatorioDevolucaoBilhetes extends Relatorio { StringBuilder sql = new StringBuilder(); sql.append("SELECT DISTINCT "); - sql.append(" TO_CHAR(COALESCE(BANT.FECHORVENTA, B.FECHORVENTA), 'DD/MM/YYYY') AS FECHOR_VENTA, "); - sql.append(" TO_CHAR(BORI.FECHORVENTA, 'DD/MM/YYYY') AS FECHOR_DEVOLUCAO, "); + sql.append(" TO_CHAR(COALESCE(BANT.FECCREACION, B.FECCREACION), 'DD/MM/YYYY') AS FECHOR_VENTA, "); + sql.append(" TO_CHAR(BORI.FECCREACION, 'DD/MM/YYYY') AS FECHOR_DEVOLUCAO, "); sql.append(" COALESCE(AIDF.DOCFISCAL, COALESCE(BORI.SERIEIMPFISCALORIGINAL, B.SERIEIMPFISCALORIGINAL), "); sql.append(" COALESCE(BORI.SERIEIMPFISCAL, B.SERIEIMPFISCAL)) AS AIDF, "); - sql.append(" COALESCE(BANT.NUM_BPE, B.NUM_BPE, B.NUMFOLIOSISTEMA, B.NUMOPERACION) AS NUMFOLIOSISTEMA, "); + sql.append(" COALESCE(BORI.NUM_BPE, BANT.NUM_BPE) 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(" COALESCE(BANT.NUMFOLIOPREIMPRESO, B.NUMFOLIOPREIMPRESO) AS FOLIO, "); - sql.append(" COALESCE(BANT.PRECIOBASE ,B.PRECIOBASE) AS PRECIOBASE, "); + sql.append(" COALESCE(BORI.NUMFOLIOPREIMPRESO, B.NUMFOLIOPREIMPRESO) AS FOLIO, "); + sql.append(" COALESCE(BORI.PRECIOBASE ,B.PRECIOBASE) AS PRECIOBASE, "); sql.append(" E.NOMBEMPRESA AS NOMB_EMPRESA, "); sql.append(" E.EMPRESA_ID AS EMPRESA_ID, "); sql.append(" PTV.NUMPUNTOVENTA AS NUMPUNTOVENTA, "); @@ -487,42 +487,42 @@ 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(" BPEORI.CHBPE AS CHBPE, "); sql.append(" BPE.CHBPE AS CHBPE_SUBSTITUICAO, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.CMUNINI ELSE BPE.CMUNINI END AS CMUNINI, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.CMUNFIM ELSE BPE.CMUNFIM END AS CMUNFIM, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.UFINI ELSE BPE.UFINI END AS UFINI, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.UFFIM ELSE BPE.UFFIM END AS UFFIM, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.NBP ELSE BPE.NBP END AS NBP, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.DHEMB ELSE BPE.DHEMB END AS DHEMB, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.CST00 ELSE BPE.CST00 END AS CST00, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.CST20 ELSE BPE.CST20 END AS CST20, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.CST45 ELSE BPE.CST45 END AS CST45, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.CST90 ELSE BPE.CST90 END AS CST90, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.CSTOUTRAUF ELSE BPE.CSTOUTRAUF END AS CSTOUTRAUF, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.CSTSN ELSE BPE.CSTSN END AS CSTSN, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.VBC00 ELSE BPE.VBC00 END AS VBC00, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.PICMS00 ELSE BPE.PICMS00 END AS PICMS00, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.VICMS00 ELSE BPE.VICMS00 END AS VICMS00, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.VBC20 ELSE BPE.VBC20 END AS VBC20, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.PICMS20 ELSE BPE.PICMS20 END AS PICMS20, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.VICMS20 ELSE BPE.VICMS20 END AS VICMS20, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.VBP ELSE BPE.VBP END AS VBP, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.VDESCONTO ELSE BPE.VDESCONTO END AS VDESCONTO, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.VPGTO ELSE BPE.VPGTO END AS VPGTO, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.TPCOMP01 ELSE BPE.TPCOMP01 END AS TPCOMP01, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.TPCOMP02 ELSE BPE.TPCOMP02 END AS TPCOMP02, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.TPCOMP03 ELSE BPE.TPCOMP03 END AS TPCOMP03, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.TPCOMP04 ELSE BPE.TPCOMP04 END AS TPCOMP04, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.TPCOMP05 ELSE BPE.TPCOMP05 END AS TPCOMP05, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.TPCOMP06 ELSE BPE.TPCOMP06 END AS TPCOMP06, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.TPCOMP99 ELSE BPE.TPCOMP99 END AS TPCOMP99, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.VCOMP01 ELSE BPE.VCOMP01 END AS VCOMP01, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.VCOMP02 ELSE BPE.VCOMP02 END AS VCOMP02, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.VCOMP03 ELSE BPE.VCOMP03 END AS VCOMP03, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.VCOMP04 ELSE BPE.VCOMP04 END AS VCOMP04, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.VCOMP05 ELSE BPE.VCOMP05 END AS VCOMP05, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.VCOMP06 ELSE BPE.VCOMP06 END AS VCOMP06, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.VCOMP99 ELSE BPE.VCOMP99 END AS VCOMP99, "); - sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.PREDBC ELSE BPE.PREDBC END AS PREDBC "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.CMUNINI ELSE BPEORI.CMUNINI END AS CMUNINI, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.CMUNFIM ELSE BPEORI.CMUNFIM END AS CMUNFIM, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.UFINI ELSE BPEORI.UFINI END AS UFINI, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.UFFIM ELSE BPEORI.UFFIM END AS UFFIM, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.NBP ELSE BPEORI.NBP END AS NBP, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.DHEMB ELSE BPEORI.DHEMB END AS DHEMB, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.CST00 ELSE BPEORI.CST00 END AS CST00, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.CST20 ELSE BPEORI.CST20 END AS CST20, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.CST45 ELSE BPEORI.CST45 END AS CST45, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.CST90 ELSE BPEORI.CST90 END AS CST90, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.CSTOUTRAUF ELSE BPEORI.CSTOUTRAUF END AS CSTOUTRAUF, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.CSTSN ELSE BPEORI.CSTSN END AS CSTSN, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VBC00 ELSE BPEORI.VBC00 END AS VBC00, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.PICMS00 ELSE BPEORI.PICMS00 END AS PICMS00, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VICMS00 ELSE BPEORI.VICMS00 END AS VICMS00, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VBC20 ELSE BPEORI.VBC20 END AS VBC20, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.PICMS20 ELSE BPEORI.PICMS20 END AS PICMS20, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VICMS20 ELSE BPEORI.VICMS20 END AS VICMS20, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VBP ELSE BPEORI.VBP END AS VBP, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VDESCONTO ELSE BPEORI.VDESCONTO END AS VDESCONTO, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VPGTO ELSE BPEORI.VPGTO END AS VPGTO, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.TPCOMP01 ELSE BPEORI.TPCOMP01 END AS TPCOMP01, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.TPCOMP02 ELSE BPEORI.TPCOMP02 END AS TPCOMP02, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.TPCOMP03 ELSE BPEORI.TPCOMP03 END AS TPCOMP03, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.TPCOMP04 ELSE BPEORI.TPCOMP04 END AS TPCOMP04, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.TPCOMP05 ELSE BPEORI.TPCOMP05 END AS TPCOMP05, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.TPCOMP06 ELSE BPEORI.TPCOMP06 END AS TPCOMP06, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.TPCOMP99 ELSE BPEORI.TPCOMP99 END AS TPCOMP99, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VCOMP01 ELSE BPEORI.VCOMP01 END AS VCOMP01, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VCOMP02 ELSE BPEORI.VCOMP02 END AS VCOMP02, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VCOMP03 ELSE BPEORI.VCOMP03 END AS VCOMP03, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VCOMP04 ELSE BPEORI.VCOMP04 END AS VCOMP04, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VCOMP05 ELSE BPEORI.VCOMP05 END AS VCOMP05, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VCOMP06 ELSE BPEORI.VCOMP06 END AS VCOMP06, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VCOMP99 ELSE BPEORI.VCOMP99 END AS VCOMP99, "); + sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.PREDBC ELSE BPEORI.PREDBC END 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 "); @@ -544,16 +544,16 @@ public class RelatorioDevolucaoBilhetes extends Relatorio { 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 (BPE.CODSTAT IN ('-1','100','101','102','135','150') AND BPE.CHBPE_SUBSTITUICAO IS NOT NULL "); - sql.append(" OR (BPE.CODSTAT IN ('101','135') AND TO_CHAR(B.FECHORVENTA, 'MM/YYYY') < TO_CHAR(BORI.FECHORVENTA, 'MM/YYYY')) ) "); + sql.append(" OR (BPE.CODSTAT IN ('101','135') AND TO_CHAR(B.FECCREACION, 'MM/YYYY') < TO_CHAR(BORI.FECCREACION, 'MM/YYYY')) ) "); sql.append(" AND (BPE.CODSTAT IN ('-1','100','101','102','135','150') AND BPE.TIPOEVENTO not in('110115','110116') OR BPE.TIPOEVENTO IS NULL) "); sql.append(" AND (BPEORI.CODSTAT IN ('-1','100','101','102','135','150') AND BPEORI.TIPOEVENTO not in('110115','110116')OR BPEORI.TIPOEVENTO IS NULL) "); sql.append(" and (bpe.xmlregular is not null or bpe.xmlcontingencia is not null) "); if (dataDevolucaoInicial != null) { - sql.append("AND BORI.FECHORVENTA >= TO_DATE(:dataDevolucaoInicial,'DD/MM/YYYY HH24:MI') "); + sql.append("AND BORI.FECCREACION >= TO_DATE(:dataDevolucaoInicial,'DD/MM/YYYY HH24:MI') "); } if (dataDevolucaoFinal != null) { - sql.append("AND BORI.FECHORVENTA <= TO_DATE(:dataDevolucaoFinal,'DD/MM/YYYY HH24:MI') "); + sql.append("AND BORI.FECCREACION <= TO_DATE(:dataDevolucaoFinal,'DD/MM/YYYY HH24:MI') "); } sql.append(estados == null ? "" : "AND EST_BPE.ESTADO_ID IN (" + estados + ") "); @@ -563,8 +563,8 @@ public class RelatorioDevolucaoBilhetes extends Relatorio { sql.append(" UNION ALL "); sql.append("SELECT DISTINCT "); - sql.append(" TO_CHAR(COALESCE(BANT.FECHORVENTA, B.FECHORVENTA), 'DD/MM/YYYY') AS FECHOR_VENTA, "); - sql.append(" TO_CHAR(BORI.FECHORVENTA, 'DD/MM/YYYY') AS FECHOR_DEVOLUCAO, "); + sql.append(" TO_CHAR(COALESCE(BANT.FECCREACION, B.FECCREACION), 'DD/MM/YYYY') AS FECHOR_VENTA, "); + sql.append(" TO_CHAR(BORI.FECCREACION, 'DD/MM/YYYY') AS FECHOR_DEVOLUCAO, "); sql.append(" COALESCE(AIDF.DOCFISCAL, COALESCE(BORI.SERIEIMPFISCALORIGINAL, B.SERIEIMPFISCALORIGINAL), "); sql.append(" COALESCE(BORI.SERIEIMPFISCAL, B.SERIEIMPFISCAL)) AS AIDF, "); sql.append(" COALESCE(BANT.NUM_BPE, B.NUM_BPE, B.NUMFOLIOSISTEMA, B.NUMOPERACION) AS NUMFOLIOSISTEMA, "); @@ -654,15 +654,15 @@ public class RelatorioDevolucaoBilhetes extends Relatorio { sql.append("LEFT JOIN BPE BPEANT ON BPEANT.BOLETO_ID = BANT.BOLETO_ID "); sql.append("LEFT JOIN PUNTO_VENTA PTVO ON PTVO.PUNTOVENTA_ID = COALESCE(BANT.PUNTOVENTA_ID, BORI.PUNTOVENTA_ID,B.PTOVTAVENTA_ID) "); sql.append("WHERE (BPE.CODSTAT IN ('101','135') "); - sql.append(" AND TO_CHAR(COALESCE(BANT.FECHORVENTA, B.FECHORVENTA), 'MM/YYYY') < TO_CHAR(BORI.FECHORVENTA, 'MM/YYYY')) "); + sql.append(" AND TO_CHAR(COALESCE(BANT.FECCREACION, B.FECCREACION), 'MM/YYYY') < TO_CHAR(BORI.FECCREACION, 'MM/YYYY')) "); sql.append(" AND (BPE.CODSTAT IN ('-1','100','101','102','135','150') AND BPE.TIPOEVENTO not in('110115','110116') OR BPE.TIPOEVENTO IS NULL) "); sql.append(" AND (BPEORI.CODSTAT IN ('-1','100','101','102','135','150') AND BPEORI.TIPOEVENTO not in('110115','110116') OR BPEORI.TIPOEVENTO IS NULL) "); if (dataDevolucaoInicial != null) { - sql.append("AND BORI.FECHORVENTA >= TO_DATE(:dataDevolucaoInicial,'DD/MM/YYYY HH24:MI') "); + sql.append("AND BORI.FECCREACION >= TO_DATE(:dataDevolucaoInicial,'DD/MM/YYYY HH24:MI') "); } if (dataDevolucaoFinal != null) { - sql.append("AND BORI.FECHORVENTA <= TO_DATE(:dataDevolucaoFinal,'DD/MM/YYYY HH24:MI') "); + sql.append("AND BORI.FECCREACION <= TO_DATE(:dataDevolucaoFinal,'DD/MM/YYYY HH24:MI') "); } sql.append(" and (bpe.xmlregular is not null or bpe.xmlcontingencia is not null) "); @@ -680,8 +680,8 @@ public class RelatorioDevolucaoBilhetes extends Relatorio { StringBuilder sql = new StringBuilder(); sql.append("SELECT DISTINCT "); - sql.append(" TO_CHAR(B.FECHORVENTA, 'DD/MM/YYYY') AS FECHOR_VENTA, "); - sql.append(" TO_CHAR(BORI.FECHORVENTA, 'DD/MM/YYYY') AS FECHOR_DEVOLUCAO, "); + sql.append(" TO_CHAR(B.FECCREACION, 'DD/MM/YYYY') AS FECHOR_VENTA, "); + sql.append(" TO_CHAR(BORI.FECCREACION, 'DD/MM/YYYY') AS FECHOR_DEVOLUCAO, "); sql.append(" COALESCE(AIDF.DOCFISCAL, COALESCE(BORI.SERIEIMPFISCALORIGINAL, B.SERIEIMPFISCALORIGINAL), "); sql.append(" COALESCE(BORI.SERIEIMPFISCAL, B.SERIEIMPFISCAL)) AS AIDF, "); sql.append(" COALESCE(B.NUM_BPE, B.NUMFOLIOSISTEMA, B.NUMOPERACION) AS NUMFOLIOSISTEMA, "); @@ -754,15 +754,15 @@ public class RelatorioDevolucaoBilhetes extends Relatorio { 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 (BPE.CODSTAT IN ('-1','100','101','102','135','150') AND BPE.CHBPE_SUBSTITUICAO IS NOT NULL "); - sql.append(" OR (BPE.CODSTAT IN ('101','135') AND TO_CHAR(B.FECHORVENTA, 'MM/YYYY') < TO_CHAR(BORI.FECHORVENTA, 'MM/YYYY')) ) "); + sql.append(" OR (BPE.CODSTAT IN ('101','135') AND TO_CHAR(B.FECCREACION, 'MM/YYYY') < TO_CHAR(BORI.FECCREACION, 'MM/YYYY')) ) "); sql.append(" AND (BPE.CODSTAT IN ('-1','100','101','102','135','150') AND BPE.TIPOEVENTO <> '110115' OR BPE.TIPOEVENTO IS NULL) "); sql.append(" AND (BPEORI.CODSTAT IN ('-1','100','101','102','135','150') AND BPEORI.TIPOEVENTO <> '110115' OR BPEORI.TIPOEVENTO IS NULL) "); if (dataDevolucaoInicial != null) { - sql.append("AND BORI.FECHORVENTA >= TO_DATE(:dataDevolucaoInicial,'DD/MM/YYYY HH24:MI') "); + sql.append("AND BORI.FECCREACION >= TO_DATE(:dataDevolucaoInicial,'DD/MM/YYYY HH24:MI') "); } if (dataDevolucaoFinal != null) { - sql.append("AND BORI.FECHORVENTA <= TO_DATE(:dataDevolucaoFinal,'DD/MM/YYYY HH24:MI') "); + sql.append("AND BORI.FECCREACION <= TO_DATE(:dataDevolucaoFinal,'DD/MM/YYYY HH24:MI') "); } sql.append(estados == null ? "" : "AND EST_BPE.ESTADO_ID IN (" + estados + ") "); @@ -772,8 +772,8 @@ public class RelatorioDevolucaoBilhetes extends Relatorio { sql.append(" UNION ALL "); sql.append("SELECT DISTINCT "); - sql.append(" TO_CHAR(B.FECHORVENTA, 'DD/MM/YYYY') AS FECHOR_VENTA, "); - sql.append(" TO_CHAR(BORI.FECHORVENTA, 'DD/MM/YYYY') AS FECHOR_DEVOLUCAO, "); + sql.append(" TO_CHAR(B.FECCREACION, 'DD/MM/YYYY') AS FECHOR_VENTA, "); + sql.append(" TO_CHAR(BORI.FECCREACION, 'DD/MM/YYYY') AS FECHOR_DEVOLUCAO, "); sql.append(" COALESCE(AIDF.DOCFISCAL, COALESCE(BORI.SERIEIMPFISCALORIGINAL, B.SERIEIMPFISCALORIGINAL), "); sql.append(" COALESCE(BORI.SERIEIMPFISCAL, B.SERIEIMPFISCAL)) AS AIDF, "); sql.append(" COALESCE(B.NUM_BPE, B.NUMFOLIOSISTEMA, B.NUMOPERACION) AS NUMFOLIOSISTEMA, "); @@ -846,15 +846,15 @@ public class RelatorioDevolucaoBilhetes extends Relatorio { 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.FECHORVENTA, 'MM/YYYY') < TO_CHAR(BORI.FECHORVENTA, 'MM/YYYY')) "); + sql.append(" (BPE.CODSTAT IN ('101','135') AND TO_CHAR(B.FECCREACION, 'MM/YYYY') < TO_CHAR(BORI.FECCREACION, 'MM/YYYY')) "); sql.append(" AND (BPE.CODSTAT IN ('-1','100','101','102','135','150') AND BPE.TIPOEVENTO <> '110115' OR BPE.TIPOEVENTO IS NULL) "); sql.append(" AND (BPEORI.CODSTAT IN ('-1','100','101','102','135','150') AND BPEORI.TIPOEVENTO <> '110115' OR BPEORI.TIPOEVENTO IS NULL) "); if (dataDevolucaoInicial != null) { - sql.append("AND BORI.FECHORVENTA >= TO_DATE(:dataDevolucaoInicial,'DD/MM/YYYY HH24:MI') "); + sql.append("AND BORI.FECCREACION >= TO_DATE(:dataDevolucaoInicial,'DD/MM/YYYY HH24:MI') "); } if (dataDevolucaoFinal != null) { - sql.append("AND BORI.FECHORVENTA <= TO_DATE(:dataDevolucaoFinal,'DD/MM/YYYY HH24:MI') "); + sql.append("AND BORI.FECCREACION <= TO_DATE(:dataDevolucaoFinal,'DD/MM/YYYY HH24:MI') "); } sql.append(estados == null ? "" : "AND EST_BPE.ESTADO_ID IN (" + estados + ") ");