Merge branch 'master' of http://192.168.10.111:8383/SIG
This commit is contained in:
@@ -28,7 +28,8 @@
|
||||
</div>
|
||||
<div class="titlefiltros caption">
|
||||
<div class="row">
|
||||
<div class="col-md-1 truncate"><asp:Label runat="server" ID="LblFiltroSubProyecto">SubProyecto:</asp:Label></div>
|
||||
<div class="col-md-1 truncate">
|
||||
<asp:Label runat="server" ID="LblFiltroSubProyecto">SubProyecto:</asp:Label></div>
|
||||
<div class="col-md-4">
|
||||
<asp:DropDownList ID="DdlFiltroSubProyecto" CssClass="form-control select2me" runat="server" AppendDataBoundItems="true" DataTextField="SubProyecto" DataValueField="CveSubProyecto" Width="70%"></asp:DropDownList>
|
||||
</div>
|
||||
@@ -89,9 +90,9 @@
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:BoundField DataField="Estatus" HeaderText="Estatus" />
|
||||
<asp:TemplateField HeaderText="">
|
||||
<asp:TemplateField HeaderText="">
|
||||
<ItemTemplate>
|
||||
<asp:HyperLink ID="HplDif" runat="server" NavigateUrl='<%# Eval("CveInventarioFisico", "~/Inventarios/RepAnomalias.aspx?CveInventarioFisico={0}") %>' Text="Dif."></asp:HyperLink>
|
||||
<asp:HyperLink ID="HplDif" runat="server" NavigateUrl='<%# Eval("CveInventarioFisico", "~/Inventarios/RepAnomalias.aspx?CveInventarioFisico={0}") %>' Text="Dif."></asp:HyperLink>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField ItemStyle-HorizontalAlign="Center" HeaderText="Comandos">
|
||||
@@ -218,7 +219,7 @@
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<asp:GridView ID="GvClasificacion" runat="server" GridLines="None" DataKeyNames="CveClasificacion,Clasificacion" CssClass="table table-striped table-advance table-hover Widthall mysmallbtn ScrollAD" data-heightfijo="150" data-height="150" Width="380px" AutoGenerateColumns="False" ToolTip="Listado de Clasificaciones" >
|
||||
<asp:GridView ID="GvClasificacion" runat="server" GridLines="None" DataKeyNames="CveClasificacion,Clasificacion" CssClass="table table-striped table-advance table-hover Widthall mysmallbtn ScrollAD" data-heightfijo="150" data-height="150" Width="380px" AutoGenerateColumns="False" ToolTip="Listado de Clasificaciones">
|
||||
<Columns>
|
||||
<asp:BoundField DataField="Clasificacion" HeaderText="Clasificacion" ItemStyle-HorizontalAlign="Left" />
|
||||
<asp:TemplateField ItemStyle-HorizontalAlign="Center" HeaderText="Comandos">
|
||||
@@ -254,8 +255,7 @@
|
||||
<div class="row">
|
||||
<div class="col-md-10">
|
||||
<label for="<%= DdlProductosServicios.ClientID.ToString()%>">Productos:</label>
|
||||
<ADS:Dropdownlost ID="DdlProductosServicios" CssStyle="width: 95%;" runat="server" DataTextField="PSCodigo" DataValueField="CvePS" >
|
||||
</ADS:Dropdownlost>
|
||||
<ADS:Dropdownlost ID="DdlProductosServicios" CssStyle="width: 95%;" runat="server" DataTextField="PSCodigo" DataValueField="CvePS"></ADS:Dropdownlost>
|
||||
</div>
|
||||
|
||||
<div class="col-md-2" style="margin-top: 20px;">
|
||||
@@ -263,11 +263,22 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row" id="DivSelectiva" runat="server" visible="false">
|
||||
<div class="col-md-10">
|
||||
<label for="<%= DdlSelectiva.ClientID.ToString()%>">Selectiva:</label><br />
|
||||
<asp:DropDownList ID="DdlSelectiva" CssClass="form-control select2me" Width="95%" runat="server" DataTextField="Selectiva" DataValueField="CveSelectiva"></asp:DropDownList>
|
||||
</div>
|
||||
|
||||
<div class="col-md-2" style="margin-top: 20px;">
|
||||
<asp:Button for="DdlSelectiva" ID="BtnSelectiva" runat="server" CssClass="btn btn-primary btn-sm" Text="+" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<asp:GridView ID="GvPS" runat="server" GridLines="None" DataKeyNames="CvePS" CssClass="table table-striped table-advance table-hover Widthall mysmallbtn ScrollAD" data-heightfijo="150" data-height="150" Width="380px" AutoGenerateColumns="False" EmptyDataText="">
|
||||
<Columns>
|
||||
<asp:BoundField DataField="CodigoPS" HeaderText="Productos" ItemStyle-HorizontalAlign="Left" ItemStyle-Width="310px" HeaderStyle-Width="310px"/>
|
||||
<asp:BoundField DataField="CodigoPS" HeaderText="Productos" ItemStyle-HorizontalAlign="Left" ItemStyle-Width="310px" HeaderStyle-Width="310px" />
|
||||
<asp:TemplateField ItemStyle-HorizontalAlign="Center" HeaderText="Comandos" ItemStyle-Width="70px" HeaderStyle-Width="70px">
|
||||
<ItemTemplate>
|
||||
<asp:LinkButton ID="imgD" runat="server" AlternateText="Eliminar" OnClick="DeleteProductosServicios_Click" CausesValidation="False" CssClass="btn btn-circle btn-sm red" Text="<i class='icon-trash'></i>" data-toggle="confirmation" data-popout="true" data-original-title="Confirmar" data-btn-ok-label="si" />
|
||||
@@ -314,7 +325,7 @@
|
||||
<asp:BoundField DataField="Clasificacion" HeaderText="Clasificacion" ItemStyle-HorizontalAlign="Left" />
|
||||
<asp:TemplateField ItemStyle-HorizontalAlign="Center" HeaderText="Comandos">
|
||||
<ItemTemplate>
|
||||
<asp:LinkButton ID="LnkEliminarClasificacionExcluida" OnClick="LnkEliminarClasificacionExcluida_Click" runat="server" AlternateText="Eliminar" CausesValidation="False" CssClass="btn btn-circle btn-sm red" Text="<i class='icon-trash'></i>" data-toggle="confirmation" data-popout="true" data-original-title="Confirmar" data-btn-ok-label="si" />
|
||||
<asp:LinkButton ID="LnkEliminarClasificacionExcluida" OnClick="LnkEliminarClasificacionExcluida_Click" runat="server" AlternateText="Eliminar" CausesValidation="False" CssClass="btn btn-circle btn-sm red" Text="<i class='icon-trash'></i>" data-toggle="confirmation" data-popout="true" data-original-title="Confirmar" data-btn-ok-label="si" />
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
</Columns>
|
||||
@@ -345,11 +356,10 @@
|
||||
<div class="row">
|
||||
<div class="col-md-10">
|
||||
<label for="<%= DdlPSExcluye.ClientID.ToString()%>">Productos:</label>
|
||||
<ADS:Dropdownlost ID="DdlPSExcluye" CssStyle="width: 95%;" runat="server" DataTextField="PSCodigo" DataValueField="CvePS" >
|
||||
</ADS:Dropdownlost>
|
||||
<ADS:Dropdownlost ID="DdlPSExcluye" CssStyle="width: 95%;" runat="server" DataTextField="PSCodigo" DataValueField="CvePS"></ADS:Dropdownlost>
|
||||
</div>
|
||||
|
||||
<div class="col-md-2" style="margin-top:20px;">
|
||||
<div class="col-md-2" style="margin-top: 20px;">
|
||||
<asp:Button for="DdlPSExcluye" ID="BtnAddPSExcluye" runat="server" CssClass="btn btn-primary btn-sm" Text="+" />
|
||||
</div>
|
||||
</div>
|
||||
@@ -390,23 +400,22 @@
|
||||
<div class="row">
|
||||
<div class="col-md-10">
|
||||
<label for="<%= DdlProveedor.ClientID.ToString()%>">Proveedor:</label>
|
||||
<ADS:Dropdownlost ID="DdlProveedor" CssStyle="width: 95%;" runat="server" DataTextField="RazonSocial" DataValueField="CveProveedor" >
|
||||
</ADS:Dropdownlost>
|
||||
<ADS:Dropdownlost ID="DdlProveedor" CssStyle="width: 95%;" runat="server" DataTextField="RazonSocial" DataValueField="CveProveedor"></ADS:Dropdownlost>
|
||||
</div>
|
||||
<div class="col-md-2" style="margin-top:20px;">
|
||||
<div class="col-md-2" style="margin-top: 20px;">
|
||||
<asp:Button for="DdlProveedor" ID="BtnAgregarProveedor" runat="server" CssClass="btn btn-primary btn-sm" Text="+" />
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<asp:GridView ID="GvProveedor" runat="server" GridLines="None" DataKeyNames="CveProveedor,RazonSocial" CssClass="table table-striped table-advance table-hover Widthall mysmallbtn ScrollAD" data-heightfijo="150" data-height="150" Width="380px" AutoGenerateColumns="False" ToolTip="Listado de Proveedores" >
|
||||
<asp:GridView ID="GvProveedor" runat="server" GridLines="None" DataKeyNames="CveProveedor,RazonSocial" CssClass="table table-striped table-advance table-hover Widthall mysmallbtn ScrollAD" data-heightfijo="150" data-height="150" Width="380px" AutoGenerateColumns="False" ToolTip="Listado de Proveedores">
|
||||
<Columns>
|
||||
<asp:BoundField DataField="RazonSocial" HeaderText="Proveedor" ItemStyle-HorizontalAlign="Left" />
|
||||
<asp:TemplateField ItemStyle-HorizontalAlign="Center" HeaderText="Comandos">
|
||||
<ItemTemplate>
|
||||
<asp:LinkButton ID="imgD" runat="server" AlternateText="Eliminar" CausesValidation="False" OnClick="DeleteProveedor_Click" CssClass="btn btn-circle btn-sm red" Text="<i class='icon-trash'></i>" data-toggle="confirmation" data-popout="true" data-original-title="Confirmar" data-btn-ok-label="si"/>
|
||||
<asp:LinkButton ID="imgD" runat="server" AlternateText="Eliminar" CausesValidation="False" OnClick="DeleteProveedor_Click" CssClass="btn btn-circle btn-sm red" Text="<i class='icon-trash'></i>" data-toggle="confirmation" data-popout="true" data-original-title="Confirmar" data-btn-ok-label="si" />
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
</Columns>
|
||||
@@ -420,7 +429,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="row" style="border-top: 1px solid #e5e5e5;">
|
||||
<div class="col-md-12" style="margin-top:15px;">
|
||||
<div class="col-md-12" style="margin-top: 15px;">
|
||||
<div class="col-md-6" runat="server" id="divUsuarios" visible="false">
|
||||
<div class="portlet light xspadding bordered" id="idUsuarios">
|
||||
<div class="portlet-title">
|
||||
@@ -438,12 +447,12 @@
|
||||
<div class="row">
|
||||
<div class="col-md-10">
|
||||
<label for="<%= DdlUsuarios.ClientID.ToString()%>">Usuarios:</label>
|
||||
<asp:DropDownList ID="DdlUsuarios" CssClass="form-control select2me" runat="server" DataTextField="Nombre" DataValueField="CveUsuario" Width="100%">
|
||||
<asp:DropDownList ID="DdlUsuarios" CssClass="form-control select2me" runat="server" DataTextField="Nombre" DataValueField="CveUsuario" Width="100%">
|
||||
</asp:DropDownList>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-md-2" style="margin-top:20px;">
|
||||
<div class="col-md-2" style="margin-top: 20px;">
|
||||
<asp:Button for="DdlUsuarios" ID="btnAddUsuarios" runat="server" CssClass="btn btn-primary btn-sm" Text="+" />
|
||||
</div>
|
||||
</div>
|
||||
@@ -460,12 +469,12 @@
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField ItemStyle-HorizontalAlign="Center" HeaderText="Bloqueado">
|
||||
<ItemTemplate>
|
||||
<asp:CheckBox ID="chkBloqueado" runat="server" />
|
||||
<asp:CheckBox ID="chkBloqueado" runat="server" />
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField ItemStyle-HorizontalAlign="Center" HeaderText="Cerrado">
|
||||
<ItemTemplate>
|
||||
<asp:LinkButton ID="imgCerrar" runat="server" AlternateText="Cerrar" OnClick="imgCerrar_Click" CausesValidation="False" CssClass="btn black" Text="<i class='fa fa-lock'></i>" data-toggle="confirmation" data-popout="true" data-original-title="Confirmar" data-btn-ok-label="si" style="padding-left: 7px;padding-bottom: 1px;padding-top: 1px;padding-right: 7px; color:black;"/>
|
||||
<asp:LinkButton ID="imgCerrar" runat="server" AlternateText="Cerrar" OnClick="imgCerrar_Click" CausesValidation="False" CssClass="btn black" Text="<i class='fa fa-lock'></i>" data-toggle="confirmation" data-popout="true" data-original-title="Confirmar" data-btn-ok-label="si" Style="padding-left: 7px; padding-bottom: 1px; padding-top: 1px; padding-right: 7px; color: black;" />
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
</Columns>
|
||||
@@ -483,11 +492,11 @@
|
||||
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<asp:CheckBox runat="server" ID="chkUsarApp" AutoPostBack="true" Text="Usar en App:"/>
|
||||
<asp:CheckBox runat="server" ID="chkUsarApp" AutoPostBack="true" Text="Usar en App:" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<asp:UpdatePanel ID="UpFooter" runat="server" UpdateMode="Conditional">
|
||||
|
||||
@@ -83,6 +83,11 @@ Partial Class Inventarios_InventarioFisico
|
||||
|
||||
Protected Sub Page_Load(sender As Object, e As EventArgs) Handles Me.Load
|
||||
If Not IsPostBack Then
|
||||
If UsuarioActual.Empresa.Funcionalidad(382) = "1" Then
|
||||
DivSelectiva.Visible = True
|
||||
CargaSelectivas()
|
||||
End If
|
||||
|
||||
CargaDdlSubProyectos()
|
||||
CargaDdlClasificacion()
|
||||
CargDdlProveedor()
|
||||
@@ -100,6 +105,17 @@ Partial Class Inventarios_InventarioFisico
|
||||
End Sub
|
||||
|
||||
#Region "CARGAS"
|
||||
Private Sub CargaSelectivas()
|
||||
Using ObjPS As New ClsProductosServicios
|
||||
If ObjPS.GetSelectiva(-1, UsuarioActual.CveEmpresa) Then
|
||||
DdlSelectiva.DataSource = ObjPS.DtResultados
|
||||
End If
|
||||
End Using
|
||||
DdlSelectiva.DataBind()
|
||||
DdlSelectiva.Items.Insert(0, New ListItem("Seleccione", "-1"))
|
||||
End Sub
|
||||
|
||||
|
||||
Private Sub CargaDatos(CveEmpresa As Integer)
|
||||
Dim Inventario As New ClsInventarios
|
||||
Dim dt As New DataTable
|
||||
@@ -261,6 +277,35 @@ Partial Class Inventarios_InventarioFisico
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub BtnSelectiva_Click(sender As Object, e As EventArgs) Handles BtnSelectiva.Click
|
||||
If DdlSelectiva.SelectedValue = "-1" Then
|
||||
Alert("Tienes seleccionada la opcion 'Seleccione'.", TipoMensaje.MsgInformacion)
|
||||
GvPS.DataSource = Nothing
|
||||
GvPS.DataBind()
|
||||
tDTPS.Rows.Clear()
|
||||
Else
|
||||
If tDTPS IsNot Nothing Then
|
||||
tDTPS.Rows.Clear()
|
||||
End If
|
||||
|
||||
Using ObjPS As New ClsProductosServicios
|
||||
If ObjPS.GetPSSelectiva(DdlSelectiva.SelectedValue.ToEntero(), UsuarioActual.CveEmpresa) Then
|
||||
For Each RowPS As DataRow In ObjPS.DtResultados.Rows
|
||||
Dim Row As DataRow = tDTPS.NewRow
|
||||
Row("CvePS") = RowPS("CvePS")
|
||||
Row("CodigoPS") = RowPS("CodigoPS")
|
||||
|
||||
tDTPS.Rows.Add(Row)
|
||||
Next
|
||||
End If
|
||||
End Using
|
||||
|
||||
GvPS.DataSource = tDTPS
|
||||
GvPS.DataBind()
|
||||
UpProductosServicios.Update()
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub BtnAddPSExcluye_Click(sender As Object, e As EventArgs) Handles BtnAddPSExcluye.Click
|
||||
If DdlPSExcluye.SelectedValue = "-1" Then
|
||||
Alert("Tienes seleccionada la opcion 'Todos'.", TipoMensaje.MsgInformacion)
|
||||
|
||||
Reference in New Issue
Block a user