From aed29b5deb62cc8ae46000f678b4b07830fd7658 Mon Sep 17 00:00:00 2001 From: IsR0d Date: Mon, 23 Sep 2024 10:10:41 -0600 Subject: [PATCH] Version: 4.09.17.EP_d Se agrego la suplencia y a cada cliente se le asigna su ruta correspondiente. --- B4A/B4XMainPage.bas | 5 +- B4A/C_Principal.bas | 124 ++++++++++++++++++++++++++++------ B4A/Files/principal.bal | Bin 48336 -> 49211 bytes B4A/Files/resdia.bal | Bin 44363 -> 46043 bytes B4A/Guna Vistas V3.1.b4a | 2 +- B4A/Guna Vistas V3.1.b4a.meta | 2 +- B4A/Subs.bas | 10 +-- 7 files changed, 114 insertions(+), 29 deletions(-) diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index a7125ac..6920ec8 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -183,6 +183,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS BITACORAGPS(fechab TEXT, usuariob TEXT, almacenb TEXT, rutab TEXT, eventob TEXT, clienteb TEXT, iniciob TEXT, finb TEXT, latitudb TEXT, longitudb TEXT, precision TEXT, motivonoventa TEXT, motivonovisita TEXT)") skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS kmt_info2(CAT_CL_FOTO BLOB, CAT_CL_NUM_SERIEFISICO TEXT, CAT_CL_MTOCOMPRA TEXT, CAT_CL_CEDIS TEXT, CAT_CL_LAT TEXT, CAT_CL_LONG TEXT, CAT_CL_FBAJA TEXT, CAT_CL_FALTA TEXT, CAT_CL_CP TEXT, CAT_CL_EDO TEXT, CAT_CL_MUNI TEXT, CAT_CL_COLONIA TEXT, CAT_CL_CALLE2 TEXT, CAT_CL_CALLE1 TEXT, CAT_CL_NOINT TEXT, CAT_CL_NOEXT TEXT, CAT_CL_CALLE TEXT, CAT_CL_EMAIL TEXT, CAT_CL_TELEFONO TEXT, CAT_CL_ATIENTE2 TEXT, CAT_CL_ATIENDE1 TEXT, CAT_CL_NOMBRE TEXT, CAT_CL_GIRO TEXT, CAT_CL_DIAS_VISITA TEXT, CAT_CL_TIPO_RUTA TEXT, CAT_CL_RUTA TEXT, CAT_CL_CODIGO TEXT, gestion NUMERIC)") skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_PRO2265(H_IDCLIENTE)") + skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS RUTA_SUPLENCIA(RS_RUTA TEXT)") ' skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_VARIABLES (CAT_VA_DESCRIPCION TEXT, CAT_VA_VALOR TEXT)") Subs.agregaColumna("HIST_ENCUESTA", "HE_LAT", "TEXT") @@ -536,7 +537,7 @@ Sub JobDone(Job As HttpJob) skmt.ExecNonQuery2("UPDATE GPS SET HABILITADO = (?)",Array As Object(1)) et_codigo.Text = "" - Private c2 As Cursor = skmt.ExecQuery("SELECT CAT_CL_RUTA FROM kmt_info2") + Private c2 As Cursor = skmt.ExecQuery("select distinct CAT_CL_RUTA from kmt_info2 where CAT_CL_RUTA not in (select * from ruta_suplencia)") c2.Position = 0 Private rutades As String = c2.GetString("CAT_CL_RUTA") c2.Close @@ -853,7 +854,7 @@ End Sub Private Sub b_aceptar_Click If et_codigo.Text <> "" Then - Private c2 As Cursor = skmt.ExecQuery("SELECT CAT_CL_RUTA FROM kmt_info2") + Private c2 As Cursor = skmt.ExecQuery("select distinct CAT_CL_RUTA from kmt_info2 where CAT_CL_RUTA not in (select * from ruta_suplencia)") c2.Position = 0 Private rutades As String = c2.GetString("CAT_CL_RUTA") c2.Close diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index f97239e..e3251a0 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -19,6 +19,7 @@ Sub Class_Globals Dim b As Cursor Dim e As Cursor Dim f As Cursor + Dim ro As Cursor Dim D2 As Cursor Dim lv As ListView Dim cargar As Button @@ -225,6 +226,13 @@ Sub Class_Globals Private p_marcasRes As Panel Private p_sombra As Panel + Private Label22 As Label + Private l_rutasuplencia As Label + Dim l_ru_pri As Label + Private l_ru_sup As Label + Private Label4 As Label + Private Label2 As Label + Private Label25 As Label End Sub 'You can add more parameters here. @@ -263,10 +271,19 @@ Private Sub B4XPage_Created (Root1 As B4XView) f.Position=0 l_ruta.Text = f.GetString("CAT_CL_RUTA") f.Close + +' ro = B4XPages.MainPage.skmt.ExecQuery("select count(*) as CAT_CL_RUTA from kmt_info2") +' ro.Position = 0 +' l_ru_pri.Text = ro.GetString("CAT_CL_RUTA") +' ro.Close +' If l_ru_pri.Text = 0 Then +' l_ru_pri.Text = 0 +' End If + If l_ruta.Text = 0 Then - l_ruta.Text =0 - Else - f=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info2") + l_ruta.Text = 0 + Else If l_ruta.Text > 0 Then + f=B4XPages.MainPage.skmt.ExecQuery("select distinct CAT_CL_RUTA from kmt_info2 where CAT_CL_RUTA not in (select * from ruta_suplencia)") f.Position=0 l_ruta.Text = f.GetString("CAT_CL_RUTA") f.Close @@ -300,8 +317,20 @@ Private Sub B4XPage_Created (Root1 As B4XView) c.Close End If d.Close - e.Close + e.Close CallSubDelayed(FirebaseMessaging, "SubscribeToTopics") + + Private s As Cursor = B4XPages.MainPage.skmt.ExecQuery("select count(RS_RUTA) as cuenta, RS_RUTA FROM RUTA_SUPLENCIA") + s.Position = 0 + If s.GetString("cuenta") = 0 Then + Label22.Visible = False + l_rutasuplencia.Visible = False + Else If s.GetString("cuenta") > 0 Then + Label22.Visible = True + l_rutasuplencia.Visible = True + l_rutasuplencia.Text = s.GetString("RS_RUTA") + End If + End Sub Sub B4XPage_Appear @@ -365,7 +394,7 @@ Sub B4XPage_Appear If l_ruta.Text = 0 Then l_ruta.Text =0 Else - f=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info2") + f=B4XPages.MainPage.skmt.ExecQuery("select distinct CAT_CL_RUTA from kmt_info2 where CAT_CL_RUTA not in (select * from ruta_suplencia)") f.Position=0 l_ruta.Text = f.GetString("CAT_CL_RUTA") f.Close @@ -460,6 +489,23 @@ Sub B4XPage_Appear CallSub(Starter, "ENVIA_ULTIMA_GPS") ' panel_5.Visible = False ' 'Log("panel5 visible FALSE") + + Private s As Cursor = B4XPages.MainPage.skmt.ExecQuery("select count(RS_RUTA) as cuenta, RS_RUTA FROM RUTA_SUPLENCIA") + s.Position = 0 + If s.GetString("cuenta") = 0 Then + + Label22.Visible = False + l_rutasuplencia.Visible = False + l_rutasuplencia.Text = "" + + Else If s.GetString("cuenta") > 0 Then + + Label22.Visible = True + l_rutasuplencia.Visible = True + l_rutasuplencia.Text = s.GetString("RS_RUTA") + + End If + End Sub Sub Subir_Click @@ -621,7 +667,7 @@ Sub Subir_Click d.Close c=B4XPages.MainPage.skmt.ExecQuery2("SELECT PE_RECALCULO,PE_RECALCULOTOT,PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO, PE_COSTO_SIN, PE_RUTA, PE_DESC, PE_FOLIO FROM PEDIDO WHERE PE_RECALCULO <> ? or PE_RECALCULO <> ? or PE_RECALCULO IS NOT NULL",Array As String("","null")) - d=B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) as CUANTOS_PEDIDO FROM PEDIDO") + d=B4XPages.MainPage.skmt.ExecQuery($"SELECT COUNT(*) as CUANTOS_PEDIDO FROM PEDIDO where PE_RUTA = '${Subs.traeRuta}'"$) If c.RowCount>0 Then For i=0 To c.RowCount -1 c.Position=i @@ -984,6 +1030,12 @@ Sub cargar_Click B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "hist_pro2265") If E_RUTA2.text <> "" Then + + B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO RUTA_SUPLENCIA(RS_RUTA) VALUES(?)",Array As String(E_RUTA2.Text)) + + E_RUTA2.Visible = False + Panel11.Visible = False + cmd.Initialize cmd.Name = "select_cat_clientes_guna_GV2" cmd.Parameters = Array As Object(E_RUTA2.text, ALMACEN) @@ -1726,6 +1778,8 @@ Sub JobDone(Job As HttpJob) If RESULT.Tag = "valida_pedido" Then 'query tag For Each records() As Object In RESULT.Rows Dim CUANTOSP As Int = records(RESULT.Columns.Get("CUANTOSP")) + Log(cuantos_pedido) + Log(CUANTOSP) If cuantos_pedido < = CUANTOSP Then ' ToastMessageShow("rojo val ok 1 cuantosp." , True) datos_iguales = "ok" @@ -1868,6 +1922,7 @@ Sub JobDone(Job As HttpJob) End If End If End If + Job.Release End Sub @@ -1983,16 +2038,16 @@ Sub t2_tick B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM ENCUESTA_MODULO3") B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM ENCUESTA_MODULO4") B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM ENCUESTA_MODULO5") + B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM BITACORAGPS") + B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM RUTA_SUPLENCIA") B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("CARGA_DIA")) B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("pasword")) B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("LATITUD")) B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("LONGITUD")) - B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM BITACORAGPS") B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE GPS SET HABILITADO = (?)",Array As Object(0)) B4XPage_Appear E_RUTA2.Visible = False E_RUTA2.Text = "" - Panel11.Visible = False ' If PB2.Progress = 0 Then ' S_CP.Text = "ENVIAR DATOS (K-1)" @@ -2007,11 +2062,13 @@ Sub e_ruta_EnterPressed RES = Msgbox2("Seguro que desa hacer el cierre todos los datos se borraran?","Cierre", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore If RES = DialogResponse.POSITIVE Then - Subs.bitacora(Subs.fechanormal(DateTime.Now),usuario,Subs.traeAlmacen, Subs.traeRuta,"Fin Día", "",Subs.fechanormal(DateTime.Now),Subs.fechanormal(DateTime.Now),B4XPages.MainPage.lat_gps,B4XPages.MainPage.lon_gps,"2","","") t2.Initialize("T2", 1000) ' 1000 = 1 second t2.Enabled = True + Label22.Visible = False + l_rutasuplencia.Visible = False + l_rutasuplencia.Text = "" End If End If @@ -2233,10 +2290,10 @@ Sub resdia_Click label1 = L_MARCAS.TwoLinesLayout.Label label1.TextSize = 13 label1.TextColor = Colors.Black - Dim label2 As Label - label2 = L_MARCAS.TwoLinesLayout.SecondLabel - label2.TextSize = 13 - label2.TextColor = Colors.Black + Dim Label2 As Label + Label2 = L_MARCAS.TwoLinesLayout.SecondLabel + Label2.TextSize = 13 + Label2.TextColor = Colors.Black L_MARCAS.AddTwoLines(d.GetString("CLIENTE"),"TELEFONO :" & c.GetString("HE_RES") ) c.Close Next @@ -2284,24 +2341,51 @@ Sub resdia_Click s.Position=0 Private s5 As Cursor = B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(PE_RECALCULOTOT),0) as TOTAL_CLIE FROM PEDIDO WHERE (PE_RECALCULO <> ? or PE_RECALCULO <> ? OR PE_RECALCULO IS NOT NULL)",Array As String("","null")) s5.Position = 0 - - - L_REAL.Text =NumberFormat2(s.GetString("TOTAL_CLIE") + s5.GetString("TOTAL_CLIE"),0,2,2,False) - - - - s.Close +' l_ru_pri.Text = NumberFormat2(s.GetString("TOTAL_CLIE") + s5.GetString("TOTAL_CLIE"),0,2,2,False) + + L_REAL.Text =NumberFormat2(s.GetString("TOTAL_CLIE") + s5.GetString("TOTAL_CLIE"),0,2,2,False) + s.Close Else If s3.RowCount = 0 Then Private s As Cursor=B4XPages.MainPage.skmt.ExecQuery("select iFNULL(sum(pe_costo_tot),0) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE FROM PEDIDO ") s.Position=0 +' l_ru_pri.Text =NumberFormat2(s.GetString("TOTAL_CLIE"),0,2,2,False) + L_REAL.Text =NumberFormat2(s.GetString("TOTAL_CLIE"),0,2,2,False) s.Close End If + 'Prueba0 + Private ru_o As Cursor = B4XPages.MainPage.skmt.ExecQuery2("SELECT IFNULL(PE_RUTA, 0) AS PE_RUTA, IFNULL(SUM(PE_COSTO_TOT), 0) AS TOTAL_CLIE FROM PEDIDO LEFT JOIN RUTA_SUPLENCIA ON PE_RUTA = RS_RUTA WHERE RS_RUTA IS NULL", Null) + ru_o.Position=0 + Log("------------->RutaOriginal "&ru_o) + If ru_o.GetString("PE_RUTA") = 0 Then + Label2.Text = "N/A" + Else if ru_o.RowCount >=1 Then + Private rutOr As String = ru_o.GetString("PE_RUTA") + Label2.Text = "Ruta " & rutOr + l_ru_pri.Text = NumberFormat2(ru_o.GetString("TOTAL_CLIE"), 0, 2, 2, False) + End If + + ru_o.Close + + 'Prueba1 + Private ru_s As Cursor = B4XPages.MainPage.skmt.ExecQuery2("SELECT IFNULL(PE_RUTA, 0) As PE_RUTA, IFNULL(SUM(PE_COSTO_TOT), 0) As TOTAL_CLIE FROM PEDIDO LEFT JOIN RUTA_SUPLENCIA ON PE_RUTA = RS_RUTA WHERE RS_RUTA Is Not Null", Null) + ru_s.Position = 0 + If ru_s.GetString("PE_RUTA") = 0 Then + Label4.Text = "N/A" + Else + Private RuSu As String = ru_s.GetString("PE_RUTA") + Label4.Text = "Ruta " & RuSu + ru_s.Position = 0 + l_ru_sup.Text = NumberFormat2(ru_s.GetString("TOTAL_CLIE"), 0, 2, 2, False) + End If + + ru_s.Close + Dim cuantos_obj As String c=B4XPages.MainPage.skmt.ExecQuery("Select count(*) AS TOTAL from HIST_MARCAS_CUOTAS ") c.Position = 0 diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal index a096d7b3f4069b8f5fb881f7cc210b3909517b7a..61136d57a1fed768fa0d691d48de2df6154084b2 100644 GIT binary patch delta 666 zcmccclWBJYGcPLx0|OTy5CiGfjlAEPg!qB1ocN;BlEmWDf}GU6ZfEdP32C^A}mL9f&iK*qKP|EF^X| z5<3Tpor_@CGvpyS4Eadx0wi`J61xbAU5vyoL1LEz*=0an4#X8m>`EXT=7B08TaqCf z;hxFulz{HY~JSHfM1cF)`|FzRUZF-;fdj&kNR@9N_8Cs5x11 zqcFlCAU|`V%w+jJLQGnWlk1YLChO$!Axs8EGs5J_e4!9Sv_XbUj(5_Y+-@Sos0}ot UkqfTW4CIK(_O@J;59|>D0Q9JNmH+?% delta 468 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 diff --git a/B4A/Guna Vistas V3.1.b4a b/B4A/Guna Vistas V3.1.b4a index aa86ed7..3dc60b6 100644 --- a/B4A/Guna Vistas V3.1.b4a +++ b/B4A/Guna Vistas V3.1.b4a @@ -251,7 +251,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Guna V3.1 #VersionCode: 1 - #VersionName: 4.09.06.EP_d + #VersionName: 4.09.17.EP_d 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/Guna Vistas V3.1.b4a.meta b/B4A/Guna Vistas V3.1.b4a.meta index 85c20e3..9fe4936 100644 --- a/B4A/Guna Vistas V3.1.b4a.meta +++ b/B4A/Guna Vistas V3.1.b4a.meta @@ -76,6 +76,6 @@ ModuleClosedNodes6=8,9,10 ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=Subs,agregaColumna,1173,0,Subs,guardaAppInfo,1186,0,B4XMainPage,Class_Globals,52,0,B4XMainPage,B4XPage_Appear,274,0,B4XMainPage,B4XPage_Created,144,2,Starter,Process_Globals,33,0,Starter,Service_Create,54,0,Main,Globals,25,0,Main,Process_Globals,21,0,Subs,revisaPromoProcterPRO3009,1425,0,Subs,validaPromoProcterPRO3009,1460,0 +NavigationStack=C_Principal,Class_Globals,222,0,C_Principal,CARGA_Click,2361,0,Diseñador Visual,resdia.bal,-100,3,C_Principal,resdia_Click,2255,6,C_Principal,Subir_Click,504,0,Diseñador Visual,principal.bal,-100,3,C_Principal,B4XPage_Appear,494,0,B4XMainPage,Class_Globals,25,0,Main,Activity_Create,27,0,Main,Globals,25,0 SelectedBuild=0 VisibleModules=23,2,24,13,14,4,6,9,12,5 diff --git a/B4A/Subs.bas b/B4A/Subs.bas index 8373a27..597f544 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -661,7 +661,7 @@ End Sub Sub traeRuta As String 'ignore Private c As Cursor Private r As String - c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info2 limit 1") + c=B4XPages.MainPage.skmt.ExecQuery("select distinct CAT_CL_RUTA from kmt_info2 where CAT_CL_RUTA not in (select * from ruta_suplencia)") r = "0" If c.RowCount > 0 Then c.Position=0 @@ -748,7 +748,7 @@ End Sub Sub guardaProducto(cedis As String, costoU As String, cant As String, nombre As String, prodId As String, clienteId As String, fecha As String, usuario As String, rutaV As String, precioSin As String, tipoVenta As String) LogColor("guardaProducto: "&prodId&", cant="&cant&" - TV:"&tipoVenta, Colors.Magenta) Private c As Cursor - B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO PEDIDO (PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA,PE_COSTO_SIN,PE_FOLIO) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object (cedis, (cant * costoU), costoU, cant, nombre, prodId, clienteId, fecha, usuario, rutaV, precioSin, tipoVenta)) + B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO PEDIDO (PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA,PE_COSTO_SIN,PE_FOLIO) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object (cedis, (cant * costoU), costoU, cant, nombre, prodId, clienteId, fecha, usuario, traeRutaBitacora, precioSin, tipoVenta)) B4XPages.MainPage.skmt.ExecNonQuery2("update cat_gunaprod set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object(cant, prodId)) c=B4XPages.MainPage.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE, SUM(PE_COSTO_SIN) AS TOTAL_CLIE_SIN FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)") c.Position=0 @@ -1262,7 +1262,7 @@ End Sub 'Mandar fecha de sync(sysdate) Sub bitacora(fechab As String, usuariob As String, almacenb As String, rutab As String, eventob As String, clienteb As String, iniciob As String, finb As String, latitudb As String, longitudb As String, precision As String, motivonoventa As String, motivonovisita As String ) Log(motivonovisita) - Log("bitacora") +' Log("bitacora") Private cmd As DBCommand cmd.Initialize cmd.Name = "mandaBitacora3_GUNA" @@ -1281,7 +1281,7 @@ Sub bitacora(fechab As String, usuariob As String, almacenb As String, rutab As If eventob = "Carga día suplencia" Then nombreCliente = traeRutasSup If eventob <> "Termina Venta" And eventob <> "No Venta" Then B4XPages.MainPage.skmt.ExecNonQuery($"INSERT INTO BITACORAGPS (fechab, usuariob , almacenb , rutab , eventob , clienteb , iniciob , finb , latitudb, longitudb , precision , motivonoventa , motivonovisita) VALUES ('${fechab}' ,'${usuariob}' , '${almacenb}' , '${rutab}' , '${eventob}' , '${clienteb}' , '${iniciob}' , '${finb}' , '${latitudb}' , '${longitudb}' , '${precision}' , '${motivonoventa}' , '${motivonovisita}')"$) - Log($"'${almacenb}', '${usuariob}', '${rutab}', '${eventob}', '${clienteb}', '${nombreCliente}','${ iniciob}', '${finb}','${ latitudb}','${ longitudb}', '${precision}', '${motivonoventa}', '${motivonovisita}', '${fechab}'"$) +' Log($"'${almacenb}', '${usuariob}', '${rutab}', '${eventob}', '${clienteb}', '${nombreCliente}','${ iniciob}', '${finb}','${ latitudb}','${ longitudb}', '${precision}', '${motivonoventa}', '${motivonovisita}', '${fechab}'"$) ' TMP_ALMACEN, TMP_USUARIO, TMP_RUTA, TMP_EVENTO, TMP_ID_CLIENTE, TMP_NOMBRE_CLIENTE, TMP_INICIO, TMP_FINAL, TMP_LATITUD, TMP_LONGITUD, TMP_PRESICION, TMP_MOTIVO_NO_VENTA, TMP_MOTIVO_NO_VISITA, TMP_FECHA_SINC, TMP_FECHA_MOVIL ' cmd.Parameters = Array As Object(almacenb, usuariob, rutab, eventob, clienteb, nombreCliente, iniciob, finb, latitudb, longitudb, precision, motivonoventa, motivonovisita, fechab) ' Starter.reqManager.ExecuteCommand(cmd , "mandaBitacora") @@ -1316,7 +1316,7 @@ Sub bitacora(fechab As String, usuariob As String, almacenb As String, rutab As Starter.reqManager.ExecuteCommand(cmd , "mandaBitacora") End If End If - Log("Mandamos bitacora") +' Log("Mandamos bitacora") End Sub 'En geocerca si mete la contraseña poner 0 en precision gps y si esta dentro de los 50 mts poner 1 y 2 para eventos que no lo ocupen