-- se quito GlobalDTFolios

2020-05-30 15:33:13 -07:00
parent e8031755ee
commit 28351c58e0
7 changed files with 129 additions and 114 deletions
--- a/App_Code/Modelos.vb
+++ b/App_Code/Modelos.vb
@@ -6684,14 +6684,6 @@ Namespace Modelos
                HttpContext.Current.Application("GlobalDTLeyendasFiscales") = value
            End Set
        End Property
-        Property GlobalDTFolios() As DataTable
-            Get
-                GlobalDTFolios = DirectCast(HttpContext.Current.Application("GlobalDTFolios"), DataTable)
-            End Get
-            Set(value As DataTable)
-                HttpContext.Current.Application("GlobalDTFolios") = value
-            End Set
-        End Property
        Property GlobalDTEstatusFactura() As DataTable
            Get
                GlobalDTEstatusFactura = DirectCast(HttpContext.Current.Application("GlobalDTEstatusFactura"), DataTable)
--- a/Ashx/SIGFacturacion.ashx
+++ b/Ashx/SIGFacturacion.ashx
@@ -1,5 +1,5 @@
-<%@ WebHandler Language="VB" Class="SIGFacturacion" %>
-
+<%@ WebHandler Language="VB" Class="SIGFacturacion" %>
+
 Imports System
 Imports System.Web
 Imports System.Net.Http
@@ -212,8 +212,8 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState
        json.Add(New JProperty("Almacen", ObsInv.ToString()))

        Return json
-    End Function
-
+    End Function
+
 #Region "V A L I D A  - D A T O S"
    Private Function ValidaUsuarioSistema(CveEmpresa As Integer) As Usuario
        Dim UsuarioActual As Usuario = Nothing
@@ -247,8 +247,8 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState
            UsuarioActual.Empresa = ObjEmpresa.Empresa
        End If
        ObjEmpresa.Dispose()
-    End Sub
-
+    End Sub
+
 #End Region
 #Region "D E F I N I R - O B J E T O S"
    Private Function CreaFactura(Resp As Modelos.Factura.MMensajeFactura, UsuarioActual As Usuario, DTRemisionesPS As DataTable, CveCliente As Integer, CveSubProyecto As Integer, CveMoneda As Integer, DatosRemisiones As JObject, FechaI As DateTime, FechaF As DateTime) As Modelos.Factura
@@ -750,7 +750,7 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState

        'RECARGAR GV
        Return Row
-    End Function
+    End Function
 #End Region
 #Region "E N V I O - C O R R E O"
    Private Sub EnviarCorreo(Objfactura As Modelos.Factura, UsuarioActual As Usuario)
@@ -894,9 +894,9 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState
                End If
            End Try
        End If
-    End Sub
+    End Sub
 #End Region
-
+
    Public Sub GuardaLogFacturacion(Str As String)
        Dim ArchivoW As StreamWriter
        Dim strLineaTMP As String
@@ -919,8 +919,8 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState

        ArchivoW.Close()
        ArchivoW.Dispose()
-    End Sub
-
+    End Sub
+
 #Region "G L O B A L - D T"
    Public Property GlobalTipoCambio(Optional Fecha As Date = MinFecha) As Double
        Get
@@ -1105,10 +1105,10 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState
        Set(value As DataTable)
            HttpContext.Current.Application("GlobalDTPSATPS") = value
        End Set
-    End Property
-
+    End Property
+
 #Region "GLOBALES DE SAT COMERCIO EXTERIOR"
-
+
    Property GlobalDTClavePedimento() As DataTable
        Get
            GlobalDTClavePedimento = DirectCast(HttpContext.Current.Application("GlobalDTClavePedimento"), DataTable)
@@ -1218,10 +1218,10 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState
        Set(value As DataTable)
            HttpContext.Current.Application("GlobalDTColonia") = value
        End Set
-    End Property
-
+    End Property
+
 #End Region
-
+
    Property GlobalDTPSATUM() As DataTable
        Get
            GlobalDTPSATUM = DirectCast(HttpContext.Current.Application("GlobalDTPSATUM"), DataTable)
@@ -1605,15 +1605,8 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState
        Set(value As DataTable)
            HttpContext.Current.Application("GlobalDTLeyendasFiscales") = value
        End Set
-    End Property
-    Property GlobalDTFolios() As DataTable
-        Get
-            GlobalDTFolios = DirectCast(HttpContext.Current.Application("GlobalDTFolios"), DataTable)
-        End Get
-        Set(value As DataTable)
-            HttpContext.Current.Application("GlobalDTFolios") = value
-        End Set
-    End Property
+    End Property
+
    Property GlobalDTEstatusFactura() As DataTable
        Get
            GlobalDTEstatusFactura = DirectCast(HttpContext.Current.Application("GlobalDTEstatusFactura"), DataTable)
