diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index 61cab71..7f8cdc5 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -76,7 +76,7 @@ Sub Class_Globals Dim foto1() As Byte Private b_valida As Button Private l_version As Label - dim p_validacion As Panel + Dim p_validacion As Panel Dim l_vProds2 As Label Dim l_vPedidos2 As Label Dim l_vNoVenta2 As Label @@ -84,6 +84,7 @@ Sub Class_Globals Dim in As Intent Dim intentUsado As Boolean = False Dim Intmex As C_Intmex + Dim Durakelo As C_Durakelo Private l_version0 As Label End Sub @@ -119,11 +120,13 @@ Sub B4XPage_Created (Root1 As B4XView) et_server.Left = (Root.Width / 2) - (et_server.Width / 2) 'Centramos et_server lv_DBRServer.Left = (Root.Width / 2) - (lv_DBRServer.Width / 2) 'Centramos lv_DBRServer sp_empresa.Add("------------") + sp_empresa.Add("Durakelo") sp_empresa.Add("Guna") sp_empresa.Add("Intmex") sp_empresa.Add("Mariana") i_engrane.Left = Root.Width - i_engrane.Width - 5dip Intmex.Initialize + Durakelo.Initialize End Sub 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage. @@ -261,6 +264,11 @@ Sub B4XPage_Appear b_valida.Text = "Validar Intmex" b_enviar.Enabled = True Log("Cargamos INTMEX") + else if empresa.ToUpperCase.Contains("DURAKELO") Then + b_enviar.Text = "Enviar Durakelo" + b_valida.Text = "Validar Durakelo" + b_enviar.Enabled = True + Log("Cargamos DURAKELO") Else p_empresa.Visible = True b_enviar.Enabled = False @@ -281,6 +289,8 @@ Sub b_enviar_Click envioGuna else if empresa.ToUpperCase.Contains("INTMEX") Then envioIntmex + else if empresa.ToUpperCase.Contains("DURAKELO") Then + envioDurakelo End If ' Sleep(5000) End If @@ -441,9 +451,16 @@ End Sub 'Cambiamos la ruta actual por la especificado. Sub b_guardaRuta_Click + Log("Guardamos nueva ruta.") If et_nuevaRuta.Text <> "" Then skmt.ExecNonQuery($"update PEDIDO set PE_RUTA = '${et_nuevaRuta.Text}' where PE_RUTA = '${ruta}'"$) skmt.ExecNonQuery($"update PEDIDO_CLIENTE set PC_RUTA = '${et_nuevaRuta.Text}' where PC_RUTA = '${ruta}'"$) + skmt.ExecNonQuery($"update kmt_info set CAT_CL_RUTA = '${et_nuevaRuta.Text}' where CAT_CL_RUTA = '${ruta}'"$) + Try 'Si es Guna, se pone en kmt_info2 + skmt.ExecNonQuery($"update kmt_info2 set CAT_CL_RUTA = '${et_nuevaRuta.Text}' where CAT_CL_RUTA = '${ruta}'"$) + Catch + Log(LastException) + End Try l_ruta2.Text = et_nuevaRuta.text End If p_editaRuta.Visible = False @@ -659,141 +676,10 @@ End Sub Sub envioIntmex 'ignore Intmex.envia - -' 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 envioDurakelo 'ignore + Durakelo.envia End Sub Sub envioGuna 'ignore @@ -1076,6 +962,8 @@ Private Sub b_valida_Click else if empresa.ToUpperCase.Contains("INTMEX") Then ' valida("INTMEX") Intmex.valida + else if empresa.ToUpperCase.Contains("DURAKELO") Then + Durakelo.valida End If End Sub diff --git a/B4A/C_Intmex.bas b/B4A/C_Intmex.bas index dacc95f..3d96d6e 100644 --- a/B4A/C_Intmex.bas +++ b/B4A/C_Intmex.bas @@ -17,7 +17,7 @@ Sub Class_Globals Dim t1 As Timer ' Dim COUNT_CLIE As Int Dim enviando As Boolean = False - dim validando as Boolean = False + Dim validando As Boolean = False End Sub 'Initializes the object. You can add parameters to this method if needed. @@ -217,7 +217,6 @@ Sub JobDone(Job As HttpJob) 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 diff --git a/B4A/DBCheck.b4a b/B4A/DBCheck.b4a index 07ce3c7..206f8c0 100644 --- a/B4A/DBCheck.b4a +++ b/B4A/DBCheck.b4a @@ -25,15 +25,16 @@ Library8=randomaccessfile 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=C_Intmex -Module4=DBRequestManager -Module5=FileHandler -Module6=Starter -Module7=Subs +Module2=C_Durakelo +Module3=C_Envios +Module4=C_Intmex +Module5=DBRequestManager +Module6=FileHandler +Module7=Starter +Module8=Subs NumberOfFiles=6 NumberOfLibraries=11 -NumberOfModules=7 +NumberOfModules=8 Version=12.8 @EndOfDesignText@ #Region Project Attributes diff --git a/B4A/DBCheck.b4a.meta b/B4A/DBCheck.b4a.meta index 03419a9..bf9f614 100644 --- a/B4A/DBCheck.b4a.meta +++ b/B4A/DBCheck.b4a.meta @@ -6,6 +6,7 @@ ModuleBookmarks4= ModuleBookmarks5= ModuleBookmarks6= ModuleBookmarks7= +ModuleBookmarks8= ModuleBreakpoints0= ModuleBreakpoints1= ModuleBreakpoints2= @@ -14,14 +15,16 @@ ModuleBreakpoints4= ModuleBreakpoints5= ModuleBreakpoints6= ModuleBreakpoints7= +ModuleBreakpoints8= ModuleClosedNodes0=2,6 -ModuleClosedNodes1=8,10,11,12,13,14,15,16,17,18,19,20,21,26,30 -ModuleClosedNodes2=4,5 -ModuleClosedNodes3= +ModuleClosedNodes1=7,8,9,11,12,13,15,16,17,18,19,20,21 +ModuleClosedNodes2=6 +ModuleClosedNodes3=4,5 ModuleClosedNodes4= 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 +ModuleClosedNodes6= +ModuleClosedNodes7=1 +ModuleClosedNodes8=12,13,14 +NavigationStack=B4XMainPage,l_usuario2_LongClick,429,0,B4XMainPage,b_guardaRuta_Click,452,6,C_Durakelo,Class_Globals,10,2,C_Intmex,Class_Globals,10,0,C_Intmex,envia,22,0,C_Durakelo,JobDone,412,6,C_Intmex,JobDone,321,0,C_Durakelo,envia,214,6,C_Durakelo,T4_Tick,457,1,C_Durakelo,valida,443,0 SelectedBuild=0 -VisibleModules=1,7,4,3 +VisibleModules=1,8,5,4,2 diff --git a/B4A/Subs.bas b/B4A/Subs.bas index a71d62b..3dcdc82 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -172,6 +172,19 @@ Sub traeRuta As String 'ignore Return r End Sub +'Regresa la ruta del cliente dado de la tabla pedido. +Sub traeRutaPedidoCliente(idcliente As String) As String 'ignore + Private r As String + Private c As Cursor = B4XPages.MainPage.skmt.ExecQuery($"select PE_RUTA from pedido where PE_CLIENTE = '${idcliente}'"$) + r = "0" + If c.RowCount > 0 Then + c.Position = 0 + r = c.GetString("PE_RUTA") + End If + c.Close + Return r +End Sub + 'Regresa el cliente actual desde CUENTAA. Sub traeCliente As String 'ignore Private c As Cursor