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

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
master
julio 2018-08-15 12:51:00 +00:00
parent 76bf7638d4
commit 1a48f1b8dd
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 ");