From cb8c745939cac73ee0a54bbae9e6d8e66297025e Mon Sep 17 00:00:00 2001
From: Jose Alberto Guerra Ugalde <cheveguerra@gmail.com>
Date: Tue, 20 May 2025 17:23:53 -0600
Subject: [PATCH] =?UTF-8?q?-=20VERSION=205.05.20=20-=20Se=20agreg=C3=B3=20?=
 =?UTF-8?q?el=20c=C3=B3digo=20de=20Multi-Almacen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 B4A/B4XMainPage.bas       |   2 +
 B4A/C_Principal.bas       | 216 +++++++++++++++++++++++++++++---------
 B4A/Files/principal.bal   | Bin 35004 -> 37495 bytes
 B4A/Subs.bas              |   9 +-
 B4A/guna_reparto.b4a      |   2 +-
 B4A/guna_reparto.b4a.meta |   4 +-
 6 files changed, 178 insertions(+), 55 deletions(-)

diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas
index 16cc853..481391e 100644
--- a/B4A/B4XMainPage.bas
+++ b/B4A/B4XMainPage.bas
@@ -231,6 +231,8 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 '	Dim P As PhoneId
 	Log("provider")
 	Provider.Initialize
+	
+	Subs.guardaAppInfo
 
 '	Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_READ_PHONE_STATE)
 '	Wait For B4XPage_PermissionResult (Permission As String, Result As Boolean)
diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas
index 5269198..fece097 100644
--- a/B4A/C_Principal.bas
+++ b/B4A/C_Principal.bas
@@ -79,7 +79,7 @@ Sub Class_Globals
 	Dim RUTA_T As String
 	Dim reqs As List
 	'''''' MAPA RUTAS
-	Private Btn_Ubicar_Ru As Button
+	Private b_Ubicar_Ru As Button
 	Dim cargo As String
 	Private p_principal As Panel
 	Dim ime As IME
@@ -104,6 +104,12 @@ Sub Class_Globals
 	Private l_pagaresnuevos As Label
 	Private l_montoaliquidar As Label
 	Private Label16 As Label
+	Private p_multiAlmacen As Panel
+	Private s_almacen2 As Spinner
+	Private et_ruta2 As EditText
+	Private b_multiAlmacen As Button
+	Private multiAlmacen As Boolean = False
+	Private idAlmacenExtra As String = ""
 End Sub
 
 'You can add more parameters here.
@@ -256,8 +262,11 @@ Sub B4XPage_Appear
 '	f.Close
 
 	cargar.Visible = False
+	cargar.Enabled = True
 	Subir.Visible = False
 	connecta.Visible = True
+	b_multiAlmacen.Visible = False
+	p_multiAlmacen.Visible = False
 
 	If Cuantos = 0 Then
 		l_aLiquidar.Text = 0
@@ -1015,6 +1024,7 @@ Sub envioinfo
 End Sub
 
 Sub cargar_Click
+	ime.HideKeyboard
 	Dim pedidodiaanterior As Boolean = False
 	Dim cp As Cursor = Starter.skmt.ExecQuery("select * from NOVENTA")
 	If cp.RowCount > 0 Then
@@ -1074,44 +1084,15 @@ Sub cargar_Click
 		c.Position = 0
 		usuario = c.GetString("USUARIO")
 
-		cmd.Initialize
-		cmd.Name = "select_punteo_re_REPG_GUNA_VN"
-		cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,ALMACEN)
-		reqManager.ExecuteQuery(cmd , 0, "punteo")
-		Log($"Pedimos Punteo"$)
-		reqs.Add("punteo")
+		cargaGeneral ' Cargamos los datos del almacen principal.
 
-		cmd.Initialize
-		cmd.Name = "select_almacen_re_REPG2_GUNA_VN"
-		cmd.Parameters = Array As Object(ALMACEN)
-		reqManager.ExecuteQuery(cmd , 0, "gunaprod")
-		Log($"Pedimos gunaprod - ${ALMACEN}, ${e_ruta.text}"$)
-		reqs.Add("gunaprod")
+		If multiAlmacen Then
+			Sleep(100)
+			Log(multiAlmacen)
+			Log("====================    CARGAMOS SEGUNDO ALMACEN  ======================")
+			cargaAlmacen2 ' Cargamos los datos del segundo almacen.
+		End If
 
