diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java index 5ae6d7e0a..970dc32fe 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java @@ -82,6 +82,7 @@ public class RelatorioBPe extends Relatorio { sql.append(" COALESCE(bol.NUMSERIE_BPE, '1') as numserie_bpe, "); sql.append(" CASE bpe.CODSTAT "); sql.append(" WHEN '100' THEN (CASE WHEN bpe.TIPOSUBSTITUICAO IS NULL THEN 'Autorizado' ELSE 'Substituído' END ) "); + sql.append(" WHEN '102' THEN (CASE WHEN bpe.TIPOSUBSTITUICAO IS NOT NULL THEN 'Substituído' END) "); sql.append(" WHEN '135' THEN (CASE bpe.TIPOEVENTO WHEN '110111' THEN 'Cancelado' WHEN '110115' THEN 'Não embarcado' ELSE NULL END) "); sql.append(" WHEN '150' THEN 'Aut.Conting.' "); sql.append(" ELSE 'Rejeitado' END as status, "); @@ -110,7 +111,7 @@ public class RelatorioBPe extends Relatorio { } else if (status != null && status.equals("C")) { sql.append(" AND bpe.CODSTAT = '135' AND bpe.TIPOEVENTO = '110111' "); } else if (status != null && status.equals("S")) { - sql.append(" AND bpe.CODSTAT = '100' AND bpe.TIPOSUBSTITUICAO IS NOT NULL "); + sql.append(" AND bpe.CODSTAT IN ('100', '102') AND bpe.TIPOSUBSTITUICAO IS NOT NULL "); } else if (status != null && status.equals("NE")) { sql.append(" AND bpe.CODSTAT = '135' AND bpe.TIPOEVENTO = '110115' "); } else if (status != null && status.equals("R")) {