From 2fcfdad4cdfce52aab885e07a16557b9736d8c83 Mon Sep 17 00:00:00 2001 From: Antonio Gonzalez Date: Thu, 23 Jan 2020 12:07:11 -0700 Subject: [PATCH 1/2] agregando dropdownlost al resguardo material --- Ashx/SIGWeb.ashx | 48 ++++++ Empresas/146/Formatos/NotaCredito.rdlc | 4 +- Inventarios/ResguardoMaterial.aspx | 90 +++++----- Inventarios/ResguardoMaterial.aspx.vb | 221 +++++++++++++------------ 4 files changed, 217 insertions(+), 146 deletions(-) diff --git a/Ashx/SIGWeb.ashx b/Ashx/SIGWeb.ashx index a3b5e8ba8..b4e505574 100644 --- a/Ashx/SIGWeb.ashx +++ b/Ashx/SIGWeb.ashx @@ -41,6 +41,8 @@ Public Class SIGWeb : Implements IHttpHandler, IRequiresSessionState GetUser(context) Case "ActualizaPreP" ActualizaPrePoliza(context) + Case "getpersonal" + getpersonal(context) End Select Catch ex As Exception @@ -686,4 +688,50 @@ Public Class SIGWeb : Implements IHttpHandler, IRequiresSessionState #End Region + +#Region "Get Personal" + Private Function getpersonal(ByVal context As HttpContext) As String + Dim retorno As String = "" + Dim DtRetorno As DataTable = Nothing + + Dim usuario As Usuario = UsuarioActual(context) + Dim CveEmpresa As String + If IsNothing(usuario) Then + context.Response.Write("") + Else + CveEmpresa = usuario.CveEmpresa + Dim Name = IfNull(context.Request("Name"), "-1").ToString + Dim AppNombre As String = String.Format("GlobalDTCompProveedores{0}", CveEmpresa) + 'sino existe, recarga los datos + If context.Application(AppNombre) Is Nothing Then + Dim ObjProveedores As New ClsRH + If ObjProveedores.GetPersonal(-1, "-1", "-1", "-1", "-1", -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, usuario.CveEmpresa) Then + context.Application(AppNombre) = ObjProveedores.DtResultados + End If + ObjProveedores.Dispose() + End If + + 'Dim ObjProveedores As New ClsCompProveedores + 'If ObjProveedores.GetProveedores(ClsCompProveedores.TipoConsulta.ParaUsoEnEmpresa, -1, "-1", Name, "-1", "-1", "-1", "-1", "-1", -1, CveEmpresa) Then + ' DtRetorno = ObjProveedores.DtResultados + 'End If + 'ObjProveedores.Dispose() + Dim dt As DataTable = DirectCast(context.Application(AppNombre), DataTable).FiltraParametros($"CveEmpresa = {CveEmpresa}") + If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then + DtRetorno = dt.FiltraParametros($"Nombre like '%{Name}%'") + End If + End If + + If DtRetorno IsNot Nothing AndAlso DtRetorno.Rows.Count > 0 Then + DtRetorno.Columns("CvePersonal").ColumnName = "id" + DtRetorno.Columns("Nombre").ColumnName = "text" + retorno = JsonConvert.SerializeObject(DtRetorno).ToString + context.Response.Write(retorno) + Else + context.Response.Write("[]") + End If + + Return retorno + End Function +#End Region End Class \ No newline at end of file diff --git a/Empresas/146/Formatos/NotaCredito.rdlc b/Empresas/146/Formatos/NotaCredito.rdlc index 8044cb5cc..4cbb34b50 100644 --- a/Empresas/146/Formatos/NotaCredito.rdlc +++ b/Empresas/146/Formatos/NotaCredito.rdlc @@ -1447,9 +1447,9 @@ External =Parameters!QR.Value FitProportional - 3.15082in + 3.13693in 0.15526in - 0.95455in + 1.06738in 1.49755in 6