-		cmd.Initialize
-		cmd.Name = "select_abonosp_REP_GUNA_VN"
-		cmd.Parameters = Array As Object(ALMACEN, e_ruta.text, ALMACEN)
-		reqManager.ExecuteQuery(cmd , 0, "select_abonosp")
-
-		cmd.Initialize
-		cmd.Name = "select_cliente_re_REPG_GUNA_VN"
-		cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,ALMACEN,e_ruta.text, ALMACEN,e_ruta.Text,ALMACEN,e_ruta.Text,ALMACEN,ALMACEN)',e_ruta.Text,ALMACEN
-		reqManager.ExecuteQuery(cmd , 0, "kmt_datos")
-		Log($"Pedimos kmt_datos"$)
-		reqs.Add("kmt_datos")
-
-		cmd.Initialize
-		cmd.Name = "select_ventad2_re_REPG_GUNA_VN"
-		cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,e_ruta.Text,ALMACEN)',e_ruta.Text,ALMACEN
-		reqManager.ExecuteQuery(cmd , 0, "hist_datos")
-		Log($"Pedimos hist_datos"$)
-		reqs.Add("hist_datos")
-
-		cmd.Initialize
-		cmd.Name = "select_coords_almacen_GUNA_VN"
-		cmd.Parameters = Array As Object(ALMACEN)
-		reqManager.ExecuteQuery(cmd , 0, "coords_almacen")
-		
 '		cmd.Initialize
 '		cmd.Name = "select_cat_gunaprod3_MAZAPA"
 '		cmd.Parameters = Array As Object(ALMACEN)
@@ -1168,6 +1149,50 @@ Sub cargar_Click
 	End If
 End Sub
 
+
+'Carga los datos generales de la ruta.
+Sub cargaGeneral
+	Log($"******   ALMACEN: ${ALMACEN}"$)
+
+	cmd.Initialize
+	cmd.Name = "select_punteo_re_REPG_GUNA_VN"
+	cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,ALMACEN)
+	reqManager.ExecuteQuery(cmd , 0, "punteo")
+	Log($"Pedimos Punteo - ruta:${e_ruta.Text}, almacen: ${ALMACEN}"$)
+	reqs.Add("punteo")
+
+	cmd.Initialize
+	cmd.Name = "select_almacen_re_REPG2_GUNA_VN"
+	cmd.Parameters = Array As Object(ALMACEN)
+	reqManager.ExecuteQuery(cmd , 0, "gunaprod")
+	Log($"Pedimos gunaprod - ${ALMACEN}, ${e_ruta.text}"$)
+	reqs.Add("gunaprod")
+
+	cmd.Initialize
+	cmd.Name = "select_abonosp_REP_GUNA_VN"
+	cmd.Parameters = Array As Object(ALMACEN, e_ruta.text, ALMACEN)
+	reqManager.ExecuteQuery(cmd , 0, "select_abonosp")
+
+	cmd.Initialize
+	cmd.Name = "select_cliente_re_REPG_GUNA_VN"
+	cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,ALMACEN,e_ruta.text, ALMACEN,e_ruta.Text,ALMACEN,e_ruta.Text,ALMACEN,ALMACEN)',e_ruta.Text,ALMACEN
+	reqManager.ExecuteQuery(cmd , 0, "kmt_datos")
+	Log($"Pedimos kmt_datos - ruta: ${e_ruta.text}, almacen: ${ALMACEN}"$)
+	reqs.Add("kmt_datos")
+
+	cmd.Initialize
+	cmd.Name = "select_ventad2_re_REPG_GUNA_VN"
+	cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,e_ruta.Text,ALMACEN)',e_ruta.Text,ALMACEN
+	reqManager.ExecuteQuery(cmd , 0, "hist_datos")
+	Log($"Pedimos hist_datos - ruta: ${e_ruta.text}, almacen: ${ALMACEN}"$)
+	reqs.Add("hist_datos")
+
+	cmd.Initialize
+	cmd.Name = "select_coords_almacen_GUNA_VN"
+	cmd.Parameters = Array As Object(ALMACEN)
+	reqManager.ExecuteQuery(cmd , 0, "coords_almacen")
+End Sub
+
 Sub JobDone(Job As HttpJob)
 '	Private r As DBResult = reqManager.HandleJob(Job)
 	If Job.Success = False Then
