5.08.12

2026-04-17 19:36:50 +00:00 · 2025-09-01 13:29:10 -06:00
parent 46bd04a92f
commit beceec8c98
7 changed files with 50 additions and 29 deletions
--- a/B4A/B4XMainPage.bas
+++ b/B4A/B4XMainPage.bas
@@ -5,15 +5,15 @@ Type=Class
 Version=9.85
@EndOfDesignText@
 #Region Shared Files
-#CustomBuildAction: folders ready, %WINDIR%\System32\Robocopy.exe,"..\..\Shared Files" "..\Files"
-	'Ctrl + click to sync files: ide://run?file=%WINDIR%\System32\Robocopy.exe&args=..\..\Shared+Files&args=..\Files&FilesSync=True
-	'###########################################################################################################
-	'######################           PULL         #############################################################
-	'Ctrl + click ide://run?file=%WINDIR%\System32\cmd.exe&Args=/c&Args=git&Args=pull
-	'###########################################################################################################
-	'######################           PUSH         #############################################################
-	'Ctrl + click ide://run?file=%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe&Args=github&Args=..\..\
-	'###########################################################################################################
+'#CustomBuildAction: folders ready, %WINDIR%\System32\Robocopy.exe,"..\..\Shared Files" "..\Files"
+'Ctrl + click to sync files: ide://run?file=%WINDIR%\System32\Robocopy.exe&args=..\..\Shared+Files&args=..\Files&FilesSync=True
+'###########################################################################################################
+'######################           PULL         #############################################################
+'Ctrl + click ide://run?file=%WINDIR%\System32\cmd.exe&Args=/c&Args=..\..\gitpull.bat
+'###########################################################################################################
+'######################           PUSH         #############################################################
+'Ctrl + click ide://run?file=%WINDIR%\System32\cmd.exe&Args=/c&Args=github&Args=..\..\
+'###########################################################################################################
 	'######################      PUSH TORTOISE GIT     #########################################################
 	'Ctrl + click ide://run?file=%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe&Args=TortoiseGitProc&Args=/command:commit&Args=/path:"./../../"&Args=/closeonend:2
 	'###########################################################################################################
--- a/B4A/C_picking.bas
+++ b/B4A/C_picking.bas
@@ -90,7 +90,7 @@ Sub B4XPage_Appear
 		d.Position = 0
 		l_fecha.Text = d.GetString("FECHACONSULTA")
 		d.Close
-	Else
+		Else
 		b_cancelar.Visible = True
 		btnStartStop2.Visible = False
 		lb_folioselec.Text = B4XPages.MainPage.seleccion.folioactual
@@ -139,7 +139,7 @@ Sub B4XPage_Appear
 		End If
 	End If
 	c.Close
-	
+'	
 '	p_producto.Visible = True 'PARA PRUEBAS
 	
 End Sub
--- a/B4A/C_seleccion.bas
+++ b/B4A/C_seleccion.bas
@@ -333,18 +333,38 @@ Private Sub lb_folio_Click
 					Msgbox2Async("Estas seguro de empezar a pickear la ruta : "& folioactual &" del almacen: "& B4XPages.MainPage.almacen.almacenselec,"Atención","Si","","No",Null, False)
 					Wait For Msgbox_Result (result As Int)
 					If result=DialogResponse.POSITIVE Then
