From ef9dc7468c2f30e4c9adade62cfcbb74072db4e6 Mon Sep 17 00:00:00 2001 From: "eduardo.dicarde" Date: Wed, 5 Apr 2017 21:43:50 +0000 Subject: [PATCH] fixes bug #8849 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@67792 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../ventaboletos/relatorios/impl/RelatorioAidf.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAidf.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAidf.java index 0d080682b..8c886e76d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAidf.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAidf.java @@ -50,21 +50,23 @@ public class RelatorioAidf extends Relatorio { StringBuilder sql = new StringBuilder(); sql.append(" select a.aidf_id as aidf, e.nombempresa, p.nombpuntoventa, a.serie, "); sql.append(" concat(a.forminicial, concat('-',a.formfinal)) as numeracao,"); - sql.append(" concat(dab.numfolioinicial,concat('-',dab.numfoliofinal)) as folios "); + sql.append(" concat(fp.foliopreimpreso,concat('-',dab.numfoliofinal)) as folios "); sql.append(" from aidf a "); sql.append(" inner join empresa e on e.empresa_id = a.empresa_id "); sql.append(" inner join abasto_boleto ab on a.empresa_id = ab.empresa_id "); sql.append(" inner join det_abasto_boleto dab on dab.abastoboleto_id = ab.abastoboleto_id "); - sql.append(" inner join punto_venta p on p.puntoventa_id = ab.puntoventa_id "); + sql.append(" inner join punto_venta p on p.puntoventa_id = ab.puntoventa_id "); + sql.append(" inner join folio_preimpreso fp on (a.serie=fp.numeserie or concat(a.aidf_id, concat(a.serie,a.subserie))=fp.numeserie)"); sql.append("where (case when (length(dab.numseriepreimpresa) < 3) then '0' else substr(dab.numseriepreimpresa,0,3) end) = cast(a.aidf_id as varchar(10))"); if(parametros.get("EMPRESA_ID") != null){ sql.append(" and a.empresa_id = ").append(parametros.get("EMPRESA_ID")); } if(parametros.get("SERIE") != null){ - sql.append(" and a.serie ='").append(parametros.get("SERIE")).append("'"); + sql.append(" and (a.serie ='").append(parametros.get("SERIE")).append("'"); + sql.append(" or concat(a.aidf_id, concat(a.SERIE,a.SUBSERIE))='").append(parametros.get("SERIE")).append("')"); } sql.append(" group by a.aidf_id, e.nombempresa, p.nombpuntoventa, a.serie, concat(a.forminicial, concat('-',a.formfinal)), "); - sql.append(" concat(dab.numfolioinicial,concat('-',dab.numfoliofinal)) "); + sql.append(" concat(fp.foliopreimpreso,concat('-',dab.numfoliofinal)) "); sql.append(" order by a.aidf_id"); return sql.toString();