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

Conforme solicitação do cliente, foi retirado o agrupamento dos bilhetes 

fixes bug#10842
dev:julio
qua:renato

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@81196 d1611594-4594-4d17-8e1d-87c2c4800839
master
walace 2018-04-19 20:33:21 +00:00
parent 271402aac2
commit 6d79a7f972
1 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java
View File

@ -53,29 +53,23 @@ public class RelatorioBilhetesVendidosNovoLayout extends Relatorio {
sql.append(" t.forminicial,");
sql.append(" t.formfinal,");
sql.append(" t.serie,");
sql.append(" sum(t.preciopagado) AS valorcontabil,");
sql.append(" sum(t.preciopagado - (t.preciopagado * coalesce(t.porcredbaseicms / 100,0)))AS valorbasecalculo,");
sql.append(" t.preciopagado AS valorcontabil,");
sql.append(" t.preciopagado - (t.preciopagado * coalesce(t.porcredbaseicms / 100,0))AS valorbasecalculo,");
sql.append(" t.valoraliquiotaicms,");
sql.append(" sum( ((t.preciopagado - (t.preciopagado * coalesce(t.porcredbaseicms / 100,0))) * t.icms) / 100) AS valoricms ");
sql.append(" ((t.preciopagado - (t.preciopagado * coalesce(t.porcredbaseicms / 100,0))) * t.icms) / 100 AS valoricms ");
sql.append("from");
sql.append(" (select distinct est.icms,");
sql.append(" c.preciopagado,");
sql.append(" est.cveestado as cveestado,");
sql.append(" ei.porcredbaseicms,");
sql.append(" c.fechorventa as datavenda,");
sql.append(" c.indstatusboleto statuspassagem,");
sql.append(" ae.decespecie as especie,");
sql.append(" (select min(numfoliosistema) as maximo");
sql.append(" from boleto e");
sql.append(" where e.numoperacion = c.numoperacion) as forminicial,");
sql.append(" (select max(numfoliosistema) as maximo");
sql.append(" from boleto e");
sql.append(" where e.numoperacion = c.numoperacion) as formfinal,");
sql.append(" c.numfoliosistema as forminicial,");
sql.append(" c.numfoliosistema as formfinal,");
sql.append(" c.numseriepreimpresa as serie,");
sql.append(" c.preciopagado as valorcontabil,");
sql.append(" est.icms as valoraliquiotaicms,");
sql.append(" (select sum(c.preciopagado) as preciopagado");
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(" est.icms as valoraliquiotaicms");
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)");
@ -107,15 +101,6 @@ public class RelatorioBilhetesVendidosNovoLayout extends Relatorio {
}
}
sql.append(") t ");
sql.append("group by ");
sql.append("t.cveestado, ");
sql.append("to_char(t.dataVenda, 'dd/MM/yy'), ");
sql.append("t.statuspassagem, ");
sql.append("t.especie, ");
sql.append("t.forminicial, ");
sql.append("t.formfinal, ");
sql.append("t.serie, ");
sql.append("t.valoraliquiotaicms ");
sql.append("order by t.cveestado, to_char(t.dataVenda, 'dd/MM/yy') ");
NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql.toString());