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

fixes bug #10013 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@75749 d1611594-4594-4d17-8e1d-87c2c4800839
master
walace 2017-10-26 20:08:09 +00:00
parent 172a4b7ab8
commit af4721ade1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -265,12 +265,12 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
StringBuilder sQuery = new StringBuilder()
.append("SELECT PV.PUNTOVENTA_ID AS \"puntoventaId\", PV.NUMPUNTOVENTA as \"numPuntoVenta\", ")
.append("PV.NOMBPUNTOVENTA as \"nombpuntoventa\", TO_DATE(C.FECHORVENTA, 'DD/MM/YY') as \"datamovimento\" ")
.append("PV.NOMBPUNTOVENTA as \"nombpuntoventa\", TO_DATE(C.FECCORTE, 'DD/MM/YY') as \"datamovimento\" ")
.append("FROM CAJA C ")
.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("WHERE PV.ACTIVO = 1 AND C.INDREIMPRESION = 0 ")
.append("AND C.FECHORVENTA 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")) {
sQuery.append("AND M.EMPRESA_ID = ? ");
@ -279,7 +279,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
sQuery.append("AND PV.PUNTOVENTA_ID = ? ");
}
sQuery.append("GROUP BY PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA, PV.NOMBPUNTOVENTA, TO_DATE(C.FECHORVENTA, 'DD/MM/YY') ");
sQuery.append("GROUP BY PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA, PV.NOMBPUNTOVENTA, TO_DATE(C.FECCORTE, 'DD/MM/YY') ");
int idxParametro = 1;
stmt = con.prepareStatement(sQuery.toString());