diff --git a/Ashx/SIGWeb.ashx b/Ashx/SIGWeb.ashx index ca2e96e95..ee39b8a90 100644 --- a/Ashx/SIGWeb.ashx +++ b/Ashx/SIGWeb.ashx @@ -219,7 +219,7 @@ Public Class SIGWeb : Implements IHttpHandler, IRequiresSessionState Dim CvePS = IfNull(context.Request("cveps"), "0").ToString.ToEntero Dim objInv As New ClsInventarios - If objInv.GetExistenciasProducto(CvePS, -1, CveEmpresa, -1, FechaMovto:=DateTime.Today.AddDays(1).ToString("yyyy/MM/dd HH:mm")) Then + If objInv.GetExistenciasPS(CvePS, -1, CveEmpresa, -1, FechaMovto:=DateTime.Today.AddDays(1).ToString("yyyy/MM/dd HH:mm")) Then ' limpio los almacenes donde no tiene ningun producto existencia For i = objInv.DtResultados.Columns.Count - 1 To 1 Step -1 diff --git a/Inventarios/KardexAlmacenHorizontal.aspx.vb b/Inventarios/KardexAlmacenHorizontal.aspx.vb index 289615efa..d8e8adec3 100644 --- a/Inventarios/KardexAlmacenHorizontal.aspx.vb +++ b/Inventarios/KardexAlmacenHorizontal.aspx.vb @@ -119,7 +119,7 @@ Partial Class Inventarios_KardexAlmacen 'End If End Sub - Private Function CargarKardex(CvePS As Integer) As DataTable + Private Sub CargarKardex(CvePS As Integer) Dim dt As DataTable = Nothing Dim ObjMovimientos As New ClsInventarios Dim FechaI As String = "-1" ' If(TxtFechaI.Text <> "" AndAlso TxtFechaI.Text <> "__/__/____", TxtFechaI.Text, "-1") @@ -132,7 +132,7 @@ Partial Class Inventarios_KardexAlmacen If ObjMovimientos.DtResultados IsNot Nothing AndAlso ObjMovimientos.DtResultados.Rows.Count > 0 Then dt = ObjMovimientos.DtResultados Dim ListaBorrar As New List(Of DataColumn) - For index = 2 To dt.Columns.Count - 1 + For index = 3 To dt.Columns.Count - 1 Dim TotColumna As Double = 0 For Each Dr As DataRow In dt.Rows TotColumna += Dr.Item(index).ToString.ToDouble @@ -149,25 +149,22 @@ Partial Class Inventarios_KardexAlmacen Else Alert("La búsqueda no contiene resultados.", TipoMensaje.MsgAdvertencia) GvDatos.Columns.Clear() - dt = Nothing - Return dt - Exit Function + dt = Nothing + Exit Sub End If Else ObjMovimientos.Dispose() Alert("Ocurrió un error al consultar el Kardex.", TipoMensaje.MsgError) - Exit Function + Exit Sub End If GvDatos.DataBind() - For index = 3 To GvDatos.Rows(0).Cells.Count - 1 + For index = 4 To GvDatos.Rows(0).Cells.Count - 1 GvDatos.HeaderRow.Cells(index).Text = GvDatos.HeaderRow.Cells(index).Text.Split("|")(0) Next - - Return dt - End Function + End Sub Protected Sub GvDatos_RowDataBound(sender As Object, e As GridViewRowEventArgs) Handles GvDatos.RowDataBound @@ -179,7 +176,8 @@ Partial Class Inventarios_KardexAlmacen e.Row.CssClass = "Totales" End If - e.Row.HorizontalAlign = HorizontalAlign.Right + e.Row.HorizontalAlign = HorizontalAlign.Right + e.Row.Cells(0).HorizontalAlign = HorizontalAlign.Left e.Row.Cells(1).HorizontalAlign = HorizontalAlign.Left Dim Index As Integer = 0 @@ -187,7 +185,7 @@ Partial Class Inventarios_KardexAlmacen Dim Celda As String = Cells.Text If IsNumeric(Celda) Then Dim CveAlmacen2 As Integer = -1 - If Index >= 4 Then + If Index >= 5 Then Dim Array = GvDatos.HeaderRow.Cells(Index).Text.Split("|") If Array.Length > 1 Then CveAlmacen2 = Array(1) @@ -224,10 +222,10 @@ Partial Class Inventarios_KardexAlmacen Private Sub GvDatos_RowCreated(sender As Object, e As GridViewRowEventArgs) Handles GvDatos.RowCreated 'Escondo CvePS y CveAlmacén (Se generan por autogeneratecolumns por eso se borran por aqui). ' e.Row.Cells(0).Width = New Unit("200px") - e.Row.Cells(1).Visible = False e.Row.Cells(2).Visible = False + e.Row.Cells(3).Visible = False If e.Row.RowType = DataControlRowType.Header Then - e.Row.Cells(5).ToolTip = "Costo Promedio" + e.Row.Cells(6).ToolTip = "Costo Promedio" End If End Sub diff --git a/Inventarios/RepEntradasSalidas.aspx.vb b/Inventarios/RepEntradasSalidas.aspx.vb index 077b6d42b..767d1e66f 100644 --- a/Inventarios/RepEntradasSalidas.aspx.vb +++ b/Inventarios/RepEntradasSalidas.aspx.vb @@ -119,7 +119,9 @@ Partial Class Inventarios_ReporteEntradasSalidas Dim CveAlmacen = Request("CveAlmacen").ToString Dim Almacen As String = GlobalDTAlmacen(UsuarioActual.CveEmpresa).FiltroPrimeroValor("Almacen", $"CveAlmacen = {Request("CveAlmacen").ToString}") DdlAlmacen.Items.Insert(0, New ListItem(Almacen, CveAlmacen)) - End If + End If + Else + DdlAlmacen.SelectedValuesIfExistM("-1") End If 'Llenar dropdownlist de monedas @@ -345,7 +347,7 @@ Partial Class Inventarios_ReporteEntradasSalidas Dim FechaI As String = FechaInicial Dim FechaF As String = FechaFinal - Dim Almacen = If(DdlAlmacen.SelectedValue = "-1", "", $" Almacén: {DdlAlmacen.SelectedItem.Text}") + Dim Almacen = If(DdlAlmacen.GetSelectedValuesM = "", "", $" Almacenes: {DdlAlmacen.GetSelectedText()}") Dim TipoMov = If(DdlTipoMovimiento.SelectedValue = "-1", "", $" Tipo Movimiento: {DdlTipoMovimiento.SelectedItem.Text}") Dim Moneda = If(DdlMoneda.SelectedValue = "-1", "", $" Moneda: {DdlMoneda.SelectedItem.Text}") Dim SoloConMov = If(DdlMovs.SelectedValue = "-1", "", $" Solo Movimientos: {DdlMovs.SelectedItem.Text}") diff --git a/Site.master b/Site.master index 89a6083b8..d8edd578e 100644 --- a/Site.master +++ b/Site.master @@ -78,7 +78,6 @@