From c2a2b8394bd21056c00bfa5d350360f0c5b3317f Mon Sep 17 00:00:00 2001 From: "igor.rodrigo" Date: Tue, 27 Oct 2015 20:50:14 +0000 Subject: [PATCH] =?UTF-8?q?fixes=20bug=206555=20corre=C3=A7=C3=A3o=20na=20?= =?UTF-8?q?exibi=C3=A7=C3=A3o=20do=20valor=20de=20venda=20na=20query=20de?= =?UTF-8?q?=20devolu=C3=A7=C3=A3o=20OCD?= 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@49507 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioCancelamentoVendaCartao.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java index 279e27001..34b56f3e5 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java @@ -57,7 +57,7 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio { @Override protected void processaParametros() throws Exception { } - + private String getSql() { StringBuilder sql = new StringBuilder(); sql.append(" select * from (select distinct c.caja_id, p.nombpuntoventa, ctj.numtarjeta, c.fechorventa, ptovta.numsitef,"); @@ -81,12 +81,12 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio { } sql.append(" inner join ocd_param ocd on ocd.empresa_id = p.empresa_id "); sql.append(" and p.empresa_id = ptovta.empresa_id )"); - + sql.append(" union "); sql.append(" select * from (select distinct c.caja_id, p.nombpuntoventa, ctj.numtarjeta, c.fechorventa, ptovta.numsitef,"); sql.append(" (coalesce(c.preciopagado,0) + coalesce(c.importeoutros,0)+ coalesce(c.importepedagio,0)+ coalesce(c.importeseguro,0) + coalesce(c.importetaxaembarque,0)) as valor_venda,"); - sql.append(" TO_CHAR(coalesce(cf.importe,0) - (coalesce(cf.importe,0)*(o.PENALIZACION/100)),'FM9999999.90') as valor_cancelar,"); + sql.append(" TO_CHAR(coalesce(o.VALOR_TARJETA,0),'FM9999999.90') as valor_cancelar,"); sql.append(" 'OCD' as descmotivo, ctj.numautorizacion numautorizacion, ctj.nsu, c.numfoliosistema"); sql.append(" from OCD o"); sql.append(" inner join boleto b on o.BOLETO_ID = b.BOLETO_ID"); @@ -98,13 +98,16 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio { sql.append(" inner join empresa e on p.empresa_id = e.empresa_id and p.empresa_id = " + parametros.get("EMPRESA_ID") ); } sql.append(" inner join caja c on c.NUMOPERACION = b.NUMOPERACION"); + sql.append(" inner join ptovta_empresa ptovta on b.puntoventa_id = ptovta.puntoventa_id "); + sql.append(" inner join marca m on m.marca_id = b.marca_id "); sql.append(" inner join caja_formapago cf on c.caja_id = cf.caja_id"); + sql.append(" and m.EMPRESA_ID = ptovta.EMPRESA_ID"); sql.append(" and c.fechorventa >= :data_inicial and c.fechorventa <= :data_final "); if (parametros.get("NUMPUNTOVENTA") != null) { sql.append(" and p.puntoventa_id IN (" + parametros.get("NUMPUNTOVENTA").toString() + ")"); } sql.append(" order by c.fechorventa )"); - + return sql.toString(); }