From bfb6d3c58da79799a497085fe0543508df67e288 Mon Sep 17 00:00:00 2001 From: wilian Date: Thu, 14 Apr 2016 19:56:38 +0000 Subject: [PATCH] fixes bug #7178 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@54941 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioCancelamentoVendaCartao.java | 35 +++++++++++++----- .../RelatorioCancelamentoVendaCartao.jasper | Bin 39541 -> 39553 bytes .../RelatorioCancelamentoVendaCartao.jrxml | 14 +++---- 3 files changed, 32 insertions(+), 17 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java index f23e64396..672b204ca 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java @@ -69,9 +69,14 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio { /* Boletos apenas com venda e cancelamento direto com corrida */ sql.append("SELECT DISTINCT C.CAJA_ID, B.BOLETO_ID, P.NOMBPUNTOVENTA, CTJ.NUMTARJETA, C.FECHORVENTA, PTOVTA.NUMSITEF, ") - .append("'OCD' AS DESCMOTIVO, CTJ.NUMAUTORIZACION, CTJ.NSU, C.NUMFOLIOSISTEMA, O.FECINC AS DATADEVOLUCAO, C.NUMOPERACION, ") + .append("'OCD' AS DESCMOTIVO, CTJ.NUMAUTORIZACION, CTJ.NSU, B.NUMFOLIOSISTEMA, O.FECINC AS DATADEVOLUCAO, C.NUMOPERACION, ") .append("(COALESCE(C.PRECIOPAGADO,0) + COALESCE(C.IMPORTEOUTROS,0)+ COALESCE(C.IMPORTEPEDAGIO,0)+ COALESCE(C.IMPORTESEGURO,0) + COALESCE(C.IMPORTETAXAEMBARQUE,0)) AS VALOR_VENDA, ") - .append("TO_CHAR(COALESCE(O.VALOR_TARJETA,0),'FM9999999.90') AS VALOR_CANCELAR, ") + + .append("CASE WHEN O.VALOR_TARJETA > 0 ") + .append("THEN TO_CHAR(COALESCE(O.VALOR_TARJETA,0),'FM9999999.90') ") + .append("ELSE TO_CHAR(COALESCE(O.VALOR_PAGAR,0),'FM9999999.90') ") + .append("END AS VALOR_CANCELAR, ") + .append("(SELECT SUM(COALESCE(B1.PRECIOPAGADO,0) + COALESCE(B1.IMPORTEOUTROS,0) + COALESCE(B1.IMPORTEPEDAGIO,0) + COALESCE(B1.IMPORTESEGURO,0) + COALESCE(B1.IMPORTETAXAEMBARQUE,0)) ") .append(" FROM BOLETO B1 ") .append(" WHERE B1.NUMOPERACION = B.NUMOPERACION ") @@ -108,9 +113,14 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio { /* Boletos com entrega/transferencia/troca antes do cancelamento com corrida */ sql.append("SELECT DISTINCT C.CAJA_ID, B.BOLETO_ID, P.NOMBPUNTOVENTA, CTJ.NUMTARJETA, C.FECHORVENTA, PTOVTA.NUMSITEF, ") - .append("'OCD' AS DESCMOTIVO, CTJ.NUMAUTORIZACION, CTJ.NSU, C.NUMFOLIOSISTEMA, O.FECINC AS DATADEVOLUCAO, C.NUMOPERACION, ") + .append("'OCD' AS DESCMOTIVO, CTJ.NUMAUTORIZACION, CTJ.NSU, B.NUMFOLIOSISTEMA, O.FECINC AS DATADEVOLUCAO, C.NUMOPERACION, ") .append("(COALESCE(C.PRECIOPAGADO,0) + COALESCE(C.IMPORTEOUTROS,0)+ COALESCE(C.IMPORTEPEDAGIO,0)+ COALESCE(C.IMPORTESEGURO,0) + COALESCE(C.IMPORTETAXAEMBARQUE,0)) AS VALOR_VENDA, ") - .append("TO_CHAR(COALESCE(O.VALOR_TARJETA,0),'FM9999999.90') AS VALOR_CANCELAR, ") + + .append("CASE WHEN O.VALOR_TARJETA > 0 ") + .append("THEN TO_CHAR(COALESCE(O.VALOR_TARJETA,0),'FM9999999.90') ") + .append("ELSE TO_CHAR(COALESCE(O.VALOR_PAGAR,0),'FM9999999.90') ") + .append("END AS VALOR_CANCELAR, ") + .append("(SELECT SUM(COALESCE(B1.PRECIOPAGADO,0) + COALESCE(B1.IMPORTEOUTROS,0) + COALESCE(B1.IMPORTEPEDAGIO,0) + COALESCE(B1.IMPORTESEGURO,0) + COALESCE(B1.IMPORTETAXAEMBARQUE,0)) ") .append(" FROM BOLETO B1 ") .append(" WHERE B1.NUMOPERACION = BR.NUMOPERACION ") @@ -121,14 +131,14 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio { .append("INNER JOIN BOLETO BR ON BR.BOLETO_ID = B.BOLETOORIGINAL_ID ") .append(" AND BR.CORRIDA_ID IS NOT NULL ") .append(" AND BR.FECCORRIDA IS NOT NULL ") - .append("INNER JOIN CAJA C ON C.NUMOPERACION = BR.NUMOPERACION ") + .append("INNER JOIN CAJA C ON BR.NUMOPERACION = C.NUMOPERACION ") .append(" AND BR.NUMASIENTO = C.NUMASIENTO ") .append(" AND BR.ORIGEN_ID = C.ORIGEN_ID ") .append(" AND BR.DESTINO_ID = C.DESTINO_ID ") .append(" AND BR.CATEGORIA_ID = C.CATEGORIA_ID ") .append(" AND BR.CLASESERVICIO_ID = C.CLASESERVICIO_ID ") - .append(" AND B.CORRIDA_ID = C.CORRIDA_ID ") - .append(" AND B.FECCORRIDA = C.FECCORRIDA ") + .append(" AND BR.CORRIDA_ID = C.CORRIDA_ID ") + .append(" AND BR.FECCORRIDA = C.FECCORRIDA ") .append("INNER JOIN CAJA_DET_PAGO CDT ON CDT.CAJA_ID = C.CAJA_ID AND CDT.FORMAPAGO_ID = :formaPago1 ") .append("INNER JOIN CAJA_TARJETA CTJ ON CDT.CAJADETPAGO_ID = CTJ.CAJADETPAGO_ID ") .append("INNER JOIN PUNTO_VENTA P ON P.PUNTOVENTA_ID = BR.PUNTOVENTA_ID ") @@ -147,9 +157,14 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio { /* Boletos apenas com venda e cancelamento direto sem corrida */ sql.append("SELECT DISTINCT C.CAJA_ID, B.BOLETO_ID, P.NOMBPUNTOVENTA, CTJ.NUMTARJETA, C.FECHORVENTA, PTOVTA.NUMSITEF, ") - .append("'OCD' AS DESCMOTIVO, CTJ.NUMAUTORIZACION, CTJ.NSU, C.NUMFOLIOSISTEMA, O.FECINC AS DATADEVOLUCAO, C.NUMOPERACION, ") + .append("'OCD' AS DESCMOTIVO, CTJ.NUMAUTORIZACION, CTJ.NSU, B.NUMFOLIOSISTEMA, O.FECINC AS DATADEVOLUCAO, C.NUMOPERACION, ") .append("(COALESCE(C.PRECIOPAGADO,0) + COALESCE(C.IMPORTEOUTROS,0)+ COALESCE(C.IMPORTEPEDAGIO,0)+ COALESCE(C.IMPORTESEGURO,0) + COALESCE(C.IMPORTETAXAEMBARQUE,0)) AS VALOR_VENDA, ") - .append("TO_CHAR(COALESCE(O.VALOR_TARJETA,0),'FM9999999.90') AS VALOR_CANCELAR, ") + + .append("CASE WHEN O.VALOR_TARJETA > 0 ") + .append("THEN TO_CHAR(COALESCE(O.VALOR_TARJETA,0),'FM9999999.90') ") + .append("ELSE TO_CHAR(COALESCE(O.VALOR_PAGAR,0),'FM9999999.90') ") + .append("END AS VALOR_CANCELAR, ") + .append("(SELECT SUM(COALESCE(B1.PRECIOPAGADO,0) + COALESCE(B1.IMPORTEOUTROS,0) + COALESCE(B1.IMPORTEPEDAGIO,0) + COALESCE(B1.IMPORTESEGURO,0) + COALESCE(B1.IMPORTETAXAEMBARQUE,0)) ") .append(" FROM BOLETO B1 ") .append(" WHERE B1.NUMOPERACION = B.NUMOPERACION ") @@ -180,7 +195,7 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio { .append(") "); } - sql.append("ORDER BY 3, 5 "); + sql.append("ORDER BY FECHORVENTA, DATADEVOLUCAO, NUMFOLIOSISTEMA "); return sql.toString(); } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jasper index 8a70f9dc10bb7b1e8b369dcbccdbfedc13f13a58..0098c67904684d2cb15656419051e2c65fc88098 100644 GIT binary patch delta 3303 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 Cq6n@4 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jrxml index 88535a3df..5d7261283 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jrxml @@ -1,6 +1,6 @@ - + @@ -32,7 +32,7 @@ - + @@ -48,23 +48,23 @@ - - + + - - + + - +