From 81ce0c77cbfd84b00efe2efc9846b4dfd65f9efd Mon Sep 17 00:00:00 2001 From: walace Date: Wed, 21 Mar 2018 20:26:19 +0000 Subject: [PATCH] Alterado a consulta para buscar da caja e acertado as mesclagens de linhas no excel fixes bug #10771 dev:julio qua:marcelo git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@80106 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioBilhetesVendidosNovoLayout.java | 12 +-- ...ilhetesVendidosNovoLayout_pt_BR.properties | 2 +- ...RelatorioBilhetesVendidosNovoLayout.jasper | Bin 40626 -> 40884 bytes .../RelatorioBilhetesVendidosNovoLayout.jrxml | 92 +++++++++--------- 4 files changed, 53 insertions(+), 53 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java index 55bb7e24d..6556f5078 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java @@ -74,9 +74,9 @@ public class RelatorioBilhetesVendidosNovoLayout extends Relatorio { sql.append(" c.preciopagado as valorcontabil,"); sql.append(" est.icms as valoraliquiotaicms,"); sql.append(" (select sum(c.preciopagado) as preciopagado"); - sql.append(" from boleto e"); - sql.append(" where e.numoperacion = c.numoperacion) as preciopagado"); - sql.append(" from boleto c"); + sql.append(" from caja e"); + sql.append(" where e.numoperacion = c.numoperacion and e.fechorventa between :DATA_INICIAL AND :DATA_FINAL ) as preciopagado"); + sql.append(" from caja c"); sql.append(" left join aidf a on a.aidf_id = c.aidf_id"); sql.append(" left join aidf_especie ae on (a.aidfesp_id = ae.aidfesp_id)"); sql.append(" join empresa e on e.empresa_id = c.empresacorrida_id"); @@ -88,7 +88,7 @@ public class RelatorioBilhetesVendidosNovoLayout extends Relatorio { sql.append(" and ei.estado_id = est.estado_id"); sql.append(" where "); sql.append(" c.empresacorrida_id = :EMPRESA_ID "); - sql.append(" and c.fechorventa BETWEEN :DATA_INICIAL AND :DATA_FINAL "); + sql.append(" and c.fechorventa between :DATA_INICIAL AND :DATA_FINAL "); sql.append(" and c.activo = 1"); sql.append(" and ei.activo = 1"); if (parametros.get("NUMPUNTOVENTA") != null && !parametros.get("NUMPUNTOVENTA").equals("-1")) { @@ -112,8 +112,8 @@ public class RelatorioBilhetesVendidosNovoLayout extends Relatorio { NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql.toString()); stmt.setInt("EMPRESA_ID", Integer.valueOf(parametros.get("EMPRESA_ID").toString())); - stmt.setTimestamp("DATA_INICIAL", new Timestamp(DateUtil.inicioFecha((Date) parametros.get("DATA_INICIAL")).getTime())); - stmt.setTimestamp("DATA_FINAL", new Timestamp(DateUtil.fimFecha((Date) parametros.get("DATA_FINAL")).getTime())); + stmt.setDate("DATA_INICIAL", new java.sql.Date(DateUtil.inicioFecha((Date) parametros.get("DATA_INICIAL")).getTime())); + stmt.setDate("DATA_FINAL", new java.sql.Date(DateUtil.fimFecha((Date) parametros.get("DATA_FINAL")).getTime())); ResultSet rset = stmt.executeQuery(); lsDadosRelatorio = new ArrayList(); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosNovoLayout_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosNovoLayout_pt_BR.properties index f299de5a2..191f2c178 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosNovoLayout_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosNovoLayout_pt_BR.properties @@ -22,5 +22,5 @@ label.dataVenda=Data Venda label.valorCancelado=Qtd. Cancec header.periodo=Período: header.tipoLinha=Tipo Linha: -header.estado=Estado +header.estado=Estado: label.codFiscal=Cod. Fiscal \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosNovoLayout.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosNovoLayout.jasper index 6ca21e256a906f2577424a7342b4fd732b12a844..b160e25198d55f82e61c567fed8dd9f62d280448 100644 GIT binary patch delta 12299 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 - - - + + + @@ -47,7 +47,7 @@ <band height="28"> <textField> - <reportElement uuid="e15d26de-6873-4576-b49b-8dc546b39dbe" x="142" y="2" width="416" height="20"/> + <reportElement x="142" y="2" width="416" height="20" uuid="e15d26de-6873-4576-b49b-8dc546b39dbe"/> <textElement textAlignment="Center"> <font size="12" isBold="true"/> </textElement> @@ -56,89 +56,89 @@ </band> - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -147,89 +147,89 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -238,86 +238,86 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -337,7 +337,7 @@ - +