@@ -2354,9 +2347,9 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState
        Set(value As DataTable)
            HttpContext.Current.Application("GlobalDTVtaCobranzaEstatus") = value
        End Set
-    End Property
-
-
+    End Property
+
+
 #Region "***********************************************************************DT EVENTOS****************************************************************************************"
    Property GlobalDTTiposEventos() As DataTable
        Get
@@ -2392,9 +2385,9 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState
        Set(value As DataTable)
            HttpContext.Current.Application("GlobalDTOIEstatusEventos") = value
        End Set
-    End Property
+    End Property
 #End Region
-
+
 #Region " **********************************************************************DT PROSPECTOS*************************************************************************************"
    Property GlobalDTProspectosCaracteristicasClasificaciones() As DataTable
        Get
@@ -2435,9 +2428,9 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState
        Set(value As DataTable)
            HttpContext.Current.Application("GlobalDTProspectosCaracteristicasOpciones") = value
        End Set
-    End Property
+    End Property
 #End Region
-
+
 #Region "***********************************************************************DT ACTIVOS FIJOS**********************************************************************************"
    Property GlobalDTActivoFijos(CveEmpresa As Integer, Optional CveSubTipoActivoFijo As Integer = -1, Optional CveActivoFijo As Integer = -1) As DataTable
        Get
@@ -2530,10 +2523,10 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState
        Set(value As DataTable)
            HttpContext.Current.Application("GlobalDTTipoActivoFijo") = value
        End Set
-    End Property
-
+    End Property
+
 #End Region
-
+
 #Region "***********************************************************************DT GENERALES**************************************************************************************"
    Property GlobalDTGralPaises() As DataTable
        Get
@@ -2621,10 +2614,10 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState
        Set(value As DataTable)
            HttpContext.Current.Application("GlobalDTGralColectivas") = value
        End Set
-    End Property
-
+    End Property
+
 #End Region
-
+
 #Region "***********************************************************************DT PROSPECTOS*************************************************************************************"
    Property GlobalDTProspectosSupervisores(CveEmpresa As Integer) As DataTable
        Get
@@ -2833,8 +2826,8 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState
        Set(value As DataTable)
            HttpContext.Current.Application("GlobalDTProspectosTipos") = value
        End Set
-    End Property
-
+    End Property
+
 #Region " DT PROSPECTOS SOLICITUDES"
    Property GlobalDTProspectosSolicitudes(CveEmpresa As Integer) As DataTable
        Get
@@ -2901,15 +2894,15 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState
        Set(value As DataTable)
            HttpContext.Current.Application("GlobalDTProspectosSolicitudesApoyos") = value
        End Set
-    End Property
-
+    End Property
+
 #End Region
 #End Region
-
+
 #Region "**********************************************DT AMORTIZACIÓN CONTABLE PLAN DE DESARROLLO********************************************************************************"
-
+
 #Region "***********************************************************************DT AMORTIZACIÓN CONTABLE*********************************************************************************************"
-
+
    Property GlobalDTAC_RubrosIngreso() As DataTable
        Get
            GlobalDTAC_RubrosIngreso = DirectCast(HttpContext.Current.Application("GlobalDTAC_RubrosIngreso"), DataTable)
@@ -3165,11 +3158,11 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState
        Set(value As DataTable)
            HttpContext.Current.Application("GlobalDTAC_MatrizEgresos") = value
        End Set
-    End Property
-
-
+    End Property
+
+
 #End Region
-
+
    Property GlobalDTAC_PD_EjeRector(CveEmpresa As Integer) As DataTable
        Get
            If CveEmpresa <> -1 Then
@@ -3248,9 +3241,9 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState
        Set(value As DataTable)
            HttpContext.Current.Application("GlobalDTAC_PD_Metas") = value
        End Set
-    End Property
+    End Property
 #End Region
-
+
 #Region "***********************************************************************GLOBAL DT ORDENES DE COMPRA***********************************************************************"
    Property GlobalDTOCEstatus(CveEmpresa As Integer) As DataTable
        Get
@@ -3287,11 +3280,11 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState
        Set(value As DataTable)
            HttpContext.Current.Application("GlobalDTOCEstatusUsuarios") = value
        End Set
-    End Property
-
-
+    End Property
+
+
 #End Region
-
+
 #Region "F I N A N Z A S "
    Property GlobalDTFinan_RazonesFinancieras() As DataTable
        Get
