From d2750eb2c7e60996a3b503acc8de7c3f1789f049 Mon Sep 17 00:00:00 2001
From: edgar <edgar@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 30 Jun 2017 20:29:33 +0000
Subject: [PATCH] fixes bug #9065

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@70900 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../ventaboletos/dao/ConferenciaComissaoDAO.java          | 2 ++
 .../dao/hibernate/ConferenciaComissaoHibernateDAO.java    | 8 ++++++++
 .../ventaboletos/service/ConferenciaComissaoService.java  | 2 ++
 .../service/impl/ConferenciaComissaoServiceImpl.java      | 5 +++++
 4 files changed, 17 insertions(+)

diff --git a/src/com/rjconsultores/ventaboletos/dao/ConferenciaComissaoDAO.java b/src/com/rjconsultores/ventaboletos/dao/ConferenciaComissaoDAO.java
index bed3bd6ab..427cfd410 100644
--- a/src/com/rjconsultores/ventaboletos/dao/ConferenciaComissaoDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/ConferenciaComissaoDAO.java
@@ -53,5 +53,7 @@ public interface ConferenciaComissaoDAO extends GenericDAO<Conferencia, Long> {
 	public BigDecimal carregarValorDepositoContaCorrente(Integer empresaId, Integer puntoventaId, Date datamovimento);
 	
 	public DiaConferenciaComissaoVO carregarConferenciaRegistrada(Date datamovimento, Empresa empresa, PuntoVenta puntoVenta) throws BusinessException;
+
+	public Conferencia cancelarChegadaMalote(Conferencia conferencia) ;
 	
 }
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
index 8b7ca8c62..f0decc501 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
@@ -32,6 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
+import org.zkoss.util.resource.Labels;
 
 import com.rjconsultores.ventaboletos.constantes.Constantes;
 import com.rjconsultores.ventaboletos.dao.ConferenciaComissaoDAO;
@@ -518,6 +519,13 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 			throw new BusinessException(e.getMessage(), e);
 		}
 	}
+	
+	@Override
+	@Transactional
+	public Conferencia cancelarChegadaMalote(Conferencia conferencia) {
+		conferencia.setIndmaloterecebido(Boolean.FALSE);
+		return suscribirOrActualizacion(conferencia);
+	}
 
 	@Override
 	@Transactional
diff --git a/src/com/rjconsultores/ventaboletos/service/ConferenciaComissaoService.java b/src/com/rjconsultores/ventaboletos/service/ConferenciaComissaoService.java
index d777e0380..eb7f7d653 100644
--- a/src/com/rjconsultores/ventaboletos/service/ConferenciaComissaoService.java
+++ b/src/com/rjconsultores/ventaboletos/service/ConferenciaComissaoService.java
@@ -30,6 +30,8 @@ public interface ConferenciaComissaoService extends GenericService<Conferencia,
 	public List<ConferenciaComissaoVO> carregarConferenciaComissao(Date dataInicial, Date dataFinal, Empresa empresa, PuntoVenta puntoVenta, Date dataMovimento) throws BusinessException;
 	
 	public Conferencia confirmarChegadaMalote(Conferencia conferencia) throws BusinessException;
+	
+	public Conferencia cancelarChegadaMalote(Conferencia conferencia);
 
 	public Conferencia encerrarMovimentoDiario(Conferencia conferencia) throws BusinessException;
 
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
index 8bc91828f..3210307d1 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
@@ -1001,4 +1001,9 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
 			return true;	
 		}
 	}
+
+	@Override
+	public Conferencia cancelarChegadaMalote(Conferencia conferencia) {
+		return conferenciaComissaoDAO.cancelarChegadaMalote(conferencia);
+	}
 }