AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.10.111:8383/SIG

Browse Source
This commit is contained in:
JORGE LUIS CAUDILLO ESPARZA
2020-07-11 05:49:41 -07:00
parent bf82847ab9 dd5a10f142
commit 6b591361d6
3 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AF/AF.aspx
View File

@@ -2890,9 +2890,9 @@
<div class="row"> <div class="row">
<div class="col-md-2">Producto:</div> <div class="col-md-2">Producto:</div>
<div class="col-md-10"> <div class="col-md-10">
<asp:DropDownList ID="DdlAFInvPS" AutoPostBack="true" DataTextField="PSCodigo" DataValueField="CvePS" CssClass="select2me" AppendDataBoundItems="true" runat="server" Width="475px" OnSelectedIndexChanged="DdlAFInvPS_SelectedIndexChanged"></asp:DropDownList> <ADS:Dropdownlost runat="server" ID="DdlAFInvPS" CssStyle="width: 100%;" CssClass="DdlPS " CssClassDdl="select2me " IncluyeTodos="false" DataTextField="PSCodigo" DataValueField="CvePS" Onselectedindexchange ="DdlAFInvPS_SelectedIndexChanged" />
<asp:RequiredFieldValidator ID="RFVAFInvPS" runat="server" ControlToValidate="DdlAFInvPS" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Producto''</b> es necesario, por favor seleccione uno." InitialValue="-1" ValidationGroup="GrpAFInv"></asp:RequiredFieldValidator> <%-- <asp:RequiredFieldValidator ID="RFVAFInvPS" runat="server" ControlToValidate="DdlAFInvPS" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Producto''</b> es necesario, por favor seleccione uno." InitialValue="-1" ValidationGroup="GrpAFInv"></asp:RequiredFieldValidator>
<ajax:ValidatorCalloutExtender ID="VCEAFInvPS" runat="server" HighlightCssClass="vco" TargetControlID="RFVAFInvPS" Width="300px"></ajax:ValidatorCalloutExtender> <ajax:ValidatorCalloutExtender ID="VCEAFInvPS" runat="server" HighlightCssClass="vco" TargetControlID="RFVAFInvPS" Width="300px"></ajax:ValidatorCalloutExtender>--%>
</div> </div>
</div> </div>
<div id="DivSerie" runat="server" visible="false" class="row"> <div id="DivSerie" runat="server" visible="false" class="row">

22
AF/AF.aspx.vb
View File

@@ -530,18 +530,18 @@ Partial Class AF_AF
HLAFInv.Visible= True HLAFInv.Visible= True
Dim StrAlmacenes As String = "CveTipoAlmacen IN (1,2)" Dim StrAlmacenes As String = "CveTipoAlmacen IN (1,2,12)"
DdlAFInvAlmacen.DataSource = GlobalDTAlmacenUsuarios(UsuarioActual.CveUsuario, CveEmpresaActual, -1).FiltraParametros(StrAlmacenes) DdlAFInvAlmacen.DataSource = GlobalDTAlmacenUsuarios(UsuarioActual.CveUsuario, CveEmpresaActual, CveTipoAlmacen:=-1).FiltraParametros(StrAlmacenes)
DdlAFInvAlmacen.Items.Insert(0, New ListItem(" Seleccione ", "-1")) DdlAFInvAlmacen.Items.Insert(0, New ListItem(" Seleccione ", "-1"))
DdlAFInvAlmacen.SelectedValue = "-1" DdlAFInvAlmacen.SelectedValue = "-1"
DdlAFInvAlmacen.DataBind() DdlAFInvAlmacen.DataBind()
DdlAFInvAlmacen.SelectedValueExist(UsuarioActual.CveAlmacen) DdlAFInvAlmacen.SelectedValueExist(UsuarioActual.CveAlmacen)
DdlAFInvPS.setEsWebService(True)
'DdlAFInvPS.DataSource = GlobalDTPS(UsuarioActual.CveEmpresa).FiltraParametros("CveTipoPS = 2", "PSCodigo")
DdlAFInvPS.DataSource = GlobalDTPS(UsuarioActual.CveEmpresa).FiltraParametros("CveTipoPS = 2", "PSCodigo") 'DdlAFInvPS.Items.Insert(0, New ListItem(" Seleccione ", "-1"))
DdlAFInvPS.Items.Insert(0, New ListItem(" Seleccione ", "-1")) 'DdlAFInvPS.DataBind()
DdlAFInvPS.DataBind() 'DdlAFInvPS.SelectedValue = "-1"
DdlAFInvPS.SelectedValue = "-1"
End If End If
End Sub End Sub
Private Sub CargaMarcas() Private Sub CargaMarcas()
@@ -3043,6 +3043,12 @@ Partial Class AF_AF
#Region " AFInv " #Region " AFInv "
Protected Sub BtnAFInv_Click(sender As Object, e As EventArgs) Protected Sub BtnAFInv_Click(sender As Object, e As EventArgs)
If DdlAFInvPS.SelectedValue.ToEntero <= 0 Then
Alert("Seleccione un producto.")
Exit Sub
End If
AFInvSerie = "" AFInvSerie = ""
AFInvCvePS = -1 AFInvCvePS = -1
AFInvCveAlmacen = -1 AFInvCveAlmacen = -1
@@ -3073,7 +3079,7 @@ Partial Class AF_AF
Exit Sub Exit Sub
End If End If
TxtDescripcion.Text = DdlAFInvPS.SelectedItem.Text TxtDescripcion.Text = DdlAFInvPS.SelectedText
TxtValorCompra.Text = Costo.FormatoNumero TxtValorCompra.Text = Costo.FormatoNumero
TxtFechaCompra.Text = Now.ToShortDateString TxtFechaCompra.Text = Now.ToShortDateString
TxtNoSerie.Text = TxtAFInvSerie.Text.Trim TxtNoSerie.Text = TxtAFInvSerie.Text.Trim

