diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java index 1fe1b5cf9..383d70901 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java @@ -94,7 +94,10 @@ public class RelatorioDevolucaoBilhetes extends Relatorio { DevolucaoBilhetes db = new DevolucaoBilhetes(); db.setAidf((String) rset.getObject("AIDF")); db.setNumFolioSistema((String) rset.getObject("NUMFOLIOSISTEMA")); - db.setSerieSubSerie((String) rset.getObject("SERIE_SUBSERIE")); +// db.setSerieSubSerie((String) rset.getObject("SERIE_SUBSERIE")); + + db.setSerieSubSerie(isBpe ? (String) rset.getObject("TIPO_SIT") : (String) rset.getObject("SERIE_SUBSERIE")); + db.setFolio((String) rset.getObject("FOLIO")); db.setUf((String) rset.getObject("UF")); db.setEstado((String) rset.getObject("ESTADO")); @@ -227,7 +230,7 @@ public class RelatorioDevolucaoBilhetes extends Relatorio { sql.append("SELECT DISTINCT "); sql.append(" COALESCE(AIDF.DOCFISCAL, COALESCE(BORI.SERIEIMPFISCALORIGINAL, B.SERIEIMPFISCALORIGINAL), "); sql.append(" COALESCE(BORI.SERIEIMPFISCAL, B.SERIEIMPFISCAL)) AS AIDF, "); - sql.append(" COALESCE(B.NUMFOLIOSISTEMA, B.NUMOPERACION) AS NUMFOLIOSISTEMA, "); + sql.append(" COALESCE(B.NUM_BPE, B.NUMFOLIOSISTEMA, B.NUMOPERACION) 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(" B.NUMFOLIOPREIMPRESO AS FOLIO, "); @@ -256,6 +259,9 @@ 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("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 "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jasper index ca7e1c73b..e02712513 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml index ce1e5ebb7..894fca510 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml @@ -1,7 +1,7 @@ - +