From 47919c670a67a547a77e8cf0f8da785d84c8545a Mon Sep 17 00:00:00 2001 From: IsR0d Date: Thu, 22 May 2025 11:01:13 -0600 Subject: [PATCH] =?UTF-8?q?Version:=205.05.18=20Se=20corrigi=C3=B3=20el=20?= =?UTF-8?q?como=20se=20estaba=20enviando=20la=20informaci=C3=B3n=20de=20la?= =?UTF-8?q?s=20promociones.=20Se=20agrego=20al=20config=20propertis=20el?= =?UTF-8?q?=20query=20de=20actualizaGPS3.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- B4A/C_Principal.bas | 4 ++-- B4A/C_Productos.bas | 1 + B4A/C_Promos.bas | 20 ++++++++++++++++---- B4A/INTMEX.b4a | 4 ++-- B4A/INTMEX.b4a.meta | 6 +++--- B4A/Starter.bas | 2 +- B4A/Subs.bas | 3 ++- 7 files changed, 27 insertions(+), 13 deletions(-) diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index cf227d3..3d591fa 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -601,8 +601,8 @@ Sub Subir_Click c.Position=i Dim cmd As DBCommand cmd.Initialize - cmd.Name = "UPDATE_INTMEX_ACTUAL2_GPS" - cmd.Parameters = Array As Object(L_MONTOD.Text, L_CUANTOST.Text, l_cuantosc.Text,l_porvisitar.TEXT,c.GetString("hglat"),c.GetString("hglon"),batterystatus(0),LPT, STEYIN, STEYOUT,ALMACEN,l_ruta.Text ) + cmd.Name = "UPDATE_INTMEX_ACTUAL3_GPS" + cmd.Parameters = Array As Object(L_MONTOD.Text, L_CUANTOST.Text, l_cuantosc.Text, l_porvisitar.TEXT,c.GetString("hglat"),c.GetString("hglon"), batterystatus(0), Application.VersionName,Starter.senial,LPT, STEYIN, STEYOUT,ALMACEN,l_ruta.Text) reqManager.ExecuteCommand(cmd , "update_gps") Next End If diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index 6a72273..e26bca5 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -765,6 +765,7 @@ Sub b_terminar1_Click ' ListView1.AddSingleLine(cs.Color(textColor).Size(12).append(c.GetString("PE_PRONOMBRE") & " ").pop.Append(CRLF).Size(8).Color(Colors.Blue).Append("Cantidad #"& c.GetString("PE_CANT")).Append(" SubTotal $"& c.GetString("PE_COSTO_TOT")).Append(" " & c.GetString("PE_FOLIO")& " " &c.GetString("PE_CEDIS")).PopAll) lv_prodsPedido.AddSingleLine(cs.Color(textColor).Size(12).append(c_prods.GetString("PE_PRONOMBRE") & " ").pop.Append(CRLF).Size(8).Color(Colors.Blue).Append("Cantidad #"& c_prods.GetString("PE_CANT")).Append(" SubTotal $"& c_prods.GetString("PE_COSTO_TOT")).Append(" " & c_prods.GetString("PE_FOLIO")& " " &c_prods.GetString("PE_CEDIS")).PopAll) + Log(c_prods.GetString("PE_PRONOMBRE")) vamoaver.Add(c_prods.GetString("PE_FOLIO")) folio = c_prods.GetString("PE_FOLIO") Next diff --git a/B4A/C_Promos.bas b/B4A/C_Promos.bas index 78dab87..50b8c97 100644 --- a/B4A/C_Promos.bas +++ b/B4A/C_Promos.bas @@ -347,6 +347,7 @@ Private Sub ObtenerFijos(promo As String) End Sub Private Sub ObtenerVariablesRequeridas(promo As String) + Log("Esto es promo: " & promo) Dim cursorVariablesReq As Cursor = Starter.skmt.ExecQuery($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_STS AS CAT_GP_VAR1REQ, CAT_GP_IMP1 AS CAT_GP_VAR2REQ, CAT_GP_VARREQ3 from cat_gunaprod2 where cat_gp_id = '${promo}'"$) If cursorVariablesReq.RowCount > 0 Then @@ -391,6 +392,7 @@ End Sub Sub muestraPromo(promo As String, cliente As String) estaPromo = promo + Log("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<" & estaPromo & "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<") esteCliente = cliente Private mp As Map = Subs.traePromo(promo, cliente) @@ -403,7 +405,7 @@ Sub muestraPromo(promo As String, cliente As String) cs.Initialize lblNomPromo.text = cs.Color(Colors.RGB(100,149,237)).Size(18).Append("Promocion: ").Pop.Append(promo).Append(CRLF).Append(mp.Get("descripcion")).Popall - Log(lblNomPromo.text) + Log("|" &lblNomPromo.text&"|") ObtenerVariablesRequeridas(promo) ObtenerFijos(promo) @@ -414,7 +416,15 @@ Sub muestraPromo(promo As String, cliente As String) If pnlVariables2.IsInitialized Then pnlVariables2.RemoveAllViews If pnlVariables3.IsInitialized Then pnlVariables3.RemoveAllViews - Encabezado = promo + Dim nombrePromo As String = lblNomPromo.Text + Dim nomPromo() As String = Regex.Split("\r\n|\n", nombrePromo) + Log("Esto es nombre promo? <<<<<<<<<<<|" & nomPromo(1) & "|") + Encabezado = nomPromo(1) + Log("Esto es encabezado? |" & Encabezado) + +' Dim promoText As String = lblNomPromo.Text.Trim() +' Dim idPromo() As String = Regex.Split(":", promoText) +' Log("Esto es idPromo? | <<<<<<<<<<<<<<<<<<|" & idPromo(1).Trim() & "|") If productosFijos > 0 Then pnlFijos.Visible = True @@ -1207,7 +1217,8 @@ Private Sub AjustarScroll End Sub Private Sub btnGuardaPromo_Click - Subs.guardaProductoSinGestion(Encabezado, 0, lblSumPromo.Text, Encabezado, Encabezado, Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta, 0, B4XPages.MainPage.tipo_venta) + + Subs.guardaProductoSinGestion(Subs.traeAlmacen, 0, lblSumPromo.Text, Encabezado, estaPromo, Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta, 0, B4XPages.MainPage.tipo_venta) If productosFijos > 0 Then Log("Guardando productos fijos...") @@ -1219,6 +1230,7 @@ Private Sub btnGuardaPromo_Click Dim nombreProducto As String = lblNombre.Text Private idProducto As String = lblNombre.tag Dim nomProd() As String = Regex.Split("\r\n|\n", nombreProducto) + Log("Esto es el nombre dle producto? <<<<<<<<<<<<<<<<<<<<<<<|" &nomProd(1) & "|") If cantidad > 0 Then Subs.guardaProductoSinGestion(estaPromo, precioProducto, cantidad, nomProd(0), idProducto, Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta, 0, B4XPages.MainPage.tipo_venta) End If @@ -1300,7 +1312,7 @@ Private Sub btnGuardaPromo_Click End Sub Private Sub btnContinuar_Click - Subs.guardaProductoSinGestion(Encabezado, 0, lblSumPromo.Text, Encabezado, Encabezado, Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta, 0, B4XPages.MainPage.tipo_venta) + Subs.guardaProductoSinGestion(Subs.traeAlmacen, 0, lblSumPromo.Text, Encabezado, estaPromo, Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta, 0, B4XPages.MainPage.tipo_venta) If productosFijos > 0 Then For i = 0 To pnlFijos.NumberOfViews - 1 diff --git a/B4A/INTMEX.b4a b/B4A/INTMEX.b4a index b77dd21..32e29ee 100644 --- a/B4A/INTMEX.b4a +++ b/B4A/INTMEX.b4a @@ -159,12 +159,12 @@ Module9=C_Nota NumberOfFiles=46 NumberOfLibraries=33 NumberOfModules=30 -Version=12.8 +Version=13.1 @EndOfDesignText@ #Region Project Attributes #ApplicationLabel: Intmex #VersionCode: 1 - #VersionName: 5.05.11 + #VersionName: 5.05.18 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/INTMEX.b4a.meta b/B4A/INTMEX.b4a.meta index 4f4847f..72d884b 100644 --- a/B4A/INTMEX.b4a.meta +++ b/B4A/INTMEX.b4a.meta @@ -36,7 +36,7 @@ ModuleBreakpoints11= ModuleBreakpoints12= ModuleBreakpoints13= ModuleBreakpoints14= -ModuleBreakpoints15= +ModuleBreakpoints15=1301 ModuleBreakpoints16= ModuleBreakpoints17= ModuleBreakpoints18= @@ -91,6 +91,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Principal,cargar_Click,886,0,C_Principal,Class_Globals,212,2,C_Principal,B4XPage_Created,303,0,Starter,Service_Start,58,0,Starter,tConexion_Tick,83,0,B4XMainPage,JobDone,441,6,C_Principal,b_muestraPendientes_Click,2681,4,Diseñador Visual,principal.bal,-100,6,C_TicketsDia,B4XPage_Appear,94,0,C_Principal,val_Guardando,2688,0 +NavigationStack=C_Productos,b_terminar1_Click,754,0,Subs,guardaProductoSinGestion,764,0,C_Promos,SumarVariables1,1498,0,C_Promos,btnGuardaPromo_Click,1222,6,C_Promos,btnContinuar_Click,1316,0,C_Promos,muestraPromo,421,6,Starter,Application_Error,139,0,Starter,Process_Globals,22,0,C_Principal,Subir_Click,597,6,Starter,ENVIA_ULTIMA_GPS,107,0 SelectedBuild=0 -VisibleModules=28,2,13,20,14,9,4,29,27,17,18 +VisibleModules=28,2,13,20,14,9,4,29,27,17,15,22 diff --git a/B4A/Starter.bas b/B4A/Starter.bas index 09e9a5c..f38fb59 100644 --- a/B4A/Starter.bas +++ b/B4A/Starter.bas @@ -26,7 +26,7 @@ Sub Process_Globals ' Dim DBReqServer As String = "http://192.168.100.10:1781" Dim Timer1, tConexion As Timer Dim Interval As Int = 300 - Dim IntervalC As Int = 10 + Dim IntervalC As Int = 60 Dim ruta As String = File.DirInternal 'Para los Logs Private logs As StringBuilder diff --git a/B4A/Subs.bas b/B4A/Subs.bas index efb9247..eedb743 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -771,7 +771,8 @@ End Sub Sub guardaProductoSinGestion(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) ' LogColor("guardaProducto: "&prodId&", cant="&cant, Colors.Magenta) Private c As Cursor - B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO PEDIDO (PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA,PE_COSTO_SIN,PE_FOLIO,PE_ENVIO_OK) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,0) ", Array As Object (cedis, (cant * costoU), costoU, cant, nombre, prodId, clienteId, fecha, usuario, rutaV, precioSin, tipoVenta)) + B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO PEDIDO (PE_CEDIS, PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA,PE_COSTO_SIN,PE_FOLIO,PE_ENVIO_OK) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,0) ", Array As Object (cedis, (cant * costoU), costoU, cant, nombre, prodId, clienteId, fecha, usuario, rutaV, precioSin, tipoVenta)) + '( cedis, (cant * costoU), costoU, cant, nombre, prodId, clienteId, fecha, usuario, rutaV, precioSin,tipoVenta) B4XPages.MainPage.skmt.ExecNonQuery2($"update ${Starter.tabla} set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? "$, Array As Object(cant, prodId)) c=B4XPages.MainPage.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE, SUM(PE_COSTO_SIN) AS TOTAL_CLIE_SIN FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)") c.Position=0