From bca0d31469ea22a187abc48112f64397aa19cc61 Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Fri, 24 Oct 2025 00:46:45 -0600 Subject: [PATCH] - VERSION 5.10.20 - Correcciones en el envio de informacion despues de agregar el mandaPendientes, no se estaba enviando el pedido cuando se enviaba informacion desde la pantalla principal (por un timer que no funciona bien). --- B4A/B4XMainPage.bas | 2 +- B4A/C_Principal.bas | 116 ++++++++++++++++++++++++++++------------ B4A/Files/login.bal | Bin 23539 -> 23531 bytes B4A/Files/principal.bal | Bin 78098 -> 78106 bytes B4A/KelloggsV4.b4a | 2 +- B4A/KelloggsV4.b4a.meta | 6 +-- 6 files changed, 88 insertions(+), 38 deletions(-) diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index d455efb..f31979b 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -262,7 +262,7 @@ Log(111) End If ' reqManager.Initialize(Me, Starter.server) ' Activity.LoadLayout("login") - Label1.Text = Application.VersionName + Label1.Text = Application.VersionName & " " ' Log("Pedimos permisos de almacenamiento externo") ' Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_WRITE_EXTERNAL_STORAGE) diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 3c0e32e..ae4fcba 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -220,6 +220,7 @@ Sub Class_Globals Dim ts As C_TrendSpending Dim linker As C_deviceLinker Dim kb As IME + Dim reqTotales As Int End Sub 'You can add more parameters here. @@ -652,12 +653,15 @@ Sub Subir_Click S_CH.Visible = False PB1.Visible = False Resumen.Visible= False - L_P_2.Text = "Envio de Pedidos" + L_P_2.Text = "Envio de información" 'L_P_3.Text = "Envio de Pedidos" 'S_CH.Text = "EN PROCESO" S_CP.Text = "EN PROCESO" PB1.Progress = 0 PB2.Progress = 0 + PB2.Color = Colors.RGB(180,203,36) + PB2.Height = 15dip + PB2.Padding = Array As Int (10dip, 10dip, 10dip, 10dip) contador_env = 0 contador_strem = 0 e_ruta.Text = ruta_valida @@ -678,7 +682,7 @@ Sub Subir_Click SUBIR_INFO_PEDIDO Else Dim result As Int - result = Msgbox2("QUE VA A ENVIAR?", "ENVIO DE INFO.", "BOLETA", "VALIDAR", "VTA/PED", LoadBitmap(File.DirAssets, "alert2.png")) 'ignore + result = Msgbox2("QUE VA A ENVIAR?", "ENVIO DE INFO.", "BOLETA", "VALIDAR", "VENTA/PEDIDO", LoadBitmap(File.DirAssets, "alert2.png")) 'ignore If result = DialogResponse.Positive Then SUBIR_INFO_BOLETA ELSE IF result = DialogResponse.NEGATIVE Then @@ -1801,9 +1805,27 @@ Sub JobDone(Job As HttpJob) End If If RESULT.Tag.As(String).StartsWith("ins_pedido_") Then 'query tag + +' If L_P_2.Text = "Envio de Pedidos" Then +' L_P_2.Text = "Envio de Pedidos --" +' Log(1) +' else if L_P_2.Text = "Envio de Pedidos --" Then +' Log(2) +' L_P_2.Text = "Envio de Pedidos \" +' else if L_P_2.Text = "Envio de Pedidos \" Then +' Log(3) +' L_P_2.Text = "Envio de Pedidos |" +' else if L_P_2.Text = "Envio de Pedidos |" Then +' Log(4) +' L_P_2.Text = "Envio de Pedidos /" +' else if L_P_2.Text = "Envio de Pedidos /" Then +' Log(5) +' L_P_2.Text = "Envio de Pedidos --" +' End If + For Each records() As Object In RESULT.Rows Private temp() As String = Regex.Split("_", RESULT.Tag) - Log(temp(2)) +' Log(temp(2)) If temp.Length > 1 Then Starter.skmt.ExecNonQuery($"update pedido set pe_enviado = 1 where pe_cliente = '${temp(2)}'"$) Log($"update pedido set pe_enviado = 1 where pe_cliente = '${temp(2)}'"$) @@ -1811,7 +1833,7 @@ Sub JobDone(Job As HttpJob) PB2.Progress = PB2.Progress + 5 S_CP.Text = "SUBIENDO" Next - PB2.Progress = 100 +' PB2.Progress = 100 S_CP.Text = "VALIDANDO" End If @@ -2206,7 +2228,13 @@ Sub JobDone(Job As HttpJob) End If Job.Release -' if carga = "SUBIR" then logcolor(reqManager.reqsList, Colors.blue) + If reqManager.reqsList.IsInitialized Then + LogColor(reqManager.reqsList, Colors.blue) +' LogColor(reqManager.reqsList.Size, Colors.blue) + actualizaProgressBar + End If +' LogColor(reqTotales, Colors.blue) + ' If Starter.Logger Then Log($"tiempo Request "${Job.Tag}": ${((reqManager.inicioJobDone - reqManager.inicioRequest)/1000)}"$) ' If Starter.Logger Then Log($"tiempo JobDone "${Job.Tag}": ${((DateTime.Now - reqManager.inicioJobDone)/1000)}"$) ' If Starter.Logger Then Log($"tiempo Total "${Job.Tag}": ${((DateTime.Now - inicioContador)/1000)}"$) @@ -2217,11 +2245,20 @@ Sub JobDone(Job As HttpJob) copiaCatGPPromocion End If - Log(reqManager.requestTimes(Job.Tag)) +' Log(reqManager.requestTimes(Job.Tag)) ' Log($"tiempo Total "${Job.Tag}": ${((DateTime.Now - inicioContador)/1000)}"$) ' reqManager.PrintTable(RESULT)2 End Sub +Sub actualizaProgressBar + Log($"Porcentaje = ${(((reqTotales-reqManager.reqsList.Size)/reqTotales)*100).As(Int)}"$) + Private porcentajePB2 As Int = (((reqTotales-reqManager.reqsList.Size)/reqTotales)*100).As(Int) + If PB2.IsInitialized And PB2.Visible Then + Sleep(0) + PB2.Progress = porcentajePB2 + End If +End Sub + Sub copiaCatGPPromocion Log(">>>>>>>>> COPIAMOS CAT_GP_PROMOCION a CAT_GUNAPROD2") Starter.skmt.ExecNonQuery("UPDATE CAT_GUNAPROD2 SET CAT_GP_PROMOCION = '0'") @@ -3171,7 +3208,7 @@ Sub SUBIR_INFO_PEDIDO cmd.Initialize Private eventob As String = h.GetString("eventob") cmd.Name = "mandaBitacora3" - Log("BITACORA3") +' Log("BITACORA3") Private clienteb As String = h.GetString("clienteb") Private finb As String = h.GetString("finb") Private nombreCliente As String =Subs. traeNombreCliente(h.GetString("clienteb")) @@ -3264,6 +3301,9 @@ Sub SUBIR_INFO_PEDIDO PORENVIAR = 0 ' PEDIDO + t3.Initialize("T3", 500) ' 1000 = 1 second + t3.Enabled = True + Wait For t3_tick enviaPedido("Todos") d = Starter.skmt.ExecQuery("SELECT COUNT(*) as CUANTOS_PEDIDO FROM PEDIDO") @@ -3359,6 +3399,8 @@ Sub SUBIR_INFO_PEDIDO End If ' ToastMessageShow("Se Actualizaran los datos. Este proceso podria tardar hasta un minuto, gracias "& l_ruta.text , True) S_CP.Text = "SUBIENDO" + Log(reqManager.reqsList.Size) + reqTotales = reqManager.reqsList.Size DateTime.TimeFormat = "HH:mm:ss" End Sub @@ -3374,6 +3416,11 @@ Sub enviaPedido(filtro As String) Starter.skmt.ExecNonQuery2("update PEDIDO set PE_CEDIS = ? where PE_CLIENTE =? AND PE_FOLIO IS NULL ", Array As Object("RECARGA", "0")) End If Starter.skmt.ExecNonQuery("UPDATE PEDIDO SET PE_FOLIO = rowid where PE_FOLIO = 0 or PE_FOLIO = 1") + + Log("####################################################") + Log(PERFIL) + Log("####################################################") + If PERFIL = "V-ESPECIAL" Then Log($"pe_cedis_1"$) c = Starter.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, PE_TIPO FROM PEDIDO ${condicion} ORDER BY PE_CLIENTE"$) @@ -3394,17 +3441,15 @@ Sub enviaPedido(filtro As String) Else ' Log($"pe_cedis_3"$) Private cPed As Cursor = Starter.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, PE_TIPO FROM PEDIDO ${condicion}"$) - Log($"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, PE_TIPO FROM PEDIDO ${condicion}"$) - TIEMPO = 0 - t3.Initialize("T3", 500) ' 1000 = 1 second - t3.Enabled = True - Wait For t3_tick + Log($"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, PE_TIPO FROM PEDIDO ${condicion}"$) +' TIEMPO = 0 S_CP.Text = "Envio de Pedidos" PB2.Progress = 1 Log("pedido:" & cPed.RowCount) - If cPed.RowCount>0 Then + If cPed.RowCount > 0 Then For i = 0 To cPed.RowCount - 1 cPed.Position = i +' LogColor($"##### ${i} #### "$, Colors.magenta) Dim cmd As DBCommand cmd.Initialize cmd.Name = "insert_pedido_KELL" @@ -3412,26 +3457,31 @@ Sub enviaPedido(filtro As String) cmd.Parameters = Array As Object(cPed.GetString("PE_CEDIS"),ALMACEN,cPed.GetString("PE_COSTO_TOT"),cPed.GetString("PE_COSTOU"),cPed.GetString("PE_CANT"),cPed.GetString("PE_PRONOMBRE"),cPed.GetString("PE_PROID"),cPed.GetString("PE_CLIENTE"),cPed.GetString("PE_FECHA"),cPed.GetString("PE_USUARIO"),cPed.GetString("PE_RUTA"), cPed.GetString("PE_COSTO_SIN"),cPed.GetString("PE_DESC"),cPed.GetString("PE_FOLIO"), cPed.GetString("PE_TIPO")) reqManager.ExecuteCommand(cmd , $"ins_pedido_${cPed.GetString("PE_CLIENTE")}"$) contador_env = contador_env + 1 - TIEMPO = TIEMPO + 1 - PB2.Progress = PB2.Progress + 1 - If TIEMPO > 20 Then - ' Msgbox("M","A") 'ignore - If L_P_2.Text = "Envio de Pedidos" Then - L_P_2.Text = "Envio de Pedidos --" - else if L_P_2.Text = "Envio de Pedidos --" Then - L_P_2.Text = "Envio de Pedidos \" - else if L_P_2.Text = "Envio de Pedidos \" Then - L_P_2.Text = "Envio de Pedidos |" - else if L_P_2.Text = "Envio de Pedidos |" Then - L_P_2.Text = "Envio de Pedidos /" - else if L_P_2.Text = "Envio de Pedidos /" Then - L_P_2.Text = "Envio de Pedidos --" - End If - t3.Initialize("T3", 2000) ' 1000 = 1 second - t3.Enabled = True - Wait For t3_tick - TIEMPO = 0 - End If +' TIEMPO = TIEMPO + 1 +' PB2.Progress = PB2.Progress + 1 +' If i Mod 10 = 1 Then +' ' Msgbox("M","A") 'ignore +' If L_P_2.Text = "Envio de Pedidos" Then +' L_P_2.Text = "Envio de Pedidos --" +' Log(1) +' else if L_P_2.Text = "Envio de Pedidos --" Then +' Log(2) +' L_P_2.Text = "Envio de Pedidos \" +' else if L_P_2.Text = "Envio de Pedidos \" Then +' Log(3) +' L_P_2.Text = "Envio de Pedidos |" +' else if L_P_2.Text = "Envio de Pedidos |" Then +' Log(4) +' L_P_2.Text = "Envio de Pedidos /" +' else if L_P_2.Text = "Envio de Pedidos /" Then +' Log(5) +' L_P_2.Text = "Envio de Pedidos --" +' End If +'' t3.Initialize("T3", 2000) ' 1000 = 1 second +'' t3.Enabled = True +'' Wait For t3_tick +' TIEMPO = 0 +' End If Next cPed.Close End If diff --git a/B4A/Files/login.bal b/B4A/Files/login.bal index 1e92c51728bc9b87e93e9196dcf37860a2f3d4b8..e5925b75b6f05849c97e6e7e0abd947d55a0da1b 100644 GIT binary patch delta 48 zcmeyoo$>W{#tp$j94rhB490o}2Ah+GR=Wx>0P-Y(n9+rifk6tyn6_Cl;u13eJxdD> delta 59 zcmaF8o$>Q_#tp$j0z3>13`TmEmKF-G3IRd>E}Nr;R=ZB-wc+G)VPs&C0?IOOo2+1? OFQ diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal index 5f163e2fcc97ec7ee25359f2e1bbacc5629009cf..112247da7d3561ef01f0f2458577bb4dd93845c5 100644 GIT binary patch delta 64 zcmbRAh-KCzmJJ898NW}ykYPA^f)Cf^1wR9)Z%|`oo$P;AWOI5>5+f%!0~AaaNEe^H QAw_NS`9jXk0(ne_0b;)wx&QzG delta 53 zcmV-50LuTG;slc71hBzt0sE8CXfczJObU}fwIq_;Etek%0R@v_rWCVhY+?bE4`&#Y Luw*8)4{i&?edHC< diff --git a/B4A/KelloggsV4.b4a b/B4A/KelloggsV4.b4a index e8272cf..b34a64e 100644 --- a/B4A/KelloggsV4.b4a +++ b/B4A/KelloggsV4.b4a @@ -917,7 +917,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Kelloggs Venta #VersionCode: 3000 - #VersionName: 5.10.16 + #VersionName: 5.10.20 #SupportedOrientations: portrait #CanInstallToExternalStorage: False #BridgeLogger:true diff --git a/B4A/KelloggsV4.b4a.meta b/B4A/KelloggsV4.b4a.meta index d2edd70..5ce1561 100644 --- a/B4A/KelloggsV4.b4a.meta +++ b/B4A/KelloggsV4.b4a.meta @@ -67,7 +67,7 @@ ModuleBreakpoints7= ModuleBreakpoints8= ModuleBreakpoints9= ModuleClosedNodes0= -ModuleClosedNodes1=6,10,11,12,13,14,15,16,18,19,20,21,22,23,24,25,26,27,28,29,31,32,33,34,35,37,38,39,40,41,42,43,45,46,47 +ModuleClosedNodes1=6,10,11,12,13,14,15,16,18,19,20,21,22,23,24,25,26,27,28,29,31,33,34,35,37,38,39,40,41,42,43,45,46,47 ModuleClosedNodes10= ModuleClosedNodes11= ModuleClosedNodes12= @@ -89,7 +89,7 @@ ModuleClosedNodes26=24,26,31,32,33,35 ModuleClosedNodes27= ModuleClosedNodes28=4 ModuleClosedNodes29= -ModuleClosedNodes3=3,5,6 +ModuleClosedNodes3=5,6 ModuleClosedNodes30= ModuleClosedNodes31= ModuleClosedNodes32=101,116 @@ -100,6 +100,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_TrendSpending,traeBonificacionesMaximas,359,0,B4XMainPage,b_cargaLocalOk_Click,863,0,C_Cliente,B_IMP2_Click,1206,0,C_Principal,connecta_LongClick,2373,0,Subs,deshabilitaValidaciones,2452,6,C_Cliente,B_IMP_Click,1131,6,C_Principal,B4XPage_Created,285,6,Diseñador Visual,cliente.bal,-100,6,Diseñador Visual,principal.bal,-100,6,C_Principal,Resumen_Click,2713,6 +NavigationStack=Diseñador Visual,principal.bal,-100,6,C_Principal,SUBIR_INFO_PEDIDO,3371,6,C_Principal,B4XPage_Created,228,0,C_Principal,descargaCartaPorteyProgreso,3693,0,C_Principal,VALIDAR_INFO,3548,0,C_Principal,t1_tick,2536,0,C_Principal,cargar_Click,690,0,C_Principal,Subir_Click,679,6,C_Principal,actualizaProgressBar,2250,1,C_Principal,JobDone,2232,6 SelectedBuild=0 VisibleModules=31,1,12,5,16,3,32,13,14,9