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

fixes bug#18669 

dev: Rodrigo
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@100979 d1611594-4594-4d17-8e1d-87c2c4800839
master
fabio 2020-03-27 14:39:40 +00:00
parent 583aa0793d
commit 28c6f3e20a
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamento.java
View File

@ -65,6 +65,7 @@ public abstract class RelatorioAgenciaFechamento extends Relatorio {
sql.append(" INNER JOIN marca m "); sql.append(" INNER JOIN marca m ");
sql.append(" ON m.marca_id = c.marca_id "); sql.append(" ON m.marca_id = c.marca_id ");
sql.append(" WHERE c.TURNO_ID IS NOT NULL "); sql.append(" WHERE c.TURNO_ID IS NOT NULL ");
sql.append(" AND c.ACTIVO = 1 ");
sql.append(" AND c.FECCORTE BETWEEN :de AND :ate "); sql.append(" AND c.FECCORTE BETWEEN :de AND :ate ");
if (puntoVenta != null && !puntoVenta.equals("-1")) { if (puntoVenta != null && !puntoVenta.equals("-1")) {
sql.append(" AND c.PUNTOVENTA_ID in (" + puntoVenta + ") "); sql.append(" AND c.PUNTOVENTA_ID in (" + puntoVenta + ") ");
@ -102,6 +103,7 @@ public abstract class RelatorioAgenciaFechamento extends Relatorio {
stmt.setTimestamp("ate", new java.sql.Timestamp(sdf.parse(fecFinal).getTime())); stmt.setTimestamp("ate", new java.sql.Timestamp(sdf.parse(fecFinal).getTime()));
ResultSet rset1 = stmt.executeQuery(); ResultSet rset1 = stmt.executeQuery();
rset1.setFetchSize(500);
while (rset1.next()) { while (rset1.next()) {

1
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaDiariaAgencia.java
View File

@ -710,6 +710,7 @@ public class RelatorioReceitaDiariaAgencia extends Relatorio {
sql.append(" AND TRUNC(CJ.FECHORVENTA) BETWEEN :DATA_INICIO AND :DATA_FINAL "); sql.append(" AND TRUNC(CJ.FECHORVENTA) BETWEEN :DATA_INICIO AND :DATA_FINAL ");
} }
sql.append(" AND CJ.ACTIVO = 1 ");
sql.append(" AND PR.PARADA_ID = PV.PARADA_ID "); sql.append(" AND PR.PARADA_ID = PV.PARADA_ID ");
sql.append(" (CJ.EMPRESAPUNTOVENTA_ID = EC.EMPRESA_ID OR CJ.EMPRESAPUNTOVENTA_ID = -1) "); sql.append(" (CJ.EMPRESAPUNTOVENTA_ID = EC.EMPRESA_ID OR CJ.EMPRESAPUNTOVENTA_ID = -1) ");
sql.append(" AND CJ.MARCA_ID = MC.MARCA_ID "); sql.append(" AND CJ.MARCA_ID = MC.MARCA_ID ");