Merge branch 'master' of http://jperez@192.168.10.111:8383/SIG.git
This commit is contained in:
@@ -202,16 +202,23 @@
|
||||
<asp:UpdatePanel ID="UPDatos" runat="server" UpdateMode="Conditional">
|
||||
<ContentTemplate>
|
||||
<asp:GridView ID="GvDatos" runat="server" AutoGenerateColumns="False" EmptyDataText="No se encontró ningun Traspaso de Almacén"
|
||||
ToolTip="" data-rows="2"
|
||||
ToolTip="" data-rows="1"
|
||||
CssClass="table table-striped table-advance table-hover Widthall ScrollAD"
|
||||
data-sort="true" GridLines="None">
|
||||
<Columns>
|
||||
<asp:BoundField HeaderText="Disponible" DataField="Cantidad" DataFormatString="{0:#,##0.00####}" ItemStyle-HorizontalAlign="Right" ItemStyle-Width="10%" />
|
||||
<asp:BoundField HeaderText="Folio" DataField="Folio" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="5%" />
|
||||
<asp:BoundField HeaderText="Disponible" DataField="Cantidad" DataFormatString="{0:#,##0.00####}" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="5%" />
|
||||
<asp:BoundField HeaderText="Unidad" DataField="UnidadMedida" ItemStyle-Width="5%" />
|
||||
<asp:BoundField HeaderText="Código" DataField="Codigo" ItemStyle-Width="5%" />
|
||||
|
||||
|
||||
<asp:BoundField HeaderText="Producto" DataField="PS" ItemStyle-HorizontalAlign="Left"/>
|
||||
<asp:BoundField HeaderText="Serie" DataField="Serie" ItemStyle-Width="5%" ItemStyle-HorizontalAlign="Left"/>
|
||||
<asp:BoundField HeaderText="Valor" DataField="Valor" ItemStyle-Width="5%" ItemStyle-HorizontalAlign="Right" DataFormatString="{0:n}" />
|
||||
<asp:BoundField HeaderText="Almacen Origen" DataField="Almacen" ItemStyle-Width="10%" />
|
||||
<asp:BoundField HeaderText="Almacen Destino" DataField="AlmacenDestino" ItemStyle-Width="10%" />
|
||||
<asp:BoundField HeaderText="Responsable" DataField="Recibio" ItemStyle-Width="10%" />
|
||||
|
||||
</Columns>
|
||||
<HeaderStyle CssClass="Titulos" />
|
||||
<RowStyle CssClass="Texto" />
|
||||
|
||||
@@ -77,7 +77,7 @@ Partial Class RepTraspasoAlmacen
|
||||
If ObjInventarios.RepTraspasoAlmacen(FechaI.ToDate, FechaF.ToDate, DdlAlmacenOrigen.SelectedValue.ToEntero, DdlAlmacenDestino.SelectedValue.ToEntero, ChkRecibido.Checked, UsuarioActual.CveEmpresa) Then
|
||||
GvDatos.DataSource = ObjInventarios.DtResultados
|
||||
DtInventarios = ObjInventarios.DtResultados
|
||||
GvDatos.Columns(4).Visible = DtInventarios.MAX("Serie") <> ""
|
||||
GvDatos.Columns(5).Visible = DtInventarios.MAX("Serie") <> ""
|
||||
End If
|
||||
|
||||
ObjInventarios.Dispose()
|
||||
@@ -100,23 +100,6 @@ Partial Class RepTraspasoAlmacen
|
||||
Protected Sub GvDatos_RowDataBound(sender As Object, e As System.Web.UI.WebControls.GridViewRowEventArgs) Handles GvDatos.RowDataBound
|
||||
If e.Row.RowType = DataControlRowType.DataRow Then
|
||||
|
||||
'Cuando es titulo
|
||||
If e.Row.DBCampo("PS").ToString.Trim = "" And e.Row.DBCampo("FechaMovto") <> "" Then
|
||||
|
||||
e.Row.CssClass = "Totales"
|
||||
|
||||
e.Row.Cells(0).Text = String.Format("Folio: <a class=""texto"" style=""color:white;"" target='_blank' href='/Inventarios/EntradasSalidas.aspx?CveMovimiento={1}'>{0}</a> ", e.Row.DBCampo("FolioSalida"), e.Row.DBCampo("CveMovimientoSalida"))
|
||||
e.Row.Cells(1).Text = String.Format("{0}", e.Row.DBCampo("FechaMovto").ToString.ToDate.ToShortDateString)
|
||||
e.Row.Cells(2).Text = String.Format("<span style =""white-space: nowrap;"">{0}</span>", e.Row.DBCampo("Almacen"))
|
||||
e.Row.Cells(3).Text = String.Format("<span style =""white-space: nowrap;"">{0}</span>", e.Row.DBCampo("AlmacenDestino"))
|
||||
e.Row.Cells(4).Text = String.Format("Responsable: {0}", e.Row.DBCampo("Recibio"))
|
||||
ElseIf e.Row.DBCampo("FechaMovto") = "" Then
|
||||
e.Row.CssClass = "Totales"
|
||||
e.Row.Cells(0).Text = "Total General"
|
||||
e.Row.Cells(2).Text = String.Format("<span style =""white-space: nowrap;"">Almacen Origen</span>")
|
||||
e.Row.Cells(3).Text = String.Format("<span style =""white-space: nowrap;"">Almacen Destino</span>")
|
||||
Else
|
||||
End If
|
||||
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Reference in New Issue
Block a user