From 9e3365bf64869517a1c8ce16c0072b1f92982f25 Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 23 Oct 2015 15:44:31 +0000
Subject: [PATCH] fixes bug #6688

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@49373 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/ConferenciaComissaoDAO.java           |  2 +-
 .../ConferenciaComissaoHibernateDAO.java      | 13 +++++++--
 .../ventaboletos/entidad/Conferencia.java     | 27 +++++++++++++------
 .../ventaboletos/entidad/Empresa.java         | 10 +++++++
 .../service/ConferenciaComissaoService.java   |  2 +-
 .../impl/ConferenciaComissaoServiceImpl.java  |  4 +--
 6 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/ConferenciaComissaoDAO.java b/src/com/rjconsultores/ventaboletos/dao/ConferenciaComissaoDAO.java
index b5af9df01..1297e20a8 100644
--- a/src/com/rjconsultores/ventaboletos/dao/ConferenciaComissaoDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/ConferenciaComissaoDAO.java
@@ -41,7 +41,7 @@ public interface ConferenciaComissaoDAO extends GenericDAO<Conferencia, Long> {
 
 	public Conferencia reabrirMovimentoDiario(Conferencia conferencia) throws BusinessException;
 	
-	public Conferencia obtenerConferenciaDataMovimento(Date datamovimento) throws BusinessException;
+	public Conferencia obtenerConferenciaDataMovimento(Date datamovimento, Integer puntoventaId, Integer empresaId) throws BusinessException;
 	
 	public List<LogConferencia> carregarLogConferencia(Long conferenciaId) throws BusinessException;
 	
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
index dfab4a1ca..a4de2601b 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
@@ -554,6 +554,11 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 			if(parametros.containsKey("puntoventaId")) {
 				sQuery.append("AND B.PUNTOVENTA_ID = :puntoventaId ");
 			}
+
+			if(StringUtils.isNotBlank(conferencia.getNumfoliosistema())) {
+				sQuery.append("AND B.NUMFOLIOSISTEMA = :numfoliosistema ");
+				parametros.put("numfoliosistema", conferencia.getNumfoliosistema());
+			}
 			
 			if(BoletoStatusComissao.BOLETOS.equals(boletoStatusComissao)) {
 				sQuery.append("AND B.TIPOVENTA_ID NOT IN (:tipoVenta) ")
@@ -665,17 +670,21 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 	}
 
 	@Override
-	public Conferencia obtenerConferenciaDataMovimento(Date datamovimento) throws BusinessException {
+	public Conferencia obtenerConferenciaDataMovimento(Date datamovimento, Integer puntoventaId, Integer empresaId) throws BusinessException {
 		try {
 			StringBuilder sQuery = new StringBuilder();
 			sQuery.append("SELECT DISTINCT co ")
 				  .append("FROM Conferencia co ")
 				  .append("WHERE co.activo = 1 ")
-				  .append("AND co.datamovimento = :datamovimento ");
+				  .append("AND co.datamovimento = :datamovimento ")
+				  .append("AND co.empresa.empresaId = :empresaId ")
+				  .append("AND co.puntoVenta.puntoventaId = :puntoventaId ");
 			
 			log.info(sQuery.toString());
 			Query qr = getSession().createQuery(sQuery.toString());
 			qr.setParameter("datamovimento", datamovimento);
+			qr.setParameter("empresaId", empresaId);
+			qr.setParameter("puntoventaId", puntoventaId);
 			qr.setMaxResults(1);
 			return (Conferencia) qr.uniqueResult();
 			
diff --git a/src/com/rjconsultores/ventaboletos/entidad/Conferencia.java b/src/com/rjconsultores/ventaboletos/entidad/Conferencia.java
index f79fefc4e..ccd629846 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/Conferencia.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/Conferencia.java
@@ -71,6 +71,9 @@ public class Conferencia implements Serializable {
 	@Transient
 	private CoresConferencia cor;
 	
+	@Transient
+	private String numfoliosistema;
+	
 	public Conferencia() {
 		super();
 		this.indboletogerado = Boolean.FALSE;
@@ -152,14 +155,6 @@ public class Conferencia implements Serializable {
 		this.empresa = empresa;
 	}
 
-	public boolean isActivo() {
-		return activo;
-	}
-
-	public void setActivo(boolean activo) {
-		this.activo = activo;
-	}
-
 	public Date getFecmodif() {
 		return fecmodif;
 	}
@@ -207,4 +202,20 @@ public class Conferencia implements Serializable {
 		this.cor = cor;
 	}
 
+	public Boolean getActivo() {
+		return activo;
+	}
+
+	public void setActivo(Boolean activo) {
+		this.activo = activo;
+	}
+
+	public String getNumfoliosistema() {
+		return numfoliosistema;
+	}
+
+	public void setNumfoliosistema(String numfoliosistema) {
+		this.numfoliosistema = numfoliosistema;
+	}
+
 }
diff --git a/src/com/rjconsultores/ventaboletos/entidad/Empresa.java b/src/com/rjconsultores/ventaboletos/entidad/Empresa.java
index 3e141489e..21b2e1578 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/Empresa.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/Empresa.java
@@ -91,6 +91,8 @@ public class Empresa implements Serializable {
 	private List<EmpresaImposto> empresaImpostoList;
 	@Column(name = "NUMTELEFONO")
 	private String numtelefono;
+	@Column(name = "INDCARBOLETOSDEVOLVIDOSCONF")
+	private Boolean indcarboletosdevolvidosconf;
 
 	@OneToMany(mappedBy = "empresa")
 	private List<InscricaoEstadual> inscricoesEstaduais;
@@ -377,5 +379,13 @@ public class Empresa implements Serializable {
 
 	public void setEmpresaContaBancaria(List<EmpresaContaBancaria> empresaContaBancaria) {
 		this.empresaContaBancaria = empresaContaBancaria;
+	}
+
+	public Boolean getIndcarboletosdevolvidosconf() {
+		return indcarboletosdevolvidosconf;
+	}
+
+	public void setIndcarboletosdevolvidosconf(Boolean indcarboletosdevolvidosconf) {
+		this.indcarboletosdevolvidosconf = indcarboletosdevolvidosconf;
 	}	
 }
\ No newline at end of file
diff --git a/src/com/rjconsultores/ventaboletos/service/ConferenciaComissaoService.java b/src/com/rjconsultores/ventaboletos/service/ConferenciaComissaoService.java
index 69e0391fc..2cd82d949 100644
--- a/src/com/rjconsultores/ventaboletos/service/ConferenciaComissaoService.java
+++ b/src/com/rjconsultores/ventaboletos/service/ConferenciaComissaoService.java
@@ -41,6 +41,6 @@ public interface ConferenciaComissaoService extends GenericService<Conferencia,
 	
 	public Conferencia reabrirMovimentoDiario(Conferencia conferencia) throws BusinessException;
 	
-	public Conferencia obtenerConferenciaDataMovimento(Date datamovimento) throws BusinessException;
+	public Conferencia obtenerConferenciaDataMovimento(Date datamovimento, Integer puntoventaId, Integer empresaId) throws BusinessException;
 
 }
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
index ee15b7c32..d3be3da54 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
@@ -130,8 +130,8 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
 	}
 
 	@Override
-	public Conferencia obtenerConferenciaDataMovimento(Date datamovimento) throws BusinessException {
-		return conferenciaComissaoDAO.obtenerConferenciaDataMovimento(datamovimento);
+	public Conferencia obtenerConferenciaDataMovimento(Date datamovimento, Integer puntoventaId, Integer empresaId) throws BusinessException {
+		return conferenciaComissaoDAO.obtenerConferenciaDataMovimento(datamovimento, puntoventaId, empresaId);
 	}
 
 }