-						Dim cmd As DBCommand
-						cmd.Initialize
-						cmd.Name = "select_productos_guna_picking"
-						cmd.Parameters = Array As Object(almacen, folioactual,fechabusqueda,almacen)
-						reqManager.ExecuteQuery(cmd , 0, "detallefolio")
-						trabajo1 = trabajo1 + 1
+						Log(almacen)
+						If almacen = 89 Then
+							Dim cmd As DBCommand
+							cmd.Initialize
+							cmd.Name = "select_productos_guna_picking_BAT"
+							cmd.Parameters = Array As Object(almacen, folioactual,fechabusqueda,almacen)
+							reqManager.ExecuteQuery(cmd , 0, "detallefolio")
+							trabajo1 = trabajo1 + 1
+							
+							cmd.Initialize
+							cmd.Name = "select_costo_tot_GUNA_BAT"
+							cmd.Parameters = Array As Object(almacen, folioactual,fechabusqueda,almacen)
+							reqManager.ExecuteQuery(cmd , 0, "costo")
+							trabajo1 = trabajo1 +1
+						Else
+							Dim cmd As DBCommand
+							cmd.Initialize
+							cmd.Name = "select_productos_guna_picking"
+							cmd.Parameters = Array As Object(almacen, folioactual,fechabusqueda,almacen)
+							reqManager.ExecuteQuery(cmd , 0, "detallefolio")
+							trabajo1 = trabajo1 + 1
+							
+							cmd.Initialize
+							cmd.Name = "select_costo_tot_GUNA"
+							cmd.Parameters = Array As Object(almacen, folioactual,fechabusqueda,almacen)
+							reqManager.ExecuteQuery(cmd , 0, "costo")
+							trabajo1 = trabajo1 +1
+						End If
+						
+						
+						
 						
-						cmd.Initialize
-						cmd.Name = "select_costo_tot_GUNA"
-						cmd.Parameters = Array As Object(almacen, folioactual,fechabusqueda,almacen)
-						reqManager.ExecuteQuery(cmd , 0, "costo")
-						trabajo1 = trabajo1 +1
 						
 						ProgressDialogShow ("Cargando")
 						Starter.skmt.ExecNonQuery("delete from CUENTAA")
--- a/B4A/C_terminar.bas
+++ b/B4A/C_terminar.bas
@@ -56,7 +56,7 @@ Sub B4XPage_Appear
 	Starter.skmt.ExecNonQuery2("delete from CAT_PICKING WHERE ALMACEN = ? AND RUTA = ?",Array As String(e.GetString("ALMACEN"), e.GetString("CUENTA")))
 	For i = 0 To c.RowCount -1
 		c.Position = i
-		Starter.skmt.ExecNonQuery2("INSERT INTO CAT_PICKING(ALMACEN, RUTA, CODIGO, NOMBREPROD, CAJASOR, PIEZASOR, BLISTEROR, CAJASES, PIEZASES, BLISTERSES, USUARIO, FECHAINICIO, FECHAFIN, PIEZASTOTAL, PRECIOTOTAL, CANTIDADOR, PRECIOOR, CANTIDADBO, PRECIOBO, ENVIADO) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0)",Array As String(e.GetString("ALMACEN"), e.GetString("CUENTA"), c.GetString("CAT_DF_ID"), c.GetString("CAT_DF_NOMBRE"), c.GetString("CAT_DF_CAJAS"), c.GetString("CAT_DF_PIEZAS"), c.GetString("CAT_DF_BLISTER"), c.GetString("CAT_DF_PIEZAS_ESC"), c.GetString("CAT_DF_CAJAS_ESC"), c.GetString("CAT_DF_BLISTER_ESC"),B4XPages.MainPage.user, d.GetString("CAT_FOLIO_INICIO"),d.GetString("CAT_FOLIO_FINAL"),c.GetString("PIEZASTOTAL"),c.GetString("PRECIOTOTAL"),c.GetString("CANTIDAD"),c.GetString("PRECIOORDEN"),c.GetString("CANTIDADBO"),c.GetString("PRECIOBO")))
+		Starter.skmt.ExecNonQuery2("INSERT INTO CAT_PICKING(ALMACEN, RUTA, CODIGO, NOMBREPROD, CAJASOR, PIEZASOR, BLISTEROR, CAJASES, PIEZASES, BLISTERSES, USUARIO, FECHAINICIO, FECHAFIN, PIEZASTOTAL, PRECIOTOTAL, CANTIDADOR, PRECIOOR, CANTIDADBO, PRECIOBO, ENVIADO) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0)",Array As String(e.GetString("ALMACEN"), e.GetString("CUENTA"), c.GetString("CAT_DF_ID"), c.GetString("CAT_DF_NOMBRE"), c.GetString("CAT_DF_CAJAS"), c.GetString("CAT_DF_PIEZAS"), c.GetString("CAT_DF_BLISTER"), c.GetString("CAT_DF_CAJAS_ESC"), c.GetString("CAT_DF_PIEZAS_ESC"), c.GetString("CAT_DF_BLISTER_ESC"),B4XPages.MainPage.user, d.GetString("CAT_FOLIO_INICIO"),d.GetString("CAT_FOLIO_FINAL"),c.GetString("PIEZASTOTAL"),c.GetString("PRECIOTOTAL"),c.GetString("CANTIDAD"),c.GetString("PRECIOORDEN"),c.GetString("CANTIDADBO"),c.GetString("PRECIOBO")))
 	Next
 	
 	g = Starter.skmt.ExecQuery2("SELECT CODIGO, NOMBREPROD, CANTIDADBO , PRECIOBO FROM CAT_PICKING WHERE CANTIDADBO > 0 AND ALMACEN = ? AND RUTA = ?", Array As String(e.GetString("ALMACEN"), e.GetString("CUENTA")))