@@ -3300,10 +3293,10 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState
        Set(value As DataTable)
            HttpContext.Current.Application("GlobalDTFinan_RazonesFinancieras") = value
        End Set
-    End Property
+    End Property
 #End Region
-
-
+
+
 #Region "***********************************************************************GLOBAL DT CONTABILIDAD****************************************************************************"
    Property GlobalDTContaPlantillasPolizas(CveEmpresa As Integer, Optional TipoPlantilla As Integer = -1) As DataTable
        Get
@@ -3357,9 +3350,9 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState
        Set(value As DataTable)
            HttpContext.Current.Application("GlobalDTContaConceptosContables") = value
        End Set
-    End Property
+    End Property
 #End Region
-
+
 #Region "**********************************************************************GLOBAL DT RH (RECURSOS HUMANOS)********************************************************************"
    Property GlobalDTAsistenciaDetalle() As DataTable
        Get
@@ -3511,13 +3504,13 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState
        Set(value As DataTable)
            HttpContext.Current.Application("GlobalDTTipoBuzon") = value
        End Set
-    End Property
+    End Property
 #End Region
-
+
 #Region "***********  D T - C O M B U S T I B L E S  ***********"
-
-
-
+
+
+
    Property GlobalDTCombustibles(CveEmpresa As Integer) As DataTable
        Get
            If CveEmpresa <> -1 Then
@@ -3556,11 +3549,11 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState
        Set(ByVal value As DataTable)
            HttpContext.Current.Application("GlobalDTCombustiblesTipos") = value
        End Set
-    End Property
+    End Property
 #End Region
-
+
 #Region "***********  D T - M A N T E N I M I E N T O S  ***********"
-
+
    Property GlobalDTMantenimientosTipos() As DataTable
        Get
            GlobalDTMantenimientosTipos = DirectCast(HttpContext.Current.Application("GlobalDTMantenimientosTipos"), DataTable)
@@ -3599,13 +3592,13 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState

            HttpContext.Current.Application("GlobalDTMantenimientosTipos") = value
        End Set
-    End Property
-
+    End Property
+
 #End Region
-
-
+
+
 #Region "***********  D T - T A L L E R E S  ***********"
-
+
    Property GlobalDTTalleresTipos() As DataTable
        Get
            GlobalDTTalleresTipos = DirectCast(HttpContext.Current.Application("GlobalDTTalleresTipos"), DataTable)
@@ -3622,12 +3615,12 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState
        Set(value As DataTable)
            HttpContext.Current.Application("GlobalDTTalleres") = value
        End Set
-    End Property
-
+    End Property
+
 #End Region
-
+
 #Region "***********  D T - D I S T R I B U I D O R E S  ***********"
-
+
    Property GlobalDTDistribuidoresTipos() As DataTable
        Get
            GlobalDTDistribuidoresTipos = DirectCast(HttpContext.Current.Application("GlobalDTDistribuidoresTipos"), DataTable)
@@ -3644,11 +3637,11 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState
        Set(value As DataTable)
            HttpContext.Current.Application("GlobalDTDistribuidores") = value
        End Set
-    End Property
-
+    End Property
+
 #End Region
-
-
+
+
    Property GlobalDTOIRevision(CveEmpresa As Integer) As DataTable
        Get
            If CveEmpresa <> -1 Then
@@ -3739,8 +3732,8 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState
        Set(value As DataTable)
            HttpContext.Current.Application("GlobalDTPaqueterias") = value
        End Set
-    End Property
-
+    End Property
+
 #End Region
-
+
 End Class
--- a/Contratos/FacturacionMasiva.aspx.vb
+++ b/Contratos/FacturacionMasiva.aspx.vb
@@ -19,6 +19,15 @@ Partial Class Contratos_FacturacionMasiva
            ViewState("DTCicloComercial") = value
        End Set
    End Property
+    Private Property FolioVigentes As Boolean
+        Get
+            Return CType(ViewState("FolioVigentes"), Boolean)
+        End Get
+        Set(value As Boolean)
+            ViewState("FolioVigentes") = value
+        End Set
+    End Property
+
    Private Property Mensaje As String
        Get
            Return CType(ViewState("Mensaje"), String)
@@ -100,6 +109,7 @@ Partial Class Contratos_FacturacionMasiva

    Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load
        If Not IsPostBack Then
+            FolioVigentes = False
            CargaCombos()
            txtFechaI.Text = DateTime.Today.ToString("d")
            txtFechaF.Text = DateTime.Today.ToString("d")
