From 3e02876a5f00cc1156f50f2917a79e210a54896a Mon Sep 17 00:00:00 2001 From: rrene Date: Thu, 26 Jan 2023 07:00:57 -0700 Subject: [PATCH] -- cambio en globalDT --- App_Code/ClsPaginas.vb | 51 +++++++++++++++++++++--------------------- Ashx/SIGWeb.ashx | 9 +------- Global.asax | 2 +- 3 files changed, 28 insertions(+), 34 deletions(-) diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb index 8c9fc0de4..a730c53b0 100644 --- a/App_Code/ClsPaginas.vb +++ b/App_Code/ClsPaginas.vb @@ -227,23 +227,24 @@ Public Class ClsPaginas End Property Property GlobalDTNomConceptos(CveEmpresa As Integer) As DataTable Get - If CveEmpresa <> -1 Then - Dim Dv As New DataView(DirectCast(Application("GlobalDTNomConceptos"), DataTable), String.Format("CveEmpresa = {0}", CveEmpresa), "", DataViewRowState.CurrentRows) - GlobalDTNomConceptos = Dv.ToTable - Dv.Dispose() - Else - GlobalDTNomConceptos = DirectCast(Application("GlobalDTNomConceptos"), DataTable) + Dim AppNombre As String = String.Format("GlobalDTNomConceptos-{0}", CveEmpresa) + If Application("GlobalDTNomConceptos") Is Nothing Then + Dim ObjNom As New ClsNominas + If ObjNom.GetConceptos(CveEmpresa) Then Application(AppNombre) = ObjNom.DtResultados + ObjNom.Dispose() End If + GlobalDTNomConceptos = DirectCast(Application(AppNombre), DataTable) + End Get Set(value As DataTable) - Application("GlobalDTNomConceptos") = value + Dim AppNombre As String = String.Format("GlobalDTNomConceptos-{0}", CveEmpresa) + Application(AppNombre) = value End Set End Property Property GlobalDTTiposGastos(CveEmpresa As Integer, Optional Estatus As Integer = 1) As DataTable Get Dim AppNombre As String = String.Format("GlobalDTTiposGastos-{0}", CveEmpresa) - 'sino existe, recarga los datos If Application(AppNombre) Is Nothing Then Dim ObjCompra As New ClsCompras() If ObjCompra.GetTipoGasto(-1, -1) Then Application(AppNombre) = ObjCompra.DtResultados Else Application(AppNombre) = Nothing @@ -382,7 +383,7 @@ Public Class ClsPaginas Public Shared Property GlobalDTFraccionArancelaria() As EnumerableRowCollection(Of DataRow) Get Dim AppNombre As String = "GlobalDTFraccionArancelaria" - If DirectCast(HttpContext.Current.Application(AppNombre), DataTable) Is Nothing Then + If HttpContext.Current.Application(AppNombre) Is Nothing Then Dim ObjGrales As New ClsGenerales If ObjGrales.GetSATFraccionArancelaria() Then HttpContext.Current.Application(AppNombre) = ObjGrales.DtResultados.AsEnumerable() ObjGrales.Dispose() @@ -597,27 +598,28 @@ Public Class ClsPaginas #End Region - Property GlobalDTPSATUM() As DataTable + Public Shared Property GlobalDTPSATUM() As EnumerableRowCollection(Of DataRow) Get - If Application("GlobalDTPSATUM") Is Nothing Then + If HttpContext.Current.Application("GlobalDTPSATUM") Is Nothing Then Dim ObjGrales As New ClsGenerales - If ObjGrales.GetSATUnidadMedida Then Application("GlobalDTPSATUM") = ObjGrales.DtResultados.AsEnumerable() + If ObjGrales.GetSATUnidadMedida Then HttpContext.Current.Application("GlobalDTPSATUM") = ObjGrales.DtResultados.AsEnumerable() ObjGrales.Dispose() End If + Return DirectCast(HttpContext.Current.Application("GlobalDTPSATUM"), EnumerableRowCollection(Of DataRow)) - 'System.Data.EnumerableRowCollection - If Not IsNothing(Application("GlobalDTPSATUM")) Then - If Application("GlobalDTPSATUM").GetType().IsSubclassOf(GetType(EnumerableRowCollection)) Then - Return DirectCast(Application("GlobalDTPSATUM"), EnumerableRowCollection(Of DataRow)).CopyToDataTable() - Else - Return DirectCast(Application("GlobalDTPSATUM"), DataTable) - End If - Else - Return Nothing - End If + ''System.Data.EnumerableRowCollection + 'If Not IsNothing(HttpContext.Current.Application("GlobalDTPSATUM")) Then + ' If HttpContext.Current.Application("GlobalDTPSATUM").GetType().IsSubclassOf(GetType(EnumerableRowCollection)) Then + ' Return DirectCast(HttpContext.Current.Application("GlobalDTPSATUM"), EnumerableRowCollection(Of DataRow)) + ' Else + ' Return DirectCast(HttpContext.Current.Application("GlobalDTPSATUM"), EnumerableRowCollection(Of DataRow)) + ' End If + 'Else + ' Return Nothing + 'End If End Get - Set(value As DataTable) - Application("GlobalDTPSATUM") = value + Set(value As EnumerableRowCollection(Of DataRow)) + HttpContext.Current.Application("GlobalDTPSATUM") = value End Set End Property Property GlobalDTNomConceptosFunciones() As DataTable @@ -2051,7 +2053,6 @@ Public Class ClsPaginas ObjClientes.Dispose() End If - If CveEmpresa <> -1 Then Dim StrSQL As New StringBuilder diff --git a/Ashx/SIGWeb.ashx b/Ashx/SIGWeb.ashx index 7a420e7c8..3dd1135b5 100644 --- a/Ashx/SIGWeb.ashx +++ b/Ashx/SIGWeb.ashx @@ -1232,14 +1232,7 @@ Public Class SIGWeb : Implements IHttpHandler, IRequiresSessionState Private Function GETUMSAT(ByVal context As HttpContext) As String Dim retorno As String = "" - - If context.Application("GlobalDTPSATUM") Is Nothing Then - Dim ObjGrales As New ClsGenerales - If ObjGrales.GetSATUnidadMedida Then context.Application("GlobalDTPSATUM") = ObjGrales.DtResultados.AsEnumerable() Else context.Application("GlobalDTPSATUM") = Nothing - ObjGrales.Dispose() - End If - - Dim DTUM = DirectCast(context.Application("GlobalDTPSATUM"), EnumerableRowCollection(Of DataRow)) + Dim DTUM = ClsPaginas.GlobalDTPSATUM 'DirectCast(context.Application("GlobalDTPSATUM"), EnumerableRowCollection(Of DataRow)) Dim DtPSRetorno As DataTable Dim Name = IfNull(context.Request("Name"), "-1").ToString diff --git a/Global.asax b/Global.asax index e8091ab91..82b26aad6 100644 --- a/Global.asax +++ b/Global.asax @@ -149,7 +149,7 @@ 'C A R G A - N O M Using ObjNom As New ClsNominas() - If ObjNom.GetConceptos(-1) Then Application("GlobalDTNomConceptos") = ObjNom.DtResultados Else Application("GlobalDTNomConceptos") = Nothing + 'If ObjNom.GetConceptos(-1) Then Application("GlobalDTNomConceptos") = ObjNom.DtResultados Else Application("GlobalDTNomConceptos") = Nothing If ObjNom.GetConceptosFunciones() Then Application("GlobalDTNomConceptosFunciones") = ObjNom.DtResultados Else Application("GlobalDTNomConceptosFunciones") = Nothing If ObjNom.GetTiposPeriodos() Then Application("GlobalDTTipoPeriodo") = ObjNom.DtResultados Else Application("GlobalDTTipoPeriodo") = Nothing If ObjNom.GetPeriodos(-1, -1, -1, -1, -1) Then Application("GlobalDTNominasPeriodos") = ObjNom.DtResultados Else Application("GlobalDTNominasPeriodos") = Nothing