From 90c5ef791e438931fe9f20ab305d1bb747c25801 Mon Sep 17 00:00:00 2001 From: Rakcsle Supertramp Date: Thu, 9 Jul 2020 19:55:25 -0700 Subject: [PATCH 1/3] Tareas119 Ajustes, columnas, cambio de formato de fechas --- Bancos/RegistroPagoIntermediario.aspx.vb | 2 +- RH/RepDocumentacionVencida.aspx | 2 +- RH/RepDocumentacionVencida.aspx.vb | 2 +- TareasProgramadas/Tareas119.ashx | 71 +++++++++++++++++++++--- 4 files changed, 67 insertions(+), 10 deletions(-) diff --git a/Bancos/RegistroPagoIntermediario.aspx.vb b/Bancos/RegistroPagoIntermediario.aspx.vb index cd7f32ce5..17e4bc86e 100644 --- a/Bancos/RegistroPagoIntermediario.aspx.vb +++ b/Bancos/RegistroPagoIntermediario.aspx.vb @@ -246,7 +246,7 @@ Partial Class Bancos_PagosIntermediarios Else ObjIE.RollBack() Alert(String.Format("Ocurrió un error al registrar el movimiento."), TipoMensaje.MsgError) - GuardaLog(MsgError) + GuardaLog($"RegistroPagoIntermediario --> {MsgError}") End If ObjIE.Dispose() diff --git a/RH/RepDocumentacionVencida.aspx b/RH/RepDocumentacionVencida.aspx index bbf751d02..bf2d3e0d8 100644 --- a/RH/RepDocumentacionVencida.aspx +++ b/RH/RepDocumentacionVencida.aspx @@ -198,7 +198,7 @@
Sucursal
- + diff --git a/RH/RepDocumentacionVencida.aspx.vb b/RH/RepDocumentacionVencida.aspx.vb index a8fc898ed..6bd981f64 100644 --- a/RH/RepDocumentacionVencida.aspx.vb +++ b/RH/RepDocumentacionVencida.aspx.vb @@ -87,7 +87,7 @@ Partial Class RH_RepDocumentacionVencida - DDLSucursal.DataSource = GlobalDTSubProyectos(UsuarioActual.Empresa.CveEmpresa) + DDLSucursal.DataSource = GlobalDTSubProyectos(-1, CveEmpresa:=UsuarioActual.CveEmpresa) DDLSucursal.DataBind() DDLSucursal.Items.Insert(0, New ListItem("Todos", "-1")) If UsuarioActual.CveSucursal > 0 Then diff --git a/TareasProgramadas/Tareas119.ashx b/TareasProgramadas/Tareas119.ashx index 49543b657..edb37572b 100644 --- a/TareasProgramadas/Tareas119.ashx +++ b/TareasProgramadas/Tareas119.ashx @@ -131,13 +131,70 @@ public class TareasJam : IHttpHandler DTClientes.Columns[7].ColumnName = "address.street1"; DTClientes.Columns[8].ColumnName = "address.street2"; DTClientes.Columns[9].ColumnName = "address.postalCode"; - DTClientes.Columns[9].ColumnName = "phone.intCode"; - DTClientes.Columns[9].ColumnName = "phone.areaCode"; - DTClientes.Columns[9].ColumnName = "phone.number"; - DTClientes.Dispose(); + DTClientes.Columns[10].ColumnName = "phone.intCode"; + DTClientes.Columns[11].ColumnName = "phone.areaCode"; + DTClientes.Columns[12].ColumnName = "phone.number"; + + DTClientes.Columns.RemoveAt(12); + DTClientes.Columns.RemoveAt(11); + DTClientes.Columns.RemoveAt(10); + DTClientes.Columns.RemoveAt(8); + DTClientes.Columns.RemoveAt(7); + DTClientes.AcceptChanges(); DTVentas.Columns.RemoveAt(7); + DTVentas.Columns.RemoveAt(6); DTVentas.AcceptChanges(); + + + DataTable dtCloned = DTVentas.Clone(); + dtCloned.Columns[3].DataType = typeof(string); + + foreach (DataRow row in DTVentas.Rows) + { + dtCloned.ImportRow(row); + } + + DTVentas = dtCloned; + foreach(DataRow dRow in DTVentas.Rows) + { + string tmpString = dRow[3].ToString().ToDate().ToString("yyyy/MM/dd"); + dRow[3] = tmpString; + } + + DTVentas.AcceptChanges(); + + + dtCloned = DTAlmacenes.Clone(); + dtCloned.Columns[3].DataType = typeof(string); + + foreach (DataRow row in DTAlmacenes.Rows) + { + dtCloned.ImportRow(row); + } + + DTAlmacenes = dtCloned; + foreach(DataRow dRow in DTAlmacenes.Rows) + { + string tmpString = dRow[3].ToString().ToDate().ToString("yyyy/MM/dd"); + dRow[3] = tmpString; + } + DTAlmacenes.AcceptChanges(); + + + + //// DTAlmacenes.Columns[3].DataType = typeof(string); + //DTAlmacenes.AcceptChanges(); + + //foreach (DataRow dRow in DTAlmacenes.Rows) + //{ + // string tmpString = dRow[3].ToString().ToDate().ToString("yyyy/MM/dd"); + // dRow[3] = tmpString; + //} + + //DTAlmacenes.AcceptChanges(); + + } catch (Exception e) { @@ -155,7 +212,7 @@ public class TareasJam : IHttpHandler string RutaProductos = $@"{ HttpContext.Current.Server.MapPath("~") }Temp\Productos{DateTime.Now.ToString("yyyyMMdd")}.xlsx"; string RutaVentas = $@"{ HttpContext.Current.Server.MapPath("~") }Temp\Ventas{DateTime.Now.ToString("yyyyMMdd")}.xlsx"; string RutaClientes = $@"{ HttpContext.Current.Server.MapPath("~") }Temp\Clientes{DateTime.Now.ToString("yyyyMMdd")}.xlsx"; - string RutaAlmacenes = $@"{ HttpContext.Current.Server.MapPath("~") }Temp\Almacenes{DateTime.Now.ToString("yyyyMMdd")}.xlsx"; + string RutaAlmacenes = $@"{ HttpContext.Current.Server.MapPath("~") }Temp\Almacenes{DateTime.Now.ToString("yyyyMMdd")}.xlsx"; SpreadsheetInfo.SetLicense(Extensiones.ModExtensiones.SerialGemBoxSpreadsheet()); @@ -312,8 +369,8 @@ public class TareasJam : IHttpHandler try { ClsSisMail Correo = new ClsSisMail(); - string Para = "julian@adssistemas.mx;rene.molina@adssistemas.mx;oscar.irigoyen@adssistemas.mx"; - //string Para = "oscar.irigoyen@adssistemas.mx"; + //string Para = "julian@adssistemas.mx;rene.molina@adssistemas.mx;oscar.irigoyen@adssistemas.mx"; + string Para = "oscar.irigoyen@adssistemas.mx"; string Asunto = ErrorProceso ? $"Carga Layout Corteva {DateTime.Now.ToString("yyyy-MM-dd")}" : $"Carga Layout Corteva Error {DateTime.Now.ToString("yyyy-MM-dd")}"; Correo.SendMail(ClsPaginas.EmpresaNotificaciones, Para, Asunto, Cuerpo); From 4772a5dc92718fc289885efcc1b3778fa8c67c07 Mon Sep 17 00:00:00 2001 From: Rakcsle Supertramp Date: Thu, 9 Jul 2020 20:06:08 -0700 Subject: [PATCH 2/3] Tareas119 correcion correos de envio --- TareasProgramadas/Tareas119.ashx | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/TareasProgramadas/Tareas119.ashx b/TareasProgramadas/Tareas119.ashx index edb37572b..1f560654a 100644 --- a/TareasProgramadas/Tareas119.ashx +++ b/TareasProgramadas/Tareas119.ashx @@ -179,20 +179,8 @@ public class TareasJam : IHttpHandler string tmpString = dRow[3].ToString().ToDate().ToString("yyyy/MM/dd"); dRow[3] = tmpString; } - DTAlmacenes.AcceptChanges(); - - - - //// DTAlmacenes.Columns[3].DataType = typeof(string); - //DTAlmacenes.AcceptChanges(); - - //foreach (DataRow dRow in DTAlmacenes.Rows) - //{ - // string tmpString = dRow[3].ToString().ToDate().ToString("yyyy/MM/dd"); - // dRow[3] = tmpString; - //} - - //DTAlmacenes.AcceptChanges(); + DTAlmacenes.AcceptChanges(); + } @@ -369,8 +357,8 @@ public class TareasJam : IHttpHandler try { ClsSisMail Correo = new ClsSisMail(); - //string Para = "julian@adssistemas.mx;rene.molina@adssistemas.mx;oscar.irigoyen@adssistemas.mx"; - string Para = "oscar.irigoyen@adssistemas.mx"; + string Para = "julian@adssistemas.mx;rene.molina@adssistemas.mx;oscar.irigoyen@adssistemas.mx"; + // string Para = "oscar.irigoyen@adssistemas.mx"; string Asunto = ErrorProceso ? $"Carga Layout Corteva {DateTime.Now.ToString("yyyy-MM-dd")}" : $"Carga Layout Corteva Error {DateTime.Now.ToString("yyyy-MM-dd")}"; Correo.SendMail(ClsPaginas.EmpresaNotificaciones, Para, Asunto, Cuerpo); From d9921be741a221379cde08d35a1deac0a7410efe Mon Sep 17 00:00:00 2001 From: JORGE LUIS CAUDILLO ESPARZA Date: Fri, 10 Jul 2020 12:30:05 -0700 Subject: [PATCH 3/3] --- App_Code/ClsGenerales.vb | 15 ++++++ App_Code/ClsVentas.vb | 34 ++++++++++++++ App_Code/WsSigfox.vb | 18 +++++++- Inicio.aspx | 86 +++++++++++++++++++++++++++++++++++ Inicio.aspx.vb | 17 +++++++ Ventas/SolicitudesSAT.aspx | 62 +++++++++++++++++++------ Ventas/SolicitudesSAT.aspx.cs | 26 ++++++++--- 7 files changed, 237 insertions(+), 21 deletions(-) diff --git a/App_Code/ClsGenerales.vb b/App_Code/ClsGenerales.vb index 30171da5f..0e131aa7b 100644 --- a/App_Code/ClsGenerales.vb +++ b/App_Code/ClsGenerales.vb @@ -210,6 +210,21 @@ Public Class ClsGenerales End Try Return retorno End Function + + Public Function SAT_DescargaSolicitudeUUIDSGET(CveSolicitudSat As Int32) As Boolean + Dim retorno As Boolean = False + DataAdapter("[PA_Gral_DescargaSolicitudesUUIDSGET]", CommandType.StoredProcedure) + With SqlAdapter.SelectCommand.Parameters + .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 #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/ClsVentas.vb b/App_Code/ClsVentas.vb index 4dcf2318d..e4cb5ef17 100644 --- a/App_Code/ClsVentas.vb +++ b/App_Code/ClsVentas.vb @@ -2862,6 +2862,40 @@ Public Class ClsVentas Return OnError End Function + + Public Function GETVentasPendientesdeTimbrar(CveEmpresa As Integer) As Boolean + Dim OnError As Boolean = False + DataAdapter("PA_Vta_VentasPendientesdeTimbrar") + With SqlAdapter.SelectCommand.Parameters + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + End With + + Try + SqlAdapter.Fill(Data) + OnError = True + Catch ex As Exception + Me.OnError("Ocurrió un error al obtener las facturas.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + End Try + + Return OnError + End Function + Public Function GETVentasPendientesdeCancelar(CveEmpresa As Integer) As Boolean + Dim OnError As Boolean = False + DataAdapter("PA_Vta_VentasPendientesdeCancelar") + With SqlAdapter.SelectCommand.Parameters + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + End With + + Try + SqlAdapter.Fill(Data) + OnError = True + Catch ex As Exception + Me.OnError("Ocurrió un error al obtener las facturas.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + End Try + + Return OnError + End Function + Public Function GetFacturasCanceladasPendientes(FoliosFiscales As String, CveEmpresa As Integer) As Boolean Dim OnError As Boolean = False DataAdapter("PA_Vta_FacturasCanceladasPendientesGet") diff --git a/App_Code/WsSigfox.vb b/App_Code/WsSigfox.vb index a3919f0f1..767dcf9e4 100644 --- a/App_Code/WsSigfox.vb +++ b/App_Code/WsSigfox.vb @@ -19,10 +19,11 @@ Namespace Sigfox Public Function CrearTrama( params As DispositivoGPS) As Object Dim respuesta = New With {.Correcto = False, .Mensaje = "", .Datos = New JObject} + Dim datos As String = "" '"0104000000000000" Dim ObjGPS As New ClsGPS() Try - 'Dim Datos = GetSigfoxDataSuntechTool(params.data) + 'Dim Datos = GetSigfoxDataSuntechTool(params.data) se calcula por Base de datos revisar el AddTrama 'respuesta.Datos = Datos Dim DevID As String = params.device @@ -48,6 +49,10 @@ Namespace Sigfox params.station, params.time) If ObjGPS.AddTrama(DevID, Trama, Lat, Lng, Fecha, Velocidad, "ST730") Then + If ObjGPS.DtResultados.Rows.Count > 0 Then + datos = ObjGPS.DtResultados.Rows(0)("Comando").ToString() + 'CveDispositivo = ObjGPS.DtResultados.Rows(0)("CveDispositivo").ToString() + End If respuesta.Correcto = True respuesta.Mensaje = "La trama se agregó correctamente" Else @@ -61,7 +66,16 @@ Namespace Sigfox Finally ObjGPS.Dispose() End Try - Return respuesta + + Dim response As HttpResponseMessage + If datos.Length > 0 Then + Dim jsonString As String = $"{{""{params.device}"":{{""downlinkData"":""{datos}""}}}}" + response = Me.Request.CreateResponse(HttpStatusCode.OK) + response.Content = New StringContent(jsonString, Encoding.UTF8, "application/json") + Else + response = Request.CreateResponse(HttpStatusCode.NoContent, "") + End If + Return response End Function #Region "F U N C I O N E S" diff --git a/Inicio.aspx b/Inicio.aspx index bc2192868..d7c9313e4 100644 --- a/Inicio.aspx +++ b/Inicio.aspx @@ -800,7 +800,93 @@
+ + +