From 9fbafa88ae574053c0a45b8e6b266524cdd376f2 Mon Sep 17 00:00:00 2001
From: "fabricio.oliveira"
 <fabricio.oliveira@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 15 Feb 2019 19:41:17 +0000
Subject: [PATCH] =?UTF-8?q?0013516:=20Santa=20Cruz=20-=20Corre=C3=A7=C3=A3?=
 =?UTF-8?q?o=20Relat=C3=B3rio=20Taxa=20de=20Embarque=20fixes=20bug#13516?=
 =?UTF-8?q?=20dev:Wallace=20qua:Juliane?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@89923 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../relatorios/impl/RelatorioTaxasLinha.java  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java
index f3eb5c0d5..8302382d8 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java
@@ -220,9 +220,9 @@ public class RelatorioTaxasLinha extends Relatorio {
 		sql.append(" SELECT RT.PREFIXO, ");
 		sql.append("        PO.DESCPARADA CIDADE_ORIGEM, ");
 		sql.append("        PD.DESCPARADA CIDADE_DESTINO, ");
-		sql.append("        CJ.IMPORTETAXAEMBARQUE, ");
-		sql.append("        CJ.IMPORTEPEDAGIO, ");
-		sql.append("        CJ.IMPORTESEGURO, ");
+		sql.append("        COALESCE(CJ.IMPORTETAXAEMBARQUE,0) AS IMPORTETAXAEMBARQUE, ");
+		sql.append("        COALESCE(CJ.IMPORTEPEDAGIO,0) AS IMPORTEPEDAGIO, ");
+		sql.append("        COALESCE(CJ.IMPORTESEGURO,0) AS IMPORTESEGURO, ");
 		sql.append("        EM.NOMBEMPRESA, ");
 		sql.append("        EM.EMPRESA_ID, ");
 		sql.append("        CJ.PUNTOVENTA_ID, ");
@@ -252,26 +252,26 @@ public class RelatorioTaxasLinha extends Relatorio {
 		sql.append("INNER JOIN ESTADO 			EST ON EST.ESTADO_ID = CO.estado_ID ");
 		sql.append("INNER JOIN CIUDAD      		CD ON PD.CIUDAD_ID         = CD.CIUDAD_ID ");
 		sql.append("LEFT JOIN  CORRIDA     		CR ON (CJ.CORRIDA_ID = CR.CORRIDA_ID AND CJ.FECCORRIDA = CR.FECCORRIDA) ");
-		sql.append("LEFT JOIN  RUTA        		RT ON RT.RUTA_ID 		  = CR.RUTA_ID ");
+		sql.append("LEFT JOIN  RUTA        		RT ON RT.RUTA_ID 		  = CJ.RUTA_ID ");
 
 		sql.append("WHERE (CJ.IMPORTETAXAEMBARQUE>0 OR CJ.IMPORTEPEDAGIO>0 OR CJ.IMPORTESEGURO>0) ");
 		sql.append("AND CJ.INDSTATUSOPERACION = 'F' ");
 		sql.append("AND CJ.INDREIMPRESION = 0 ");
 		sql.append("AND DECODE(:TIPO_DATA, 1, CJ.FECHORVENTA, 2, CJ.FECCORRIDA) BETWEEN :DATA_INICIAL AND :DATA_FINAL ");
-		sql.append("AND EM.EMPRESA_ID = NVL(:EMPRESA_ID, EM.EMPRESA_ID) ");
+		sql.append("AND EM.EMPRESA_ID = COALESCE(:EMPRESA_ID, EM.EMPRESA_ID) ");
 
 		if (!puntosVentaIds.equals("Todas")) {
 			sql.append("    AND PV.PUNTOVENTA_ID IN (").append(puntosVentaIds).append(") ");
 		}
-		sql.append("    AND PO.PARADA_ID = NVL(:ORIGEN_ID, PO.PARADA_ID) ");
-		sql.append("    AND PD.PARADA_ID = NVL(:DESTINO_ID, PD.PARADA_ID) ");
+		sql.append("    AND PO.PARADA_ID = COALESCE(:ORIGEN_ID, PO.PARADA_ID) ");
+		sql.append("    AND PD.PARADA_ID = COALESCE(:DESTINO_ID, PD.PARADA_ID) ");
 
 		sql.append("  GROUP BY RT.PREFIXO, ");
 		sql.append("           PO.DESCPARADA, ");
 		sql.append("           PD.DESCPARADA, ");
-		sql.append("           CJ.IMPORTETAXAEMBARQUE, ");
-		sql.append("           CJ.IMPORTEPEDAGIO, ");
-		sql.append("           CJ.IMPORTESEGURO, ");
+		sql.append("           COALESCE(CJ.IMPORTETAXAEMBARQUE,0), ");
+		sql.append("           COALESCE(CJ.IMPORTEPEDAGIO,0), ");
+		sql.append("           COALESCE(CJ.IMPORTESEGURO,0), ");
 		sql.append("           CO.ESTADO_ID, ");
 		sql.append("           CD.ESTADO_ID, ");
 		sql.append("           EM.NOMBEMPRESA, ");