fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug #8977 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@69871 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2017-06-12 19:59:03 +00:00
parent 23f85dffb8
commit fa495453ea
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java
View File

@ -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 ");