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

fixed bug #6478 - Alteração em tela de geração automática de linha para aceitar mesmo numero de linha para ida e volta. 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@46138 d1611594-4594-4d17-8e1d-87c2c4800839
master
thiago 2015-07-20 18:32:38 +00:00
parent fffb229d72
commit 81eec1432a
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/generaciontramosrutas/EditarCombinacionTramoRutaController.java
View File

@ -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()) || (txtNumRuta.getValue().equals(rutaTramoIdaVO.getNumRuta()))) {
if (!listRuta.isEmpty()) {
exists = CollectionUtils.exists(listRuta, new Predicate() {
@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"),