diff --git a/App_Code/ClsInventarios.vb b/App_Code/ClsInventarios.vb index 67f0db340..d10630102 100644 --- a/App_Code/ClsInventarios.vb +++ b/App_Code/ClsInventarios.vb @@ -5632,7 +5632,7 @@ Public Class ClsInventarios NumPolizaSeguro As String, CveUsuario As Integer, NombreAseguradoraMedioAmbiente As String, NumPolizaSeguroMedioAmbiente As String, NombreAseguradoraCarga As String, NumPolizaSeguroCarga As String, Optional CveTipoCamion As Integer = 1, Optional LongitudCaja As String = "", Optional LineaTransportacion As String = "", Optional SCAC As String = "", Optional CAAT As String = "", Optional CveTipoRemolque As Integer = -1, Optional NumeroTrailer As String = "", Optional Estatus As Boolean = False, Optional CveProveedor As Integer = -1, - Optional Marca As String = "", Optional Color As String = "") As Boolean + Optional Marca As String = "", Optional Color As String = "", Optional CveChoferAsignado As Integer = -1, Optional CveRemolque1Asignado As Integer = -1, Optional CveRemolque2Asignado As Integer = -1) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Inv_CamionesAdd") @@ -5662,6 +5662,9 @@ Public Class ClsInventarios .Add("@CveProveedor", SqlDbType.Int).Value = CveProveedor .Add("@Marca", SqlDbType.VarChar).Value = Marca .Add("@Color", SqlDbType.VarChar).Value = Color + .Add("@CveChoferAsignado", SqlDbType.Int).Value = CveChoferAsignado + .Add("@CveRemolque1Asignado", SqlDbType.Int).Value = CveRemolque1Asignado + .Add("@CveRemolque2Asignado", SqlDbType.Int).Value = CveRemolque2Asignado End With Try SqlAdapter.Fill(Data) @@ -5696,7 +5699,7 @@ Public Class ClsInventarios NumPolizaSeguro As String, CveUsuario As Integer, CveEmpresa As Integer, NombreAseguradoraMedioAmbiente As String, NumPolizaSeguroMedioAmbiente As String, NombreAseguradoraCarga As String, NumPolizaSeguroCarga As String, Optional CveTipoCamion As Integer = -1, Optional LongitudCaja As String = "", Optional LineaTransportacion As String = "", Optional SCAC As String = "", Optional CAAT As String = "", Optional CveTipoRemolque As Integer = -1, Optional NumeroTrailer As String = "", Optional Estatus As Boolean = False, Optional CveProveedor As Integer = -1, - Optional Marca As String = "", Optional Color As String = "") As Boolean + Optional Marca As String = "", Optional Color As String = "", Optional CveChoferAsignado As Integer = -1, Optional CveRemolque1Asignado As Integer = -1, Optional CveRemolque2Asignado As Integer = -1) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Inv_CamionesUpdate") With SqlAdapter.SelectCommand.Parameters @@ -5726,6 +5729,9 @@ Public Class ClsInventarios .Add("@CveProveedor", SqlDbType.Int).Value = CveProveedor .Add("@Marca", SqlDbType.VarChar).Value = Marca .Add("@Color", SqlDbType.VarChar).Value = Color + .Add("@CveChoferAsignado", SqlDbType.Int).Value = CveChoferAsignado + .Add("@CveRemolque1Asignado", SqlDbType.Int).Value = CveRemolque1Asignado + .Add("@CveRemolque2Asignado", SqlDbType.Int).Value = CveRemolque2Asignado End With Try SqlAdapter.Fill(Data) diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb index 55c98b3b9..72f9beaf8 100644 --- a/App_Code/ClsPaginas.vb +++ b/App_Code/ClsPaginas.vb @@ -1098,6 +1098,7 @@ Public Class ClsPaginas Application(AppNombre) = value End Set End Property + Public Shared Property GlobalDTClasificacionesPresupuestos(CveEmpresa As Integer) As DataTable Get Dim AppNombre As String = $"GlobalDTClasificacionesPresupuestos-{CveEmpresa}" @@ -1778,7 +1779,7 @@ Public Class ClsPaginas Application(AppNombre) = value End Set End Property - Property GlobalDTInvCamiones(CveEmpresa As Integer, Optional CveCamion As Integer = -1) As DataTable + Property GlobalDTInvCamiones(CveEmpresa As Integer, Optional CveCamion As Integer = -1, Optional CveTipoCamion As Integer = -1) As DataTable Get Dim AppNombre As String = $"GlobalDTInvCamiones-{CveEmpresa}" If Application(AppNombre) Is Nothing Then @@ -1788,6 +1789,7 @@ Public Class ClsPaginas End If Dim Str As New StringBuilder If CveCamion > 0 Then Str.AppendFormat("CveCamion = {0}", CveCamion) + If CveTipoCamion > 0 Then Str.AppendFormat("CveTipoCamion = {0}", CveTipoCamion) Dim Dv As New DataView(DirectCast(Application(AppNombre), DataTable), Str.ToString, "", DataViewRowState.CurrentRows) GlobalDTInvCamiones = Dv.ToTable Dv.Dispose() @@ -4389,9 +4391,7 @@ Public Class ClsPaginas End If Else LocalStopwatch.Value.Restart() - If EsProduccion Then - If UsuarioActual.CveEmpresa.Contiene(141, 152, 159, 160, 161, 162, 166) Then System.Threading.Thread.Sleep(1100) - End If + If Not Page.IsPostBack Then 'If Not CType(Session("UsuarioSIG"), Usuario).SeleccionoEmpresa AndAlso Request.ServerVariables("URL") <> "/Sistemas/PopUpSeleccionarEmpresa.aspx" Then ' Response.Redirect("/Sistemas/PopUpSeleccionarEmpresa.aspx") @@ -9330,7 +9330,7 @@ Public Class ClsPaginas PaginaDict.Add("/Ventas/RepLineasAdicionales.aspx".ToUpper(), 1331) PaginaDict.Add("/Ventas/RepLineasAdicionales.aspx?OP=OP".ToUpper(), 1332) - PaginaDict.Add("/Ventas/FacturacionAcarreos.aspx".ToUpper(), 774) + PaginaDict.Add("/Ventas/FacturacionAcarreos.aspx".ToUpper(), 784) PaginaDict.Add("/Ventas/RepIndicadoresPorProyecto.aspx".ToUpper(), 617)