From 19358a8c76a58727a7950eb1a585d9a9bfb4e900 Mon Sep 17 00:00:00 2001 From: IsR0d Date: Mon, 7 Oct 2024 16:07:49 -0600 Subject: [PATCH] v: 4.10.06.EP_d Se modifico la suplencia, en el eveno de NoVenta, las fechas deven ser iguales y solo debe mostrar un registro. --- B4A/C_Cliente.bas | 12 ++++++++---- B4A/C_NoVenta.bas | 4 ++-- B4A/Guna Vistas V3.1.b4a.meta | 4 ++-- B4A/Subs.bas | 14 -------------- 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index c43a91d..ecdffc0 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -423,7 +423,7 @@ Sub Class_Globals Dim motivoNoVenta, motivoNoVisita As String Dim contadorIniciarVenta As Int = 0 Dim IniVenNO As Boolean = False - private geoCont as int = 0 + Private geoCont As Int = 0 End Sub 'You can add more parameters here. @@ -4788,13 +4788,17 @@ Private Sub b_Inicio_Fin_venta_Click contadorIniciarVenta = 0 IniVenNO = False contadorIniciarVenta = contadorIniciarVenta + 1 - If contadorIniciarVenta = 1 And IniVenNO = False Then + If contadorIniciarVenta = 1 And IniVenNO = False And motivoNoVenta <> "NO VENTA" Then IniVenNO = True Starter.VarX = 1 - - Subs.bitacora(Subs.fechanormal(DateTime.Now), Subs.traeUsuarioDeBD, Subs.traeAlmacen, Subs.traeRutaBitacora, "Inicia Venta", Subs.traeCliente, Subs.fechanormal(DateTime.Now), "", B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, precision, motivoNoVenta, "") + Subs.bitacora(Subs.fechanormal(DateTime.Now), Subs.traeUsuarioDeBD, Subs.traeAlmacen, Subs.traeRutaBitacora, "Inicia Venta", Subs.traeCliente, Subs.fechanormal(DateTime.Now), "", B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, precision, "", "") Starter.enVenta = True ' LogColor($">>>>>> INICIA VENTA: ${Starter.enVenta} - ${Subs.traeCliente}"$, Colors.red) + Else If contadorIniciarVenta = 1 And IniVenNO = False And motivoNoVenta = "NO VENTA" Then + IniVenNO = True + Starter.VarX = 1 + Subs.bitacora(Subs.fechanormal(DateTime.Now), Subs.traeUsuarioDeBD, Subs.traeAlmacen, Subs.traeRutaBitacora, "Inicia Venta", Subs.traeCliente, Subs.fechanormal(DateTime.Now), "", B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, precision, motivoNoVenta, "") + Starter.enVenta = True Else If contadorIniciarVenta > 1 Then b_Inicio_Fin_venta.Visible = False End If diff --git a/B4A/C_NoVenta.bas b/B4A/C_NoVenta.bas index 1c8f33d..9d24344 100644 --- a/B4A/C_NoVenta.bas +++ b/B4A/C_NoVenta.bas @@ -101,7 +101,7 @@ Sub GUARDA_Click If B4XPages.MainPage.cliente.IsInitialized Then B4XPages.MainPage.cliente.motivoNoVenta = motivo - Subs.bitacora(Subs.fechanormal(DateTime.Now), usuario, Subs.traeAlmacen, Subs.traeRuta, "No Venta", Subs.traeCliente, "", Subs.fechanormal(DateTime.Now), B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, B4XPages.MainPage.cliente.precision, motivo, e_comm.text) +' Subs.bitacora(Subs.fechanormal(DateTime.Now), usuario, Subs.traeAlmacen, Subs.traeRuta, "No Venta", Subs.traeCliente, "", Subs.fechanormal(DateTime.Now), B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, B4XPages.MainPage.cliente.precision, motivo, e_comm.text) Starter.enVenta = False End If @@ -129,6 +129,6 @@ Sub GUARDA_Click B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE HIST_STAY_STORE set HSS_TOT = ? where HSS_CODIGO In (select cuenta from cuentaa)", Array As Object(stay_hh + stay_mi + stay_ss)) B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE HIST_STAY_OUT set HSO_FIN = ? ", Array As Object(sTime)) DateTime.TimeFormat = "HH:mm:ss" - Subs.bitacora(Subs.fechanormal(DateTime.Now), usuario, Subs.traeAlmacen, Subs.traeRuta, "NO VENTA", Subs.traeCliente, Subs.fechanormal(DateTime.Now), Subs.fechanormal(DateTime.Now), B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, 2, "", r_1.Checked) + Subs.bitacora(Subs.fechanormal(DateTime.Now), usuario, Subs.traeAlmacen, Subs.traeRutaBitacora, "NO VENTA", Subs.traeCliente,Subs.fechanormal(DateTime.Now), Subs.fechanormal(DateTime.Now), B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, 2, motivo, r_1.Checked) B4XPages.ShowPage("Principal") End Sub \ No newline at end of file diff --git a/B4A/Guna Vistas V3.1.b4a.meta b/B4A/Guna Vistas V3.1.b4a.meta index 4a782a5..b275d03 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=C_Principal,CARGA_Click,2361,0,C_Principal,resdia_Click,2255,6,C_Principal,Subir_Click,504,0,C_Principal,B4XPage_Appear,494,0,B4XMainPage,Class_Globals,25,0,Main,Globals,25,0,Main,Activity_Create,27,0,C_Principal,Class_Globals,0,0,C_Principal,connecta_Click,1953,0,C_Principal,JobDone,1137,0 +NavigationStack=C_Principal,Subir_Click,623,0,Subs,traeRutasSup,686,0,Subs,traeRutaBitacora,667,0,C_Cliente,b_Inicio_Fin_venta_Click,4774,0,C_Clientes,Class_Globals,0,0,C_Cliente,Class_Globals,416,0,B4XMainPage,Class_Globals,58,1,C_NoVenta,GUARDA_Click,125,1,Subs,iniciaActividad,1322,0,Subs,bitacora,1285,0 SelectedBuild=0 -VisibleModules=23,2,24,13,14,4,6,9,12,5 +VisibleModules=23,2,24,13,14,4,6,9,12,5,10 diff --git a/B4A/Subs.bas b/B4A/Subs.bas index 597f544..3ae6865 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -1277,34 +1277,20 @@ Sub bitacora(fechab As String, usuariob As String, almacenb As String, rutab As If eventob = "Salida almacen" Then nombreCliente = "CHECKLIST" If eventob = "Fin Día" Then nombreCliente = "FIN DIA" If eventob = "Carga día" Then nombreCliente = "CARGA DIA" -' If eventob = "Suplencia" Then nombreCliente = traeRutasSup 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}'"$) -' 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") Else Private e As Cursor = B4XPages.MainPage.skmt.ExecQuery($"select fechab from BITACORAGPS where usuariob = '${usuariob}' and almacenb = '${almacenb}' and rutab = '${rutab}' and clienteb = '${clienteb}' and eventob = 'Inicia Venta' order by fechab desc"$) -' TMP_RUTA = (?) And tmp_almacen = (?) And tmp_usuario = (?) And tmp_id_cliente = (?) And tmp_evento = (?) And tmp_fecha_movil = to_date((?),'YYYY/MM/DD HH24:MI:ss') If e.RowCount > 0 Then e.Position = 0 Log("ACTUALIZA BITACORA") If eventob = "Termina Venta" Then B4XPages.MainPage.skmt.ExecNonQuery($"update BITACORAGPS set finb = '${finb}' where rutab = '${rutab}' and almacenb = '${almacenb}' and usuariob = '${usuariob}' and clienteb = '${clienteb}' and fechab = '${e.GetString("fechab")}' "$) -' cmd.Name = "actualizaSalidaBitacora" -' TMP_FINAL = to_date((?),'YYYY/MM/DD HH24:MI:ss') where TMP_RUTA = (?) and tmp_almacen = (?) and tmp_usuario = (?) and tmp_id_cliente = (?) and tmp_evento = (?) and tmp_fecha_movil = to_date((?),'YYYY/MM/DD HH24:MI:ss'); cmd.Parameters = Array As Object(finb, rutab, almacenb, usuariob, clienteb, "Inicia Venta", e.GetString("fechab")) -' Log($"${finb}, ${rutab}, ${almacenb}, ${usuariob}, ${clienteb}, 'Inicia Venta', ${e.GetString("fechab")}, "$) -' Starter.reqManager.ExecuteCommand(cmd , "mandaBitacora") else if eventob = "No Venta" Then B4XPages.MainPage.skmt.ExecNonQuery($"update BITACORAGPS set finb = '${finb}', motivonoventa = '${motivonoventa}', motivonovisita = '${motivonovisita}' where rutab = '${rutab}' and almacenb = '${almacenb}' and usuariob = '${usuariob}' and clienteb = '${clienteb}' and fechab = '${e.GetString("fechab")}' "$) -' cmd.Name = "actualizaNoVentaBitacora" -' TMP_FINAL = to_date((?),'YYYY/MM/DD HH24:MI:ss'), TMP_MOTIVO_NO_VENTA = (?), TMP_MOTIVO_NO_VISITA = (?) where TMP_RUTA = (?) and tmp_almacen = (?) and tmp_usuario = (?) and tmp_id_cliente = (?) and tmp_evento = (?) and tmp_fecha_movil = to_date((?),'YYYY/MM/DD HH24:MI:ss') cmd.Parameters = Array As Object(finb, motivonoventa, motivonovisita, rutab, almacenb, usuariob, clienteb, "Inicia Venta", e.GetString("fechab")) -' Log($"${finb}, ${rutab}, ${almacenb}, ${usuariob}, ${clienteb}, 'Inicia Venta', ${e.GetString("fechab")}, "$) -' Starter.reqManager.ExecuteCommand(cmd , "mandaBitacora") End If End If End If