fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug #8849 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@67792 d1611594-4594-4d17-8e1d-87c2c4800839
master
eduardo.dicarde 2017-04-05 21:43:50 +00:00
parent c5fc8bbf2d
commit ef9dc7468c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAidf.java
View File

@ -50,21 +50,23 @@ public class RelatorioAidf extends Relatorio {
StringBuilder sql = new StringBuilder(); StringBuilder sql = new StringBuilder();
sql.append(" select a.aidf_id as aidf, e.nombempresa, p.nombpuntoventa, a.serie, "); 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(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(" from aidf a ");
sql.append(" inner join empresa e on e.empresa_id = a.empresa_id "); 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 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 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))"); 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){ if(parametros.get("EMPRESA_ID") != null){
sql.append(" and a.empresa_id = ").append(parametros.get("EMPRESA_ID")); sql.append(" and a.empresa_id = ").append(parametros.get("EMPRESA_ID"));
} }
if(parametros.get("SERIE") != null){ 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(" 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"); sql.append(" order by a.aidf_id");
return sql.toString(); return sql.toString();