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

fixes bug #10242 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@76683 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2017-11-22 19:27:52 +00:00
parent c757500c8d
commit ca8c279681
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
View File

@ -269,7 +269,8 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
.append("FROM CAJA C ") .append("FROM CAJA C ")
.append("INNER JOIN PUNTO_VENTA PV ON C.PUNTOVENTA_ID = PV.PUNTOVENTA_ID ") .append("INNER JOIN PUNTO_VENTA PV ON C.PUNTOVENTA_ID = PV.PUNTOVENTA_ID ")
.append("INNER JOIN MARCA M ON C.MARCA_ID = M.MARCA_ID ") .append("INNER JOIN MARCA M ON C.MARCA_ID = M.MARCA_ID ")
.append("WHERE PV.ACTIVO = 1 AND C.INDREIMPRESION = 0 ") .append("WHERE PV.ACTIVO = 1 ")
.append("AND ((C.INDSTATUSBOLETO = 'E' AND C.INDREIMPRESION = 1) OR C.INDREIMPRESION = 0 OR C.MOTIVOCANCELACION_ID = ?) ")
.append("AND C.FECCORTE BETWEEN TO_DATE(?, 'DD/MM/YYYY HH24:MI') AND TO_DATE(?, 'DD/MM/YYYY HH24:MI') "); .append("AND C.FECCORTE BETWEEN TO_DATE(?, 'DD/MM/YYYY HH24:MI') AND TO_DATE(?, 'DD/MM/YYYY HH24:MI') ");
if (parametros.containsKey("empresaId")) { if (parametros.containsKey("empresaId")) {
@ -285,6 +286,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
stmt = con.prepareStatement(sQuery.toString()); stmt = con.prepareStatement(sQuery.toString());
String dataIncial = (String) parametros.get("dataInicial"); String dataIncial = (String) parametros.get("dataInicial");
String dataFinal = (String) parametros.get("dataFinal"); String dataFinal = (String) parametros.get("dataFinal");
stmt.setInt(idxParametro++, Constantes.MVO_CANCEL_GERACAO_OCD.intValue());
stmt.setString(idxParametro++, dataIncial); stmt.setString(idxParametro++, dataIncial);
stmt.setString(idxParametro++, dataFinal); stmt.setString(idxParametro++, dataFinal);
if (parametros.containsKey("empresaId")) { if (parametros.containsKey("empresaId")) {