diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioConferenciaFormularioFisico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioConferenciaFormularioFisico.java index d1d29d1a2..2362257f2 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioConferenciaFormularioFisico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioConferenciaFormularioFisico.java @@ -96,17 +96,17 @@ public class RelatorioConferenciaFormularioFisico extends Relatorio { formulario.setAbertura(rs.getDate(6)); formulario.setBilheteFisicoAbertura(rs.getInt(8)); formulario.setBilheteFisicoFechamento(rs.getInt(9)); - formulario.setBilheteLogicoAbertura(rs.getInt(10)); - formulario.setBilheteLogicoFechamento(rs.getInt(11)); + formulario.setDif1(rs.getInt(10)); + formulario.setBilheteLogicoAbertura(rs.getInt(11)); + formulario.setBilheteLogicoFechamento(rs.getInt(12)); + formulario.setDif2(rs.getInt(13)); formulario.setCaixa(rs.getString(2)); formulario.setFechamento(rs.getDate(7)); formulario.setSerie(rs.getString(3)); formulario.setTerminal(rs.getInt(1)); formulario.setTurno(rs.getInt(5)); formulario.setUsuario(rs.getString(4)); - formulario.setDif1(rs.getInt(9) - rs.getInt(8)); - formulario.setDif2(rs.getInt(11) - rs.getInt(10)); - formulario.setTotal(rs.getInt(11) - rs.getInt(10)); + formulario.setTotal(rs.getInt(13)); formularios.add(formulario); } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioConferenciaFormularioFisico.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioConferenciaFormularioFisico.jasper index 71ca43668..5a994266e 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioConferenciaFormularioFisico.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioConferenciaFormularioFisico.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioConferenciaFormularioFisico.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioConferenciaFormularioFisico.jrxml index 014438442..ba7a85578 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioConferenciaFormularioFisico.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioConferenciaFormularioFisico.jrxml @@ -1,7 +1,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -264,7 +264,7 @@ - + @@ -278,42 +278,42 @@ - + - + - + - + - + - +