20/11/23 - Cambios en respaldo diario

2026-04-17 18:26:11 +00:00 · 2023-11-20 09:14:57 -06:00
parent e4fa8439ec
commit 6a303eb0dc
10 changed files with 52 additions and 47 deletions
--- a/B4A/B4XMainPage.bas
+++ b/B4A/B4XMainPage.bas
@@ -179,7 +179,9 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	Starter.skmt.ExecNonQuery2("INSERT INTO HIST_ENVIOS VALUES (?,0,?)", Array As Object(sTime, "PEDIDO"))
 	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_EXHIBIDORES2 (HIST_EX_ID_CLIENTE TEXT, HIST_EX_TIPO TEXT, HIST_EX_CANT TEXT)")
 	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_PROMO_WHATS(HIST_CLIENTE TEXT, HIST_RESPUESTA_PROMO)")
-	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_RMI(CAT_GP_ID TEXT,CAT_GP_NOMBRE TEXT,CAT_GP_PRECIO TEXT)")
+'	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_RMI(CAT_GP_ID TEXT,CAT_GP_NOMBRE TEXT,CAT_GP_PRECIO TEXT)")
+	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_RMI(CAT_ID TEXT, CAT_DESCRIPCION TEXT, CAT_MONTO TEXT)")
+	
 	Starter.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)")
 	
 	''' PARA LO DE DOE---
--- a/B4A/C_Cliente.bas
+++ b/B4A/C_Cliente.bas
@@ -97,7 +97,7 @@ Sub Class_Globals
 	Dim CUANTOS As String
 	Private B_IMP As Button
 	Dim Toggla As Toggle
-	Private B_VENTA As Button
+	Dim B_VENTA As Button
 	Dim PASA_IMP As String
 	Dim sucursal As String
 	Dim FACTURA As String
@@ -369,6 +369,8 @@ End Sub
 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage.

 Sub B4XPage_Appear
+	B_VENTA.Visible = False
+	b_noVenta.Visible = False
 '	Log(Starter.rp.Check("android.permission.BLUETOOTH_CONNECT"))
 	b_inicioFinVenta.Text = "INICIAR VENTA"
 	b_inicioFinVenta.BringToFront
@@ -471,7 +473,7 @@ Sub B4XPage_Appear
 				End If
 			End If
 			If S1.GetString("CUANTOS") = 0 Then
-				b_noVenta.Visible = True
+'				b_noVenta.Visible = True
 			Else 'Si ya hay venta, ocultamos el boton de "NO VENTA"
 				b_noVenta.Visible = False
 			End If
@@ -481,7 +483,7 @@ Sub B4XPage_Appear
 				clienteDeudor = True
 '				gest.Visible = False
 			Else
-				B_VENTA.Visible = True
+'				B_VENTA.Visible = True
 				clienteDeudor = False
 '				gest.Visible = True
 			End If
@@ -534,7 +536,7 @@ Sub B4XPage_Appear
 				C3.Close
 				C1.Close
 			End If
-			B_VENTA.Visible = True
+'			B_VENTA.Visible = True
 			
 			If CREDITO = "1" Then
 				Msgbox("El cliente tiene credito excedido","Aviso") 'ignore
@@ -773,6 +775,7 @@ Private Sub B4XPage_CloseRequest As ResumableSub
 End Sub

 Sub Tar_Click
+	B_VENTA.Visible = False
 	Subs.iniciaActividad("nota")
 End Sub

@@ -3785,6 +3788,11 @@ Sub JobDone(Job As HttpJob)
 						m_lon = Starter.lon_gps
 						GPS_LocationChanged(Starter.ubicacionActual)
 						Starter.skmt.ExecNonQuery($"update kmt_info set CAT_CL_LAT = '${Starter.lat_gps}', CAT_CL_LONG = '${Starter.lon_gps}' where CAT_CL_CODIGO = '${Subs.traeCliente}'"$)
+						Dim cmd As DBCommand
+						cmd.Initialize
+						cmd.Name = "delete_geoPass"
+						cmd.Parameters = Array As Object( Subs.traeAlmacen, Subs.traeRuta)
+						reqManager.ExecuteQuery(cmd , 0, "traeGeoPass")
 					End If
 				Next
 			End If
--- a/B4A/C_Principal.bas
+++ b/B4A/C_Principal.bas
@@ -271,18 +271,16 @@ End Sub
 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage.

 Sub B4XPage_Appear
-'	Log("XXXXXXXXXXXXXXXXXXXXXXXXX    REVISAMOS PERMISOS DE BT  - APPEAR -")
 	StartBluetooth
-'	Log("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
-	If Not(kh.CheckNotificationAccess) Then
-		Msgbox2Async($"Se necesita acceso a las notificaciones, haga clic en "Aceptar" y en la siguiente pantalla permita el acceso a la aplicación "${Application.LabelName}"."$, "Permisos necesarios", "Aceptar", "", "", Null, True)
-		Wait For Msgbox_Result (resultado As Int)
-		If resultado = DialogResponse.POSITIVE Then
-			Dim In As Intent
-			In.Initialize("android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS", "")
-			StartActivity(In)
-		End If
-	End If
+'	If Not(kh.CheckNotificationAccess) Then
+'		Msgbox2Async($"Se necesita acceso a las notificaciones, haga clic en "Aceptar" y en la siguiente pantalla permita el acceso a la aplicación "${Application.LabelName}"."$, "Permisos necesarios", "Aceptar", "", "", Null, True)
+'		Wait For Msgbox_Result (resultado As Int)
+'		If resultado = DialogResponse.POSITIVE Then
+'			Dim In As Intent
+'			In.Initialize("android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS", "")
+'			StartActivity(In)
+'		End If
+'	End If
 	If Subs.traeUltimaActividadBD <> "principal" Then Subs.iniciaActividad(Subs.traeUltimaActividadBD)
 	reqManager.Initialize(Me, Starter.DBReqServer)
 '	If Not(btAdmin.IsEnabled) Then btAdmin.Enable 'Si no esta prendido el BT, lo prendemos.
@@ -1896,10 +1894,10 @@ Sub JobDone(Job As HttpJob)
 					If logger Then Log("TIEMPO prods RMI : " & ((DateTime.Now-inicioContador)/1000))
 					Starter.skmt.ExecNonQuery("delete from cat_rmi")
 					For Each records() As Object In RESULT.Rows
-						Dim CAT_GP_ID As String = records(RESULT.COLUMNS.GET("CAT_GP_ID"))
-						Dim CAT_GP_NOMBRE As String = records(RESULT.COLUMNS.GET("CAT_GP_NOMBRE"))
-						Dim CAT_GP_PRECIO As String = records(RESULT.COLUMNS.GET("CAT_GP_PRECIO"))
-						Starter.skmt.ExecNonQuery2("INSERT INTO CAT_RMI (CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_PRECIO) VALUES (?,?,?)", Array As Object (CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_PRECIO))
+						Dim CAT_ID As String = records(RESULT.COLUMNS.GET("CAT_GP_ID"))
+						Dim CAT_DESCRIPCION As String = records(RESULT.COLUMNS.GET("CAT_GP_NOMBRE"))
+						Dim CAT_MONTO As String = records(RESULT.COLUMNS.GET("CAT_GP_PRECIO"))
+						Starter.skmt.ExecNonQuery2("INSERT INTO CAT_RMI (CAT_ID, CAT_DESCRIPCION, CAT_MONTO) VALUES (?,?,?)", Array As Object (CAT_ID, CAT_DESCRIPCION, CAT_MONTO))
 					Next
 				End If
 			End If
--- a/B4A/C_Productos.bas
+++ b/B4A/C_Productos.bas
@@ -1083,7 +1083,7 @@ Sub Busca_TextChanged (Old As String, New As String)
 		End If
 		cPromo.Close
 	else if lfila.text = "RMI" Then
-		Dim p As ResultSet = Starter.skmt.ExecQuery($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_PRECIO, '1000' as CAT_GP_ALMACEN from CAT_RMI where CAT_GP_NOMBRE like '%${New}%' order by CAT_GP_NOMBRE"$)
+		Dim p As ResultSet = Starter.skmt.ExecQuery($"select CAT_ID as CAT_GP_ID, CAT_DESCRIPCION as CAT_GP_NOMBRE, CAT_MONTO as CAT_GP_PRECIO, '1000' as CAT_GP_ALMACEN from CAT_RMI where CAT_DESCRIPCION like '%${New}%' order by CAT_DESCRIPCION"$)
 		Log($"Llamamos LlenaProdsLL con ${p.RowCount} prods."$)
 		lfila.Text = "RMI"
 		b_rmi.Visible = False
@@ -1245,7 +1245,7 @@ Private Sub b_rmi_mas_Click
 End Sub

 Private Sub b_rmi_Click
-	Dim p As ResultSet = Starter.skmt.ExecQuery($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_PRECIO, '1000' as CAT_GP_ALMACEN from CAT_RMI order by CAT_GP_NOMBRE"$)
+	Dim p As ResultSet = Starter.skmt.ExecQuery($"select CAT_ID as CAT_GP_ID, CAT_DESCRIPCION as CAT_GP_NOMBRE, CAT_MONTO as CAT_GP_PRECIO, '1000' as CAT_GP_ALMACEN from CAT_RMI order by CAT_DESCRIPCION"$)
 	Log($"Llamamos LlenaProdsLL con ${p.RowCount} prods."$)
 	lfila.Text = "RMI"
 	b_rmi.Visible = False
--- a/B4A/Files/foto.bal
+++ b/B4A/Files/foto.bal
--- a/B4A/Files/principal.bal
+++ b/B4A/Files/principal.bal
--- a/B4A/KelloggsV4.b4a
+++ b/B4A/KelloggsV4.b4a
@@ -825,7 +825,6 @@ Library27=xcustomlistview
 Library28=xui
 Library29=zxing_scanner
 Library3=baqrcode
-Library30=replyauto
 Library4=bitmapcreator
 Library5=byteconverter
 Library6=camera
@@ -852,12 +851,11 @@ Module23=foto
 Module24=kms_helperSubs
 Module25=ManageExternalStorage
 Module26=MAPA_RUTAS
-Module27=NotificationService
-Module28=SD_Spinner
-Module29=Starter
+Module27=SD_Spinner
+Module28=Starter
+Module29=Subs
 Module3=C_Cliente
-Module30=Subs
-Module31=Tracker
+Module30=Tracker
 Module4=C_Clientes
 Module5=C_Historico
 Module6=C_Mapas
@@ -865,14 +863,14 @@ Module7=C_Nota
 Module8=C_NoVenta
 Module9=C_NuevoCliente
 NumberOfFiles=401
-NumberOfLibraries=30
-NumberOfModules=31
+NumberOfLibraries=29
+NumberOfModules=30
 Version=12.5
@EndOfDesignText@
 #Region  Project Attributes	
 	#ApplicationLabel: Kelloggs Venta
 	#VersionCode: 3000
-	#VersionName: 3.11.08 PRUEBA V4
+	#VersionName: 3.11.11 PRUEBA V4
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False
 	#BridgeLogger:true
--- a/B4A/KelloggsV4.b4a.meta
+++ b/B4A/KelloggsV4.b4a.meta
@@ -23,7 +23,6 @@ ModuleBookmarks28=
 ModuleBookmarks29=
 ModuleBookmarks3=
 ModuleBookmarks30=
-ModuleBookmarks31=
 ModuleBookmarks4=
 ModuleBookmarks5=
 ModuleBookmarks6=
@@ -55,7 +54,6 @@ ModuleBreakpoints28=
 ModuleBreakpoints29=
 ModuleBreakpoints3=
 ModuleBreakpoints30=
-ModuleBreakpoints31=
 ModuleBreakpoints4=
 ModuleBreakpoints5=
 ModuleBreakpoints6=
@@ -83,17 +81,16 @@ ModuleClosedNodes24=
 ModuleClosedNodes25=
 ModuleClosedNodes26=2
 ModuleClosedNodes27=
-ModuleClosedNodes28=
-ModuleClosedNodes29=9,10,11
-ModuleClosedNodes3=3
+ModuleClosedNodes28=9,10,11
+ModuleClosedNodes29=
+ModuleClosedNodes3=
 ModuleClosedNodes30=
-ModuleClosedNodes31=
 ModuleClosedNodes4=
 ModuleClosedNodes5=
 ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=B4XMainPage,et_maxClientesNuevos_TextChanged,768,5,Visual Designer,principal.bal,-100,1,B4XMainPage,b_aceptarExtras_Click,812,0,B4XMainPage,Initialize,116,0,B4XMainPage,et_geocerca_TextChanged,804,6,kms_helperSubs,traeUsarGeocerca,642,0,kms_helperSubs,traeMaxClientesNuevos,655,2,kms_helperSubs,traeUsarCartaPorte,644,0,Visual Designer,login.bal,-100,6,B4XMainPage,B4XPage_Appear,359,5
+NavigationStack=C_Principal,B4XPage_Created,236,0,C_Nota,Class_Globals,21,0,C_Nota,borra_Click,202,0,Subs,borraPedidoClienteActual,1405,0,C_Principal,Class_Globals,0,0,C_Principal,B4XPage_Appear,288,0,C_Cliente,B4XPage_Created,297,0,C_Cliente,Initialize,287,0,C_Cliente,LBL_REGRESA_Click,2703,0,Subs,procesaPromocion,1175,0
 SelectedBuild=0
-VisibleModules=1,29,11,24,3,30,14,12,7,13,9
+VisibleModules=1,28,11,24,3,29,14,12,7,13
--- a/B4A/Subs.bas
+++ b/B4A/Subs.bas
@@ -805,10 +805,10 @@ End Sub
 Sub traeRMINombre(id As String) As String
 	Private h As Cursor
 	Private n As String
-	h=Starter.skmt.ExecQuery2("select CAT_GP_NOMBRE from CAT_RMI where CAT_GP_ID = ? ", Array As String(id.Trim))
+	h=Starter.skmt.ExecQuery2("select CAT_DESCRIPCION from CAT_RMI where CAT_ID = ? ", Array As String(id.Trim))
 	If h.RowCount > 0 Then
 		h.Position = 0
-		n = h.GetString("CAT_GP_NOMBRE")
+		n = h.GetString("CAT_DESCRIPCION")
 '		Log(h.RowCount&"|"&id&"|"&n&"|")
 	End If
 	h.Close
@@ -1408,7 +1408,9 @@ Sub borraPedidoClienteActual As String
 	If thisC.RowCount>0 Then
 		For i=0 To thisC.RowCount -1
 			thisC.Position=i
-			If thisC.GetString("PE_CEDIS") <> "DUR" Then Starter.skmt.ExecNonQuery2($"update ${traeTablaProds(Starter.tipov)} set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?"$, Array As Object(thisC.GetString("PE_CANT"), thisC.GetString("PE_PROID")))
+			If thisC.GetString("PE_CEDIS") <> "DUR" Then
+				Starter.skmt.ExecNonQuery2($"update ${traeTablaProds(Starter.tipov)} set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?"$, Array As Object(thisC.GetString("PE_CANT"), thisC.GetString("PE_PROID")))
+			End If
 '			Starter.skmt.ExecNonQuery2("INSERT INTO INVENT_X_ENVIAR (ALMACEN , PROID , CANTIDAD ) VALUES(?,?,?) ", Array As Object (traeAlmacen, thisC.GetString("PE_PROID"),thisC.GetString("PE_CANT")* -1))
 		Next
 	End If
--- a/B4A/kms_helperSubs.bas
+++ b/B4A/kms_helperSubs.bas
@@ -174,7 +174,7 @@ Sub RD_restaura_cat_gunaprod
 		skmt.ExecNonQuery($"insert into CAT_GUNAPROD (${lasCols}) select ${lasCols} from rkmt1.CAT_GUNAPROD where fecha = '${c.GetString("FECHA")}'"$)
 		Log($"insert into CAT_GUNAPROD (${lasCols}) select ${lasCols} from rkmt1.CAT_GUNAPROD where fecha = '${c.GetString("FECHA")}'"$)
 	Else
-		ToastMessageShow($"No hay respaldo para la fecha ${fechaRestauracion.SubString(fechaRestauracion.Length - 10)}"$, True)
+		ToastMessageShow($"No hay respaldo GP para la fecha ${fechaRestauracion.SubString(fechaRestauracion.Length - 10)}"$, True)
 	End If
 	Log("R-GP: " & ((DateTime.Now - inicio)/1000) & " segs")
 End Sub
@@ -213,7 +213,7 @@ Sub RD_restaura_cat_gunaprod2
 		skmt.ExecNonQuery($"insert into CAT_GUNAPROD2 (${lasCols}) select ${lasCols} from rkmt1.CAT_GUNAPROD2 where fecha = '${c.GetString("FECHA")}'"$)
 		Log($"insert into CAT_GUNAPROD2 (${lasCols}) select ${lasCols} from rkmt1.CAT_GUNAPROD2 where fecha = '${c.GetString("FECHA")}'"$)
 	Else
-		ToastMessageShow($"No hay respaldo para la fecha ${fechaRestauracion.SubString(fechaRestauracion.Length - 10)}"$, True)
+		ToastMessageShow($"No hay respaldo GP2 para la fecha ${fechaRestauracion.SubString(fechaRestauracion.Length - 10)}"$, True)
 	End If
 	Log("R-GP2: " & ((DateTime.Now - inicio)/1000) & " segs")
 End Sub
@@ -251,7 +251,7 @@ Sub RD_restaura_cat_detalle_paq
 		skmt.ExecNonQuery($"insert into CAT_DETALLES_PAQ (${lasCols}) select ${lasCols} from rkmt1.CAT_DETALLES_PAQ where fecha = '${c.GetString("FECHA")}'"$)
 		Log($"insert into CAT_DETALLES_PAQ (${lasCols}) select ${lasCols} from rkmt1.CAT_DETALLES_PAQ where fecha = '${c.GetString("FECHA")}'"$)
 	Else
-		ToastMessageShow($"No hay respaldo para la fecha ${fechaRestauracion.SubString(fechaRestauracion.Length - 10)}"$, True)
+		ToastMessageShow($"No hay respaldo DP para la fecha ${fechaRestauracion.SubString(fechaRestauracion.Length - 10)}"$, True)
 	End If
 	Log("R-DP: " & ((DateTime.Now - inicio)/1000) & " segs")
 End Sub
@@ -289,7 +289,7 @@ Sub RD_restaura_kmt_info
 		skmt.ExecNonQuery($"insert into kmt_info (${lasCols}) select ${lasCols} from rkmt1.kmt_info where fecha = '${c.GetString("FECHA")}'"$)
 		Log($"insert into kmt_info (${lasCols}) select ${lasCols} from rkmt1.kmt_info where fecha = '${c.GetString("FECHA")}'"$)
 	Else
-		ToastMessageShow($"No hay respaldo para la fecha ${fechaRestauracion.SubString(fechaRestauracion.Length - 10)}"$, True)
+		ToastMessageShow($"No hay respaldo KMTI para la fecha ${fechaRestauracion.SubString(fechaRestauracion.Length - 10)}"$, True)
 	End If
 	Log("R-KMT: " & ((DateTime.Now - inicio)/1000) & " segs")
 End Sub
@@ -327,7 +327,7 @@ Sub RD_restaura_promos_comp
 		skmt.ExecNonQuery($"insert into PROMOS_COMP (${lasCols}) select ${lasCols} from rkmt1.PROMOS_COMP where fecha = '${c.GetString("FECHA")}'"$)
 		Log($"insert into PROMOS_COMP (${lasCols}) select ${lasCols} from rkmt1.PROMOS_COMP where fecha = '${c.GetString("FECHA")}'"$)
 	Else
-		ToastMessageShow($"No hay respaldo para la fecha ${fechaRestauracion.SubString(fechaRestauracion.Length - 10)}"$, True)
+		ToastMessageShow($"No hay respaldo PC para la fecha ${fechaRestauracion.SubString(fechaRestauracion.Length - 10)}"$, True)
 	End If
 	Log("R-KMT: " & ((DateTime.Now - inicio)/1000) & " segs")
 End Sub