diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java index 781717379..fc8a32287 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java @@ -150,58 +150,62 @@ public class RelatorioOperacionalFinanceiro extends Relatorio { sql.append(" ( "); sql.append(" ( "); sql.append(" CASE "); - sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL "); + sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL AND c.indreimpresion = 0 "); 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 OR c.INDREMOTOINVERSO =0) "); 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 "); + sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL AND c.indreimpresion = 0 "); sql.append(" AND c.FECVENTADIGITA IS NOT NULL "); sql.append(" AND (c.PORCCATEGORIA <> 100 OR c.PORCCATEGORIA IS NULL ) "); sql.append(" AND (c.INDREMOTOINVERSO IS NULL OR c.INDREMOTOINVERSO =0) "); 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 "); + sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL AND c.indreimpresion = 0 "); sql.append(" AND c.FECVENTADIGITA IS NULL "); sql.append(" AND c.PORCCATEGORIA > 0 "); sql.append(" AND (c.INDREMOTOINVERSO IS NULL OR c.INDREMOTOINVERSO =0) "); 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 "); + sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL AND c.indreimpresion = 0 "); sql.append(" AND c.FECVENTADIGITA IS NOT NULL "); sql.append(" AND ( c.PORCCATEGORIA <> 100 OR c.PORCCATEGORIA IS NULL ) "); sql.append(" AND (c.INDREMOTOINVERSO IS NULL OR c.INDREMOTOINVERSO =0)"); sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID in (9,39)) "); sql.append(" THEN 'VENDA ANTECIPADA' "); sql.append(" "); - sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL "); + sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL AND c.indreimpresion = 0 "); 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 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)) "); + sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL AND c.indreimpresion = 0 "); + sql.append(" AND (c.INDSTATUSBOLETO = 'V' AND c.TIPOVENTA_ID = 5) "); sql.append(" THEN 'VENDA CENTRAL TELEFONICA' "); sql.append(" "); - sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL "); - sql.append(" AND (c.INDSTATUSBOLETO = 'E' OR c.TIPOVENTA_ID in (18)) "); + sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL AND c.indreimpresion = 0 "); + sql.append(" AND (c.INDSTATUSBOLETO = 'V' AND c.TIPOVENTA_ID = 18) "); sql.append(" THEN 'VENDA PRE-PAGA' "); + sql.append(" "); + sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL AND c.indreimpresion = 1"); + sql.append(" AND (c.INDSTATUSBOLETO = 'E' AND c.TIPOVENTA_ID in (5,12,18)) "); + sql.append(" THEN 'IMPRESSAO POSTERIOR' "); sql.append(" "); - sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL "); - sql.append(" AND c.TIPOVENTA_ID = 12 "); + sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL AND c.indreimpresion = 0 "); + sql.append(" AND c.INDSTATUSBOLETO = 'V' AND c.TIPOVENTA_ID = 12 "); sql.append(" THEN 'VENDA INTERNET' "); sql.append(" "); - sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NOT NULL "); + sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NOT NULL AND c.indreimpresion = 0 "); sql.append(" AND c.MOTIVOCANCELACION_ID = 31 "); sql.append(" THEN 'ANULADO' "); sql.append(" "); - sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NOT NULL "); + sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NOT NULL AND c.indreimpresion = 0 "); sql.append(" AND c.MOTIVOCANCELACION_ID <> 31 "); sql.append(" THEN 'DEVOLVIDO' "); sql.append(" END) "); @@ -219,7 +223,7 @@ public class RelatorioOperacionalFinanceiro extends Relatorio { sql.append(" LEFT JOIN parada DES ON DES.parada_id = c.destino_id "); sql.append(" where c.ACTIVO = 1 "); sql.append(" AND c.tipoventa_id <> 6 "); - sql.append(" AND c.indreimpresion = 0 "); + //sql.append(" AND c.indreimpresion = 0 "); sql.append(" AND c.feccorte BETWEEN :fecInicioVenda AND :fecFinalVenda "); if (tramo != null && !tramo.equals("Todas") ) { diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jasper index 35ebb3fdb..3802d4ffe 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jrxml index f9d2f9c3a..e16622deb 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jrxml @@ -345,7 +345,7 @@ $F{seguro}]]> - + @@ -356,7 +356,7 @@ $F{seguro}]]> - + @@ -367,7 +367,7 @@ $F{seguro}]]> - + @@ -389,7 +389,7 @@ $F{seguro}]]> - + @@ -400,7 +400,7 @@ $F{seguro}]]> - + @@ -411,7 +411,7 @@ $F{seguro}]]> - + @@ -555,7 +555,7 @@ $F{seguro}]]> - + @@ -566,7 +566,7 @@ $F{seguro}]]> - + @@ -577,7 +577,7 @@ $F{seguro}]]> - + @@ -588,7 +588,7 @@ $F{seguro}]]> - + @@ -599,7 +599,7 @@ $F{seguro}]]> - + @@ -621,7 +621,7 @@ $F{seguro}]]> - + @@ -719,7 +719,7 @@ $F{seguro}]]> - + @@ -730,7 +730,7 @@ $F{seguro}]]> - + @@ -763,7 +763,7 @@ $F{seguro}]]> - + @@ -774,7 +774,7 @@ $F{seguro}]]> - + @@ -785,7 +785,7 @@ $F{seguro}]]> - + @@ -796,7 +796,7 @@ $F{seguro}]]> - + @@ -811,7 +811,7 @@ $F{seguro}]]> - + @@ -833,7 +833,7 @@ $F{seguro}]]> - + @@ -855,7 +855,7 @@ $F{seguro}]]> - + @@ -866,7 +866,7 @@ $F{seguro}]]> - + @@ -877,7 +877,7 @@ $F{seguro}]]> - + @@ -888,7 +888,7 @@ $F{seguro}]]> - +