@@ -151,6 +151,7 @@ Private Sub b_enviar_Click
 			reqManager.ExecuteCommand(cmd , $"ins_pickingPendientes_head_${c.GetString("CODIGO")}"$)
 			trabajos = trabajos +1
 		Next
+'		B4XPages.ShowPage("almacen")
 	Else If c.RowCount = 0 Then
 		e = Starter.skmt.ExecQuery("SELECT * FROM CUENTAA")
 		e.Position = 0
--- a/B4A/Starter.bas
+++ b/B4A/Starter.bas
@@ -15,7 +15,7 @@ Sub Process_Globals
 	
 	Public rp As RuntimePermissions
 	Dim reqManager As DBRequestManager
-	Dim DBReqServer As String = "http://keymon.lat:1782" '"http://keymon.lat:1782" "http://10.0.0.205:1782" "http://keymon.lat:1783" "http://11.0.0.48:1783" ""' CAMBIAR HACIA AFUERA O DENTRO DE LA OFNA
+	Dim DBReqServer As String = "http://keymon.net:1782" '"http://keymon.lat:1782" "http://10.0.0.205:1782" "http://keymon.lat:1783" "http://11.0.0.48:1783" ""' CAMBIAR HACIA AFUERA O DENTRO DE LA OFNA
 '	Dim server As String = "http://10.0.0.205:1782"
 	Dim rutaBD As String = File.DirInternal
 	Dim skmt As SQL
--- a/B4A/guna_picking.b4a
+++ b/B4A/guna_picking.b4a
@@ -41,7 +41,7 @@ Library6=compressstrings
 Library7=core
 Library8=ime
 Library9=okhttputils2
