diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java index 94da1fdfc..1c711d1e7 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java @@ -157,7 +157,7 @@ public class RelatorioOperacionalFinanceiro extends Relatorio { sql.append(" AND ( c.PORCCATEGORIA <> 100 OR c.PORCCATEGORIA IS NULL ) "); sql.append(" AND (c.INDREMOTOINVERSO IS NULL "); sql.append(" OR c.INDREMOTOINVERSO =0) "); - sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID not in (5,12,18)) "); + sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID not in (5,12,18,99)) "); sql.append(" THEN 'VENDA NORMAL' "); sql.append(" "); sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL "); @@ -165,7 +165,7 @@ public class RelatorioOperacionalFinanceiro extends Relatorio { sql.append(" AND ( c.PORCCATEGORIA <> 100 OR c.PORCCATEGORIA IS NULL ) "); sql.append(" AND (c.INDREMOTOINVERSO IS NULL "); sql.append(" OR c.INDREMOTOINVERSO =0) "); - sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID not in (5,12,18)) "); + sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID not in (5,12,18,99)) "); sql.append(" THEN 'VENDA TRANSITO' "); sql.append(" "); sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL "); @@ -173,7 +173,7 @@ public class RelatorioOperacionalFinanceiro extends Relatorio { sql.append(" AND c.PORCCATEGORIA > 0 "); sql.append(" AND (c.INDREMOTOINVERSO IS NULL "); sql.append(" OR c.INDREMOTOINVERSO =0) "); - sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID not in (5,12,18)) "); + sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID not in (5,12,18,99)) "); sql.append(" THEN cat.DESCCATEGORIA "); sql.append(" "); sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL "); @@ -185,6 +185,14 @@ public class RelatorioOperacionalFinanceiro extends Relatorio { sql.append(" THEN 'VENDA ANTECIPADA' "); sql.append(" "); sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL "); + sql.append(" AND c.FECVENTADIGITA IS NULL "); + sql.append(" AND ( c.PORCCATEGORIA <> 100 OR c.PORCCATEGORIA IS NULL ) "); + sql.append(" AND (c.INDREMOTOINVERSO IS NULL "); + sql.append(" OR c.INDREMOTOINVERSO =0) "); + sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID in (99)) "); + sql.append(" THEN 'VENDA EMBARCADA' "); + sql.append(" "); + sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL "); sql.append(" AND (c.INDSTATUSBOLETO = 'E' OR c.TIPOVENTA_ID in (5,18)) "); sql.append(" THEN 'IMPRESSAO POSTERIOR' "); sql.append(" ");