From 5cda2592ecff0076732ac5aebec100462fea6ee0 Mon Sep 17 00:00:00 2001 From: JORGE LUIS CAUDILLO ESPARZA Date: Thu, 2 Jul 2020 17:47:27 -0700 Subject: [PATCH 01/23] --- AF/AF.aspx | 50 ++++++- AF/AF.aspx.vb | 58 +++++++- Nomina/Nomina2.aspx | 302 ++++++++++++++++++----------------------- Nomina/Nomina2.aspx.cs | 89 +++++++++++- Scripts/custom.js | 18 +-- 5 files changed, 333 insertions(+), 184 deletions(-) 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 @@ Solicitudes CFDI SAT @@ -121,8 +126,8 @@ - + @@ -131,7 +136,7 @@ - + @@ -141,12 +146,12 @@ - + - + @@ -161,7 +166,7 @@ - + @@ -170,6 +175,36 @@ +
@@ -225,7 +260,7 @@
--%> -
+
@@ -236,17 +271,17 @@ - +
-
-
+
+
- -
+ +
@@ -271,6 +306,7 @@
Solicitar SAT +
diff --git a/Ventas/SolicitudesSAT.aspx.cs b/Ventas/SolicitudesSAT.aspx.cs index 287c0dd55..8763d0441 100644 --- a/Ventas/SolicitudesSAT.aspx.cs +++ b/Ventas/SolicitudesSAT.aspx.cs @@ -19,7 +19,7 @@ public partial class Ventas_SolicitudesSAT : ClsPaginas string rfIngFin = Request["fIngFin"] == null ? "" : Request["fIngFin"].ToString().Trim(); string rfSolInicio = Request["fSolInicio"] == null ? "" : Request["fSolInicio"].ToString().Trim(); string rfSolFin = Request["fSolFin"] == null ? "" : Request["fSolFin"].ToString().Trim(); - + DateTime dValor = DateTime.Now; dValor = DateTime.Now; if (DateTime.TryParse(rfIngInicio, out dValor)) { rfIngInicio = string.Format("{0:dd/MM/yyyy}", dValor); } else { rfIngInicio = ""; } dValor = DateTime.Now; if (DateTime.TryParse(rfIngFin, out dValor)) { rfIngFin = string.Format("{0:dd/MM/yyyy}", dValor); } else { rfIngFin = ""; } @@ -29,7 +29,7 @@ public partial class Ventas_SolicitudesSAT : ClsPaginas DdlTipo.SelectedValueExist(rtipo); txtFechaI.Text = rfIngInicio; txtFechaF.Text = rfIngFin; - txtFechaISol.Text = rfSolInicio; + txtFechaISol.Text = rfSolInicio; txtFechaFSol.Text = rfSolFin; cargarDatos(); } @@ -59,10 +59,10 @@ public partial class Ventas_SolicitudesSAT : ClsPaginas protected void LnkVerificarSolicitudes_Click(object sender, EventArgs e) { - string direxe = string.Format("{0}{1}",AppDomain.CurrentDomain.BaseDirectory, "Utilerias\\ADSUtilerias.exe"); + string direxe = string.Format("{0}{1}", AppDomain.CurrentDomain.BaseDirectory, "Utilerias\\ADSUtilerias.exe"); - String json = string.Format("{{cveTareaProgramada:{0},cveEmpresa:{1},CveTareaProgramadaHistorial:{2},recursividad:{3},Resultado:{4},parametros:'Tipo=SP'}}", 1, UsuarioActual.CveEmpresa,-1, 0, 1);//Mod.ToLiteral(new System.Web.Script.Serialization.JavaScriptSerializer().Serialize(tarea)); - //this.Alert(string.Format("json:{0} : --mod TareaProgramada --Item {1}", DateTime.Now, json)); + String json = string.Format("{{cveTareaProgramada:{0},cveEmpresa:{1},CveTareaProgramadaHistorial:{2},recursividad:{3},Resultado:{4},parametros:'Tipo=SP'}}", 1, UsuarioActual.CveEmpresa, -1, 0, 1);//Mod.ToLiteral(new System.Web.Script.Serialization.JavaScriptSerializer().Serialize(tarea)); + //this.Alert(string.Format("json:{0} : --mod TareaProgramada --Item {1}", DateTime.Now, json)); try { string Mensajes = ""; @@ -97,7 +97,7 @@ public partial class Ventas_SolicitudesSAT : ClsPaginas string direxe = string.Format("{0}{1}", AppDomain.CurrentDomain.BaseDirectory, "Utilerias\\ADSUtilerias.exe"); - String json = string.Format("{{cveTareaProgramada:{0},cveEmpresa:{1},CveTareaProgramadaHistorial:{2},recursividad:{3},Resultado:{4},parametros:'Tipo={5}&fechai={6}&fechaf={7}'}}", 1, UsuarioActual.CveEmpresa, -1, 0, 1,DdlTipoAdd.SelectedValue, FechaI, FechaF);//Mod.ToLiteral(new System.Web.Script.Serialization.JavaScriptSerializer().Serialize(tarea)); + String json = string.Format("{{cveTareaProgramada:{0},cveEmpresa:{1},CveTareaProgramadaHistorial:{2},recursividad:{3},Resultado:{4},parametros:'Tipo={5}&fechai={6}&fechaf={7}'}}", 1, UsuarioActual.CveEmpresa, -1, 0, 1, DdlTipoAdd.SelectedValue, FechaI, FechaF);//Mod.ToLiteral(new System.Web.Script.Serialization.JavaScriptSerializer().Serialize(tarea)); //this.Alert(string.Format("json:{0} : --mod TareaProgramada --Item {1}", DateTime.Now, json)); try { @@ -125,4 +125,18 @@ public partial class Ventas_SolicitudesSAT : ClsPaginas cargarDatos(); Alert("La solicitud ha sido enviada"); } + + protected void LnknoCFDI_Click(object sender, EventArgs e) + { + GridViewRow gvrow = (GridViewRow)(((LinkButton)sender).NamingContainer); + int CveSolicitudSat = gvrow.DataKey("CveSolicitudSat").ToEntero(); + using (ClsGenerales objgeneral = new ClsGenerales()) + { + objgeneral.SAT_DescargaSolicitudeUUIDSGET(CveSolicitudSat); + GVFoliosSAT.DataSource = objgeneral.DtResultados; + } + GVFoliosSAT.DataBind(); + RegistraScript("$('#ModalFoliosSolicitud').modal();"); + UpFoliosSAT.Update(); + } } \ No newline at end of file From 67973953b3333bf4c48637df38158feea63c9128 Mon Sep 17 00:00:00 2001 From: rrene Date: Fri, 10 Jul 2020 15:23:28 -0700 Subject: [PATCH 16/23] -columna de observaciones --- Inventarios/RepMovimientos.aspx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Inventarios/RepMovimientos.aspx b/Inventarios/RepMovimientos.aspx index c620e5880..c4d79e109 100644 --- a/Inventarios/RepMovimientos.aspx +++ b/Inventarios/RepMovimientos.aspx @@ -177,11 +177,12 @@ - - - - - + + + + + + From dd5a10f1422b449ca1d7463fd35223e5925e05d3 Mon Sep 17 00:00:00 2001 From: rrene Date: Fri, 10 Jul 2020 16:00:13 -0700 Subject: [PATCH 17/23] -- importacion de AF, almacenes productos financieros --- AF/AF.aspx | 6 +++--- AF/AF.aspx.vb | 42 ++++++++++++++++++++++++------------------ 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/AF/AF.aspx b/AF/AF.aspx index 81fd169d0..c4357400e 100644 --- a/AF/AF.aspx +++ b/AF/AF.aspx @@ -2890,9 +2890,9 @@
Producto:
- - - + + <%-- + --%>
diff --git a/AF/AF.aspx.vb b/AF/AF.aspx.vb index db5d2faa8..ca666a371 100644 --- a/AF/AF.aspx.vb +++ b/AF/AF.aspx.vb @@ -530,18 +530,18 @@ Partial Class AF_AF HLAFInv.Visible= True - Dim StrAlmacenes As String = "CveTipoAlmacen IN (1,2)" - DdlAFInvAlmacen.DataSource = GlobalDTAlmacenUsuarios(UsuarioActual.CveUsuario, CveEmpresaActual, -1).FiltraParametros(StrAlmacenes) + Dim StrAlmacenes As String = "CveTipoAlmacen IN (1,2,12)" + DdlAFInvAlmacen.DataSource = GlobalDTAlmacenUsuarios(UsuarioActual.CveUsuario, CveEmpresaActual, CveTipoAlmacen:=-1).FiltraParametros(StrAlmacenes) DdlAFInvAlmacen.Items.Insert(0, New ListItem(" Seleccione ", "-1")) DdlAFInvAlmacen.SelectedValue = "-1" DdlAFInvAlmacen.DataBind() - DdlAFInvAlmacen.SelectedValueExist(UsuarioActual.CveAlmacen) + DdlAFInvAlmacen.SelectedValueExist(UsuarioActual.CveAlmacen) + DdlAFInvPS.setEsWebService(True) - - DdlAFInvPS.DataSource = GlobalDTPS(UsuarioActual.CveEmpresa).FiltraParametros("CveTipoPS = 2", "PSCodigo") - DdlAFInvPS.Items.Insert(0, New ListItem(" Seleccione ", "-1")) - DdlAFInvPS.DataBind() - DdlAFInvPS.SelectedValue = "-1" + 'DdlAFInvPS.DataSource = GlobalDTPS(UsuarioActual.CveEmpresa).FiltraParametros("CveTipoPS = 2", "PSCodigo") + 'DdlAFInvPS.Items.Insert(0, New ListItem(" Seleccione ", "-1")) + 'DdlAFInvPS.DataBind() + 'DdlAFInvPS.SelectedValue = "-1" End If End Sub Private Sub CargaMarcas() @@ -3035,14 +3035,20 @@ Partial Class AF_AF Catch ex As Exception End Try - End Sub - - + End Sub + + #End Region - - + + #Region " AFInv " 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 = "" AFInvCvePS = -1 AFInvCveAlmacen = -1 @@ -3073,7 +3079,7 @@ Partial Class AF_AF Exit Sub End If - TxtDescripcion.Text = DdlAFInvPS.SelectedItem.Text + TxtDescripcion.Text = DdlAFInvPS.SelectedText TxtValorCompra.Text = Costo.FormatoNumero TxtFechaCompra.Text = Now.ToShortDateString TxtNoSerie.Text = TxtAFInvSerie.Text.Trim @@ -3091,11 +3097,11 @@ Partial Class AF_AF DivAFInvAdvertencia.Visible = True UpDatos.Update() - End Sub - - + End Sub + + #End Region - + #Region "AF GRUPOS" Private Sub BtnAgregarGrupo_Click(sender As Object, e As EventArgs) Handles BtnAgregarGrupo.Click TxtGrupoAF.Text = "" From bf82847ab901871d3dec2bbdb839a1571ca44201 Mon Sep 17 00:00:00 2001 From: JORGE LUIS CAUDILLO ESPARZA Date: Sat, 11 Jul 2020 05:49:32 -0700 Subject: [PATCH 18/23] --- App_Code/ClsGenerales.vb | 31 +++++++++++++++++++ App_Code/modExtensiones.vb | 4 +-- Site.master | 57 +++++++++++++++++++++++++++++++++++ Site.master.vb | 25 +++++++++++++++ SiteGPS.master | 2 +- Ventas/SolicitudesSAT.aspx | 27 ++++++++++++++++- Ventas/SolicitudesSAT.aspx.cs | 9 ++++++ 7 files changed, 151 insertions(+), 4 deletions(-) diff --git a/App_Code/ClsGenerales.vb b/App_Code/ClsGenerales.vb index 0e131aa7b..80b8e3306 100644 --- a/App_Code/ClsGenerales.vb +++ b/App_Code/ClsGenerales.vb @@ -225,6 +225,37 @@ Public Class ClsGenerales End Try Return retorno End Function + + + Public Function SAT_DescargaSolicitudesAddNotificaciones(CveEmpresa As Int32, CveSolicitudSat As Int32) As Boolean + Dim retorno As Boolean = False + DataAdapter("[PA_Gral_SAT_DescargaSolicitudesAddNotificaciones]", CommandType.StoredProcedure) + With SqlAdapter.SelectCommand.Parameters + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@CveSolicitudSat", SqlDbType.Int).Value = CveSolicitudSat + End With + Try + SqlAdapter.Fill(Data) + retorno = True + Catch ex As Exception + OnError("Ocurrió un error al obtener los registros de solicitudes CFDI SAT.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + End Try + Return retorno + End Function + Public Function SAT_DescargaSolicitudesAddNotificacionesCOUNT(CveEmpresa As Int32) As Boolean + Dim retorno As Boolean = False + DataAdapter("[PA_Gral_SAT_DescargaSolicitudesAddNotificacionesCOUNT]", CommandType.StoredProcedure) + With SqlAdapter.SelectCommand.Parameters + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + End With + Try + SqlAdapter.Fill(Data) + retorno = True + Catch ex As Exception + OnError("Ocurrió un error al obtener los registros de solicitudes CFDI SAT.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + End Try + Return retorno + End Function #Region " I N D I C A D O R E S Y G R A F I C A S" Public Function GetIndicadores(CveEmpresa As Integer) As DataSet 'Dim Retorno As Boolean = False diff --git a/App_Code/modExtensiones.vb b/App_Code/modExtensiones.vb index ad51f25bc..c5fb9f873 100644 --- a/App_Code/modExtensiones.vb +++ b/App_Code/modExtensiones.vb @@ -463,10 +463,10 @@ Namespace Extensiones ''' Icono clase example fa fa-bell-o ''' 'danger','success','warning','info' ''' - Public Function ItemNotificaciones(Mensaje As String, Optional Fecha As String = "", Optional Ico As String = "fa fa-bell-o", Optional Tipo As String = "info", Optional Link As String = "javascript:;") As String + Public Function ItemNotificaciones(Mensaje As String, Optional Fecha As String = "", Optional Ico As String = "fa fa-bell-o", Optional Tipo As String = "info", Optional Link As String = "javascript:;", Optional tonewpage As Boolean = True) As String Dim Time As String = "" If Fecha <> "" Then Time = String.Format("{0}", Fecha) - Return String.Format("
  • {0}{3}
    • ", Time, Tipo, Ico, Mensaje, Link) + Return String.Format("
  • {0}{3}
    • ", Time, Tipo, Ico, Mensaje, Link, If(tonewpage, "target=""_blank""", "")) End Function ' 'Public Function addindicador(Obj As Object, color As String, icono As String, titulo As String, comentario As String, link As String) As String diff --git a/Site.master b/Site.master index b57fe65e1..ac198d1a4 100644 --- a/Site.master +++ b/Site.master @@ -666,6 +666,63 @@ + + + + +
    +
    + +

    Folios descargados

    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + +
    +
    +     +     +