@@ -1206,7 +1231,7 @@ Sub JobDone(Job As HttpJob)
 					Dim CAT_CL_BCREDITO As String = records(result.Columns.Get("CAT_CL_BCREDITO"))
 					Dim CAT_CL_LIMITECREDITO As String = records(result.Columns.Get("CAT_CL_LIMITECREDITO"))
 '					Dim CAT_CL_SECUENCIA As String = records(result.Columns.Get("CAT_CL_SECUENCIA"))
-'					Log("  ++  insert into kmt_info: "&CAT_CL_RUTA&","&CAT_CL_CODIGO&","&CAT_CL_RUTA&","&CAT_CL_NOMBRE)
+					Log("  ++  insert into kmt_info: "&ALMACEN&","&CAT_CL_CODIGO&","&CAT_CL_RUTA&","&CAT_CL_NOMBRE)
 					Starter.skmt.ExecNonQuery2("INSERT INTO kmt_info(CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_BCREDITO, gestion,CAT_CL_LIMITECREDITO) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,?)", Array As Object (CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_BCREDITO,CAT_CL_LIMITECREDITO))
 				Next
 '				Starter.skmt.ExecNonQuery2("INSERT INTO kmt_info(CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_BCREDITO, gestion,SECUENCIA) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,?)", Array As Object (63403,1000, "VENTA RECHAZO","","","","","","","","","","","","","","-98.8357694","19.6906052","0","1"))
@@ -1283,7 +1308,7 @@ Sub JobDone(Job As HttpJob)
 		If Job.JobName = "DBRequest" Then
 			Dim result As DBResult = reqManager.HandleJob(Job)
 			If result.Tag = "gunaprod" Then 'query tag
-				Log("Entramos a GUNA_PROD<---------------------------------")
+				Log("Entramos a GUNA_PROD  <---------------------------------")
 				If reqs.IndexOf("gunaprod") > -1 Then
 					reqs.RemoveAt(reqs.IndexOf("gunaprod"))
 					Log(reqs.Size)
@@ -1306,7 +1331,7 @@ Sub JobDone(Job As HttpJob)
 					'	Dim CAT_GP_DEV As String = records(RESULT.Columns.Get("CAT_GP_DEV"))
 					'  skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG,CAT_GP_ALMACEN,CAT_GP_DEV) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object (CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG, CAT_GP_ALMACEN,CAT_GP_DEV))
 '					Log("  ++  insert into CAT_GUNAPROD: "&CAT_GP_ID&","&CAT_GP_NOMBRE&","&CAT_GP_IMP1)
-					Log(CAT_GP_NOMBRE & "<-------------------------------------")
+'					Log(CAT_GP_NOMBRE & "<-------------------------------------")
 					Starter.skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG,CAT_GP_ALMACEN,CONVERSION,PRECIOCONVER) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object (CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG, 0,CONVERSION,PRECIOCONVER))
 				Next
 				Starter.skmt.TransactionSuccessful
@@ -1469,7 +1494,7 @@ Sub JobDone(Job As HttpJob)
 '						Log("Hay ruta, guardamos los nuevos")
 						Private tc As Cursor = Starter.skmt.ExecQuery($"select HVD_CLIENTE from HIST_VENTAS where HVD_CLIENTE = '${HVD_CLIENTE}' and HVD_PROID = '${HVD_PROID}'"$)
 						If tc.RowCount = 0 Then
