From 7f867fac042cb9eda48900cfb864e678a9e26b86 Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Sat, 16 Dec 2023 22:04:38 -0600 Subject: [PATCH] =?UTF-8?q?16/12/23=20-=20Correccion=20de=20qu=20cuando=20?= =?UTF-8?q?se=20env=C3=ADa=20pedido=20no=20mandaba=20"INFO=20OK"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- B4A/B4XMainPage.bas | 1 - B4A/C_Principal.bas | 34 ++++++++++++++++++++++------------ B4A/C_Productos.bas | 4 ++-- B4A/C_Promos.bas | 2 +- B4A/KelloggsV4.b4a.meta | 4 ++-- B4A/Subs.bas | 4 ++-- 6 files changed, 29 insertions(+), 20 deletions(-) diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index 33f4f9e..65d759f 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -126,7 +126,6 @@ End Sub 'This event will be called once, before the page becomes visible. Private Sub B4XPage_Created (Root1 As B4XView) If Not(Starter.Logger) Then logger = False - Dim sDate, sTime As String DateTime.DateFormat = "yyyyMMdd" sDate=DateTime.Date(DateTime.Now) diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index fe879fe..551597b 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -1537,7 +1537,7 @@ Sub JobDone(Job As HttpJob) S_CP.Text = "SUBIENDO" Next PB2.Progress = 100 - S_CP.Text = "LISTO" + S_CP.Text = "VALIDANDO" End If End If @@ -1901,8 +1901,13 @@ Sub JobDone(Job As HttpJob) End If End If - If PB2.Progress = 100 Then S_CP.Text = "LISTO" + If PB2.Progress = 100 And CARGA <> "SUBIR" Then + S_CP.Text = "LISTO" + End If Job.Release + +' if carga = "SUBIR" then logcolor(reqManager.reqsList, Colors.blue) + Log($"tiempo Request "${Job.Tag}": ${((reqManager.inicioJobDone - reqManager.inicioRequest)/1000)}"$) Log($"tiempo JobDone "${Job.Tag}": ${((DateTime.Now - reqManager.inicioJobDone)/1000)}"$) Log($"tiempo Total "${Job.Tag}": ${((DateTime.Now - inicioContador)/1000)}"$) @@ -2112,6 +2117,7 @@ Sub inv_Click End Sub Sub t1_tick + reqManager.trackInit cmd.Initialize cmd.Name = "select_cuantos_pedido_KELL" cmd.Parameters = Array As Object(ALMACEN,l_ruta.text) @@ -2121,16 +2127,16 @@ Sub t1_tick t3.Enabled = True Wait For t3_tick ' -' cmd.Initialize -' cmd.Name = "select_cuantos_noventa_KELL" -' cmd.Parameters = Array As Object(ALMACEN,l_ruta.text) -' reqManager.ExecuteQuery(cmd , 0, "valida_noventa") -' -' cmd.Initialize -' cmd.Name = "select_cuantos_pedidoc_KELL" -' cmd.Parameters = Array As Object(ALMACEN,l_ruta.text) -' reqManager.ExecuteQuery(cmd , 0, "valida_pedidoc") -' + cmd.Initialize + cmd.Name = "select_cuantos_noventa_KELL" + cmd.Parameters = Array As Object(ALMACEN,l_ruta.text) + reqManager.ExecuteQuery(cmd , 0, "valida_noventa") + + cmd.Initialize + cmd.Name = "select_cuantos_pedidoc_KELL" + cmd.Parameters = Array As Object(ALMACEN,l_ruta.text) + reqManager.ExecuteQuery(cmd , 0, "valida_pedidoc") + If PB2.Progress = 0 Then S_CP.Text = "ENVIAR DATOS (K-1)" End If @@ -2139,6 +2145,7 @@ Sub t1_tick End Sub Sub B_OK_PAS_Click + Log($"${CARGA}|${S_CP.text}"$) If CARGA = "SUBIR" And S_CP.Text = "INFO OK" Then c = Starter.skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("PERFIL")) PERFIL = "0" @@ -2620,6 +2627,9 @@ Sub SUBIR_INFO_PEDIDO If abordo1 = "" Then abordo1 = "0" Log($"${monto1}, ${abordo1}"$) monto1 = monto1 - abordo1 + + reqManager.trackInit + Dim cmd As DBCommand cmd.Initialize cmd.Name ="insert_drop2_KELL" diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index 9d117db..93109d9 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -141,10 +141,10 @@ Private Sub B4XPage_Created (Root1 As B4XView) listaProds.Initialize pedidoMap.Initialize listaHints.Initialize - Log("Llamamos LlenaProdsLL") +' Log("Llamamos LlenaProdsLL") LlenaProdsLL(Null, Null) list_prodsPedido.Initialize - Log("list_prodsPedido.Initialize") +' Log("list_prodsPedido.Initialize") p_vistaPreviaTrans.Width = Root.Width p_vistaPreviaTrans.Height = Root.Height Subs.centraPanel(p_vistaPreviaTrans, Root.Width) diff --git a/B4A/C_Promos.bas b/B4A/C_Promos.bas index 129d2b9..74abcbb 100644 --- a/B4A/C_Promos.bas +++ b/B4A/C_Promos.bas @@ -252,7 +252,7 @@ Sub b_prodMenos_Click End Sub Sub b_prodMas_Click - LogColor($"prodmas clic "$,Colors.Magenta) +' LogColor($"prodmas clic "$,Colors.Magenta) If totalProds < prodsVarReq + tpf Then Dim index As Int = clv_prodsVariabes.GetItemFromView(Sender) Dim pnl0 As B4XView = clv_prodsVariabes.GetPanel(index) diff --git a/B4A/KelloggsV4.b4a.meta b/B4A/KelloggsV4.b4a.meta index f8eecb6..109ef60 100644 --- a/B4A/KelloggsV4.b4a.meta +++ b/B4A/KelloggsV4.b4a.meta @@ -91,6 +91,6 @@ ModuleClosedNodes6= ModuleClosedNodes7=11,12 ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Nota,clv_pedidos_ItemLongClick,481,0,C_Nota,B4XPage_Created,81,0,kms_helperSubs,traeDisponibleAbordo,761,0,C_Productos,b_prodMas_Click,602,0,C_Productos,cuentaProds,747,6,C_Promos,b_continuar_Click,391,0,Subs,revisaMaxPromosProdsFijosPorInventario,1264,0,Subs,procesaPromocion,1152,1,Subs,traeMaxPromos,1130,1,Subs,restaFijosPromo,1048,1 +NavigationStack=Visual Designer,productos.bal,-100,2,DBRequestManager,HandleJob,233,0,Visual Designer,principal.bal,-100,6,C_Principal,t1_tick,2121,0,C_Principal,Subir_Click,508,0,DBRequestManager,trackNext,333,0,C_Principal,SUBIR_INFO_PEDIDO,2711,0,C_Principal,B_OK_PAS_Click,2188,6,C_Principal,SUBIR_INFO_BOLETA,2937,0,C_Principal,JobDone,1533,6 SelectedBuild=0 -VisibleModules=1,28,11,24,3,12,7,4,29,2,13 +VisibleModules=1,28,11,24,3,12,7,4,29,2 diff --git a/B4A/Subs.bas b/B4A/Subs.bas index b53ba3d..b0a68c6 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -917,7 +917,7 @@ Sub guardaProductoSin(cedis As String, costoTot As String, costoU As String, can Starter.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT,PC_ALMACEN,PC_RUTA,PC_COSTO_SIN) VALUES (?,?,?,?,?,?,?,?,?,?)", Array As Object(clienteId, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), Starter.lon_gps, Starter.lat_gps, cedis, rutaV, c.GetString("TOTAL_CLIE_SIN"))) Starter.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)") c.Close - ToastMessageShow("guardaProdSin", False) +' ToastMessageShow("guardaProdSin", False) End Sub Sub actualizaProducto(cedis As String, costoU As String, cant As String, nombre As String, prodId As String, clienteId As String, fecha As String, usuario As String, rutaV As String, precioSin As String, tipoVenta As String) @@ -1591,7 +1591,7 @@ End Sub 'En geocerca si mete la contraseña poner 0 en precision gps y si esta dentro de los 50 mts poner 1 y 2 para eventos que no lo ocupen 'Mandar fecha de sync(sysdate) Sub bitacora(fechab As String, usuariob As String, almacenb As String, rutab As String, eventob As String, clienteb As String, iniciob As String, finb As String, latitudb As String, longitudb As String, precision As String, motivonoventa As String, motivonovisita As String ) - Log("bitacora") +' Log("bitacora") Starter.skmt.ExecNonQuery($"INSERT INTO BITACORAGPS (fechab, usuariob , almacenb , rutab , eventob , clienteb , iniciob , finb , latitudb , longitudb , precision , motivonoventa , motivonovisita) VALUES ('${fechab}' ,'${usuariob}' , '${almacenb}' , '${rutab}' , '${eventob}' , '${clienteb}' , '${iniciob}' , '${finb}' , '${latitudb}' , '${longitudb}' , '${precision}' , '${motivonoventa}' , '${motivonovisita}')"$) End Sub