diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java index 7f374849e..e01b95f30 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java @@ -6,7 +6,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -2585,8 +2584,9 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO } PreparedStatement ps = connection.prepareStatement(sql); + ps.setLong(1, Long.valueOf(empresaId)); + if (isECF) { - ps.setLong(1, Long.valueOf(empresaId)); ps.setString(2, DateUtil.getStringDate(inicio, DATE_FORMAT_FISCAL)); ps.setString(3, DateUtil.getStringDate(fim, DATE_FORMAT_FISCAL)); } else { @@ -2638,7 +2638,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO if (isECF) { brp.setEcf(rs.getString("ecf")); brp.setDatamov(rs.getString("datamov")); - brp.setCoo(rs.getString("coo")); + brp.setCoo(rs.getString("cooredz")); brp.setCcf(rs.getString("ccf")); brp.setTotalFiscal(rs.getString("totalFiscal")); brp.setEstadoImpressora(rs.getString("estadoImpressora")); @@ -2785,8 +2785,10 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sql.append(" r4.coo as coo, "); sql.append(" r4.contador as ccf, "); sql.append(" r4.impsubtotal as totalFiscal, "); + sql.append(" r2.coo as cooredz, "); sql.append(" epv.cveestado as estadoImpressora "); sql.append("from fiscal_r4 r4 "); + sql.append(" join fiscal_r2 r2 on r4.numserie20 = r2.numserie20 and r4.datamov = r2.datamov "); sql.append(" join boleto b on b.boleto_id = r4.boleto_id "); sql.append(" join marca m on b.marca_id = m.marca_id "); sql.append(" join empresa e on e.empresa_id = m.empresa_id ");