fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug#15168 

qua:julio
dev:julio

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@96514 d1611594-4594-4d17-8e1d-87c2c4800839
master
walace 2019-08-08 19:09:48 +00:00
parent 6a9e5931d7
commit 7eb0b2256a
1 changed files with 79 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java
View File

@ -442,7 +442,6 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
StringBuilder sql = new StringBuilder();
sql.append("SELECT DISTINCT ");
sql.append(" BORI.BOLETO_ID, ");
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), ");
@ -479,42 +478,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(" BPEORI.CMUNINI, ");
sql.append(" BPEORI.CMUNFIM, ");
sql.append(" BPEORI.UFINI, ");
sql.append(" BPEORI.UFFIM, ");
sql.append(" BPEORI.NBP, ");
sql.append(" BPEORI.DHEMB, ");
sql.append(" BPEORI.CST00, ");
sql.append(" BPEORI.CST20, ");
sql.append(" BPEORI.CST45, ");
sql.append(" BPEORI.CST90, ");
sql.append(" BPEORI.CSTOUTRAUF, ");
sql.append(" BPEORI.CSTSN, ");
sql.append(" BPEORI.VBC00, ");
sql.append(" BPEORI.PICMS00, ");
sql.append(" BPEORI.VICMS00, ");
sql.append(" BPEORI.VBC20, ");
sql.append(" BPEORI.PICMS20, ");
sql.append(" BPEORI.VICMS20, ");
sql.append(" BPEORI.VBP, ");
sql.append(" BPEORI.VDESCONTO, ");
sql.append(" BPEORI.VPGTO, ");
sql.append(" BPEORI.TPCOMP01, ");
sql.append(" BPEORI.TPCOMP02, ");
sql.append(" BPEORI.TPCOMP03, ");
sql.append(" BPEORI.TPCOMP04, ");
sql.append(" BPEORI.TPCOMP05, ");
sql.append(" BPEORI.TPCOMP06, ");
sql.append(" BPEORI.TPCOMP99, ");
sql.append(" BPEORI.VCOMP01, ");
sql.append(" BPEORI.VCOMP02, ");
sql.append(" BPEORI.VCOMP03, ");
sql.append(" BPEORI.VCOMP04, ");
sql.append(" BPEORI.VCOMP05, ");
sql.append(" BPEORI.VCOMP06, ");
sql.append(" BPEORI.VCOMP99, ");
sql.append(" BPEORI.PREDBC ");
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("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 ");
@ -537,8 +536,9 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
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.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) ");
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.FECCREACION >= TO_DATE(:dataDevolucaoInicial,'DD/MM/YYYY HH24:MI') ");
}
@ -554,7 +554,6 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
sql.append(" UNION ALL ");
sql.append("SELECT DISTINCT ");
sql.append(" BORI.BOLETO_ID, ");
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), ");
@ -591,42 +590,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(" BPE.CHBPE AS CHBPE, ");
sql.append(" '' AS CHBPE_SUBSTITUICAO, ");
sql.append(" BPE.CMUNINI, ");
sql.append(" BPE.CMUNFIM, ");
sql.append(" BPE.UFINI, ");
sql.append(" BPE.UFFIM, ");
sql.append(" BPE.NBP, ");
sql.append(" BPE.DHEMB, ");
sql.append(" BPE.CST00, ");
sql.append(" BPE.CST20, ");
sql.append(" BPE.CST45, ");
sql.append(" BPE.CST90, ");
sql.append(" BPE.CSTOUTRAUF, ");
sql.append(" BPE.CSTSN, ");
sql.append(" BPE.VBC00, ");
sql.append(" BPE.PICMS00, ");
sql.append(" BPE.VICMS00, ");
sql.append(" BPE.VBC20, ");
sql.append(" BPE.PICMS20, ");
sql.append(" BPE.VICMS20, ");
sql.append(" BPE.VBP, ");
sql.append(" BPE.VDESCONTO, ");
sql.append(" BPE.VPGTO, ");
sql.append(" BPE.TPCOMP01, ");
sql.append(" BPE.TPCOMP02, ");
sql.append(" BPE.TPCOMP03, ");
sql.append(" BPE.TPCOMP04, ");
sql.append(" BPE.TPCOMP05, ");
sql.append(" BPE.TPCOMP06, ");
sql.append(" BPE.TPCOMP99, ");
sql.append(" BPE.VCOMP01, ");
sql.append(" BPE.VCOMP02, ");
sql.append(" BPE.VCOMP03, ");
sql.append(" BPE.VCOMP04, ");
sql.append(" BPE.VCOMP05, ");
sql.append(" BPE.VCOMP06, ");
sql.append(" BPE.VCOMP99, ");
sql.append(" BPE.PREDBC ");
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("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 ");
@ -649,8 +648,8 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
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')) ");
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) ");
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.FECCREACION >= TO_DATE(:dataDevolucaoInicial,'DD/MM/YYYY HH24:MI') ");
}
@ -658,13 +657,14 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
if (dataDevolucaoFinal != null) {
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) ");
sql.append(estados == null ? "" : "AND EST_BPE.ESTADO_ID IN (" + estados + ") ");
sql.append(puntoVentas == null ? "" : "AND PTV.PUNTOVENTA_ID IN (" + puntoVentas + ") ");
sql.append(empresaId == null ? "" : "AND E.EMPRESA_ID IN (" + empresaId + ") ");
sql.append("ORDER BY NOMB_EMPRESA, ESTADO, UF, FECHOR_DEVOLUCAO, NUMFOLIOSISTEMA");
return sql.toString();
}
@ -673,7 +673,6 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
StringBuilder sql = new StringBuilder();
sql.append("SELECT DISTINCT ");
sql.append(" BORI.BOLETO_ID, ");
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), ");
@ -766,7 +765,6 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
sql.append(" UNION ALL ");
sql.append("SELECT DISTINCT ");
sql.append(" BORI.BOLETO_ID, ");
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), ");