-ManifestCode='This code will be applied to the manifest file during compilation.~\n~'You do not need to modify it in most cases.~\n~'See this link for for more information: https://www.b4x.com/forum/showthread.php?p=78136~\n~AddManifestText(~\n~<uses-sdk android:minSdkVersion="5" android:targetSdkVersion="30"/>~\n~<supports-screens android:largeScreens="true" ~\n~    android:normalScreens="true" ~\n~    android:smallScreens="true" ~\n~    android:anyDensity="true"/>)~\n~SetApplicationAttribute(android:icon, "@drawable/icon")~\n~SetApplicationAttribute(android:label, "$LABEL$")~\n~CreateResourceFromFile(Macro, Themes.LightTheme)~\n~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~'End of default text.~\n~~\n~AddApplicationText(~\n~<meta-data~\n~  android:name="com.google.android.geo.API_KEY"~\n~  android:value="AIzaSyBlBnx3O-DncOSv3oFIp-12wgujOYYcl-U"/>~\n~  <meta-data android:name="com.google.android.gms.version"~\n~   android:value="@integer/google_play_services_version" />~\n~)~\n~~\n~AddManifestText(~\n~<uses-permission~\n~  android:name="android.permission.ACCESS_FINE_LOCATION"~\n~  android:maxSdkVersion="30" />~\n~)~\n~AddPermission(android.permission.ACCESS_BACKGROUND_LOCATION)~\n~~\n~AddManifestText(<uses-permission~\n~android:name="android.permission.WRITE_EXTERNAL_STORAGE"~\n~android:maxSdkVersion="28" />~\n~)
+ManifestCode='This code will be applied to the manifest file during compilation.~\n~'You do not need to modify it in most cases.~\n~'See this link for for more information: https://www.b4x.com/forum/showthread.php?p=78136~\n~AddManifestText(~\n~<uses-sdk android:minSdkVersion="5" android:targetSdkVersion="33"/>~\n~<supports-screens android:largeScreens="true" ~\n~    android:normalScreens="true" ~\n~    android:smallScreens="true" ~\n~    android:anyDensity="true"/>)~\n~SetApplicationAttribute(android:icon, "@drawable/icon")~\n~SetApplicationAttribute(android:label, "$LABEL$")~\n~CreateResourceFromFile(Macro, Themes.LightTheme)~\n~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~'End of default text.~\n~~\n~AddApplicationText(~\n~<meta-data~\n~  android:name="com.google.android.geo.API_KEY"~\n~  android:value="AIzaSyBlBnx3O-DncOSv3oFIp-12wgujOYYcl-U"/>~\n~  <meta-data android:name="com.google.android.gms.version"~\n~   android:value="@integer/google_play_services_version" />~\n~)~\n~~\n~AddManifestText(~\n~<uses-permission~\n~  android:name="android.permission.ACCESS_FINE_LOCATION"~\n~  android:maxSdkVersion="30" />~\n~)~\n~AddPermission(android.permission.ACCESS_BACKGROUND_LOCATION)~\n~~\n~AddManifestText(<uses-permission~\n~android:name="android.permission.WRITE_EXTERNAL_STORAGE"~\n~android:maxSdkVersion="28" />~\n~)
 Module1=B4XMainPage
 Module2=C_almacen
 Module3=C_picking
@@ -54,12 +54,12 @@ Module9=Subs
 NumberOfFiles=11
 NumberOfLibraries=19
 NumberOfModules=9
-Version=12.5
+Version=12.8
@EndOfDesignText@
 #Region  Project Attributes 
 	#ApplicationLabel: Guna-Picking
 	#VersionCode: 1
-	#VersionName: 
+	#VersionName: 5.08.12
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False
--- a/B4A/guna_picking.b4a.meta
+++ b/B4A/guna_picking.b4a.meta
@@ -28,6 +28,6 @@ ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=C_terminar,Class_Globals,0,4,Diseñador Visual,almacen.bal,-100,1,Diseñador Visual,dpicking.bal,-100,1,Diseñador Visual,folio.bal,-100,1,Diseñador Visual,MainPage.bal,-100,3,Diseñador Visual,picking.bal,-100,1,Starter,Process_Globals,11,0,C_seleccion,Class_Globals,0,0,C_picking,Class_Globals,0,0,C_seleccion,lb_folio_Click,324,0
+NavigationStack=C_terminar,b_enviar_Click,147,0,C_picking,B4XPage_Appear,136,2,C_almacen,Class_Globals,0,0,C_almacen,b_cargar_Click,48,0,C_seleccion,Class_Globals,0,0,C_seleccion,b_cargar_Click,270,0,C_almacen,lb_folio_Click,65,0,C_almacen,B4XPage_Appear,40,0,Starter,Process_Globals,11,2,C_seleccion,lb_folio_Click,339,6
 SelectedBuild=0
-VisibleModules=8,1,2,4,3,5,9,7,6
+VisibleModules=1,2,3,4,5,6,7,8,9