From c579ee7d0be3566464377d5e287517e768cee50a Mon Sep 17 00:00:00 2001 From: wilian Date: Thu, 3 Mar 2016 19:36:37 +0000 Subject: [PATCH] fixes bug #6962 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@53522 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioCancelamentoTransacao.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoTransacao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoTransacao.java index 1e47e369a..01e3efc87 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoTransacao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoTransacao.java @@ -82,14 +82,15 @@ public class RelatorioCancelamentoTransacao extends Relatorio { sql.append("(COALESCE(c.preciopagado,0) + COALESCE(c.importeoutros,0) + COALESCE(c.importepedagio,0) + COALESCE(c.importeseguro,0) + COALESCE(c.importetaxaembarque,0)) AS valorCompra "); sql.append("FROM CAJA c "); sql.append("INNER JOIN BOLETO b ON c.numoperacion = b.numoperacion "); - sql.append(" AND b.numfoliosistema = c.numfoliosistema "); + sql.append(" AND c.feccorrida = b.feccorrida "); + sql.append(" AND c.corrida_id = b.corrida_id "); sql.append("INNER JOIN OCD ocd ON ocd.BOLETO_ID = b.BOLETO_ID "); sql.append("INNER JOIN MARCA m ON m.marca_id = b.marca_id "); sql.append("INNER JOIN EMPRESA e ON e.empresa_id = m.empresa_id "); sql.append("WHERE ocd.FECINC BETWEEN :dataInicial AND :dataFinal "); - sql.append("AND ocd.puntoventa_id = "); + sql.append("AND b.puntoventa_id = "); - Constante constante = constanteService.buscarPorNomeConstante("ID_PUNTO_VENTA_J3_RELATORIO_CANCELAMENTO"); + Constante constante = constanteService.buscarPorNomeConstante("PUNTO_VENTA_J3"); if(constante != null && constante.getActivo() && constante.getValorconstante() != null @@ -122,7 +123,8 @@ public class RelatorioCancelamentoTransacao extends Relatorio { sql.append("+ COALESCE(e2.impingreso,0)) "); sql.append("FROM CAJA c2 "); sql.append("INNER JOIN BOLETO b ON c2.numoperacion = b.numoperacion "); - sql.append(" AND b.numfoliosistema = c2.numfoliosistema "); + sql.append(" AND c2.feccorrida = b.feccorrida "); + sql.append(" AND c2.corrida_id = b.corrida_id "); sql.append("LEFT JOIN evento_extra e2 ON e2.boleto_id = b.boleto_id "); sql.append(" AND e2.impingreso > 0 "); sql.append("LEFT JOIN OCD ocd ON ocd.BOLETO_ID = b.BOLETO_ID ");