diff --git a/AF/AF.aspx b/AF/AF.aspx
index 506805e0f..49c50f5fc 100644
--- a/AF/AF.aspx
+++ b/AF/AF.aspx
@@ -1362,7 +1362,55 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/AF/AF.aspx.vb b/AF/AF.aspx.vb
index d47cf410c..edfc7507a 100644
--- a/AF/AF.aspx.vb
+++ b/AF/AF.aspx.vb
@@ -284,8 +284,64 @@ Partial Class AF_AF
End If
CargaAFInv()
+ cargaOrdenesdeservicio()
End If
End Sub
+ Private Sub cargaOrdenesdeservicio()
+ Dim dt As New DataTable()
+ dt.Columns.Add("Folio", GetType(String))
+ dt.Columns.Add("Fecha", GetType(Date))
+ dt.Columns.Add("Obra", GetType(String))
+ dt.Columns.Add("TipodeServicio", GetType(String))
+ dt.Columns.Add("Servicio", GetType(String))
+ dt.Columns.Add("Estatus", GetType(String))
+ dt.Columns.Add("Duracion", GetType(String))
+ dt.Columns.Add("Atendio", GetType(String))
+
+ Dim dr As DataRow = dt.NewRow()
+ dr("Folio") = "101"
+ dr("Fecha") = "2019/08/23"
+ dr("Obra") = "Ganaderos"
+ dr("TipodeServicio") = "Preventivo"
+ dr("Servicio") = "100 Hrs"
+ dr("Estatus") = "Terminada"
+ dr("Duracion") = "5 Hrs"
+ dr("Atendio") = "Juan perez"
+ dt.Rows.Add(dr)
+ dr = dt.NewRow()
+ dr("Folio") = "190"
+ dr("Fecha") = "2019/09/30"
+ dr("Obra") = "Ganaderos"
+ dr("TipodeServicio") = "Preventivo"
+ dr("Servicio") = "200 Hrs"
+ dr("Estatus") = "Terminada"
+ dr("Duracion") = "5 hrs"
+ dr("Atendio") = "Ernesto Lopez"
+ dt.Rows.Add(dr)
+ dr = dt.NewRow()
+ dr("Folio") = "501"
+ dr("Fecha") = "2019/11/30"
+ dr("Obra") = "Vildósola"
+ dr("TipodeServicio") = "Preventivo"
+ dr("Servicio") = "400 Hrs"
+ dr("Estatus") = "Terminada"
+ dr("Duracion") = "8 hrs"
+ dr("Atendio") = "Juan perez"
+ dt.Rows.Add(dr)
+ dr = dt.NewRow()
+ dr("Folio") = "505"
+ dr("Fecha") = "2019/12/14"
+ dr("Obra") = "Vildósola"
+ dr("TipodeServicio") = "Correctivo"
+ dr("Servicio") = "Rep. Mayor motor"
+ dr("Estatus") = "En proceso"
+ dr("Duracion") = "ND"
+ dr("Atendio") = "Juan perez"
+ dt.Rows.Add(dr)
+
+ GVOrdenesdeServicio.DataSource = dt
+ GVOrdenesdeServicio.DataBind()
+ End Sub
Private Sub CargaFechaGPS()
TxtFechaIH.Text = $"01/{DateTime.Now.ToString("MM")}/{DateTime.Now.Year} 00:00"
TxtFechaFH.Text = $"{DateTime.Now.ToString("dd/MM/yyyy")} 23:59"
@@ -476,7 +532,7 @@ Partial Class AF_AF
Private Sub CargaAFInv()
If UsuarioActual.Empresa.UsaInventarios AndAlso CveActivoFijo <= 0 Then
- HLAFInv.Visible = True
+ HLAFInv.Visible= True
Dim StrAlmacenes As String = "CveTipoAlmacen IN (1,2)"
DdlAFInvAlmacen.DataSource = GlobalDTAlmacenUsuarios(UsuarioActual.CveUsuario, CveEmpresaActual, -1).FiltraParametros(StrAlmacenes)
diff --git a/Nomina/Nomina2.aspx b/Nomina/Nomina2.aspx
index 176fdd0eb..43b852e4f 100644
--- a/Nomina/Nomina2.aspx
+++ b/Nomina/Nomina2.aspx
@@ -4,6 +4,10 @@