From a0c9ccd5542c61d283c7ce4252c7c5c25140dfdd Mon Sep 17 00:00:00 2001 From: lucassilverio Date: Mon, 29 Jul 2019 14:46:22 +0000 Subject: [PATCH] fixes bug#14522 dev: lucas taia qua: xxx git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@96181 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioOperacionalFinanceiro.java | 32 +++++++----- .../RelatorioOperacionalFinanceiro.jasper | Bin 75748 -> 75562 bytes .../RelatorioOperacionalFinanceiro.jrxml | 48 +++++++++--------- 3 files changed, 42 insertions(+), 38 deletions(-) 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 35ebb3fdb2443a75da6692e3086c2aaf63104c7d..3802d4ffebf3f67d8c33bb33ca53d3941ddb3d6b 100644 GIT binary patch delta 492 zcmaEIo@LcJmJK!- zKTL2zkSF$T6M$=;3^W?7N@Z6V-1x~bPk^*v+zpig1qw)@ZZAY&^Zk9kjC^^g{_Wbw zz`&r#B+tlTJlX1ivVe(!siCQ%v6*SSsi}#Xx#i~U0|x10qVa~NW+v!z)7PsrngRfg Cubnjj delta 681 zcmZ2=j^)XDmJKqMNx*n+1@~-8|8C8LBFvvnKay3Qdmok=fkl9*rr< zyA2{~;Q50I*(i{QCSNcV+8pgui>b@NKxi|!UpcCT;y&@sbNoBmFpL2?U`>e3=8~`& zR2@(|z>@M2NtlvAd%%(xBC+V4peM9BKDq)^7syW_`_y88V)$vZL&9GfCPstJjbVC1 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}]]> - +