-							Log($"Guardamos ${HVD_CLIENTE}"$)
+'							Log($"Guardamos ${HVD_CLIENTE}"$)
 							Starter.skmt.ExecNonQuery2("INSERT INTO HIST_VENTAS(HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT, HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_ESTATUS, HVD_PARCIAL, BCAJAS,CANTC,CONSECUTIVO,BCAJAS_OR,CANTC_OR) VALUES (?,?,?,?,?,?,?,?,?,?,0,0,?,?,?,?,?)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, bcajas,cantc,consecutivo,bcajas,cantc))
 							Starter.skmt.ExecNonQuery2("INSERT INTO HIST_VENTAS2(HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT, HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_ESTATUS, HVD_PARCIAL) VALUES (?,?,?,?,?,?,?,?,?,?,0,0)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO))
 						End If
@@ -1623,7 +1648,7 @@ Sub JobDone(Job As HttpJob)
 						Starter.skmt.ExecNonQuery2("INSERT INTO RUTAA(RUTAA) VALUES (?)", Array As Object (e_ruta.TEXT))
 						B4XPages.MainPage.rutaPreventa = e_ruta.TEXT
 						If conn = "1" Then
-							ToastMessageShow("Existe Conexión con el Servidor." , True)
+							ToastMessageShow("Existe Conexión con el Servidor." , False)
 						End If
 					Else
 						cargar.Visible = False
@@ -1676,7 +1701,31 @@ Sub JobDone(Job As HttpJob)
 					Next
 				Next
 			End If
+			
+			If result.Tag = "agrupaAlmacen" Then 'query tag
+				If result.Rows.Size > 1 Then
+					Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_ALMACEN_AGRUPADOR(ID TEXT, DESCRIPCION TEXT)")
+					Starter.skmt.ExecNonQuery($"delete from CAT_ALMACEN_AGRUPADOR"$)
+					b_multiAlmacen.Visible = True
+					s_almacen2.Clear
+					s_almacen2.Add("-= Seleccione =-")
+					For Each records() As Object In result.Rows
+'						For Each k As String In result.Columns.Keys
+'							Log(k & ": " & records(result.Columns.Get(k)))
+'						Next
+						If ALMACEN <> records(result.Columns.Get("CAT_AL_ID")) Then
+							s_almacen2.Add(records(result.Columns.Get("CAT_AL_DESC")))
+							Starter.skmt.ExecNonQuery($"insert into CAT_ALMACEN_AGRUPADOR (ID, DESCRIPCION) values ('${records(result.Columns.Get("CAT_AL_ID"))}', '${records(result.Columns.Get("CAT_AL_DESC"))}')"$)
+						End If
+						s_almacen2.TextSize = 13
+						s_almacen2.DropdownTextColor = Colors.RGB(6, 137, 0)
+'						s_almacen2.TextColor = Colors.Green
+					Next
+				End If
+			End If
+			
 		End If
+
 		Job.Release
 	End If
 	If reqs.Size = 0 Then
@@ -1731,6 +1780,11 @@ Sub connecta_Click
 		Starter.skmt.ExecNonQuery("DELETE FROM RUTAA")
 		Starter.skmt.ExecNonQuery2("INSERT INTO RUTAA(RUTAA) VALUES (?)", Array As Object (e_ruta.TEXT))
 		B4XPages.MainPage.rutaPreventa = e_ruta.TEXT
+		
+		cmd.Name = "selectAgrupadorAlmacen"
+		cmd.Parameters = Array As Object(ALMACEN)
+		Log($"${ALMACEN}, ${e_ruta.text}, ${imei}"$)
+		reqManager.ExecuteQuery(cmd , 0, "agrupaAlmacen")
 	End If
 End Sub
 
@@ -1774,6 +1828,10 @@ Sub e_ruta_EnterPressed
 			Starter.skmt.ExecNonQuery("DELETE FROM ABONOSP")
 			Starter.skmt.ExecNonQuery("DELETE FROM ABONOS")
 			Starter.skmt.ExecNonQuery("DELETE FROM BLOCKENVIO")
+			b_multiAlmacen.Visible = False
+			p_multiAlmacen.Visible = False
+			s_almacen2.SelectedIndex = 0
+			et_ruta2.Text = ""
 			B4XPage_Appear
 		End If
 '		Starter.waypointsOrdered.Clear
@@ -1822,7 +1880,7 @@ Sub B_CLIEPROD_Click
 		B_CLIEPROD.Visible = False
 		Panel1.Visible = True
 		Panel1.BringToFront
-		Btn_Ubicar_Ru.Visible=False
+		b_Ubicar_Ru.Visible=False
 		c=Starter.skmt.ExecQuery("select  distinct(CAT_CL_NOMBRE), CAT_CL_CODIGO, gestion from kmt_info WHERE gestion <> 0 order by HORAENT")
 		Subs.SetDivider(ListView1, Colors.LightGray, 2)
 		ListView1.Clear
@@ -2025,11 +2083,11 @@ Sub B_REGRESA_Click
 	trabajar.Visible = True
 	B_CLIEPROD.Visible = True
 	Panel1.Visible = False
-	Btn_Ubicar_Ru.Visible=True
+	b_Ubicar_Ru.Visible=True
 End Sub
 
 ''''''''''''''''''''''''''''MAPA RUTAS
-Sub Btn_Ubicar_Ru_Click
+Sub b_Ubicar_Ru_Click
 	If b_check.Visible = True Then
 		MsgboxAsync("Favor de hacer el checklist.","Atención")
 	Else
@@ -2138,7 +2196,7 @@ Private Sub iv_calificarcliente_Click
 End Sub
 
 Private Sub iv_ubicar_Click
-	Btn_Ubicar_Ru_Click
+	b_Ubicar_Ru_Click
 End Sub
 
 Private Sub B_PAGARES_Click
@@ -2317,11 +2375,6 @@ Sub cuanto
 	Log(rescant2r+rescantr)
 	
 	'''' FIN RECHAZO
-	
-	'''''
-
-	
-	
 End Sub
 
 Private Sub ListView2_ItemClick (Position As Int, Value As Object)
@@ -2340,4 +2393,65 @@ Private Sub ListView2_ItemClick (Position As Int, Value As Object)
 		P_PAGARES.Visible = False
 		B4XPages.ShowPage("Cliente")
 	End If
+End Sub
+
+Private Sub et_ruta2_TextChanged (Old As String, New As String)
+	If s_almacen2.Size > 0 Then
+		If s_almacen2.SelectedItem <> "-= Seleccione =-" And New <> "" Then
+			cargar.Enabled = True
+		Else
+			cargar.Enabled = False
+		End If
+	End If
+End Sub
+
+Private Sub s_almacen2_ItemClick (Position As Int, Value As Object)
+	Private ga As ResultSet = Starter.skmt.ExecQuery($"select * from CAT_ALMACEN_AGRUPADOR where descripcion = '${Value}'"$)
+	Do While ga.NextRow
+		idAlmacenExtra = ga.GetString("ID")
+	Loop
+	Log($"${Value}, ${idAlmacenExtra}"$)
+	If Value <> "-= Seleccione =-" And et_ruta2.Text <> "" Then
+		cargar.Enabled = True
+	Else
+		cargar.Enabled = False
+	End If
+End Sub
+
+Private Sub b_multiAlmacen_Click
+	s_almacen2.SelectedIndex = 0
+	et_ruta2.Text = ""
+	If p_multiAlmacen.Visible Then
+		p_multiAlmacen.Visible = False
+		cargar.Enabled = True
+		multiAlmacen = False
+	Else
+		p_multiAlmacen.Visible = True
+		cargar.Enabled = False
+		multiAlmacen = True
+	End If
+End Sub
+
+Sub cargaAlmacen2
+	Log("=================================================")
+	Log("============    CARGAMOS ALMACEN 2   ===============")
+	Log("=================================================")
+	Private almacenPrincipal = ALMACEN
+	Private rutaPrincipal = e_ruta.text
+	ALMACEN = idAlmacenExtra
+	e_ruta.text = et_ruta2.text
+	Starter.skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("MULTI_A_ALMACEN"))
+	Starter.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("MULTI_A_ALMACEN", ALMACEN))
+	Starter.skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("MULTI_A_RUTA"))
+	Starter.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("MULTI_A_RUTA", e_ruta.Text))
+	l_ruta.Text = "0"
+	cargaGeneral
+	Sleep(2000)
+	ALMACEN = almacenPrincipal
+	e_ruta.text = rutaPrincipal
+	b_multiAlmacen.Visible = False
+	p_multiAlmacen.Visible = False
+	s_almacen2.SelectedIndex = 0
+	et_ruta2.Text = ""
+	cargar.Enabled = True
 End Sub
\ No newline at end of file
diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal
index 324f4f70679e90b762677450f5a74111b38475ac..630079a9548d0e4aa745d3d4e995742e62b77784 100644
GIT binary patch
delta 4227
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

delta 3328
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
WdB|nzKI);l&C@I`9tm)^rtZH+HMHCS

diff --git a/B4A/Subs.bas b/B4A/Subs.bas
index 5bdd1ae..3fa207f 100644
--- a/B4A/Subs.bas
+++ b/B4A/Subs.bas
@@ -1104,4 +1104,11 @@ Sub logJobDoneResultados(resultado As DBResult)
 			LogColor(k & " = " & records(resultado.Columns.Get(k)), Colors.RGB(215,37,0))
 		Next
 	Next
-End Sub
\ No newline at end of file
+End Sub
+
+'Guarda el nombre y version de la app en CAT_VARIABLES.
+Sub guardaAppInfo 'ignore
+	Starter.skmt.ExecNonQuery("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = 'EMPRESA' or CAT_VA_DESCRIPCION = 'APP_NAME' or CAT_VA_DESCRIPCION = 'APP_VERSION'")
+	Starter.skmt.ExecNonQuery($"insert into CAT_VARIABLES (CAT_VA_DESCRIPCION, CAT_VA_VALOR) values ('APP_NAME', '${Application.LabelName}')"$)
+	Starter.skmt.ExecNonQuery($"insert into CAT_VARIABLES (CAT_VA_DESCRIPCION, CAT_VA_VALOR) values ('APP_VERSION', '${Application.VersionName}')"$)
+End Sub
diff --git a/B4A/guna_reparto.b4a b/B4A/guna_reparto.b4a
index f880747..8497340 100644
--- a/B4A/guna_reparto.b4a
+++ b/B4A/guna_reparto.b4a
@@ -251,7 +251,7 @@ Version=12.8
 #Region Project Attributes 
 	#ApplicationLabel: Guna Reparto
 	#VersionCode: 1
-	#VersionName: 5.05.07
+	#VersionName: 5.05.20
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False
diff --git a/B4A/guna_reparto.b4a.meta b/B4A/guna_reparto.b4a.meta
index f8b11df..d5f08a5 100644
--- a/B4A/guna_reparto.b4a.meta
+++ b/B4A/guna_reparto.b4a.meta
@@ -94,6 +94,6 @@ ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=Diseñador Visual,principal.bal,-100,2,Diseñador Visual,cliente.bal,-100,1,C_Cliente,Class_Globals,111,0,C_Principal,JobDone,1146,0,C_Principal,envioinfo,879,6,C_Cliente,imprime_abonopagare,1735,0,C_Cliente,B_IMP_Click,847,0,C_Cliente,b_imprimesegun_Click,2571,0,C_Cliente,B4XPage_Appear,210,6,C_Cliente,HIST_Click,814,0
+NavigationStack=C_Principal,cargaAlmacen2,2447,6,C_Principal,JobDone,1669,2,C_Principal,envioinfo,1015,0,C_Principal,cargaGeneral,1177,6,C_Principal,e_ruta_EnterPressed,1823,0,C_Principal,ListView2_ItemClick,2386,0,C_Principal,et_ruta2_TextChanged,2393,5,Diseñador Visual,principal.bal,-100,6,C_Principal,B4XPage_Appear,176,6,C_Principal,cargar_Click,1074,6,B4XMainPage,B4XPage_Created,226,0
 SelectedBuild=0
-VisibleModules=2,4,5,6,7,9,30,29,16,27
+VisibleModules=2,16,4,5,6,7,9,30,29,27