@@ -118,6 +128,8 @@ Partial Class Contratos_FacturacionMasiva
        DdlSucursal.DataBind()
    End Sub
    Private Sub CargaDatos(CveContrato As Integer, CveCliente As Integer)
+        ValidaFolio()
+
        Dim ObjContratos As New ClsContratos
        If ObjContratos.CicloComercialGet(CveContrato, CveCliente, -1, UsuarioActual.CveEmpresa, txtFechaI.Text.ToDateTime, txtFechaF.Text.ToDateTime, DdlSucursal.SelectedValue.ToEntero) Then
            DTCicloComercial = ObjContratos.DtResultados().FiltraParametros($"FueFacturado = 0")
@@ -127,9 +139,21 @@ Partial Class Contratos_FacturacionMasiva
        GvCiclosComerciales.DataBind()
        UpGv.Update()
    End Sub
+
+    Private Sub ValidaFolio()
+        Dim ObjFolios As New ClsGralFolios
+        If ObjFolios.GetFolios("Ing", UsuarioActual.CveEmpresa) Then
+            If ObjFolios.DtResultados.Rows.Count > 0 Then
+                FolioVigentes = True
+            End If
+        End If
+
+        ObjFolios.Dispose()
+    End Sub
    Protected Sub GvCiclosComerciales_RowDataBound(sender As Object, e As GridViewRowEventArgs) Handles GvCiclosComerciales.RowDataBound
        If e.Row.RowType = DataControlRowType.DataRow Then
-            If GlobalDTFolios().FiltraParametros($"CveSubProyecto = {e.Row.DBCampo("CveSubProyecto")} AND TipoDocto = 'Ing' ").Rows.Count = 0 Then
+            '' Pendiente de aplicar validacion
+            If Not FolioVigentes Then
                e.Row.FCCheckBox("chkDis").Enabled = False
                e.Row.FCCheckBox("chkDis").ToolTip = "La sucursal vinculada con este contrato no tiene folios"
            End If
--- a/GPS/FacturacionMasiva.aspx.vb
+++ b/GPS/FacturacionMasiva.aspx.vb
@@ -27,6 +27,14 @@ Partial Class Contratos_FacturacionMasiva
            ViewState("Mensaje") = value
        End Set
    End Property
+    Private Property FolioVigentes As Boolean
+        Get
+            Return CType(ViewState("FolioVigentes"), Boolean)
+        End Get
+        Set(value As Boolean)
+            ViewState("FolioVigentes") = value
+        End Set
+    End Property
    Private Property ErrorList As List(Of String)
        Get
            Return CType(ViewState("ErrorList"), List(Of String))
@@ -79,6 +87,7 @@ Partial Class Contratos_FacturacionMasiva

    Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load
        If Not IsPostBack Then
+            FolioVigentes = False
            CargaCombos()
            txtFechaI.Text = DateTime.Today.ToString("d")
            txtFechaF.Text = DateTime.Today.ToString("d")
@@ -97,6 +106,7 @@ Partial Class Contratos_FacturacionMasiva
        DdlSucursal.DataBind()
    End Sub
    Private Sub CargaDatos(CveContrato As Integer, CveCliente As Integer)
+        ValidaFolio()
        Dim ObjContratos As New ClsContratos
        If ObjContratos.CicloComercialGet(CveContrato, CveCliente, -1, UsuarioActual.CveEmpresa, txtFechaI.Text.ToDateTime, txtFechaF.Text.ToDateTime, DdlSucursal.SelectedValue.ToEntero) Then
            DTCicloComercial = ObjContratos.DtResultados().FiltraParametros($"FueFacturado = 0")
@@ -106,9 +116,20 @@ Partial Class Contratos_FacturacionMasiva
        GvCiclosComerciales.DataBind()
        UpGv.Update()
    End Sub
+
+    Private Sub ValidaFolio()
+        Dim ObjFolios As New ClsGralFolios
+        If ObjFolios.GetFolios("Ing", UsuarioActual.CveEmpresa) Then
+            If ObjFolios.DtResultados.Rows.Count > 0 Then
+                FolioVigentes = True
+            End If
+        End If
+
+        ObjFolios.Dispose()
+    End Sub
    Protected Sub GvCiclosComerciales_RowDataBound(sender As Object, e As GridViewRowEventArgs) Handles GvCiclosComerciales.RowDataBound
        If e.Row.RowType = DataControlRowType.DataRow Then
-            If GlobalDTFolios().FiltraParametros($"CveSubProyecto = {e.Row.DBCampo("CveSubProyecto")} AND TipoDocto = 'Ing' ").Rows.Count = 0 Then
+            If Not FolioVigentes Then
                e.Row.FCCheckBox("chkDis").Enabled = False
                e.Row.FCCheckBox("chkDis").ToolTip = "La sucursal vinculada con este contrato no tiene folios"
            End If
