From 81eec1432aa830d251abfac5a9de627695dbe083 Mon Sep 17 00:00:00 2001
From: thiago <thiago@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 20 Jul 2015 18:32:38 +0000
Subject: [PATCH] =?UTF-8?q?fixed=20bug=20#6478=20-=20Altera=C3=A7=C3=A3o?=
 =?UTF-8?q?=20em=20tela=20de=20gera=C3=A7=C3=A3o=20autom=C3=A1tica=20de=20?=
 =?UTF-8?q?linha=20para=20aceitar=20mesmo=20numero=20de=20linha=20para=20i?=
 =?UTF-8?q?da=20e=20volta.?=
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/Web/trunk/ventaboletos@46138 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../EditarCombinacionTramoRutaController.java   | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/generaciontramosrutas/EditarCombinacionTramoRutaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/generaciontramosrutas/EditarCombinacionTramoRutaController.java
index 6a54f025c..569b9ada0 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/generaciontramosrutas/EditarCombinacionTramoRutaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/generaciontramosrutas/EditarCombinacionTramoRutaController.java
@@ -6,6 +6,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.esquemaoperacional.
 
 import java.util.List;
 
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.Predicate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -13,7 +15,6 @@ import org.zkoss.util.resource.Labels;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.event.Event;
-import org.zkoss.zul.Intbox;
 import org.zkoss.zul.Messagebox;
 import org.zkoss.zul.Radio;
 import org.zkoss.zul.Window;
@@ -121,10 +122,22 @@ public class EditarCombinacionTramoRutaController extends MyGenericForwardCompos
 
 	public void onClick$btnRutaRegreso(Event e) throws InterruptedException {
 		txtNumRuta.getValue();
+		boolean exists = false;
 		rutaTramoIdaVO.setLsCombinacionRutaTramoVO(gridRutaSecuenciaIda.getLsSecuenciaRutaTramoCoeficienteVO());
 		List<Ruta> listRuta = rutaService.buscarNumRuta(txtNumRuta.getValue());
+		
+		if (!listRuta.isEmpty()) {
+			
+			exists = CollectionUtils.exists(listRuta, new Predicate() {
 
-		if ((!listRuta.isEmpty()) || (txtNumRuta.getValue().equals(rutaTramoIdaVO.getNumRuta()))) {
+				@Override
+				public boolean evaluate(Object object) {
+					return ((Ruta) object).getNumRuta().equals(txtNumRuta.getValue()) && ((Ruta) object).getIndSentidoIda().equals(radIda.isChecked());
+				}
+			});
+		}
+		
+		if ((!listRuta.isEmpty() && exists) || (txtNumRuta.getValue().equals(rutaTramoIdaVO.getNumRuta()) && rutaTramoIdaVO.getIndSentidoIda().equals(radIda.isChecked()))) {
 
 			Messagebox.show(
 					Labels.getLabel("editarCatalogoDeRutaController.registroNumRutaExiste"),