11
Inventarios/RepMovimientos.aspx
View File

@@ -177,11 +177,12 @@
<Columns> <Columns>
<asp:BoundField HeaderText="Concepto" DataField="Concepto" ItemStyle-Width="10%" /> <asp:BoundField HeaderText="Concepto" DataField="Concepto" ItemStyle-Width="10%" />
<asp:HyperLinkField DataNavigateUrlFields="CveMovimiento" DataNavigateUrlFormatString="~/inventarios/EntradasSalidas.aspx?CveMovimiento={0}" Target="_blank" ItemStyle-Width="15%" HeaderText="Movimiento" ControlStyle-CssClass="Texto" ItemStyle-HorizontalAlign="Left" DataTextField="Folio" /> <asp:HyperLinkField DataNavigateUrlFields="CveMovimiento" DataNavigateUrlFormatString="~/inventarios/EntradasSalidas.aspx?CveMovimiento={0}" Target="_blank" ItemStyle-Width="15%" HeaderText="Movimiento" ControlStyle-CssClass="Texto" ItemStyle-HorizontalAlign="Left" DataTextField="Folio" />
<asp:BoundField HeaderText="Almacen" DataField="Almacen" ItemStyle-Width="20%" /> <asp:BoundField HeaderText="Almacen" DataField="Almacen" ItemStyle-Width="10%" />
<asp:BoundField HeaderText="F. Movimiento" DataField="FechaMovto" DataFormatString="{0:d}" ItemStyle-Width="10%" ItemStyle-HorizontalAlign="Center" /> <asp:BoundField HeaderText="Observación" DataField="Observaciones" ItemStyle-Width="20%" />
<asp:BoundField HeaderText="F. Ingreso" DataField="FechaIng" DataFormatString="{0:d}" ItemStyle-Width="10%" ItemStyle-HorizontalAlign="Center" /> <asp:BoundField HeaderText="F. Movimiento" DataField="FechaMovto" DataFormatString="{0:d}" ItemStyle-Width="5%" ItemStyle-HorizontalAlign="Center" />
<asp:HyperLinkField DataNavigateUrlFields="CveCompra" DataNavigateUrlFormatString="~/Compras/Compras.aspx?CveCompra={0}" Target="_blank" ItemStyle-Width="12.5%" HeaderText="Compra" ControlStyle-CssClass="Texto" ItemStyle-HorizontalAlign="Left" DataTextField="SerieFolioCompra" /> <asp:BoundField HeaderText="F. Ingreso" DataField="FechaIng" DataFormatString="{0:d}" ItemStyle-Width="5%" ItemStyle-HorizontalAlign="Center" />
<asp:HyperLinkField DataNavigateUrlFields="CveVenta" DataNavigateUrlFormatString="~/Ventas/Ventas.aspx?CvePS={0}" Target="_blank" ItemStyle-Width="12.5%" HeaderText="Venta" ControlStyle-CssClass="Texto" ItemStyle-HorizontalAlign="Left" DataTextField="SerieFolioVenta" /> <asp:HyperLinkField DataNavigateUrlFields="CveCompra" DataNavigateUrlFormatString="~/Compras/Compras.aspx?CveCompra={0}" Target="_blank" ItemStyle-Width="5%" HeaderText="Compra" ControlStyle-CssClass="Texto" ItemStyle-HorizontalAlign="Left" DataTextField="SerieFolioCompra" />
<asp:HyperLinkField DataNavigateUrlFields="CveVenta" DataNavigateUrlFormatString="~/Ventas/Ventas.aspx?CvePS={0}" Target="_blank" ItemStyle-Width="5%" HeaderText="Venta" ControlStyle-CssClass="Texto" ItemStyle-HorizontalAlign="Left" DataTextField="SerieFolioVenta" />
</Columns> </Columns>
</asp:GridView> </asp:GridView>
</ContentTemplate> </ContentTemplate>