diff --git a/pom.xml b/pom.xml index 28bd4f35e..1157f7229 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.54.0 + 1.54.1 war diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java index 66d355a9d..726e57724 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java @@ -110,13 +110,23 @@ public class RelatorioEstoque extends Relatorio { sql.append(" coalesce(fp.FOLIOPREIMPRESO,dab.NUMFOLIOINICIAL) "); sql.append(" end ) AS forminicial,"); sql.append(" dab.NUMFOLIOFINAL AS formfinal, "); - sql.append(" CASE WHEN dab.STATUSOPERACION = 1 THEN fp.FOLIOPREIMPRESO ELSE "); - sql.append(" COALESCE((SELECT to_char(MAX(cd.numfoliopreimpreso)) FROM caja_diversos cd where cd.numseriepreimpresa = dab.numseriepreimpresa), "); - sql.append(" (SELECT TO_CHAR(MAX(c.numfoliopreimpreso)) FROM caja c WHERE ( c.numseriepreimpresa = dab.numseriepreimpresa OR "); - sql.append(" ( c.numseriepreimpresa IS NULL AND dab.numseriepreimpresa IS NULL ) ) AND to_number(c.numfoliopreimpreso) "); - sql.append(" BETWEEN dab.numfolioinicial AND dab.numfoliofinal AND ( c.indreimpresion = 0 OR ( c.indreimpresion = 1 AND c.indstatusboleto = 'E' ) ) "); - sql.append(" AND c.marca_id = m.marca_id), dab.NUMFOLIOINICIAL) "); - sql.append(" END as ultimoFolioCaja, "); + sql.append(" CASE "); + sql.append(" WHEN dab.STATUSOPERACION = 1 THEN fp.FOLIOPREIMPRESO "); + sql.append(" ELSE COALESCE( "); + sql.append(" "); + sql.append(" (SELECT TO_CHAR(MAX(c.numfoliopreimpreso)) "); + sql.append(" FROM caja c "); + sql.append(" WHERE (c.numseriepreimpresa = dab.numseriepreimpresa "); + sql.append(" OR (c.numseriepreimpresa IS NULL "); + sql.append(" AND dab.numseriepreimpresa IS NULL)) "); + sql.append(" AND to_number(c.numfoliopreimpreso) BETWEEN dab.numfolioinicial AND dab.numfoliofinal "); + sql.append(" AND (c.indreimpresion = 0 "); + sql.append(" OR (c.indreimpresion = 1 "); + sql.append(" AND c.indstatusboleto = 'E')) "); + sql.append(" AND c.marca_id = m.marca_id), (SELECT to_char(MAX(cd.numfoliopreimpreso)) "); + sql.append(" FROM caja_diversos cd "); + sql.append(" WHERE cd.numseriepreimpresa = dab.numseriepreimpresa), dab.NUMFOLIOINICIAL) "); + sql.append(" END AS ultimoFolioCaja, "); sql.append(" ar.articulo_id AS tipoventa,"); sql.append(" ar.descarticulo, "); sql.append(" est.nombestado ");