From 30d7180d935bb71ba28f6279e30a923c763cc8f2 Mon Sep 17 00:00:00 2001 From: walace Date: Wed, 30 Aug 2017 17:14:13 +0000 Subject: [PATCH] fixes bug #9447 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@73308 d1611594-4594-4d17-8e1d-87c2c4800839 --- ...torioRemarcacaoPassagensTransferencia.java | 4 +- ...caoPassagensTransferencia_pt_BR.properties | 4 +- ...rioRemarcacaoPassagensTransferencia.jasper | Bin 52710 -> 52365 bytes ...orioRemarcacaoPassagensTransferencia.jrxml | 70 ++++++++---------- ...oRemarcacaoPassagensTransferenciaBean.java | 9 +++ 5 files changed, 44 insertions(+), 43 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioRemarcacaoPassagensTransferencia.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioRemarcacaoPassagensTransferencia.java index 499960bdc..14519bf1e 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioRemarcacaoPassagensTransferencia.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioRemarcacaoPassagensTransferencia.java @@ -82,6 +82,8 @@ public class RelatorioRemarcacaoPassagensTransferencia extends Relatorio { bean.setBilheteiroRemarcado((String) rset.getObject("BILHETEIRO_REMARCADO")); bean.setStatus((String) rset.getObject("STATUS")); bean.setDocumentoRemarcado((String) rset.getObject("DOCUMENTO_REMARCADO")); + + bean.setDiferenca(bean.getTarifaVenda() == null ? new BigDecimal("0") : bean.getTarifaVenda().subtract(bean.getMulta())); lsDadosRelatorio.add(bean); } @@ -175,7 +177,7 @@ public class RelatorioRemarcacaoPassagensTransferencia extends Relatorio { sql.append(" AND ((B.MOTIVOCANCELACION_ID = 23 AND B.INDSTATUSBOLETO IN('T','V')) "); sql.append(" OR (B.MOTIVOCANCELACION_ID IS NULL AND B.INDSTATUSBOLETO IN('T'))) "); sql.append(empresaId.equals("-1") ? "" : " AND C.EMPRESACORRIDA_ID= " + empresaId + " "); - sql.append(puntoVentasId == null || puntoVentasId.equals("-1") ? "" : " AND C.PUNTOVENTA_ID in(" + puntoVentasId + ") "); + sql.append(puntoVentasId == null || puntoVentasId.equals("-1") ? "" : " AND C.PUNTOVENTA_ID in(" + puntoVentasId + ") "); sql.append("ORDER BY C.NUMFOLIOSISTEMA, C.CAJA_ID"); return sql.toString(); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioRemarcacaoPassagensTransferencia_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioRemarcacaoPassagensTransferencia_pt_BR.properties index 3fb95c5f2..cda680a64 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioRemarcacaoPassagensTransferencia_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioRemarcacaoPassagensTransferencia_pt_BR.properties @@ -15,14 +15,14 @@ cabecalho.puntoventa=Ag cabecalho.usuario=Usuário: label.nomeVendaAgencia=Agência Atendimento label.nomeAgenciaEmissao=Agência Emissão -label.documento=Documento +label.documento=Doc. label.dataRemarcacao=Data Remarcac label.dataVenda=Data Venda label.dataServico=Data Serv. label.origem= Origem label.destino=Destino label.formaPagamento=Forma Pag. -label.servico=Servico +label.servico=Servi. label.poltrona= Poltrona label.dataInicial=Data Inicial: label.dataFinal=Data Final: diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRemarcacaoPassagensTransferencia.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRemarcacaoPassagensTransferencia.jasper index 8499a4009173a1f42b028ca99cb050a6c0698b1c..2243ced1dbb7cb6621c8f87fe539275b19bee1b3 100644 GIT binary patch literal 52365 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 - - - + + + @@ -42,6 +42,8 @@ + + @@ -165,7 +167,7 @@ - + @@ -173,7 +175,7 @@ - + @@ -188,6 +190,14 @@ + + + + + + + + @@ -251,7 +261,7 @@ - + @@ -322,35 +332,35 @@ - + - + - + - + - + - + @@ -365,7 +375,7 @@ - + @@ -378,6 +388,13 @@ + + + + + + + @@ -388,36 +405,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioRemarcacaoPassagensTransferenciaBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioRemarcacaoPassagensTransferenciaBean.java index aa5f1a6ad..0f5e055f4 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioRemarcacaoPassagensTransferenciaBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioRemarcacaoPassagensTransferenciaBean.java @@ -12,6 +12,7 @@ public class RelatorioRemarcacaoPassagensTransferenciaBean { private String bilheteVenda; private String bilheteRemarcado; private BigDecimal multa; + private BigDecimal diferenca; private String codOrigemVenda; private String descOrigemVenda; private String codDestinoVenda; @@ -375,4 +376,12 @@ public class RelatorioRemarcacaoPassagensTransferenciaBean { this.servicoRemarcado = servicoRemarcado; } + public BigDecimal getDiferenca() { + return diferenca; + } + + public void setDiferenca(BigDecimal diferenca) { + this.diferenca = diferenca; + } + }