From aa659dc33a1c5b3ac3e9e15e64a28b04a11ae541 Mon Sep 17 00:00:00 2001 From: "igor.rodrigo" Date: Thu, 29 Dec 2016 19:18:50 +0000 Subject: [PATCH] fixes bug #8378 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@64316 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioCancelamentoVendaCartao.java | 10 +- ...torioCancelamentoVendaCartao_es.properties | 3 +- ...ioCancelamentoVendaCartao_pt_BR.properties | 3 +- .../RelatorioCancelamentoVendaCartao.jasper | Bin 39553 -> 40248 bytes .../RelatorioCancelamentoVendaCartao.jrxml | 138 ++++++++++-------- 5 files changed, 89 insertions(+), 65 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java index a73b934f3..27f777a33 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java @@ -41,6 +41,7 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio { while (rset.next()) { Map dataResult = new HashMap(); dataResult.put("estabelecimento", rset.getString("nombpuntoventa")); + dataResult.put("pv_cancelamento", rset.getString("pv_cancel")); if (rset.getString("numtarjeta") != null) { dataResult.put("cartao", rset.getString("numtarjeta").replace('*', ' ').trim()); @@ -72,7 +73,7 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio { StringBuilder sql = new StringBuilder(); /* Boletos apenas com venda e cancelamento direto com corrida */ - sql.append("SELECT DISTINCT B.BOLETO_ID, P.NOMBPUNTOVENTA, O.NUMTARJETA, B.FECHORVENTA, PTOVTA.NUMSITEF, ") + sql.append("SELECT DISTINCT B.BOLETO_ID, P.NOMBPUNTOVENTA, PO.NOMBPUNTOVENTA AS PV_CANCEL, O.NUMTARJETA, B.FECHORVENTA, PTOVTA.NUMSITEF, ") .append("'OCD' AS DESCMOTIVO, O.NUMAUTORIZACION, O.NSU, B.NUMFOLIOSISTEMA, O.FECINC AS DATADEVOLUCAO, O.NUMOPERACION, ") .append("(COALESCE(B.PRECIOPAGADO,0) + COALESCE(B.IMPORTEOUTROS,0)+ COALESCE(B.IMPORTEPEDAGIO,0)+ COALESCE(B.IMPORTESEGURO,0) + COALESCE(B.IMPORTETAXAEMBARQUE,0)) AS VALOR_VENDA, ") @@ -96,6 +97,7 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio { .append("INNER JOIN PUNTO_VENTA P ON P.PUNTOVENTA_ID = B.PUNTOVENTA_ID ") .append("INNER JOIN PTOVTA_EMPRESA PTOVTA ON B.PUNTOVENTA_ID = PTOVTA.PUNTOVENTA_ID ") .append("INNER JOIN MARCA M ON M.MARCA_ID = B.MARCA_ID AND M.EMPRESA_ID = PTOVTA.EMPRESA_ID ") + .append("INNER JOIN PUNTO_VENTA PO ON PO.PUNTOVENTA_ID = O.PUNTOVENTA_ID ") .append("WHERE O.FECINC BETWEEN :data_inicial AND :data_final ") .append("AND B.MARCA_ID = :empresaId "); @@ -108,7 +110,7 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio { sql.append("UNION ALL "); /* Boletos com entrega/transferencia/troca antes do cancelamento com corrida */ - sql.append("SELECT DISTINCT B.BOLETO_ID, P.NOMBPUNTOVENTA, O.NUMTARJETA, B.FECHORVENTA, PTOVTA.NUMSITEF, ") + sql.append("SELECT DISTINCT B.BOLETO_ID, P.NOMBPUNTOVENTA, PO.NOMBPUNTOVENTA AS PV_CANCEL, O.NUMTARJETA, B.FECHORVENTA, PTOVTA.NUMSITEF, ") .append("'OCD' AS DESCMOTIVO, O.NUMAUTORIZACION, O.NSU, B.NUMFOLIOSISTEMA, O.FECINC AS DATADEVOLUCAO, O.NUMOPERACION, ") .append("(COALESCE(B.PRECIOPAGADO,0) + COALESCE(B.IMPORTEOUTROS,0)+ COALESCE(B.IMPORTEPEDAGIO,0)+ COALESCE(B.IMPORTESEGURO,0) + COALESCE(B.IMPORTETAXAEMBARQUE,0)) AS VALOR_VENDA, ") @@ -132,6 +134,7 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio { .append("INNER JOIN PUNTO_VENTA P ON P.PUNTOVENTA_ID = BR.PUNTOVENTA_ID ") .append("INNER JOIN PTOVTA_EMPRESA PTOVTA ON BR.PUNTOVENTA_ID = PTOVTA.PUNTOVENTA_ID ") .append("INNER JOIN MARCA M ON M.MARCA_ID = BR.MARCA_ID AND M.EMPRESA_ID = PTOVTA.EMPRESA_ID ") + .append("INNER JOIN PUNTO_VENTA PO ON PO.PUNTOVENTA_ID = O.PUNTOVENTA_ID ") .append("WHERE O.FECINC BETWEEN :data_inicial AND :data_final ") .append("AND BR.MARCA_ID = :empresaId "); @@ -144,7 +147,7 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio { sql.append("UNION ALL "); /* Boletos apenas com venda e cancelamento direto sem corrida */ - sql.append("SELECT DISTINCT B.BOLETO_ID, P.NOMBPUNTOVENTA, O.NUMTARJETA, B.FECHORVENTA, PTOVTA.NUMSITEF, ") + sql.append("SELECT DISTINCT B.BOLETO_ID, P.NOMBPUNTOVENTA, PO.NOMBPUNTOVENTA AS PV_CANCEL, O.NUMTARJETA, B.FECHORVENTA, PTOVTA.NUMSITEF, ") .append("'OCD' AS DESCMOTIVO, O.NUMAUTORIZACION, O.NSU, B.NUMFOLIOSISTEMA, O.FECINC AS DATADEVOLUCAO, O.NUMOPERACION, ") .append("(COALESCE(B.PRECIOPAGADO,0) + COALESCE(B.IMPORTEOUTROS,0)+ COALESCE(B.IMPORTEPEDAGIO,0)+ COALESCE(B.IMPORTESEGURO,0) + COALESCE(B.IMPORTETAXAEMBARQUE,0)) AS VALOR_VENDA, ") @@ -168,6 +171,7 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio { .append("INNER JOIN PUNTO_VENTA P ON P.PUNTOVENTA_ID = B.PUNTOVENTA_ID ") .append("INNER JOIN PTOVTA_EMPRESA PTOVTA ON B.PUNTOVENTA_ID = PTOVTA.PUNTOVENTA_ID ") .append("INNER JOIN MARCA M ON M.MARCA_ID = B.MARCA_ID AND M.EMPRESA_ID = PTOVTA.EMPRESA_ID ") + .append("INNER JOIN PUNTO_VENTA PO ON PO.PUNTOVENTA_ID = O.PUNTOVENTA_ID ") .append("WHERE O.FECINC BETWEEN :data_inicial AND :data_final ") .append("AND B.MARCA_ID = :empresaId "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCancelamentoVendaCartao_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCancelamentoVendaCartao_es.properties index 01753b785..f07d7424c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCancelamentoVendaCartao_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCancelamentoVendaCartao_es.properties @@ -12,7 +12,8 @@ cabecalho.de=de cabecalho.filtros=Filtros: #Labels header -label.Estabelecimento=Estabelecimento +label.Estabelecimento=Agência da compra +label.Estabelecimento.cancelamento=Agência de cancelamento label.cartao=Cartão label.data=Data da compra label.valor.cesta=Total da Compra diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCancelamentoVendaCartao_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCancelamentoVendaCartao_pt_BR.properties index eb126320f..c1cf10709 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCancelamentoVendaCartao_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCancelamentoVendaCartao_pt_BR.properties @@ -12,7 +12,8 @@ cabecalho.de=de cabecalho.filtros=Filtros: #Labels header -label.Estabelecimento=Estabelecimento +label.Estabelecimento=Agência da compra +label.Estabelecimento.cancelamento=Agência de cancelamento label.cartao=Cartão label.data=Data da compra label.valor.cesta=Total da Compra diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jasper index 0098c67904684d2cb15656419051e2c65fc88098..ff8bedf45a4e17cf03969dc64c556f0fc6144daf 100644 GIT binary patch literal 40248 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 KoqF3{?0*28gWZk* literal 39553 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jrxml index 5d7261283..3b4f57440 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jrxml @@ -26,13 +26,14 @@ + - + @@ -40,7 +41,7 @@ - + @@ -48,7 +49,7 @@ - + @@ -56,7 +57,7 @@ - + @@ -64,7 +65,7 @@ - + @@ -72,14 +73,14 @@ - + - + @@ -87,7 +88,7 @@ - + @@ -95,7 +96,7 @@ - + @@ -103,7 +104,7 @@ - + @@ -111,7 +112,7 @@ - + @@ -128,219 +129,236 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + @@ -349,7 +367,7 @@ - +