From 82c1d7d30a857908d2474619a728040759ba594b Mon Sep 17 00:00:00 2001 From: wilian Date: Fri, 21 Jul 2017 20:22:08 +0000 Subject: [PATCH] fixes bug #9157 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@71756 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioConferenciaFormularioFisico.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioConferenciaFormularioFisico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioConferenciaFormularioFisico.java index eda73e937..ba8a1777d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioConferenciaFormularioFisico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioConferenciaFormularioFisico.java @@ -59,6 +59,7 @@ public class RelatorioConferenciaFormularioFisico extends Relatorio { sql.append(" and c.motivocancelacion_id is null "); sql.append(" and c.numfoliopreimpreso is not null "); sql.append(" and c.numfoliosistema is not null "); + sql.append(" and ((c.indstatusboleto = 'E' and c.indreimpresion = 1) or c.indreimpresion = 0) "); sql.append("group by "); sql.append(" e.numcaja, "); sql.append(" p.nombpuntoventa, "); @@ -68,8 +69,8 @@ public class RelatorioConferenciaFormularioFisico extends Relatorio { 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 "); - sql.append("inner join (select numfoliosistema, numfoliopreimpreso, numseriepreimpresa from caja) t3 on t1.maxfisico = t3.numfoliopreimpreso and t1.serie = t3.numseriepreimpresa "); + sql.append("inner join (select numfoliosistema, numfoliopreimpreso, numseriepreimpresa from caja where ((indstatusboleto = 'E' and indreimpresion = 1) or indreimpresion = 0)) t2 on t1.minfisico = t2.numfoliopreimpreso and t1.serie = t2.numseriepreimpresa "); + sql.append("inner join (select numfoliosistema, numfoliopreimpreso, numseriepreimpresa from caja where ((indstatusboleto = 'E' and indreimpresion = 1) or indreimpresion = 0)) t3 on t1.maxfisico = t3.numfoliopreimpreso and t1.serie = t3.numseriepreimpresa "); sql.append("inner join det_abasto_boleto dab on t1.minfisico between dab.numfolioinicial and dab.numfoliofinal and dab.numseriepreimpresa = t1.serie "); sql.append("inner join abasto_boleto abb on abb.abastoboleto_id = dab.abastoboleto_id "); if (tipoventaId != null) {