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

Correção de produto cartesiano no relatorio de deposito fix bug#AL-2743 

Reviewed-on: adm/VentaBoletosAdm#193
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
master 1.7.11
fabio 2023-06-13 17:51:21 +00:00
parent 94600df3f6 cb47673ac1
commit 5752885f80
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId> <artifactId>ventaboletosadm</artifactId>
<version>1.7.10</version> <version>1.7.11</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java
View File

@ -141,7 +141,6 @@ public class RelatorioDepositos extends Relatorio {
@Override @Override
protected void processaParametros() throws Exception { protected void processaParametros() throws Exception {
// TODO document why this method is empty
} }
private String getSQL(Integer puntoVentaId, Integer empresaId, boolean filtrarPendentes) { private String getSQL(Integer puntoVentaId, Integer empresaId, boolean filtrarPendentes) {
@ -192,7 +191,10 @@ public class RelatorioDepositos extends Relatorio {
sql.append(" LEFT JOIN FECHAMENTO_DEPOSITO fdp "); sql.append(" LEFT JOIN FECHAMENTO_DEPOSITO fdp ");
sql.append(" ON fdp.FECHAMENTODEPOSITO_ID = fd.FECHAMENTODEPOSITO_ID "); sql.append(" ON fdp.FECHAMENTODEPOSITO_ID = fd.FECHAMENTODEPOSITO_ID ");
sql.append(" AND fdp.activo = 1 "); sql.append(" AND fdp.activo = 1 ");
sql.append(" INNER JOIN fechamento_paramptovta fptovta on (fptovta.PUNTOVENTA_ID = F.puntoventa_id and fptovta.empresa_id = F.empresa_id) "); sql.append(" INNER JOIN fechamento_paramptovta fptovta ");
sql.append(" ON fptovta.PUNTOVENTA_ID = F.puntoventa_id ");
sql.append(" AND fptovta.empresa_id = F.empresa_id ");
sql.append(" AND fptovta.activo = 1 ");
sql.append(" WHERE f.fecfechamento BETWEEN :fecInicio AND :fecFinal "); sql.append(" WHERE f.fecfechamento BETWEEN :fecInicio AND :fecFinal ");
sql.append(" AND f.activo = 1 "); sql.append(" AND f.activo = 1 ");
sql.append(" AND fptovta.TIPOPAGAMENTO = 'D' "); sql.append(" AND fptovta.TIPOPAGAMENTO = 'D' ");