--- a/Planeacion/CatFolios.aspx.vb
+++ b/Planeacion/CatFolios.aspx.vb
@@ -91,7 +91,7 @@ Partial Class CatFolios
        Dim ObjFolios As New ClsGralFolios
        If ObjFolios.GetFolios() Then
            ViewState("DTFolios") = ObjFolios.DtResultados.FiltraParametros("CveEmpresa = " & UsuarioActual.CveEmpresa)
-            GlobalDTFolios = ObjFolios.DtResultados
+
            GvDatos.DataSource = ObjFolios.DtResultados.FiltraParametros("CveEmpresa = " & UsuarioActual.CveEmpresa)
            GvDatos.DataBind()
        Else
@@ -153,7 +153,7 @@ Partial Class CatFolios
        If ObjFolios.RemoveFolios(GvDatos.DataKeys(e.RowIndex).Value.ToString.ToEntero) Then
            GvDatos.EditIndex = -1
            ViewState("DTFolios") = ObjFolios.DtResultados.FiltraParametros("CveEmpresa = " & UsuarioActual.CveEmpresa)
-            GlobalDTFolios = ObjFolios.DtResultados
+
            Alert("La Aprobación de Folios se eliminó correctamente.", TipoMensaje.MsgInformacion)
        End If
        ObjFolios.Dispose()
@@ -194,7 +194,7 @@ Partial Class CatFolios
            Session("FileUpload") = ""

            Alert("La nueva Aprobación de Folios se guardó/editó correctamente.", TipoMensaje.MsgInformacion)
-            GlobalDTFolios = ObjFolios.DtResultados
+
            ViewState("DTFolios") = ObjFolios.DtResultados.FiltraParametros("CveEmpresa = " & UsuarioActual.CveEmpresa)


--- a/Sistemas/CatSesiones.aspx
+++ b/Sistemas/CatSesiones.aspx
@@ -20,8 +20,7 @@
        <asp:ListItem Text="Proyectos" Value="GlobalDTProyectos"></asp:ListItem>
        <asp:ListItem Text="ProyectosUsuarios" Value="GlobalDTProyectosUsuarios"></asp:ListItem>
        <asp:ListItem Text="Sub Proyectos" Value="GlobalDTSubProyectos"></asp:ListItem>
-        <asp:ListItem Text="Sub ProyectosUsuarios" Value="GlobalDTSubProyectosUsuarios"></asp:ListItem>
-        <asp:ListItem Text="Folios" Value="GlobalDTFolios"></asp:ListItem>
+        <asp:ListItem Text="Sub ProyectosUsuarios" Value="GlobalDTSubProyectosUsuarios"></asp:ListItem>     
       <%-- <asp:ListItem Text="Sucursales" Value="GlobalDTSucursales"></asp:ListItem>--%>
        <asp:ListItem Text="Proveedores" Value="GlobalDTCompProveedores"></asp:ListItem>       
        <asp:ListItem Text="Métodos de Pago" Value="GlobalDTMetodosPago"></asp:ListItem>
--- a/Sistemas/CatSesiones.aspx.vb
+++ b/Sistemas/CatSesiones.aspx.vb
@@ -24,8 +24,6 @@ Partial Class Sistemas_CatSesiones
            CargaSubProyectos()
        ElseIf DdlVariable.SelectedItem.Value = "GlobalDTSubProyectosUsuarios" Then
            CargaSubProyectos()
-        ElseIf DdlVariable.SelectedItem.Value = "GlobalDTFolios" Then
-            CargaFolios()
            'ElseIf DdlVariable.SelectedItem.Value = "GlobalDTSucursales" Then
            '    CargaSucursales()
        ElseIf DdlVariable.SelectedItem.Value = "GlobalDTCompProveedores" Then
@@ -341,18 +339,6 @@ Partial Class Sistemas_CatSesiones
        'Fin Carga Proyectos
    End Sub

-    Private Sub CargaFolios()
-        'Carga Folios
-        Dim ObjFolios As New ClsGralFolios()
-        If ObjFolios.GetFolios() Then
-            Application("GlobalDTFolios") = ObjFolios.DtResultados
-        Else
-            Application("GlobalDTFolios") = Nothing
-        End If
-        ObjFolios.Dispose()
-        'Fin Carga Folios
-    End Sub
-
    'Private Sub CargaSucursales()
    '    'Carga Sucursales
    '    Dim ObjSucursales As New ClsSucursales()