From 314401bbf3ba8d07beffca5cede1819b5e0511ca Mon Sep 17 00:00:00 2001 From: frederico Date: Thu, 7 Dec 2017 12:06:13 +0000 Subject: [PATCH] fixed bug #10252 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@77043 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioEstoque.java | 5 +- .../templates/RelatorioEstoque.jasper | Bin 33050 -> 32809 bytes .../templates/RelatorioEstoque.jrxml | 64 +++++++++--------- 3 files changed, 35 insertions(+), 34 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java index 4c3b5b803..c6b949430 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java @@ -36,7 +36,7 @@ public class RelatorioEstoque extends Relatorio { dataResult.put("forminicio", rset.getString("forminicial")); dataResult.put("formfinal", rset.getString("formfinal")); dataResult.put("estado", rset.getString("nombestado")); - dataResult.put("descestacion", rset.getString("estacao")); + dataResult.put("tipo", rset.getString("tipo")); this.dados.add(dataResult); } @@ -51,13 +51,14 @@ public class RelatorioEstoque extends Relatorio { private String getSql() { StringBuilder sql = new StringBuilder(); - sql.append(" select dab.aidf_id as aidf, e.nombempresa, p.nombpuntoventa, dab.NUMSERIEPREIMPRESA as serie, es.descestacion as estacao, "); + sql.append(" select dab.aidf_id as aidf, e.nombempresa, p.nombpuntoventa, dab.NUMSERIEPREIMPRESA as serie, es.descestacion as estacao, tp.desctipo as tipo, "); sql.append(" case when dab.STATUSOPERACION = 0 then dab.NUMFOLIOINICIAL else coalesce(fp.FOLIOPREIMPRESO,dab.NUMFOLIOINICIAL) end as forminicial, dab.NUMFOLIOFINAL as formfinal, "); sql.append(" est.nombestado, ar.descarticulo "); sql.append(" from abasto_boleto ab "); sql.append(" inner join empresa e on e.empresa_id = ab.empresa_id and ab.ACTIVO = 1 "); sql.append(" inner join det_abasto_boleto dab on dab.abastoboleto_id = ab.abastoboleto_id and dab.ACTIVO = 1 "); sql.append(" inner join punto_venta p on p.puntoventa_id = ab.puntoventa_id and p.ACTIVO = 1 "); + sql.append(" left join TIPO_PTOVTA tp on tp.TIPOPTOVTA_ID = p.TIPOPTOVTA_ID and tp.ACTIVO = 1 "); sql.append(" inner join estacion es on es.ESTACION_ID = ab.ESTACION_ID "); sql.append(" inner join ARTICULO ar on ar.ARTICULO_ID = ab.ARTICULO_ID "); sql.append(" left join FOLIO_PREIMPRESO fp on fp.AIDF_ID = dab.AIDF_ID and fp.EMPRESA_ID = e.EMPRESA_ID and fp.ESTACION_ID = ab.ESTACION_ID and fp.activo = 1 "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstoque.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstoque.jasper index cfe8a90765d47a71df8bf66712f60cd33d3e2fa1..95809d320b480513a571add1045d6a718dce9dd7 100644 GIT binary patch delta 6661 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 delta 7000 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 j&e%TkV~nGeuKsA6V*jgYVU&u@|M0qh - + @@ -23,7 +23,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -39,14 +39,14 @@ - + - + @@ -54,10 +54,10 @@ - + - + @@ -65,7 +65,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -81,10 +81,10 @@ - + - + @@ -95,66 +95,66 @@ - + - + - + - + - + - + - + - + - + - + @@ -165,14 +165,14 @@ - + - + @@ -180,28 +180,28 @@ - + - + - + - + - + @@ -209,7 +209,7 @@ - + @@ -217,14 +217,14 @@ - + - + @@ -238,7 +238,7 @@ - +