From 257b0fa0ed1bd3a4a461b50b66bd6eeab4699d30 Mon Sep 17 00:00:00 2001 From: "wallace.henrique" Date: Tue, 27 Aug 2024 16:18:09 -0300 Subject: [PATCH 1/2] fixes bugAL-4718 --- pom.xml | 2 +- .../relatorios/impl/RelatorioEstoque.java | 27 ++++++++++++++----- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index f10a820b3..0102be3de 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.131.0 + 1.131.1 war diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java index 9c2fdf869..0fc1b8547 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java @@ -4,6 +4,7 @@ import java.math.BigDecimal; import java.sql.Connection; import java.sql.ResultSet; import java.util.ArrayList; +import java.util.Calendar; import java.util.Collections; import java.util.Comparator; import java.util.Date; @@ -14,7 +15,6 @@ import java.util.Map; import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.ItemReporteControleEstoqueBoletos; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; -import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioBilhetesVendidosEstoqueAgenciaBean; import com.rjconsultores.ventaboletos.utilerias.DateUtil; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; @@ -48,12 +48,21 @@ public class RelatorioEstoque extends Relatorio { } String sql = retornarItensConsultaPorPuloFolio(puntoVentaId,empresaId, dtInicio, dtFim, aidfTipoId, aidfId); NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql); + if(dtInicio != null && dtFim != null) { stmt.setString("dataInicio", DateUtil.getStringDate(dtInicio, "dd/MM/yyyy") + " 00:00:00"); - stmt.setString("dataFinal", DateUtil.getStringDate(dtFim, "dd/MM/yyyy") + " 23:59:59"); + stmt.setString("dataFinal", DateUtil.getStringDate(dtFim, "dd/MM/yyyy") + " 23:59:59"); }else if(dtInicio != null) { stmt.setString("dataInicio", DateUtil.getStringDate(dtInicio, "dd/MM/yyyy") + " 00:00:00"); } + + Calendar c = Calendar.getInstance(); + c.setTime(dtInicio); + c.add(Calendar.YEAR, -3); + + stmt.setString("dataInicioVenda", DateUtil.getStringDate(c.getTime(), "dd/MM/yyyy") + " 23:59:59"); + stmt.setString("dataFimVenda", DateUtil.getStringDate(new Date(), "dd/MM/yyyy") + " 23:59:59"); + if(aidfTipoId != null) { stmt.setInt("aidfTipo",aidfTipoId); } @@ -99,6 +108,10 @@ public class RelatorioEstoque extends Relatorio { }else if(dtInicio != null) { stmt2.setString("dataInicio", DateUtil.getStringDate(dtInicio, "dd/MM/yyyy") + " 00:00:00"); } + + stmt2.setString("dataInicioVenda", DateUtil.getStringDate(c.getTime(), "dd/MM/yyyy") + " 23:59:59"); + stmt2.setString("dataFimVenda", DateUtil.getStringDate(new Date(), "dd/MM/yyyy") + " 23:59:59"); + if(aidfTipoId != null) { stmt2.setInt("aidfTipo",aidfTipoId); } @@ -264,12 +277,12 @@ public class RelatorioEstoque extends Relatorio { .append(empresaId); } if(dataInicio!= null && dataFim != null) { - sb.append(" AND AI.fecadquisicion BETWEEN TO_DATE(:dataInicio,'dd/mm/yyyy hh24:mi:ss') AND TO_DATE(:dataFinal,'dd/mm/yyyy hh24:mi:ss') "); - sb.append(" AND cj.fechorventa BETWEEN TO_DATE('01/08/2022 00:00:00','dd/mm/yyyy hh24:mi:ss') AND TO_DATE('17/09/2024 00:00:00','dd/mm/yyyy hh24:mi:ss') "); + sb.append(" AND AI.fecadquisicion BETWEEN TO_DATE(:dataInicio,'dd/mm/yyyy hh24:mi:ss') AND TO_DATE(:dataFinal,'dd/mm/yyyy hh24:mi:ss') "); }else if(dataInicio!= null) { sb.append(" AND AI.fecadquisicion >= TO_DATE(:dataInicio,'dd/mm/yyyy hh24:mi:ss') "); } - sb.append(" AND DAB.NUMFOLIOFINAL < 2147483647 "); + sb.append(" AND cj.fechorventa BETWEEN TO_DATE(:dataInicioVenda,'dd/mm/yyyy hh24:mi:ss') AND TO_DATE(:dataFimVenda,'dd/mm/yyyy hh24:mi:ss') "); + sb.append(" AND DAB.NUMFOLIOFINAL < 2147483647 "); sb.append(" AND DAB.STATUSOPERACION IN(0, "); sb.append(" 1, "); sb.append(" 4) "); @@ -349,10 +362,10 @@ public class RelatorioEstoque extends Relatorio { } if(dataInicio!= null && dataFim != null) { sb.append(" AND AI.fecadquisicion BETWEEN TO_DATE(:dataInicio,'dd/mm/yyyy hh24:mi:ss') AND TO_DATE(:dataFinal,'dd/mm/yyyy hh24:mi:ss') "); - sb.append(" AND CJ.FECHORVTA BETWEEN TO_DATE('01/08/2022 00:00:00','dd/mm/yyyy hh24:mi:ss') AND TO_DATE('17/09/2024 00:00:00','dd/mm/yyyy hh24:mi:ss') "); }else if(dataInicio!= null) { sb.append(" AND AI.fecadquisicion >= TO_DATE(:dataInicio,'dd/mm/yyyy hh24:mi:ss') "); } + sb.append(" AND FECHORVTA BETWEEN TO_DATE(:dataInicioVenda,'dd/mm/yyyy hh24:mi:ss') AND TO_DATE(:dataFimVenda,'dd/mm/yyyy hh24:mi:ss') "); sb.append(" AND DAB.NUMFOLIOFINAL < 2147483647 "); sb.append(" AND DAB.STATUSOPERACION IN(0, "); sb.append(" 1, "); @@ -460,7 +473,7 @@ public class RelatorioEstoque extends Relatorio { .append(" AND (cj.NUMSERIEPREIMPRESA = dab.NUMSERIEPREIMPRESA ") .append(" OR (cj.NUMSERIEPREIMPRESA IS NULL ") .append("AND dab.NUMSERIEPREIMPRESA IS NULL)) ") - .append("AND CJ.FECHORVTA BETWEEN TO_DATE('01/08/2022 00:00:00', 'dd/mm/yyyy hh24:mi:ss') AND TO_DATE('30/08/2024 23:59:00', 'dd/mm/yyyy hh24:mi:ss') "); + .append(" AND CJ.FECHORVTA BETWEEN TO_DATE(:dataInicioVenda,'dd/mm/yyyy hh24:mi:ss') AND TO_DATE(:dataFimVenda,'dd/mm/yyyy hh24:mi:ss') "); From 77a08757ca535694c2dc5f3bae1660fb9f8512d0 Mon Sep 17 00:00:00 2001 From: "wallace.henrique" Date: Tue, 27 Aug 2024 16:19:38 -0300 Subject: [PATCH 2/2] fixes bug#AL-4718 --- pom.xml | 2 +- .../ventaboletos/relatorios/impl/RelatorioEstoque.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0102be3de..ebfb3d852 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd "> 4.0.0 br.com.rjconsultores diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java index 0fc1b8547..ff90965ed 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java @@ -121,6 +121,7 @@ public class RelatorioEstoque extends Relatorio { ResultSet rset2 = null; rset2 = stmt2.executeQuery(); + List lsEstoque = new ArrayList<>() ; while (rset2.next()) {