From ecb7ef15d4a494bed90824f17733d84b273cf116 Mon Sep 17 00:00:00 2001
From: rrene <rene.molina@adssistemas.mx>
Date: Wed, 10 Jan 2024 06:35:24 -0700
Subject: [PATCH] =?UTF-8?q?-=20unificaci=C3=B3n=20de=20cls?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App_Code/ClsRutas.vb              | 20 --------------------
 App_Code/ClsTransportes.vb        | 28 ++++++++++++++++++++++++++++
 Transportes/ListadoViajes.aspx.vb | 14 ++++++--------
 3 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/App_Code/ClsRutas.vb b/App_Code/ClsRutas.vb
index 82f301ee0..bde0252dc 100644
--- a/App_Code/ClsRutas.vb
+++ b/App_Code/ClsRutas.vb
@@ -129,26 +129,6 @@ Public Class ClsRutas
         GC.SuppressFinalize(Me)
     End Sub
 #End Region
-    Public Function GetRutas(CveRuta As Integer, CveUsuario As Integer, CveEmpresa As Integer, Ruta As String, Estatus As Boolean, FechaIng As DateTime) As Boolean
-        Dim Retorno As Boolean = False
-        DataAdapter("PA_Trans_RutasGet")
-        With SqlAdapter.SelectCommand.Parameters
-            .Add("@CveRuta", SqlDbType.Int).Value = CveRuta
-            .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
-            .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario
-            .Add("@Ruta", SqlDbType.VarChar).Value = Ruta
-            .Add("@Estatus", SqlDbType.Bit).Value = Estatus
-            .Add("@FechaIng", SqlDbType.DateTime).Value = FechaIng
 
-        End With
-        Try
-            SqlAdapter.Fill(Data)
-            Retorno = True
-        Catch ex As Exception
-            OnError("Ocurrió un error al obtener las rutas.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo())
-        End Try
-
-        Return Retorno
-    End Function
 
 End Class
diff --git a/App_Code/ClsTransportes.vb b/App_Code/ClsTransportes.vb
index 6705d9007..0e1efccc8 100644
--- a/App_Code/ClsTransportes.vb
+++ b/App_Code/ClsTransportes.vb
@@ -316,6 +316,8 @@ Public Class ClsTransportes
 
     End Function
 #End Region
+
+#Region "Destinos"
     Public Function GetDestinos(Optional CveRuta As Integer = 0) As Boolean
         Dim Retorno As Boolean = False
         DataAdapter("PA_Trans_DestinosGet")
@@ -335,6 +337,32 @@ Public Class ClsTransportes
         Return Retorno
     End Function
 
+#End Region
+
+#Region "Rutas"
+    Public Function GetRutas(CveRuta As Integer, CveUsuario As Integer, CveEmpresa As Integer, Ruta As String, Estatus As Boolean, FechaIng As DateTime) As Boolean
+        Dim Retorno As Boolean = False
+        DataAdapter("PA_Trans_RutasGet")
+        With SqlAdapter.SelectCommand.Parameters
+            .Add("@CveRuta", SqlDbType.Int).Value = CveRuta
+            .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
+            .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario
+            .Add("@Ruta", SqlDbType.VarChar).Value = Ruta
+            .Add("@Estatus", SqlDbType.Bit).Value = Estatus
+            .Add("@FechaIng", SqlDbType.DateTime).Value = FechaIng
+
+        End With
+        Try
+            SqlAdapter.Fill(Data)
+            Retorno = True
+        Catch ex As Exception
+            OnError("Ocurrió un error al obtener las rutas.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo())
+        End Try
+
+        Return Retorno
+    End Function
+#End Region
+
 #Region "Tarifas"
     Public Function GetDestinosTarifas(CveDestinoOrigen As Integer, CveDestinoFinal As Integer) As Boolean
         Dim Retorno As Boolean = False
diff --git a/Transportes/ListadoViajes.aspx.vb b/Transportes/ListadoViajes.aspx.vb
index 9a0ca63a4..755540f3a 100644
--- a/Transportes/ListadoViajes.aspx.vb
+++ b/Transportes/ListadoViajes.aspx.vb
@@ -46,7 +46,7 @@ Partial Class ListadoViajes
         ObjAF.Dispose()
 
         'Lista Rutas'
-        Dim ObjRutas As New ClsRutas()
+        Dim ObjRutas As New ClsTransportes()
         If ObjRutas.GetRutas(-1, -1, -1, "", True, DateTime.Now) Then
 
             If ObjRutas.DtResultados.Rows.Count > 0 Then
@@ -55,18 +55,16 @@ Partial Class ListadoViajes
                 DdlRutas.Items.Insert(0, New ListItem("Seleccione Ruta", ""))
             End If
         End If
-        ObjRutas.Dispose()
-
         'Lista Destinos'
-        Dim ObjDestinos As New ClsDestinos()
-        If ObjDestinos.GetDestinos() Then
 
-            If ObjDestinos.DtResultados.Rows.Count > 0 Then
-                DdlPartida.DataSource = ObjDestinos.DtResultados
+        If ObjRutas.GetDestinos() Then
+
+            If ObjRutas.DtResultados.Rows.Count > 0 Then
+                DdlPartida.DataSource = ObjRutas.DtResultados
                 DdlPartida.DataBind()
                 DdlPartida.Items.Insert(0, New ListItem("Seleccione Partida", ""))
 
-                DdlDestino.DataSource = ObjDestinos.DtResultados
+                DdlDestino.DataSource = ObjRutas.DtResultados
                 DdlDestino.DataBind()
                 DdlDestino.Items.Insert(0, New ListItem("Seleccione Destino", ""))
             End If