diff --git a/App_Code/ClsVentas.vb b/App_Code/ClsVentas.vb
index c348cebec..daee7399b 100644
--- a/App_Code/ClsVentas.vb
+++ b/App_Code/ClsVentas.vb
@@ -460,7 +460,8 @@ Public Class ClsVentas
Optional TipoDocto As String = "Cot", Optional Vigencia As Date = MinFecha, Optional CondicionesPago As Integer = -1,
Optional AtencionA As String = "-1", Optional PedidoContrato As String = "-1", Optional CveFormaPago33 As Integer = -1, Optional CveMetodoPago33 As Integer = -1,
Optional CveCliente As Integer = -1, Optional CveClienteSucursal As Integer = -1, Optional OrdenCompra As String = "-1", Optional RetIVA As Double = -1,
- Optional RetISR As Double = -1, Optional Kilometraje As Double = 0) As Boolean
+ Optional RetISR As Double = -1, Optional Kilometraje As Double = 0, Optional CveVendedor As Integer = -1, Optional ObsAlm As String = "", Optional FormaPaqueteria As Integer = -1,
+ Optional CorreoNot As String = "-1") As Boolean
Dim Retorno As Boolean = False
DataAdapter("PA_Vta_VentasUpdate")
@@ -491,6 +492,10 @@ Public Class ClsVentas
.Add("@CveClienteSucursal", SqlDbType.Int).Value = CveClienteSucursal
.Add("@OrdenCompra", SqlDbType.VarChar).Value = OrdenCompra
.Add("@Kilometraje", SqlDbType.Float).Value = Kilometraje
+ .Add("@CveVendedor", SqlDbType.Int).Value = CveVendedor
+ .Add("@ObservacionesAlm", SqlDbType.NVarChar).Value = ObsAlm
+ .Add("@FormaPaqueteria", SqlDbType.Int).Value = FormaPaqueteria
+ .Add("@CorreoNotificacion", SqlDbType.NVarChar).Value = CorreoNot
End With
Try
diff --git a/Ashx/SIGGPSRCService.ashx b/Ashx/SIGGPSRCService.ashx
index fdf23c18b..33e0b4b40 100644
--- a/Ashx/SIGGPSRCService.ashx
+++ b/Ashx/SIGGPSRCService.ashx
@@ -15,6 +15,17 @@ using System.Text;
public class SIGGPSRCService : IHttpHandler, IRequiresSessionState
{
+ public bool EsProduccion
+ {
+ get
+ {
+ if (System.Configuration.ConfigurationManager.AppSettings["EsProduccion"] == null)
+ return false;
+ else
+ return (System.Configuration.ConfigurationManager.AppSettings["EsProduccion"].ToString() == "1");
+ }
+ }
+
private Usuario ValidaUsuarioSistema(int CveEmpresa)
{
Usuario UsuarioActual = null;
@@ -85,8 +96,28 @@ public class SIGGPSRCService : IHttpHandler, IRequiresSessionState
{
try
{
- context.Response.ContentType = "application/json";
- IniciarTransmision(context);
+ context.Response.ContentType = "text/plain";
+ bool retorno = false;
+ string Metodo = context.Request["Metodo"] == null ? "" : context.Request["Metodo"];
+ switch (Metodo)
+ {
+ case "EjecutaServicio":
+ ModExtensiones.GuardaLogAD("Servicio Ejecutado...........", "LogServicioConfiable");
+ IniciarTransmision(context);
+ retorno = true;
+ break;
+ default:
+ break;
+ }
+ if (retorno)
+ {
+ context.Response.Write("True");
+ }
+ else
+ {
+ context.Response.Write("False");
+ }
+
}
catch (Exception ex)
{
@@ -147,16 +178,26 @@ public class SIGGPSRCService : IHttpHandler, IRequiresSessionState
this.OnError("Ocurrió un error al enviar los datos", ex);
}
ObjGPS.Dispose();
+
DtTrackings.Dispose();
DtTrackings = null;
- var respuesta = WS.GPSAssetTracking(Token.token, ListaEventos.ToArray());
+ if (ListaEventos.Count > 0)
+ {
+
+ var respuesta = WS.GPSAssetTracking(Token.token, ListaEventos.ToArray());
+ context.Response.Write(JsonConvert.SerializeObject(respuesta));
+ }
WS.Close();
- context.Response.Write(JsonConvert.SerializeObject(respuesta));
-
+ //context.Response.Write(JsonConvert.SerializeObject(new { idJob = "1", exception = "" }));
}
- private string UserService => "demo_cedis_corp";
- private string PasswordService => "xxxxxxxx";
+
+
+
+
+ private string UserService => EsProduccion ? "ws_avl_opsat" : "demo_cedis_corp";
+ private string PasswordService => EsProduccion ? "eiHv##889iWfz#&2" : "xxxxxxxx";
+
}
\ No newline at end of file
diff --git a/GPS/RecursoConfiableTracking.aspx.vb b/GPS/RecursoConfiableTracking.aspx.vb
index 7faaaf405..f88665cbe 100644
--- a/GPS/RecursoConfiableTracking.aspx.vb
+++ b/GPS/RecursoConfiableTracking.aspx.vb
@@ -29,7 +29,7 @@ Partial Class GPS_RecursoConfiableTracking
DdlDispositivoFiltro.DataBind()
DdlDispositivoFiltro.Items.Insert(0, New ListItem("Todos", "-1"))
- DdlDispositivo.DataSource = GlobalDTDispositivosUsuarios(UsuarioActual.CveCliente, UsuarioActual.CveUsuario).FiltraParametros("PlacasVehiculo <> ''")
+ DdlDispositivo.DataSource = GlobalDTDispositivosUsuarios(UsuarioActual.CveCliente, UsuarioActual.CveUsuario).FiltraParametros("PlacasVehiculo IS NOT NULL AND PlacasVehiculo <> ''")
DdlDispositivo.DataBind()
DdlDispositivo.Items.Insert(0, New ListItem("Seleccione", "-1"))
diff --git a/Inventarios/PaquetesArmadoDesarmado.aspx b/Inventarios/PaquetesArmadoDesarmado.aspx
index b6b4271e3..403797160 100644
--- a/Inventarios/PaquetesArmadoDesarmado.aspx
+++ b/Inventarios/PaquetesArmadoDesarmado.aspx
@@ -216,18 +216,38 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+