diff --git a/App_Code/ClsOC.vb b/App_Code/ClsOC.vb index 4a1cd26ba..b12725805 100644 --- a/App_Code/ClsOC.vb +++ b/App_Code/ClsOC.vb @@ -1729,9 +1729,11 @@ Public Class ClsOC 'End Function #End Region - Public Function GetOrdenesCompraRep(Tipo As String, CveProyecto As Integer, CveSubProyecto As Integer, CveClasificacion As Integer, CveEstatus As Integer, - FechaInicio As Date, FechaFin As Date, CveOrdenCompra As Integer, CveProveedor As Integer, Folio As Integer, CveUsuarioRegistro As Integer, CveUsuario As Integer, CveEmpresa As Integer, CvePS As Integer, Optional PendientePorSurtir As Boolean = False, Optional CveCliente As Integer = -1, Optional Guia As String = "-1", Optional CveActivoFijo As Integer = -1, - Optional SoloSubProyectosConPermiso As Boolean = False, Optional CveUsuarioAutorizo As Integer = -1, Optional TopSelect As Integer = 10000) As Boolean + Public Function GetOrdenesCompraRep(Tipo As String, CveProyecto As Integer, CveSubProyecto As Integer, CveClasificacion As Integer, CveEstatus As Integer, FechaInicio As Date, + FechaFin As Date, CveOrdenCompra As Integer, CveProveedor As Integer, Folio As Integer, CveUsuarioRegistro As Integer, CveUsuario As Integer, + CveEmpresa As Integer, CvePS As Integer, Optional PendientePorSurtir As Boolean = False, Optional CveCliente As Integer = -1, Optional Guia As String = "-1", + Optional CveActivoFijo As Integer = -1, Optional SoloSubProyectosConPermiso As Boolean = False, Optional CveUsuarioAutorizo As Integer = -1, + Optional CveUsuarioAsignado As Integer = -1, Optional EntregaDirecta As Integer = -1, Optional TopSelect As Integer = 10000) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_OC_OrdenesCompraRep") @@ -1757,6 +1759,8 @@ Public Class ClsOC .Add("@CveActivoFijo", SqlDbType.Int).Value = CveActivoFijo .Add("@SoloSubProyectosConPermiso", SqlDbType.Bit).Value = SoloSubProyectosConPermiso .Add("@CveUsuarioAutorizo", SqlDbType.Int).Value = CveUsuarioAutorizo + .Add("@CveUsuarioAsignado", SqlDbType.Int).Value = CveUsuarioAsignado + .Add("@EntregaDirecta", SqlDbType.Int).Value = EntregaDirecta .Add("@TopSelect", SqlDbType.Int).Value = TopSelect End With @@ -1863,7 +1867,7 @@ Public Class ClsOC End Function Public Function GetOrdenesPendientes(pTipo As String, pTipoBusqueda As Integer, pCveEmpresa As Integer, pCveProyecto As Integer, pCveSubProyecto As Integer, pCveEstatusCompra As Integer, - pCveUsuario As Integer, CveCliente As Integer, Optional SoloSubProyectosConPermiso As Boolean = False) As Boolean + pCveUsuario As Integer, CveCliente As Integer, Optional SoloSubProyectosConPermiso As Boolean = False, Optional CveUsuarioAsignado As Integer = -1, Optional EntregaDirecta As Integer = -1) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_OC_OrdenesCompraPendientes") @@ -1878,6 +1882,8 @@ Public Class ClsOC .Add("@CveCliente", SqlDbType.Int).Value = CveCliente .Add("@TipoBusqueda", SqlDbType.Int).Value = pTipoBusqueda .Add("@SoloSubProyectosConPermiso", SqlDbType.Bit).Value = SoloSubProyectosConPermiso + .Add("@CveUsuarioAsignado", SqlDbType.Int).Value = CveUsuarioAsignado + .Add("@EntregaDirecta", SqlDbType.Int).Value = EntregaDirecta End With Try diff --git a/Edoc/Contratos.aspx b/Edoc/Contratos.aspx index 89cf0b08c..ca690e7c6 100644 --- a/Edoc/Contratos.aspx +++ b/Edoc/Contratos.aspx @@ -16,7 +16,17 @@
  • +
  • + PDF +
  • +
  • + Excel +
  • + + + + diff --git a/Edoc/Contratos.aspx.vb b/Edoc/Contratos.aspx.vb index 46bd9fa4b..87fd7d107 100644 --- a/Edoc/Contratos.aspx.vb +++ b/Edoc/Contratos.aspx.vb @@ -3,6 +3,7 @@ Imports System.Data Imports System.Linq Imports Extensiones +Imports Microsoft.Reporting.WebForms Partial Class Proveedores_Contratos Inherits ClsPaginas @@ -20,6 +21,15 @@ Partial Class Proveedores_Contratos End Set End Property + Protected Property DtDatos As DataTable + Get + Return CType(ViewState("DtDatos"), DataTable) + End Get + Set(value As DataTable) + ViewState("DtDatos") = value + End Set + End Property + Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load If Not Page.IsPostBack Then @@ -39,6 +49,7 @@ Partial Class Proveedores_Contratos If ObjProv.GetContrato(-1, DdlSubProyectoFiltro.SelectedValue.ToEntero, DdlProveedorFiltro.SelectedValue.ToEntero, DdlTipoContratoFiltro.SelectedValue.ToEntero, -1, -1, UsuarioActual.CveEmpresa) Then GvDatos.DataSource = ObjProv.DtResultados + DtDatos = ObjProv.DtResultados Else GvDatos.DataSource = Nothing End If @@ -329,4 +340,31 @@ Partial Class Proveedores_Contratos End If End Sub + + Protected Sub LnkPDF_Click(sender As Object, e As EventArgs) Handles LnkPDF.Click + Imprimir("PDF") + End Sub + + Protected Sub LnkExcel_Click(sender As Object, e As EventArgs) Handles LnkExcel.Click + Imprimir("Excel") + End Sub + + Private Sub Imprimir(Formato As String) + Dim logouri As String = String.Format("{0}://{1}:{2}/Empresas/{3}/Logo.png", Request.Url.Scheme, Request.Url.Host, Request.Url.Port, UsuarioActual.CveEmpresa) + Dim Imagen As New System.IO.FileInfo(String.Format("{0}/Logo.png", UsuarioActual.Empresa.Ruta)) + + Dim params As New List(Of ReportParameter) + + params.Add(New ReportParameter("NombreEmpresa", UsuarioActual.Empresa.Empresa)) + params.Add(New ReportParameter("UsuarioImprimio", UsuarioActual.Nombre)) + + Dim Filtro As String = String.Format("{0}: {1}   Proveedor: {2}   Tipo Contrato: {3}", LblSubProyectoFiltro.Text, DdlSubProyectoFiltro.SelectedItem.Text, DdlProveedorFiltro.SelectedItem.Text, DdlTipoContratoFiltro.SelectedItem.Text) + params.Add(New ReportParameter("Filtro", Filtro)) + If Imagen.Exists Then + params.Add(New ReportParameter("LogoPath", logouri)) + Else + params.Add(New ReportParameter("LogoPath", logouri)) + End If + ImprimirPDF("Empresas/Grales/Formatos/RepContratosGen.rdlc", DtDatos, params, "Reporte de Contratos", Formato) + End Sub End Class diff --git a/Empresas/72/Formatos/OC.rdlc b/Empresas/72/Formatos/OC.rdlc index 98d08aecd..a50a0b15a 100644 --- a/Empresas/72/Formatos/OC.rdlc +++ b/Empresas/72/Formatos/OC.rdlc @@ -2289,7 +2289,7 @@ - Comprador: + Asignado a: