diff --git a/pom.xml b/pom.xml index e2826f37d..5b8065477 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 br.com.rjconsultores ModelWeb - 1.103.1 + 1.103.2 diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java index 91228fde8..d68988751 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java @@ -708,14 +708,25 @@ public class CajaHibernateDAO extends GenericHibernateDAO implemen @Override public String validarEstoqueUtilizado(Aidf aidf, String folioInicial, String folioFinal) { StringBuilder sql = new StringBuilder(); - sql.append(" SELECT coalesce(min( numfoliosistema), '0') "); + sql.append(" SELECT tb.folio from ( "); + sql.append(" SELECT coalesce(min( numfoliopreimpreso), '0') as folio "); sql.append(" FROM caja "); sql.append(" where activo = 1 "); sql.append(" and numseriepreimpresa = :serie "); - sql.append(" and numfoliosistema between :folioInicial and :folioFinal "); + sql.append(" and numfoliopreimpreso between :folioInicial and :folioFinal "); + sql.append(" union all "); + sql.append(" SELECT coalesce(min( numfoliopreimpreso), '0') as folio "); + sql.append(" FROM caja "); + sql.append(" where activo = 1 "); + sql.append(" and numseriepreimpresa = :serie "); + sql.append(" and numfoliopreimpreso between :folioInicial and :folioFinal "); + sql.append(" )tb "); + sql.append(" where tb.folio > 0 "); + sql.append(" group by tb.folio "); + SQLQuery query = getSession().createSQLQuery(sql.toString()); - query.setString("serie", aidf.getSerie()); + query.setString("serie", aidf.obterSerieSubserieFormatada()); query.setString("folioInicial", folioInicial); query.setString("folioFinal", folioFinal); return (String)query.uniqueResult();