From 427ec486bf9ec6d394aef723a01f2fc1bd4bc656 Mon Sep 17 00:00:00 2001 From: julio Date: Wed, 2 Jan 2019 19:53:12 +0000 Subject: [PATCH] fixes bug#13081 dev:julio qua:julio git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@88446 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../ventaboletos/dao/hibernate/FiscalHibernateDAO.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java index 81f9a18ea..fb4097a9f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java @@ -422,7 +422,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sql.append(" (t2.cnpj in "); sql.append(" (select TRANSLATE(cnpj, ' / - . ', ' ') from inscricao_estadual where empresa_id = ? and activo = 1 )) "); sql.append(" inner join inscricao_estadual ie ON e.empresa_id = ie.empresa_id, "); - sql.append(" (SELECT numserie20, crz, totgeral "); + sql.append(" (SELECT numserie20, datamov, crz, totgeral "); sql.append(" FROM fiscal_r2) anterior "); sql.append("WHERE r2.datamov BETWEEN ? AND ? "); sql.append(" AND r2.activo = 1 "); @@ -431,7 +431,8 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sql.append(" AND r3.totparcial not in ("); sql.append("'" + SituacaoTributaria.NAO_FISCAL.getValue() + "'").append(")"); sql.append(" AND anterior.numserie20 = r2.numserie20 "); - sql.append(" AND anterior.crz = r2.crz - 1 "); + sql.append(" AND anterior.datamov = r2.datamov - 1 "); + sql.append(" AND to_number(anterior.crz) = to_number(r2.crz) - 1 "); sql.append(" AND r2.vendabrutadiaria > 0 "); sql.append("GROUP BY r2.datamov, "); sql.append(" r2.numreducoes, ");