From c932ab5bcee89ca940f4dc500eb7beb38ca2975d Mon Sep 17 00:00:00 2001 From: thiago Date: Fri, 17 Jul 2015 13:01:08 +0000 Subject: [PATCH] =?UTF-8?q?Altera=C3=A7=C3=A3o=20em=20persist=C3=AAncia=20?= =?UTF-8?q?de=20numero=20de=20linha?= 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@46077 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../EditarCatalogoDeRutaController.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeRutaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeRutaController.java index d9bbe1ccd..baccb2a7b 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeRutaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeRutaController.java @@ -605,17 +605,23 @@ public class EditarCatalogoDeRutaController extends MyGenericForwardComposer txtPrefixo.getValue(); List lsRuta = rutaService.buscarNumRuta(txtNumRuta.getValue()); + + if (radIda.isChecked()) { + ruta.setIndSentidoIda(Boolean.TRUE); + } else if (radVolta.isChecked()) { + ruta.setIndSentidoIda(Boolean.FALSE); + } if (!lsRuta.isEmpty()) { boolean exists = CollectionUtils.exists(lsRuta, new Predicate() { @Override public boolean evaluate(Object object) { - return ((Ruta) object).getRutaId().equals(ruta.getRutaId()); + return ((Ruta) object).getNumRuta().equals(ruta.getNumRuta()) && ((Ruta) object).getIndSentidoIda().equals(ruta.getIndSentidoIda()); } }); - if (!exists) { + if (ruta.getRutaId() == null && exists) { Messagebox.show( Labels.getLabel("editarCatalogoDeRutaController.registroNumRutaExiste"), Labels.getLabel("editarCatalogoDeRutaController.window.title"), @@ -658,11 +664,7 @@ public class EditarCatalogoDeRutaController extends MyGenericForwardComposer ruta.setIndNombreObligatorio(Boolean.FALSE); } - if (radIda.isChecked()) { - ruta.setIndSentidoIda(Boolean.TRUE); - } else if (radVolta.isChecked()) { - ruta.setIndSentidoIda(Boolean.FALSE); - } + if (ruta.getRutaId() == null) {