From ebb5d70d54f1773f575de2909e990aa9065d1e78 Mon Sep 17 00:00:00 2001 From: wilian Date: Fri, 25 Aug 2017 00:40:08 +0000 Subject: [PATCH] fixes bug #9392 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@73067 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioOCDNaoResgatadaEmpresa.java | 3 +- ...atorioOCDNaoResgatadaEmpresa_es.properties | 2 + ...rioOCDNaoResgatadaEmpresa_pt_BR.properties | 2 + .../RelatorioDevolucaoBilhetes.jasper | Bin 69663 -> 70018 bytes .../RelatorioDevolucaoBilhetes.jrxml | 15 +- ...latorioDevolucaoBilhetesConsolidado.jasper | Bin 50894 -> 51345 bytes ...elatorioDevolucaoBilhetesConsolidado.jrxml | 13 +- ...elatorioDevolucaoBilhetesFinanceiro.jasper | Bin 51725 -> 52082 bytes ...RelatorioDevolucaoBilhetesFinanceiro.jrxml | 13 +- .../RelatorioOCDNaoResgatadaEmpresa.jasper | Bin 58153 -> 60568 bytes .../RelatorioOCDNaoResgatadaEmpresa.jrxml | 387 ++++++++++-------- .../utilitarios/RelatorioOCDBean.java | 27 ++ .../relatorios/RelatorioOCDController.java | 9 +- 13 files changed, 277 insertions(+), 194 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOCDNaoResgatadaEmpresa.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOCDNaoResgatadaEmpresa.java index 9694ccc16..417d252c3 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOCDNaoResgatadaEmpresa.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOCDNaoResgatadaEmpresa.java @@ -116,6 +116,7 @@ public class RelatorioOCDNaoResgatadaEmpresa extends Relatorio { ocdBean.setNumfoliosistema(rset.getString("NUMFOLIOSISTEMA")); ocdBean.setFeccorrida(rset.getDate("FECCORRIDA")); ocdBean.setOcdId(rset.getLong("OCD_ID")); + ocdBean.setMotivocancelacionId(rset.getInt("MOTIVOCANCELACION_ID")); ocdBean.setTotalBilhete(rset.getBigDecimal("TOTAL_BILHETE")); ocdBean.setNumoperacion(OcdUtil.generaLocalizadorOCD(ocdBean.getNumoperacion(), ocdBean.getOcdId())); lsDadosRelatorio.add(ocdBean); @@ -146,7 +147,7 @@ public class RelatorioOCDNaoResgatadaEmpresa extends Relatorio { sql.append("SELECT O.OCD_ID, O.NUMOPERACION, E.NOMBEMPRESA, B.NUMFOLIOSISTEMA, "); sql.append("O.FECINC, PVO.NOMBPUNTOVENTA AS PV_OCD, O.PENALIZACION, (CASE O.VALOR_TARJETA WHEN 0 THEN O.VALOR_PAGAR ELSE O.VALOR_TARJETA END) AS VALOR_OCD, "); sql.append("PVV.NOMBPUNTOVENTA AS PV_VENDA, B.FECHORVENTA, B.FECCORRIDA, ORI.DESCPARADA AS ORIGEM, DES.DESCPARADA AS DESTINO, B.NUMASIENTO, "); - sql.append("(CASE O.VALOR_TARJETA WHEN 0 THEN 'DINHEIRO' ELSE 'CARTAO' END) AS FORMAPAGO, "); + sql.append("(CASE O.VALOR_TARJETA WHEN 0 THEN 'DINHEIRO' ELSE 'CARTAO' END) AS FORMAPAGO, B.MOTIVOCANCELACION_ID, "); sql.append("PVP.NOMBPUNTOVENTA AS PV_PAGO, O.FECPAGO, UP.CVEUSUARIO AS USUARIOPAGO, UI.CVEUSUARIO AS USUARIOINC, "); sql.append("(CASE O.INDPAGO WHEN 1 THEN (CASE O.VALOR_TARJETA WHEN 0 THEN O.VALOR_PAGAR ELSE O.VALOR_TARJETA END) ELSE NULL END) AS VALOR_PAGO, "); sql.append("NVL(B.PRECIOPAGADO,0) + NVL(B.IMPORTETAXAEMBARQUE,0) + NVL(B.IMPORTEOUTROS,0) + NVL(B.IMPORTEPEDAGIO,0) + NVL(B.IMPORTESEGURO,0) AS TOTAL_BILHETE "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOCDNaoResgatadaEmpresa_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOCDNaoResgatadaEmpresa_es.properties index 0e736565c..78da46b2f 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOCDNaoResgatadaEmpresa_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOCDNaoResgatadaEmpresa_es.properties @@ -21,6 +21,8 @@ detail.fecpago=Fecha Pago detail.fecvenda=Fecha Venta detail.valorOcd=Valor OCD detail.penalizacion=Penalizacion +detail.multa=Multa +detail.motivo=Motivo detail.nombusuarioinc=Usuário Inc. detail.fecinc=Fecha OCD diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOCDNaoResgatadaEmpresa_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOCDNaoResgatadaEmpresa_pt_BR.properties index eeb7201b0..088e7e9a3 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOCDNaoResgatadaEmpresa_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOCDNaoResgatadaEmpresa_pt_BR.properties @@ -21,6 +21,8 @@ detail.fecpago=Data Pagamento detail.fecvenda=Data Venda detail.valorOcd=Valor OCD detail.penalizacion=Penalização +detail.multa=Multa +detail.motivo=Motivo detail.nombusuarioinc=Usuário Geração detail.fecinc=Data OCD diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jasper index 96383317de79eeb8ded50546eaa9b15b1b0f6d5a..86ded97fdad9f8dcc974a38ae8679ff982e77590 100644 GIT binary patch delta 9043 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 i0R27*ES6&hPKxUmo6tS3{-0TLRK` - - + +