diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioConferenciaFormularioFisico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioConferenciaFormularioFisico.java index 6bb2a4393..fa49a1353 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioConferenciaFormularioFisico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioConferenciaFormularioFisico.java @@ -26,7 +26,9 @@ public class RelatorioConferenciaFormularioFisico extends Relatorio { private String getSql(Integer puntoventaId, Integer tipoventaId) { StringBuffer sql = new StringBuffer(); - sql.append("select distinct t1.*, t2.numfoliosistema as minlogico, t3.numfoliosistema as maxlogico "); + sql.append("select t1.ter,t1.caixa,t1.serie,t1.usuario,t1.turno,t1.abertura,t1.fechamento, "); + sql.append("t1.minfisico,t1.maxfisico,t1.dif1,t1.total, "); + sql.append("min(to_number(t2.numfoliosistema)) as minlogico, max(to_number(t3.numfoliosistema)) as maxlogico "); sql.append("from "); sql.append("(select "); sql.append(" e.numcaja as ter, "); @@ -36,9 +38,9 @@ public class RelatorioConferenciaFormularioFisico extends Relatorio { sql.append(" t.turno_id as turno, "); sql.append(" min(c.fechorventa) as abertura, "); sql.append(" max(c.fechorventa) as fechamento, "); - sql.append(" min(c.numfoliopreimpreso) as minfisico, "); - sql.append(" max(c.numfoliopreimpreso) as maxfisico, "); - sql.append(" (max(c.numfoliopreimpreso) + 1) - min(c.numfoliopreimpreso) as dif1, "); + sql.append(" min(to_number(c.numfoliopreimpreso)) as minfisico, "); + sql.append(" max(to_number(c.numfoliopreimpreso)) as maxfisico, "); + sql.append(" (max(to_number(c.numfoliopreimpreso)) + 1) - min(to_number(c.numfoliopreimpreso)) as dif1, "); sql.append(" count(case when (c.indreimpresion = 1 and c.indstatusboleto = 'E') then -1 else 1 end) as total "); sql.append("from "); sql.append(" caja c "); @@ -63,7 +65,7 @@ public class RelatorioConferenciaFormularioFisico extends Relatorio { sql.append(" c.numseriepreimpresa, "); sql.append(" u.cveusuario || ' - ' || u.nombusuario, "); sql.append(" t.turno_id "); - sql.append("having min(c.numfoliopreimpreso) > 0 "); + sql.append("having min(to_number(c.numfoliopreimpreso)) > 0 "); sql.append("order by "); sql.append(" u.nombusuario, min(c.fechorventa)) t1 "); sql.append("inner join (select numfoliosistema, numfoliopreimpreso, numseriepreimpresa from caja) t2 on t1.minfisico = t2.numfoliopreimpreso and t1.serie = t2.numseriepreimpresa "); @@ -73,7 +75,8 @@ public class RelatorioConferenciaFormularioFisico extends Relatorio { if (tipoventaId != null) { sql.append("where abb.articulo_id = " + tipoventaId); } - sql.append(" order by t1.caixa, t2.numfoliosistema, t3.numfoliosistema "); + sql.append(" group by t1.ter,t1.caixa,t1.serie,t1.usuario,t1.turno,t1.abertura,t1.fechamento, t1.minfisico,t1.maxfisico,t1.dif1,t1.total "); + sql.append(" order by t1.caixa, min(to_number(t2.numfoliosistema)), max(to_number(t3.numfoliosistema)) "); return sql.toString(); }