From 2232c482370f1844b1e97f8b4b9957e0fdee5656 Mon Sep 17 00:00:00 2001
From: alberto <alberto@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 27 Mar 2019 22:28:35 +0000
Subject: [PATCH] =?UTF-8?q?S=C3=A9rie=20para=20venda=20embarcada=20bug#137?=
 =?UTF-8?q?48=20dev:trevezani=20qua:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@91285 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../hibernate/CtrlSerieBPeHibernateDAO.java   |  6 +++---
 .../CtrlSerieEmbarcadaHibernateDAO.java       |  8 +++++++-
 .../ControleSerieEmbarcadaServiceImpl.java    | 19 +++++--------------
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CtrlSerieBPeHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CtrlSerieBPeHibernateDAO.java
index 17dcc1818..6252d7ed1 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CtrlSerieBPeHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CtrlSerieBPeHibernateDAO.java
@@ -23,12 +23,12 @@ public class CtrlSerieBPeHibernateDAO extends GenericHibernateDAO<CtrlSerieBPe,
 	public CtrlSerieBPe buscarPorEmpresaEstado(Integer empresaId, Integer estadoId) {
 		StringBuilder sb = new StringBuilder();
 		sb.append("SELECT ctrl ");
-		sb.append("FROM CtrlSerieBpe ctrl ");
+		sb.append("FROM CtrlSerieBPe ctrl ");
 		sb.append("WHERE ctrl.activo = 1 AND ctrl.empresa.empresaId = :empresaId AND ctrl.estado.estadoId = :estadoId ");
 		
 		Query qr = getSession().createQuery(sb.toString());
-		qr.setParameter("empresaId", empresaId);
-		qr.setParameter("estadoId", estadoId);
+		qr.setInteger("empresaId", empresaId);
+		qr.setInteger("estadoId", estadoId);
 		
 		return (CtrlSerieBPe) qr.uniqueResult();
 	}
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CtrlSerieEmbarcadaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CtrlSerieEmbarcadaHibernateDAO.java
index 2e23f948a..e01510de9 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CtrlSerieEmbarcadaHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CtrlSerieEmbarcadaHibernateDAO.java
@@ -165,13 +165,19 @@ public class CtrlSerieEmbarcadaHibernateDAO  extends GenericHibernateDAO<CtrlSer
 		sb.append("where se.activo = 1 and se.indReutilizado = 0 and se.indBaixado = 1 and se.ctrlSerieEmbarcadaId in (:list)");
 		sb.append("order by se.serie ");
 		
+		Set<Long> ids = buscarIdsSeriesEmbarcadaDisponivel(empresaId, estadoId);
+		
+		if (ids.isEmpty()) {
+			throw new SerieEmbarcadaNaoDisponivelException();
+		}
+		
 		Session session = null;
 		
 		try {
 			session = getSessionFactory().openSession();
 
 			Query query = session.createQuery(sb.toString());
-			query.setParameterList("list", buscarIdsSeriesEmbarcadaDisponivel(empresaId, estadoId));
+			query.setParameterList("list", ids);
 			
 			query.setLockOptions(LockOptions.UPGRADE);
 			query.setTimeout(20);
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ControleSerieEmbarcadaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ControleSerieEmbarcadaServiceImpl.java
index 1c89f3ad1..590ceee38 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/ControleSerieEmbarcadaServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/ControleSerieEmbarcadaServiceImpl.java
@@ -49,27 +49,18 @@ public class ControleSerieEmbarcadaServiceImpl implements ControleSerieEmbarcada
 		if (serieembarcada == null) {
 			CtrlSerieBPe ctrlSerieBpe = ctrlSerieBPeDAO.buscarPorEmpresaEstado(controleSerieEmbarcada.getEmpresa().getEmpresaId(), controleSerieEmbarcada.getEstado().getEstadoId());
 			
-			if (ctrlSerieBpe == null) {
-				ctrlSerieBpe = new CtrlSerieBPe();
-				ctrlSerieBpe.setEmpresa(controleSerieEmbarcada.getEmpresa());
-				ctrlSerieBpe.setEstado(controleSerieEmbarcada.getEstado());
-				ctrlSerieBpe.setActivo(Boolean.TRUE);
-			}
-			
-			ctrlSerieBpe.setFecmodif(new Date());
-
 			Integer serie = 0;
 			
+			if (ctrlSerieBpe != null) {
+				serie = Integer.valueOf(ctrlSerieBpe.getSerie());
+			}
+			
 			do {
 				serie++;
 			} while (ctrlSerieEmbarcadaDAO.validaPossuiDispositivo(controleSerieEmbarcada.getEmpresa().getEmpresaId(), controleSerieEmbarcada.getEstado().getEstadoId(), serie.toString()));
 			
-			ctrlSerieBpe.setSerie(serie.toString());
-			
-			ctrlSerieBpe = ctrlSerieBPeDAO.suscribir(ctrlSerieBpe);
-			
 			serieembarcada = new SerieEmbarcada();
-			serieembarcada.setSerie(ctrlSerieBpe.getSerie());
+			serieembarcada.setSerie(serie.toString());
 			serieembarcada.setNumero("1");
 		}