diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java index 178d57402..e137d6e65 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java @@ -28,8 +28,32 @@ public class RelatorioEstoque extends Relatorio { while (rset.next()) { Map dataResult = new HashMap(); - String formInicio = rset.getString("tipoVenta").equals(EnumTipoVenda.TPV_MANUAL.getId().toString()) ? - (rset.getString("ultimoFolioCaja") != null ? rset.getString("ultimoFolioCaja") : rset.getString("forminicial")) : rset.getString("forminicial"); + String tipoVenta = rset.getString("tipoVenta"); + String formfinal = rset.getString("formfinal"); + + String formInicio = rset.getString("forminicial"); + if (tipoVenta.equals(EnumTipoVenda.TPV_MANUAL.getId().toString())) { + + String ultimoFolioCaja = rset.getString("ultimoFolioCaja"); + + boolean isFormularioMaior = false; + try { + int ultimoFolioCajaInt = Integer.parseInt(ultimoFolioCaja); + int formfinalInt = Integer.parseInt(formfinal); + + if (ultimoFolioCaja != null && ultimoFolioCajaInt > formfinalInt) { + isFormularioMaior = true; + } + + } catch (Exception e) { + } + + if (isFormularioMaior) { + formInicio = formfinal; + } else { + formInicio = ultimoFolioCaja != null ? ultimoFolioCaja : formInicio; + } + } dataResult.put("aidf", rset.getString("aidf")); dataResult.put("empresa", rset.getString("nombempresa")); @@ -37,7 +61,7 @@ public class RelatorioEstoque extends Relatorio { dataResult.put("agencia", rset.getString("nombpuntoventa")); dataResult.put("serie", rset.getString("serie")); dataResult.put("forminicio", formInicio); - dataResult.put("formfinal", rset.getString("formfinal")); + dataResult.put("formfinal", formfinal); dataResult.put("estado", rset.getString("nombestado")); dataResult.put("tipo", rset.getString("tipo")); this.dados.add(dataResult); @@ -60,7 +84,7 @@ public class RelatorioEstoque extends Relatorio { sql.append(" dab.NUMSERIEPREIMPRESA AS serie, "); sql.append(" es.descestacion AS estacao, "); sql.append(" tp.desctipo AS tipo, "); - + sql.append(" ( case "); sql.append(" when "); sql.append(" dab.STATUSOPERACION = 0 "); @@ -70,7 +94,7 @@ 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(" ( SELECT "); sql.append(" MAX(to_number(c.numfoliopreimpreso)) + 1 AS numfoliopreimpreso"); sql.append(" FROM Caja c");