diff --git a/OS/OrdenesServicios.aspx.vb b/OS/OrdenesServicios.aspx.vb index 1c1c2b60f..f40618b95 100644 --- a/OS/OrdenesServicios.aspx.vb +++ b/OS/OrdenesServicios.aspx.vb @@ -4,16 +4,7 @@ Option Strict On Imports Extensiones Imports System.IO Imports System.Data -Imports Microsoft.Reporting.WebForms -Imports ADSNetLibrary.SIGAPI.Models.Sistema -Imports Telerik.Charting.Styles Imports Telerik.Web.UI -Imports DocumentFormat.OpenXml.Drawing.Diagrams -Imports Profact.TimbraCFDI.Complementos.InstitucionesEducativas - - -'Imports msExcel = Microsoft.Office.Interop.Excel -'Imports VBIDE Partial Class OS_OrdenesServicios Inherits ClsPaginas @@ -846,7 +837,7 @@ Partial Class OS_OrdenesServicios Private Sub CargaMaterialesDetalle(CveOsDetalle As Integer, Consecutivo As Integer, CveConsecutivoDetalle As Integer) Dim ObjMateriales As New ClsOS - If ObjMateriales.GetDetalleMateriales(CveOsDetalle, CveOS) Then + If ObjMateriales.GetDetalleMateriales(CveOsDetalle, CveOS, -1) Then For Each RowE As DataRow In ObjMateriales.DtResultados.Rows Dim Row As DataRow = Nothing @@ -874,8 +865,8 @@ Partial Class OS_OrdenesServicios End Sub Private Sub CargaMateriales() Dim objOS As New ClsOS - - If objOS.GetDetalleMateriales(-1, CveOS, True) Then + Dim Opcion As Integer = If(DdlTipoVenta.SelectedValue.Contiene("2", "3"), 2, 1) + If objOS.GetDetalleMateriales(-1, CveOS, Opcion, True) Then GvMateriales.DataSource = objOS.DtResultados End If objOS.Dispose()