diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas
index 0d08aa4..61cab71 100644
--- a/B4A/B4XMainPage.bas
+++ b/B4A/B4XMainPage.bas
@@ -76,11 +76,15 @@ Sub Class_Globals
Dim foto1() As Byte
Private b_valida As Button
Private l_version As Label
- Private p_validacion As Panel
- Private l_vProds2 As Label
- Private l_vPedidos2 As Label
- Private l_vNoVenta2 As Label
- Private i_progress As B4XGifView
+ dim p_validacion As Panel
+ Dim l_vProds2 As Label
+ Dim l_vPedidos2 As Label
+ Dim l_vNoVenta2 As Label
+ Dim i_progress As B4XGifView
+ Dim in As Intent
+ Dim intentUsado As Boolean = False
+ Dim Intmex As C_Intmex
+ Private l_version0 As Label
End Sub
Public Sub Initialize
@@ -93,7 +97,9 @@ Sub B4XPage_Created (Root1 As B4XView)
Root.LoadLayout("MainPage")
i_progress.SetGif(File.DirAssets, "progress.gif")
l_version.Text = Application.VersionName
+ l_version0.Text = Application.VersionName
p_principal.Width = Root.Width : p_principal.Height = Root.Height
+ l_version0.Top = Root.Height - 60dip
Subs.centraPanel(p_datos, Root.Width)
Subs.centraPanel(p_validacion, Root.Width)
p_validacion.Top = l_diasVenta.Top
@@ -117,14 +123,17 @@ Sub B4XPage_Created (Root1 As B4XView)
sp_empresa.Add("Intmex")
sp_empresa.Add("Mariana")
i_engrane.Left = Root.Width - i_engrane.Width - 5dip
+ Intmex.Initialize
End Sub
'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage.
Sub B4XPage_Appear
Log("INICIO")
- Dim in As Intent = B4XPages.GetNativeParent(Me).GetStartingIntent
- If in <> Null Then
+ If Not(in.IsInitialized) Then in = B4XPages.GetNativeParent(Me).GetStartingIntent
+ If Not(intentUsado) And in <> Null Then
+ Log(in)
+ intentUsado = True
' Log(in.GetData)
If in.GetData <> Null Then
Dim XmlData As String
@@ -136,8 +145,9 @@ Sub B4XPage_Appear
Dim OutStr As OutputStream = File.OpenOutput(File.DirInternal,"kmt.db",False)
Dim InStr As InputStream = File.OpenInput("ContentDir",XmlData)
File.Copy2(InStr,OutStr)
- Log("BD copiada a interna.")
+ LogColor("BD copiada a interna.", Colors.Blue)
OutStr.Close
+ If in.As(String).Contains("whatsapp") Then B4XPages.SetTitle(Me, "BD cargada desde Whatsapp")
Catch
Log(LastException)
End Try
@@ -172,6 +182,11 @@ Sub B4XPage_Appear
l_pedidos2.Text = c.GetString("pedidos")
l_diasVenta.Text = "N/A"
If c.GetString("diasVenta") <> Null Then l_diasVenta.Text = c.GetString("diasVenta")
+ If c.GetString("diasVenta").Length > 2 Then
+ l_diasVenta.TextColor = Colors.Red
+ Else
+ l_diasVenta.TextColor = Colors.Black
+ End If
If c.GetString("total") <> Null Then l_totalVenta.Text = "$" & NumberFormat2(c.GetString("total"), 1, 2, 2, True) Else l_totalVenta.Text = "0"
l_cantsEnCero.Text = "0"
If c.GetString("cantsEnCero") <> Null Then l_cantsEnCero.Text = c.GetString("cantsEnCero")
@@ -227,18 +242,25 @@ Sub B4XPage_Appear
Log(LastException)
End Try
' b_enviar.Enabled = False
- If empresa.ToUpperCase = "MARIANA" Then
+
+ Log(empresa)
+ p_empresa.Visible = False
+
+ If empresa.ToUpperCase.Contains("MARIANA") Then
b_enviar.Text = "Enviar Mariana"
b_valida.Text = "Validar Mariana"
+ Log("Cargamos MARIANA")
b_enviar.Enabled = True
- else if empresa.ToUpperCase = "GUNA" Then
+ else if empresa.ToUpperCase.Contains("GUNA") Then
b_enviar.Text = "Enviar Guna"
b_valida.Text = "Validar Guna"
b_enviar.Enabled = True
- else if empresa.ToUpperCase = "INTMEX" Then
+ Log("Cargamos GUNA")
+ else if empresa.ToUpperCase.Contains("INTMEX") Then
b_enviar.Text = "Enviar Intmex"
b_valida.Text = "Validar Intmex"
b_enviar.Enabled = True
+ Log("Cargamos INTMEX")
Else
p_empresa.Visible = True
b_enviar.Enabled = False
@@ -253,11 +275,11 @@ Sub b_enviar_Click
B4XPages.MainPage.p_progressDialog.Visible = True
B4XPages.MainPage.p_progressDialog.BringToFront
reqManager.reqsList.Initialize 'inicializamos lista de requests.
- If empresa.ToUpperCase = "MARIANA" Then
+ If empresa.ToUpperCase.Contains("MARIANA") Then
envioMariana
- else if empresa.ToUpperCase = "GUNA" Then
+ else if empresa.ToUpperCase.Contains("GUNA") Then
envioGuna
- else if empresa.ToUpperCase = "INTMEX" Then
+ else if empresa.ToUpperCase.Contains("INTMEX") Then
envioIntmex
End If
' Sleep(5000)
@@ -380,6 +402,9 @@ Sub b_cargarBD_Click
p_editaRuta.Visible = False
File.Copy(Result.Dir, Result.FileName, File.DirInternal, "kmt.db") 'Copia la base de datos seleccionada al directorio interno.
skmt.Initialize(File.DirInternal,"kmt.db", True) 'Reiniciliza la base de datos con la recien importada.
+
+ B4XPage_Appear
+
ToastMessageShow("¡BD importada!", False)
End If
End Sub
@@ -633,155 +658,142 @@ Sub envioMariana 'ignore
End Sub
Sub envioIntmex 'ignore
- Private PASO As Int = 1
- reqManager.reqsList.Initialize 'inicializamos lista de requests.
- If PASO = 1 Then
- B4XPages.MainPage.skmt.ExecNonQuery2("delete from PEDIDO WHERE PE_PRONOMBRE = ? ", Array As Object("N/A") )
- B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE not In (select PE_CLIENTE from pedido)")
- ' PEDIO_CLIENTE
- c=B4XPages.MainPage.skmt.ExecQuery("SELECT PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT, PC_COSTO_SIN, PC_RUTA, PC_ALMACEN, PC_FACTURA FROM PEDIDO_CLIENTE ")
- d=B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) as CUANTOS_PEDIDOSC FROM PEDIDO_CLIENTE ")
- If c.RowCount>0 Then
- For i=0 To c.RowCount -1
- c.Position=i
- Dim cmd As DBCommand
- cmd.Initialize
- cmd.Name = "insert_pedidos_INTMEX"
- cmd.Parameters = Array As Object(c.GetString("PC_CLIENTE"), c.GetString("PC_FECHA"), c.GetString("PC_USER"), c.GetString("PC_NOART"), c.GetString("PC_MONTO"), c.GetString("PC_LON"), c.GetString("PC_LAT"), almacen, ruta, c.GetString("PC_COSTO_SIN"), c.GetString("PC_FACTURA"))
- B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedidos")
- Next
- End If
- c.Close
- d.Position=0
- cuantos_pedidosc = D.GetString("CUANTOS_PEDIDOSC")
- d.Close
+ Intmex.envia
- ' ENVIO DE LOS CODIGOS QR
- 'c=skmt.ExecQuery2("SELECT CAT_CL_NUM_SERIEFISICO,CAT_CL_CODIGO ,CAT_CL_LONG,CAT_CL_LAT, CAT_CL_FOTO FROM kmt_info where CAT_CL_NUM_SERIEFISICO = ?", Array As String("OK"))
-
- c=B4XPages.MainPage.skmt.ExecQuery("SELECT CODIGOKMTS, CODIGOB, LAT, LON FROM HIST_CODIGO_BARRAS" )
- If c.RowCount>0 Then
- For i=0 To c.RowCount -1
- c.Position=i
- Dim cmd As DBCommand
- cmd.Initialize
- cmd.Name = "insert_QR_2_INTMEX"
- cmd.Parameters = Array As Object(C.GetString("CODIGOKMTS"), C.GetString("CODIGOB"), C.GetString("LON"), C.GetString("LAT"), almacen, ruta)
- B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_QR")
- Next
- End If
- c.Close
-
-
- c=B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_NUM_SERIEFISICO,CAT_CL_CODIGO ,CAT_CL_LONG,CAT_CL_LAT, CAT_CL_FOTO FROM kmt_info where CAT_CL_NUM_SERIEFISICO IS NOT NULL")
- If c.RowCount>0 Then
- For i=0 To c.RowCount -1
- c.Position=i
- foto1 = c.GetBlob("CAT_CL_FOTO")
- Dim cmd As DBCommand
- cmd.Initialize
- cmd.Name = "insert_QR_INTMEX"
- cmd.Parameters = Array As Object(C.GetString("CAT_CL_NUM_SERIEFISICO"), C.GetString("CAT_CL_CODIGO"), C.GetString("CAT_CL_LONG"), C.GetString("CAT_CL_LAT"), almacen, ruta, foto1 )
- B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_QR")
- Next
- End If
- c.Close
-
- c=B4XPages.MainPage.skmt.ExecQuery("SELECT HE_CLIE, HE_RES, HE_FECHA, HE_TIPO FROM HIST_ENCUESTA")
- If c.RowCount>0 Then
- For i=0 To c.RowCount -1
- c.Position=i
- Dim cmd As DBCommand
- cmd.Initialize
- cmd.Name = "insert_encuesta_INTMEX"
- cmd.Parameters = Array As Object(C.GetString("HE_CLIE"),C.GetString("HE_RES"),C.GetString("HE_FECHA"), c.GetString("HE_TIPO"))
- B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_noventa")
- Next
- End If
- c.Close
-
- c=B4XPages.MainPage.skmt.ExecQuery("SELECT 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")
- If c.RowCount>0 Then
- For i=0 To c.RowCount -1
- c.Position=i
- Dim cmd As DBCommand
- cmd.Initialize
- cmd.Name = "insert_pedido_INTMEX"
- cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"),almacen,C.GetString("PE_COSTO_TOT"),C.GetString("PE_COSTOU"),C.GetString("PE_CANT"),C.GetString("PE_PRONOMBRE"),C.GetString("PE_PROID"),C.GetString("PE_CLIENTE"),C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO"))
- B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedido")
- Next
- End If
- c.Close
-
- d=B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) as CUANTOS_PEDIDO FROM PEDIDO")
- d.Position=0
- cuantos_pedido = D.GetString("CUANTOS_PEDIDO")
- d.Close
-
- ' NOVENTA
- c = B4XPages.MainPage.skmt.ExecQuery("SELECT NV_CLIENTE,NV_FECHA,NV_USER,NV_MOTIVO,NV_COMM,NV_LAT,NV_LON FROM NOVENTA")
- If c.RowCount > 0 Then
- For i = 0 To c.RowCount -1
- c.Position = i
- Dim cmd As DBCommand
- cmd.Initialize
- cmd.Name = "insert_noventa_INTMEX"
- cmd.Parameters = Array As Object(C.GetString("NV_CLIENTE"),C.GetString("NV_FECHA"),C.GetString("NV_USER"),C.GetString("NV_MOTIVO"),C.GetString("NV_COMM"),C.GetString("NV_LAT"),C.GetString("NV_LON"), almacen, ruta)
- B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_noventa")
- Next
- End If
- c.Close
-
- d = B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) AS CUANTOS_NOVENTA FROM NOVENTA")
- d.Position = 0
- cuantos_noventa = d.GetString("CUANTOS_NOVENTA")
- d.Close
-
- ' GEO CERCA
-
- c=B4XPages.MainPage.skmt.ExecQuery("Select HGCLIENTE, HGDATE, HGLAT, HGLON from HIST_GEOCERCA")
- If c.RowCount>0 Then
- For i=0 To c.RowCount -1
- c.Position=i
- Dim cmd As DBCommand
- cmd.Initialize
- cmd.Name = "insert_geocerca_INTMEX"
- cmd.Parameters = Array As Object(C.GetString("HGCLIENTE"),C.GetString("HGDATE"),C.GetString("HGLAT"),C.GetString("HGLON"))
- B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_noventa")
- Next
- End If
- c.Close
-
- ' LO DEL LIKE
-
- c=B4XPages.MainPage.skmt.ExecQuery("Select HFCLIENTE, HFALIAS,HFRUTA,HFALMACEN from HIST_FACE")
- If c.RowCount>0 Then
- For i=0 To c.RowCount -1
- c.Position=i
- Dim cmd As DBCommand
- cmd.Initialize
- cmd.Name = "insert_face_like_INTMEX"
- cmd.Parameters = Array As Object(C.GetString("HFCLIENTE"),C.GetString("HFALIAS"),C.GetString("HFRUTA"),C.GetString("HFALMACEN"))
- B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_noventa")
- Next
- End If
- c.Close'
- ' DROP
-' t1.Initialize("T1", 30000) ' 1000 = 1 second
-' t1.Enabled = True
-' Dim sDate,sTime As String
-' DateTime.DateFormat = "MM/dd/yyyy"
-' sDate=DateTime.Date(DateTime.Now)
-' sTime=DateTime.Time(DateTime.Now)
-' Dim cmd As DBCommand
-' cmd.Initialize
-' cmd.Name ="insert_drop_INTMEX_2"
-' cmd.Parameters = Array As Object(usuario,l_ruta.Text,sDate & sTime, l_porvisitar.Text,l_drop.Text,l_efectiva.Text,l_cuantosc.Text,l_cuantosn.Text, L_MONTOD.Text,"ENVIO",almacen)
-' B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_noventa")
-' img2.Visible =True
-' PORCENTAJE = Round(100/ (cuantos_noventa + cuantos_pedido + cuantos_pedidosc + 1))
-' If Starter.marcaCel <> "Sony" Then ToastMessageShow("Se Actualizaran los datos, Este proceso podria tardar hasta un minuto, gracias "& l_ruta.text , True)
- End If
+' Private PASO As Int = 1
+' reqManager.reqsList.Initialize 'inicializamos lista de requests.
+' If PASO = 1 Then
+' B4XPages.MainPage.skmt.ExecNonQuery2("delete from PEDIDO WHERE PE_PRONOMBRE = ? ", Array As Object("N/A") )
+' B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE not In (select PE_CLIENTE from pedido)")
+' ' PEDIO_CLIENTE
+' c=B4XPages.MainPage.skmt.ExecQuery("SELECT PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT, PC_COSTO_SIN, PC_RUTA, PC_ALMACEN, PC_FACTURA FROM PEDIDO_CLIENTE ")
+' d=B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) as CUANTOS_PEDIDOSC FROM PEDIDO_CLIENTE ")
+' If c.RowCount>0 Then
+' For i=0 To c.RowCount -1
+' c.Position=i
+' Dim cmd As DBCommand
+' cmd.Initialize
+' cmd.Name = "insert_pedidos_INTMEX"
+' cmd.Parameters = Array As Object(c.GetString("PC_CLIENTE"), c.GetString("PC_FECHA"), c.GetString("PC_USER"), c.GetString("PC_NOART"), c.GetString("PC_MONTO"), c.GetString("PC_LON"), c.GetString("PC_LAT"), almacen, ruta, c.GetString("PC_COSTO_SIN"), c.GetString("PC_FACTURA"))
+' B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedidos")
+' Next
+' End If
+' c.Close
+' d.Position=0
+' cuantos_pedidosc = D.GetString("CUANTOS_PEDIDOSC")
+' d.Close
+'
+' ' ENVIO DE LOS CODIGOS QR
+' 'c=skmt.ExecQuery2("SELECT CAT_CL_NUM_SERIEFISICO,CAT_CL_CODIGO ,CAT_CL_LONG,CAT_CL_LAT, CAT_CL_FOTO FROM kmt_info where CAT_CL_NUM_SERIEFISICO = ?", Array As String("OK"))
+'
+' c=B4XPages.MainPage.skmt.ExecQuery("SELECT CODIGOKMTS, CODIGOB, LAT, LON FROM HIST_CODIGO_BARRAS" )
+' If c.RowCount>0 Then
+' For i=0 To c.RowCount -1
+' c.Position=i
+' Dim cmd As DBCommand
+' cmd.Initialize
+' cmd.Name = "insert_QR_2_INTMEX"
+' cmd.Parameters = Array As Object(C.GetString("CODIGOKMTS"), C.GetString("CODIGOB"), C.GetString("LON"), C.GetString("LAT"), almacen, ruta)
+' B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_QR")
+' Next
+' End If
+' c.Close
+'
+'
+' c=B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_NUM_SERIEFISICO,CAT_CL_CODIGO ,CAT_CL_LONG,CAT_CL_LAT, CAT_CL_FOTO FROM kmt_info where CAT_CL_NUM_SERIEFISICO IS NOT NULL")
+' If c.RowCount>0 Then
+' For i=0 To c.RowCount -1
+' c.Position=i
+' foto1 = c.GetBlob("CAT_CL_FOTO")
+' Dim cmd As DBCommand
+' cmd.Initialize
+' cmd.Name = "insert_QR_INTMEX"
+' cmd.Parameters = Array As Object(C.GetString("CAT_CL_NUM_SERIEFISICO"), C.GetString("CAT_CL_CODIGO"), C.GetString("CAT_CL_LONG"), C.GetString("CAT_CL_LAT"), almacen, ruta, foto1 )
+' B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_QR")
+' Next
+' End If
+' c.Close
+'
+' c=B4XPages.MainPage.skmt.ExecQuery("SELECT HE_CLIE, HE_RES, HE_FECHA, HE_TIPO FROM HIST_ENCUESTA")
+' If c.RowCount>0 Then
+' For i=0 To c.RowCount -1
+' c.Position=i
+' Dim cmd As DBCommand
+' cmd.Initialize
+' cmd.Name = "insert_encuesta_INTMEX"
+' cmd.Parameters = Array As Object(C.GetString("HE_CLIE"),C.GetString("HE_RES"),C.GetString("HE_FECHA"), c.GetString("HE_TIPO"))
+' B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_noventa")
+' Next
+' End If
+' c.Close
+'
+' c=B4XPages.MainPage.skmt.ExecQuery("SELECT 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")
+' If c.RowCount>0 Then
+' For i=0 To c.RowCount -1
+' c.Position=i
+' Dim cmd As DBCommand
+' cmd.Initialize
+' cmd.Name = "insert_pedido_INTMEX"
+' cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"),almacen,C.GetString("PE_COSTO_TOT"),C.GetString("PE_COSTOU"),C.GetString("PE_CANT"),C.GetString("PE_PRONOMBRE"),C.GetString("PE_PROID"),C.GetString("PE_CLIENTE"),C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO"))
+' B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedido")
+' Next
+' End If
+' c.Close
+'
+' d=B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) as CUANTOS_PEDIDO FROM PEDIDO")
+' d.Position=0
+' cuantos_pedido = D.GetString("CUANTOS_PEDIDO")
+' d.Close
+'
+' ' NOVENTA
+' c = B4XPages.MainPage.skmt.ExecQuery("SELECT NV_CLIENTE,NV_FECHA,NV_USER,NV_MOTIVO,NV_COMM,NV_LAT,NV_LON FROM NOVENTA")
+' If c.RowCount > 0 Then
+' For i = 0 To c.RowCount -1
+' c.Position = i
+' Dim cmd As DBCommand
+' cmd.Initialize
+' cmd.Name = "insert_noventa_INTMEX"
+' cmd.Parameters = Array As Object(C.GetString("NV_CLIENTE"),C.GetString("NV_FECHA"),C.GetString("NV_USER"),C.GetString("NV_MOTIVO"),C.GetString("NV_COMM"),C.GetString("NV_LAT"),C.GetString("NV_LON"), almacen, ruta)
+' B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_noventa")
+' Next
+' End If
+' c.Close
+'
+' d = B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) AS CUANTOS_NOVENTA FROM NOVENTA")
+' d.Position = 0
+' cuantos_noventa = d.GetString("CUANTOS_NOVENTA")
+' d.Close
+'
+' ' GEO CERCA
+'
+' c=B4XPages.MainPage.skmt.ExecQuery("Select HGCLIENTE, HGDATE, HGLAT, HGLON from HIST_GEOCERCA")
+' If c.RowCount>0 Then
+' For i=0 To c.RowCount -1
+' c.Position=i
+' Dim cmd As DBCommand
+' cmd.Initialize
+' cmd.Name = "insert_geocerca_INTMEX"
+' cmd.Parameters = Array As Object(C.GetString("HGCLIENTE"),C.GetString("HGDATE"),C.GetString("HGLAT"),C.GetString("HGLON"))
+' B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_noventa")
+' Next
+' End If
+' c.Close
+'
+' ' LO DEL LIKE
+'
+' c=B4XPages.MainPage.skmt.ExecQuery("Select HFCLIENTE, HFALIAS,HFRUTA,HFALMACEN from HIST_FACE")
+' If c.RowCount>0 Then
+' For i=0 To c.RowCount -1
+' c.Position=i
+' Dim cmd As DBCommand
+' cmd.Initialize
+' cmd.Name = "insert_face_like_INTMEX"
+' cmd.Parameters = Array As Object(C.GetString("HFCLIENTE"),C.GetString("HFALIAS"),C.GetString("HFRUTA"),C.GetString("HFALMACEN"))
+' B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_noventa")
+' Next
+' End If
+' c.Close'
+' End If
End Sub
Sub envioGuna 'ignore
@@ -1013,7 +1025,7 @@ End Sub
'Revisa que la NOVENTA, la cantidad de pedidos y los productos de PEDIDO sean los mismos en web y locales.
Sub valida(identificador As String)
Log("Validamos " & identificador)
- If empresa.ToUpperCase = "GUNA" Then
+ If empresa.ToUpperCase.Contains("GUNA") Then
reqManager.Initialize(Me, "http://keymon.lat:1782")
Else
reqManager.Initialize(Me, "http://keymon.lat:1781")
@@ -1057,12 +1069,13 @@ Private Sub b_valida_Click
l_vProds2.Text = ""
l_vNoVenta2.Text = ""
p_validacion.Visible = True
- If empresa.ToUpperCase = "MARIANA" Then
+ If empresa.ToUpperCase.Contains("MARIANA") Then
valida("MARDS")
- else if empresa.ToUpperCase = "GUNA" Then
+ else if empresa.ToUpperCase.Contains("GUNA") Then
valida("GV2")
- else if empresa.ToUpperCase = "INTMEX" Then
- valida("INTMEX")
+ else if empresa.ToUpperCase.Contains("INTMEX") Then
+' valida("INTMEX")
+ Intmex.valida
End If
End Sub
diff --git a/B4A/C_Intmex.bas b/B4A/C_Intmex.bas
new file mode 100644
index 0000000..dacc95f
--- /dev/null
+++ b/B4A/C_Intmex.bas
@@ -0,0 +1,377 @@
+B4A=true
+Group=Default Group
+ModulesStructureVersion=1
+Type=Class
+Version=12.8
+@EndOfDesignText@
+Sub Class_Globals
+' Dim skmt As SQL
+ Dim reqManager As DBRequestManager
+ Dim cmd As DBCommand
+ Dim c, d As Cursor
+ Dim usuario, almacen, PORCENTAJE, datos_iguales As String
+ Dim cuantos_pedido As String = 0
+ Dim cuantos_noventa As String = 0
+ Dim cuantos_pedidosc As String = 0
+ Dim foto1() As Byte
+ Dim t1 As Timer
+' Dim COUNT_CLIE As Int
+ Dim enviando As Boolean = False
+ dim validando as Boolean = False
+End Sub
+
+'Initializes the object. You can add parameters to this method if needed.
+Public Sub Initialize
+ reqManager.Initialize(Me, "http://keymon.lat:1781")
+End Sub
+
+Sub envia
+ enviando = True
+ almacen = Subs.traeAlmacen
+ B4XPages.MainPage.skmt.ExecNonQuery2("delete from PEDIDO WHERE PE_PRONOMBRE = ? ", Array As Object("N/A") )
+ B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE not In (select PE_CLIENTE from pedido)")
+ c=B4XPages.MainPage.skmt.ExecQuery("select usuario from usuarioa")
+ c.Position = 0
+ usuario = c.GetString("USUARIO")
+ c.Close
+
+ ' ENVIO DE LOS CODIGOS QR
+ c=B4XPages.MainPage.skmt.ExecQuery("SELECT CODIGOKMTS, CODIGOB, LAT, LON FROM HIST_CODIGO_BARRAS" )
+ If c.RowCount>0 Then
+ For i=0 To c.RowCount -1
+ c.Position=i
+ Dim cmd As DBCommand
+ cmd.Initialize
+ cmd.Name = "insert_QR_2_INTMEX"
+ cmd.Parameters = Array As Object(C.GetString("CODIGOKMTS"),C.GetString("CODIGOB"),C.GetString("LON"),C.GetString("LAT"),almacen,Subs.traeruta )
+ reqManager.ExecuteCommand(cmd , "ins_QR")
+ Next
+ End If
+ c.Close
+
+' c=B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_NUM_SERIEFISICO, CAT_CL_CODIGO, CAT_CL_LONG, CAT_CL_LAT, CAT_CL_FOTO FROM kmt_info where CAT_CL_NUM_SERIEFISICO IS NOT NULL")
+' If c.RowCount>0 Then
+' For i=0 To c.RowCount -1
+' c.Position=i
+' 's=skmt.ExecQuery2("SELECT HIST_VI_IMAGEN FROM HIST_VISITAS WHERE HIST_VI_CREDITO =?", Array As String (c.GetString("HIST_VI_CREDITO")))
+' 's.Position =0
+' foto1 = c.GetBlob("CAT_CL_FOTO")
+' Dim cmd As DBCommand
+' cmd.Initialize
+' cmd.Name = "insert_QR_INTMEX"
+' cmd.Parameters = Array As Object(C.GetString("CAT_CL_NUM_SERIEFISICO"),C.GetString("CAT_CL_CODIGO"),C.GetString("CAT_CL_LONG"),C.GetString("CAT_CL_LAT"),almacen,Subs.traeruta, foto1 )
+' reqManager.ExecuteCommand(cmd , "ins_QR")
+' Next
+' End If
+' c.Close
+
+ 'ENCUESTA
+ c=B4XPages.MainPage.skmt.ExecQuery("SELECT HE_CLIE, HE_RES, HE_FECHA, HE_TIPO FROM HIST_ENCUESTA")
+ If c.RowCount>0 Then
+ For i=0 To c.RowCount -1
+ c.Position=i
+ Dim cmd As DBCommand
+ cmd.Initialize
+ cmd.Name = "insert_encuesta_INTMEX"
+ cmd.Parameters = Array As Object(C.GetString("HE_CLIE"),C.GetString("HE_RES"),C.GetString("HE_FECHA"), c.GetString("HE_TIPO"))
+ reqManager.ExecuteCommand(cmd , "inst_noventa")
+ Next
+ End If
+ c.Close
+
+ ' PEDIDO_CLIENTE
+ Dim PCNoArts As String
+ Dim PCMonto As String
+ c = B4XPages.MainPage.skmt.ExecQuery("SELECT PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT, PC_COSTO_SIN, PC_RUTA, PC_ALMACEN, PC_FACTURA FROM PEDIDO_CLIENTE ")
+ d = B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) as CUANTOS_PEDIDOSC FROM PEDIDO_CLIENTE ")
+ If c.RowCount > 0 Then
+ For i = 0 To c.RowCount - 1
+ c.Position = i
+ Dim cmd As DBCommand
+ cmd.Initialize
+ cmd.Name = "insert_pedidos_INTMEX"
+ cmd.Parameters = Array As Object(c.GetString("PC_CLIENTE"), c.GetString("PC_FECHA"), c.GetString("PC_USER"), c.GetString("PC_NOART"), c.GetString("PC_MONTO"), c.GetString("PC_LON"), c.GetString("PC_LAT"), almacen, Subs.traeruta, c.GetString("PC_COSTO_SIN"), c.GetString("PC_FACTURA"))
+ PCNoArts = c.GetString("PC_NOART")
+ PCMonto = c.GetString("PC_MONTO")
+ reqManager.ExecuteCommand(cmd , "ins_pedidos")
+ Log(">>>>>> INSERT PEDIDO_CLIENTE")
+ Next
+ End If
+ c.Close
+ d.Position = 0
+ cuantos_pedidosc = d.GetString("CUANTOS_PEDIDOSC")
+ d.Close
+
+ ' PEDIDO
+ c = B4XPages.MainPage.skmt.ExecQuery("SELECT 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")
+ d = B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) as CUANTOS_PEDIDO FROM PEDIDO")
+ If c.RowCount > 0 Then
+ For i = 0 To c.RowCount - 1
+ c.Position = i
+ Dim cmd As DBCommand
+ cmd.Initialize
+ cmd.Name = "insert_pedido2_INTMEX" 'CON TOTALES INCLUIDOS
+ cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"),almacen,C.GetString("PE_COSTO_TOT"),C.GetString("PE_COSTOU"),C.GetString("PE_CANT"),C.GetString("PE_PRONOMBRE"),C.GetString("PE_PROID"),C.GetString("PE_CLIENTE"),C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO"), PCNoArts, PCMonto)
+ reqManager.ExecuteCommand(cmd , $"ins_pedidosPendientes_prods_${c.GetString("PE_CLIENTE")}_${c.GetString("PE_PROID")}"$)
+' Log($">>>> INS_PEDIDO= ${C.GetString("PE_CEDIS")},${ALMACEN},${C.GetString("PE_COSTO_TOT")},${C.GetString("PE_COSTOU")},${C.GetString("PE_CANT")}, ${C.GetString("PE_PRONOMBRE")}, ${C.GetString("PE_PROID")}, ${C.GetString("PE_CLIENTE")}, ${C.GetString("PE_FECHA")}, ${C.GetString("PE_USUARIO")}, ${C.GetString("PE_RUTA")}, ${C.GetString("PE_COSTO_SIN")}, ${C.GetString("PE_DESC")}, ${c.GetString("PE_FOLIO")}, ${PCNoArts}, ${PCMonto}"$)
+' cmd.Name = "insert_pedido_INTMEX" ' SIN TOTALES INCLUIDOS
+' cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"),ALMACEN,C.GetString("PE_COSTO_TOT"),C.GetString("PE_COSTOU"),C.GetString("PE_CANT"),C.GetString("PE_PRONOMBRE"),C.GetString("PE_PROID"),C.GetString("PE_CLIENTE"),C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO"))
+' reqManager.ExecuteCommand(cmd , "ins_pedido")
+ Next
+ End If
+ c.Close
+ d.Position=0
+ cuantos_pedido = D.GetString("CUANTOS_PEDIDO")
+ d.Close
+
+ ' NOVENTA
+ c=B4XPages.MainPage.skmt.ExecQuery("SELECT NV_CLIENTE,NV_FECHA,NV_USER,NV_MOTIVO,NV_COMM,NV_LAT,NV_LON FROM NOVENTA")
+ D=B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) AS CUANTOS_NOVENTA FROM NOVENTA")
+ If c.RowCount>0 Then
+ For i=0 To c.RowCount -1
+ c.Position=i
+ Dim cmd As DBCommand
+ cmd.Initialize
+ cmd.Name = "insert_noventa_INTMEX"
+ cmd.Parameters = Array As Object(C.GetString("NV_CLIENTE"),C.GetString("NV_FECHA"),C.GetString("NV_USER"),C.GetString("NV_MOTIVO"),C.GetString("NV_COMM"),C.GetString("NV_LAT"),C.GetString("NV_LON"), almacen, Subs.traeruta)
+ reqManager.ExecuteCommand(cmd , "inst_noventa")
+ Next
+ End If
+ c.Close
+ d.Position=0
+ cuantos_noventa = D.GetString("CUANTOS_NOVENTA")
+ d.Close
+
+ ' GEO CERCA
+ c=B4XPages.MainPage.skmt.ExecQuery("Select HGCLIENTE, HGDATE, HGLAT, HGLON from HIST_GEOCERCA")
+ If c.RowCount>0 Then
+ For i=0 To c.RowCount -1
+ c.Position=i
+ Dim cmd As DBCommand
+ cmd.Initialize
+ cmd.Name = "insert_geocerca_INTMEX"
+ cmd.Parameters = Array As Object(C.GetString("HGCLIENTE"),C.GetString("HGDATE"),C.GetString("HGLAT"),C.GetString("HGLON"))
+ reqManager.ExecuteCommand(cmd , "inst_noventa")
+ Next
+ End If
+ c.Close
+
+ ' LO DEL LIKE
+ c=B4XPages.MainPage.skmt.ExecQuery("Select HFCLIENTE, HFALIAS, HFRUTA, HFALMACEN from HIST_FACE")
+ If c.RowCount>0 Then
+ For i=0 To c.RowCount -1
+ c.Position=i
+ Dim cmd As DBCommand
+ cmd.Initialize
+ cmd.Name = "insert_face_like_INTMEX"
+ cmd.Parameters = Array As Object(C.GetString("HFCLIENTE"),C.GetString("HFALIAS"),C.GetString("HFRUTA"),C.GetString("HFALMACEN"))
+ reqManager.ExecuteCommand(cmd , "inst_noventa")
+ Next
+ End If
+ c.Close
+
+ ' DROP
+' t1.Initialize("T1", 30000) ' 1000 = 1 second
+' t1.Enabled = True
+' Dim sDate,sTime As String
+' DateTime.DateFormat = "MM/dd/yyyy"
+' sDate=DateTime.Date(DateTime.Now)
+' sTime=DateTime.Time(DateTime.Now)
+' Dim cmd As DBCommand
+' cmd.Initialize
+' cmd.Name ="insert_drop_INTMEX_2"
+' cmd.Parameters = Array As Object(usuario,Subs.traeruta,sDate & sTime, l_porvisitar.Text,l_drop.Text,l_efectiva.Text,l_cuantosc.Text,l_cuantosn.Text, L_MONTOD.Text,"ENVIO",almacen)
+' reqManager.ExecuteCommand(cmd , "inst_noventa")
+ '' img2.Visible =True
+' PORCENTAJE = Round(100/ (cuantos_noventa + cuantos_pedido + cuantos_pedidosc + 1))
+' If Starter.marcaCel <> "Sony" Then ToastMessageShow("Se Actualizaran los datos, Este proceso podria tardar hasta un minuto, gracias "& Subs.traeruta , True)
+
+ 'CUESTIONARIOS
+ c = B4XPages.MainPage.skmt.ExecQuery($"select * from cuestionario where ifnull(Q_ENVIO_OK, 0) = 0"$)
+ Private rutaActual As String = Subs.traeRuta
+ If c.RowCount > 0 Then
+ For x = 0 To c.RowCount - 1
+ c.Position = x
+ Dim cmd As DBCommand
+ cmd.Initialize
+ cmd.Name = "insert_CUESTIONARIO_INTMEX"
+ cmd.Parameters = Array As Object(c.GetString("Q_IDCLIENTE"), rutaActual, almacen, c.GetString("Q_FECHA"), c.GetString("Q_IDPREGUNTA"), c.GetString("Q_PREGUNTA"), c.GetString("Q_IDRESPUESTA"), C.GetString("Q_RESPUESTA"))
+ reqManager.ExecuteCommand(cmd , "ins_cuestionario")
+ Next
+ End If
+ c.Close
+End Sub
+
+Sub JobDone(Job As HttpJob)
+ Log("JOBDONE INTMEX")
+ Log(reqManager.link)
+ If reqManager.reqsList.IsInitialized Then 'Si tenemos lista de requests, la procesamos.
+ If reqManager.reqsList.IndexOf(Job.tag) <> -1 Then
+ reqManager.reqsList.RemoveAt(reqManager.reqsList.IndexOf(Job.tag))
+ LogColor($">>>>>> Quitamos ${Job.tag}"$, Colors.Blue)
+ End If
+ LogColor(">>>>>> " & reqManager.reqsList.Size & " - " & reqManager.reqsList, Colors.Blue)
+ End If
+ If Job.Success = False Then
+ Log("ERROR")
+ LogColor("Error: " & reqManager.HandleJob(Job).tag & " : " & Job.ErrorMessage, Colors.red)
+' Job.Release
+ Else 'If Job Success then ...
+ Log(3)
+ LogColor("JobDone: '" & reqManager.HandleJob(Job).tag & "' - Registros: " & reqManager.HandleJob(Job).Rows.Size, Colors.RGB(0,160,0)) 'Mod por CHV - 211027
+ 'Verificamos que el usuario guardado en BD sea VALIDO.
+ If Job.JobName = "DBRequest" Then
+ Dim RESULT As DBResult = reqManager.HandleJob(Job)
+ If RESULT.Tag = "update_gps" Then
+ For Each records() As Object In RESULT.Rows
+ Log("==========================REGISTROS="&RESULT.Rows)
+ For Each k As String In RESULT.Columns.Keys
+ Log(RESULT.Tag & ": " & k & ": " & records(RESULT.Columns.Get(k)))
+ Next
+ Next
+ End If
+ If RESULT.Tag = "ins_pedidos" Then
+ For Each records() As Object In RESULT.Rows
+ Log("==========================REGISTROS="&RESULT.Rows)
+ For Each k As String In RESULT.Columns.Keys
+ Log(RESULT.Tag & ": " & k & ": " & records(RESULT.Columns.Get(k)))
+ Next
+ Next
+ End If
+ End If
+
+ If Job.JobName = "DBRequest" Then
+ Dim RESULT As DBResult = reqManager.HandleJob(Job)
+ If RESULT.Tag = "valida_pedido" Then 'query tag
+ Subs.logJobDoneResultados(RESULT)
+ For Each records() As Object In RESULT.Rows
+ Dim CUANTOSP As Int = records(RESULT.Columns.Get("CUANTOSP"))
+ Log(CUANTOSP)
+ B4XPages.MainPage.l_vProds2.Text = $"${CUANTOSP}/${cuantos_pedido}"$
+ If cuantos_pedido <= CUANTOSP Then
+ ' ToastMessageShow("rojo val ok 1 cuantosp." , True)
+ datos_iguales = "ok"
+' S_CP.Text = "INFO OK"
+ ToastMessageShow("INFO OK", False)
+ Else
+' S_CP.Text = "ENVIAR DATOS (K-2)"
+ ToastMessageShow($"No se cargo bien la info de pedido.${CRLF}Envíe nuevamente: "$ & CUANTOSP & "/" & cuantos_pedido, True)
+ ToastMessageShow("ENVIAR DATOS (K-2)", True)
+ Log("No se cargo bien la info de pedido. Envíe nuevamente: " & CUANTOSP & "/" & cuantos_pedido)
+ End If
+ Next
+ End If
+ End If
+
+ If Job.JobName = "DBRequest" Then
+ Dim RESULT As DBResult = reqManager.HandleJob(Job)
+ If RESULT.Tag = "valida_pedidoc" Then 'query tag
+ Subs.logJobDoneResultados(RESULT)
+ For Each records() As Object In RESULT.Rows
+ Dim CUANTOSC As Int = records(RESULT.Columns.Get("CUANTOSC"))
+ B4XPages.MainPage.l_vPedidos2.Text = $"${CUANTOSC}/${cuantos_pedidosc}"$
+ If cuantos_pedidosc = CUANTOSC Then
+ ' ToastMessageShow("rojo val ok 1 cuantosp." , True)
+ datos_iguales = "ok"
+ Else
+ ToastMessageShow($"No se cargo bien la info de pedido_cliente.${CRLF}Envíe nuevamente: "$ & CUANTOSC & "/" & cuantos_pedidosc, True)
+ Log("No se cargo bien la info de pedido_cliente. Envíe nuevamente: " & CUANTOSC & "/" & cuantos_pedidosc)
+ End If
+ Next
+ End If
+ End If
+
+ If Job.JobName = "DBRequest" Then
+ Dim RESULT As DBResult = reqManager.HandleJob(Job)
+ If RESULT.Tag = "valida_noventa" Then 'query tag
+ Subs.logJobDoneResultados(RESULT)
+ For Each records() As Object In RESULT.Rows
+ Dim CUANTOSN As Int = records(RESULT.Columns.Get("CUANTOSN"))
+ B4XPages.MainPage.l_vNoVenta2.Text = $"${CUANTOSN}/${cuantos_noventa}"$
+ If cuantos_noventa = CUANTOSN Then
+ ' ToastMessageShow("rojo val ok 1 cuantosp." , True)
+ datos_iguales = "ok"
+ Else
+ ToastMessageShow($"No se cargo bien la info de NoVenta.${CRLF}Envíe nuevamente: "$ & CUANTOSN & "/" & cuantos_noventa, True)
+ Log("No se cargo bien la info de NoVenta. Envíe nuevamente:" & CUANTOSN & "/" & cuantos_noventa)
+ End If
+ Next
+ End If
+ End If
+
+ If Job.JobName = "DBRequest" Then
+ Dim RESULT As DBResult = reqManager.HandleJob(Job)
+ If RESULT.Tag = "ins_pedido" Then 'query tag
+ For Each records() As Object In RESULT.Rows
+' PB2.Progress = PB2.Progress + 5
+' S_CP.Text = "SUBIENDO"
+ Next
+' PB2.Progress = 100
+ Log("PROGRESO 100")
+' S_CP.Text = "REVISANDO ..."
+ ToastMessageShow("REVISANDO", False)
+ Log("REVISANDO")
+ End If
+ End If
+
+ Dim RESULT As DBResult = reqManager.HandleJob(Job)
+ If RESULT.Tag = "ins_cuestionario" Then 'query tag
+ Subs.logJobDoneResultados(RESULT)
+ End If
+ End If
+ If reqManager.reqsList.size = 0 Then ' Si ya no hay consultas pendientes ...
+ B4XPages.MainPage.p_progressDialog.Visible = False
+ If enviando Then ' Si terminamos de enviar pedido ...
+ Sleep(200)
+ B4XPages.MainPage.l_progressDialog.Text = "Validando " ' Mostramos el panel de progreso.
+ B4XPages.MainPage.p_progressDialog.Visible = True
+ valida ' Iniciamos la validación
+ enviando = False
+ End If
+ If validando Then
+ validando = False
+ Sleep(300)
+ 'Mostramos el panel de Validación.
+ B4XPages.MainPage.p_validacion.Visible = True
+ End If
+ End If
+ Job.Release
+End Sub
+
+Sub valida
+ validando = True
+ almacen = Subs.traeAlmacen
+ d = B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) as CUANTOS_PEDIDO FROM PEDIDO")
+ d.Position = 0
+ cuantos_pedido = d.GetString("CUANTOS_PEDIDO")
+
+ d = B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) as CUANTOS_PEDIDOSC FROM PEDIDO_CLIENTE ")
+ d.Position = 0
+ cuantos_pedidosc = d.GetString("CUANTOS_PEDIDOSC")
+
+ d = B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) AS CUANTOS_NOVENTA FROM NOVENTA")
+ d.Position = 0
+ cuantos_noventa = d.GetString("CUANTOS_NOVENTA")
+ d.Close
+
+ cmd.Initialize
+ cmd.Name = "select_cuantos_pedido_INTMEX"
+ cmd.Parameters = Array As Object(almacen, Subs.traeRuta)
+ Log($"${almacen}, ${Subs.traeRuta}"$)
+ reqManager.ExecuteQuery(cmd , 0, "valida_pedido")
+
+ cmd.Initialize
+ cmd.Name = "select_cuantos_noventa_INTMEX"
+ cmd.Parameters = Array As Object(almacen, Subs.traeRuta)
+ reqManager.ExecuteQuery(cmd , 0, "valida_noventa")
+
+ cmd.Initialize
+ cmd.Name = "select_cuantos_pedidoc_INTMEX"
+ cmd.Parameters = Array As Object(almacen, Subs.traeRuta)
+ reqManager.ExecuteQuery(cmd , 0, "valida_pedidoc")
+ Log("http://keymon.lat:1781")
+
+ B4XPages.MainPage.l_vPedidos2.Text = ""
+ B4XPages.MainPage.l_vProds2.Text = ""
+ B4XPages.MainPage.l_vNoVenta2.Text = ""
+End Sub
\ No newline at end of file
diff --git a/B4A/DBCheck.b4a b/B4A/DBCheck.b4a
index c99634a..07ce3c7 100644
--- a/B4A/DBCheck.b4a
+++ b/B4A/DBCheck.b4a
@@ -26,19 +26,20 @@ Library9=sql
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~~\n~)~\n~SetApplicationAttribute(android:icon, "@drawable/icon")~\n~SetApplicationAttribute(android:label, "$LABEL$")~\n~CreateResourceFromFile(Macro, Themes.LightTheme)~\n~'End of default text.~\n~~\n~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~AddPermission(android.permission.INTERNET)~\n~AddPermission(android.permission.READ_EXTERNAL_STORAGE)~\n~AddPermission(android.permission.WRITE_EXTERNAL_STORAGE)~\n~SetApplicationAttribute(android:allowBackup, "false")~\n~~\n~AddActivityText(main,~\n~~\n~~\n~~\n~~\n~)
Module1=B4XMainPage
Module2=C_Envios
-Module3=DBRequestManager
-Module4=FileHandler
-Module5=Starter
-Module6=Subs
+Module3=C_Intmex
+Module4=DBRequestManager
+Module5=FileHandler
+Module6=Starter
+Module7=Subs
NumberOfFiles=6
NumberOfLibraries=11
-NumberOfModules=6
-Version=12.5
+NumberOfModules=7
+Version=12.8
@EndOfDesignText@
#Region Project Attributes
#ApplicationLabel: DBCheck
#VersionCode: 1
- #VersionName: 3.11.30
+ #VersionName: 4.05.02
'SupportedOrientations possible values: unspecified, landscape or portrait.
#SupportedOrientations: portrait
#CanInstallToExternalStorage: False
@@ -53,9 +54,6 @@ Version=12.5
Sub Process_Globals
Public ActionBarHomeClicked As Boolean
-
-'linea de prueba
-
End Sub
Sub Globals
diff --git a/B4A/DBCheck.b4a.meta b/B4A/DBCheck.b4a.meta
index a5bf6ee..03419a9 100644
--- a/B4A/DBCheck.b4a.meta
+++ b/B4A/DBCheck.b4a.meta
@@ -5,6 +5,7 @@ ModuleBookmarks3=
ModuleBookmarks4=
ModuleBookmarks5=
ModuleBookmarks6=
+ModuleBookmarks7=
ModuleBreakpoints0=
ModuleBreakpoints1=
ModuleBreakpoints2=
@@ -12,13 +13,15 @@ ModuleBreakpoints3=
ModuleBreakpoints4=
ModuleBreakpoints5=
ModuleBreakpoints6=
+ModuleBreakpoints7=
ModuleClosedNodes0=2,6
-ModuleClosedNodes1=3,5,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31
-ModuleClosedNodes2=5
+ModuleClosedNodes1=8,10,11,12,13,14,15,16,17,18,19,20,21,26,30
+ModuleClosedNodes2=4,5
ModuleClosedNodes3=
ModuleClosedNodes4=
-ModuleClosedNodes5=1
-ModuleClosedNodes6=12,13,14,16,17,18
-NavigationStack=B4XMainPage,l_usuario2_LongClick,390,0,B4XMainPage,b_guardaUsuario_Click,436,6,B4XMainPage,b_guardaAlmacen_Click,424,1,B4XMainPage,l_clienteNoNumerico_LongClick,410,0,Visual Designer,MainPage.bal,-100,6,B4XMainPage,b_guardaRuta_Click,419,3,B4XMainPage,envioMariana,503,0,B4XMainPage,JobDone,320,0,B4XMainPage,B4XPage_Created,90,0,B4XMainPage,envioGuna,1006,0
+ModuleClosedNodes5=
+ModuleClosedNodes6=1
+ModuleClosedNodes7=12,13,14,16,17
+NavigationStack=B4XMainPage,b_valida_Click,1058,0,C_Intmex,envia,166,5,C_Intmex,Class_Globals,13,6,C_Intmex,JobDone,327,6,C_Intmex,valida,349,6,Main,Globals,22,0,B4XMainPage,B4XPage_Appear,160,0,B4XMainPage,Class_Globals,81,0,Visual Designer,MainPage.bal,-100,6,B4XMainPage,B4XPage_Created,88,4
SelectedBuild=0
-VisibleModules=1,6,2,3
+VisibleModules=1,7,4,3
diff --git a/B4A/DBRequestManager.bas b/B4A/DBRequestManager.bas
index e0e2b63..2eb6867 100644
--- a/B4A/DBRequestManager.bas
+++ b/B4A/DBRequestManager.bas
@@ -9,7 +9,7 @@ Sub Class_Globals
Private mTarget As Object
Type DBResult (Tag As Object, Columns As Map, Rows As List)
Type DBCommand (Name As String, Parameters() As Object)
- Private link As String
+ dim link As String
Private bc As ByteConverter
Private T_NULL = 0, T_STRING = 1, T_SHORT = 2, T_INT = 3, T_LONG = 4, T_FLOAT = 5 _
,T_DOUBLE = 6, T_BOOLEAN = 7, T_BLOB = 8 As Byte
diff --git a/B4A/Files/mainpage.bal b/B4A/Files/mainpage.bal
index 2f06803..042276c 100644
Binary files a/B4A/Files/mainpage.bal and b/B4A/Files/mainpage.bal differ
diff --git a/B4A/Files/progress.gif b/B4A/Files/progress.gif
new file mode 100644
index 0000000..aaac076
Binary files /dev/null and b/B4A/Files/progress.gif differ
diff --git a/B4A/Subs.bas b/B4A/Subs.bas
index 9d52bbc..a71d62b 100644
--- a/B4A/Subs.bas
+++ b/B4A/Subs.bas
@@ -192,4 +192,14 @@ Sub traeAlmacen As String 'ignore
a = C.GetString("ID_ALMACEN")
c.Close
Return a
+End Sub
+
+'Muestra en el Log los campos y valores que regresan en el JobDone.
+Sub logJobDoneResultados(resultado As DBResult)
+ For Each records() As Object In resultado.Rows
+ LogColor($"====== ${resultado.Tag} - REGISTROS = ${resultado.Rows.Size}"$, Colors.RGB(215,37,0))
+ For Each k As String In resultado.Columns.Keys
+ LogColor(k & " = " & records(resultado.Columns.Get(k)), Colors.RGB(215,37,0))
+ Next
+ Next
End Sub
\ No newline at end of file