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

fixed bug #9348 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@73632 d1611594-4594-4d17-8e1d-87c2c4800839
master
frederico 2017-09-08 20:47:09 +00:00
parent fbab43f030
commit d47697a625
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -267,7 +267,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
.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 ")
.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') ");
if (parametros.containsKey("empresaId")) {
@ -333,7 +333,10 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
private void processarQueryConferenciaComissao(List<ConferenciaComissaoVO> lsQuery,
List<ConferenciaComissaoVO> lsConferencias, String competencia, Date dataMovimento, Date dataInicial, Date dataFinal) throws ParseException {
Set<Integer> diasSemMovimentos = DateUtil.carregarDiasCompetencia(competencia, dataMovimento);
Set<Integer> diasSemMovimentos = new TreeSet<Integer>() ;
if (dataMovimento != null) {
DateUtil.carregarDiasCompetencia(competencia, dataMovimento);
}
for (ConferenciaComissaoVO conferenciaComissaoMovimentoDiario : lsQuery) {
ConferenciaComissaoVO conferenciaComissao = new ConferenciaComissaoVO();