diff --git a/App_Code/ClsClientes.vb b/App_Code/ClsClientes.vb index 154097b80..5b4bd4c6b 100644 --- a/App_Code/ClsClientes.vb +++ b/App_Code/ClsClientes.vb @@ -567,7 +567,7 @@ Public Class ClsClientes Optional AplicaComercioExterior As Boolean = False, Optional CveTipoOperacion As Integer = -1, Optional CvePedimento As Integer = -1, Optional CveIncoterm As Integer = -1, Optional CvePais As Integer = -1, Optional CveEstado As Integer = -1, Optional CveMunicipio As Integer = -1, Optional CveColonia As Integer = -1, Optional CveMotivoTraslado As Integer = 0, Optional NumRegIdTrib As String = "", Optional ComExtEstado As String = "-1", Optional ComExtMunicipio As String = "-1", Optional ComExtColonia As String = "-1", Optional RequiereOC As Boolean = False, Optional LT As String = "0", Optional LG As String = "0", Optional EsDistribuidor As Boolean = False, Optional TipoCliente As Integer = 1, Optional CargoUsado As Boolean = False, Optional BonificacionUsado As Boolean = False, Optional CveTipoRetencion As Integer = 0, - Optional CorreoEntregaCompras As String = "-1", Optional CorreoEntregaAlmacen As String = "-1", Optional CveSATEstado As Integer = -1) As Boolean + Optional CorreoEntregaCompras As String = "-1", Optional CorreoEntregaAlmacen As String = "-1", Optional CveSATEstado As Integer = -1, Optional CveAdminTrayecto As Integer = -1) As Boolean Dim Retorno As Boolean = False @@ -707,6 +707,8 @@ Public Class ClsClientes .Add("@CorreoEntregaAlmacen", SqlDbType.VarChar).Value = CorreoEntregaAlmacen .Add("@CveSATEstado", SqlDbType.Int).Value = CveSATEstado + .Add("@CveAdminTrayecto", SqlDbType.TinyInt).Value = CveAdminTrayecto + End With Try @@ -755,7 +757,7 @@ Public Class ClsClientes Optional CveMotivoTraslado As Integer = 0, Optional NumRegIdTrib As String = "-1", Optional ComExtEstado As String = "-1", Optional ComExtMunicipio As String = "-1", Optional ComExtColonia As String = "-1", Optional ApellidoPaternoPF As String = "-1", Optional ApellidoMaternoPF As String = "-1", Optional NombresPF As String = "-1", Optional RequiereOC As Boolean = False, Optional LT As String = "0", Optional LG As String = "0", Optional EsDistribuidor As Boolean = False, Optional TipoCliente As Integer = 1, Optional CargoUsado As Boolean = False, Optional BonificacionUsado As Boolean = False, Optional CveTipoRetencion As Integer = 0, Optional CorreoEntregaCompras As String = "-1", Optional CorreoEntregaAlmacen As String = "-1", - Optional CveSATEstado As Integer = -1) As Boolean + Optional CveSATEstado As Integer = -1, Optional CveAdminTrayecto As Integer = -1) As Boolean Dim Retorno As Boolean = False @@ -910,7 +912,7 @@ Public Class ClsClientes .Add("@CorreoEntregaAlmacen", SqlDbType.VarChar).Value = CorreoEntregaAlmacen .Add("@CveSATEstado", SqlDbType.Int).Value = CveSATEstado - + .Add("@CveAdminTrayecto", SqlDbType.TinyInt).Value = CveAdminTrayecto End With Try diff --git a/App_Code/ClsGPS.vb b/App_Code/ClsGPS.vb index 568713257..a16f069eb 100644 --- a/App_Code/ClsGPS.vb +++ b/App_Code/ClsGPS.vb @@ -3231,7 +3231,7 @@ Public Class ClsGPS Return retorno End Function - Public Function DispositivosUsuariosGet(CveDispositivo As Integer, CveEstatus As Integer, CveCliente As Integer, Optional CveEmpresa As Integer = -1, Optional CveUsuario As Integer = -1) As Boolean + Public Function DispositivosUsuariosGet(CveDispositivo As Integer, CveEstatus As Integer, CveCliente As Integer, Optional CveEmpresa As Integer = -1, Optional CveUsuario As Integer = -1, Optional ConcatenarDispuestos As Boolean = False) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_GPS_DispositivosUsuariosGet") With SqlAdapter.SelectCommand.Parameters @@ -3240,6 +3240,7 @@ Public Class ClsGPS .Add("@CveCliente", SqlDbType.Int).Value = CveCliente .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario + .Add("@ConcatenarDispuestos", SqlDbType.Bit).Value = ConcatenarDispuestos End With Try SqlAdapter.Fill(Data) @@ -5105,6 +5106,41 @@ Public Class ClsGPS Return retorno End Function + Public Function UpdateUnidadesDispuestas(CveDispositivo As Integer, Dispuesta As Boolean) As Boolean + Dim retorno As Boolean = False + DataAdapter("PA_GPS_UnidadesDispuestasUpdate", CommandType.StoredProcedure) + With SqlAdapter.SelectCommand.Parameters + .Add("@CveDispositivo", SqlDbType.Int).Value = CveDispositivo + .Add("@Dispuesta", SqlDbType.Bit).Value = Dispuesta + End With + + Try + SqlAdapter.Fill(Data) + retorno = True + Catch ex As Exception + OnError("Ocurrió un error al actualizar las unidades dispuestas.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + End Try + Return retorno + End Function + + Public Function GetUnidadesDispuestas(CveDispositivo As Integer, CveCliente As Integer, CveEmpresa As Integer) As Boolean + Dim retorno As Boolean = False + DataAdapter("PA_GPS_UnidadesDispuestasGet", CommandType.StoredProcedure) + With SqlAdapter.SelectCommand.Parameters + .Add("@CveDispositivo", SqlDbType.Int).Value = CveDispositivo + .Add("@CveCliente", SqlDbType.Int).Value = CveCliente + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + End With + + Try + SqlAdapter.Fill(Data) + retorno = True + Catch ex As Exception + OnError("Ocurrió un error al obtener las unidades dispuestas.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + End Try + Return retorno + End Function + #End Region #Region "G A S T O S" diff --git a/GPS/Trayectos.aspx b/GPS/Trayectos.aspx index c07974719..5f12e5d13 100644 --- a/GPS/Trayectos.aspx +++ b/GPS/Trayectos.aspx @@ -104,7 +104,7 @@