fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'AL-4718' (!682) from AL-4718 into master 

Reviewed-on: adm/VentaBoletosAdm#682
Reviewed-by: Julio Heredia <julio@rjconsultores.com.br>
master 1.131.1
wallace 2024-08-27 19:25:59 +00:00
parent 8ea7800fe9 77a08757ca
commit 037485cf9b
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -1,10 +1,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd ">
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.131.0</version>
<version>1.131.1</version>
<packaging>war</packaging>
<properties>

24
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java
View File

@ -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");
}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);
}
@ -108,6 +121,7 @@ public class RelatorioEstoque extends Relatorio {
ResultSet rset2 = null;
rset2 = stmt2.executeQuery();
List<ItemReporteControleEstoqueBoletos> lsEstoque = new ArrayList<>() ;
while (rset2.next()) {
@ -265,11 +279,11 @@ 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.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') ");
}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 +363,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 +474,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') ");