From e45c86a857fc6b15372f5db1506f1b41679b07ae Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Tue, 4 Mar 2025 21:24:23 -0600 Subject: [PATCH] =?UTF-8?q?-=20VERSION=205.03.02.MV=20-=20Se=20agreg=C3=B3?= =?UTF-8?q?=20en=20TicketsDia=20el=20estatus=20de=20los=20pedidos=20segun?= =?UTF-8?q?=20las=20validaciones=20de=20envio.=20-=20Se=20agreg=C3=B3=20qu?= =?UTF-8?q?e=20al=20final,=20cuando=20se=20valida=20que=20coincidan=20las?= =?UTF-8?q?=20cantidades=20totales=20y=20montos=20totales=20del=20pedido?= =?UTF-8?q?=20contra=20Web,=20si=20no=20coinciden,=20se=20reinicien=20las?= =?UTF-8?q?=20validaciones=20poniendo=20en=20cero=20PE=5FENVIO=5FOK=20y=20?= =?UTF-8?q?PC=5FENVIO=5FOK.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- B4A/C_Principal.bas | 6 ++-- B4A/C_TicketsDia.bas | 66 ++++++++++++++++++++++++++++++-------------- B4A/INTMEX.b4a.meta | 4 +-- 3 files changed, 51 insertions(+), 25 deletions(-) diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 31a0253..de4cdfc 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -640,7 +640,7 @@ Sub Subir_Click ' 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 ") + 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 @@ -683,8 +683,8 @@ Sub Subir_Click 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") + 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 diff --git a/B4A/C_TicketsDia.bas b/B4A/C_TicketsDia.bas index aaab518..817f38b 100644 --- a/B4A/C_TicketsDia.bas +++ b/B4A/C_TicketsDia.bas @@ -32,24 +32,22 @@ Private Sub B4XPage_Created (Root1 As B4XView) If File.Exists(ruta, "kmt.db") = False Then File.Copy(File.DirAssets, "kmt.db", ruta, "kmt.db") End If - c = B4XPages.MainPage.skmt.ExecQuery("select PC_CLIENTE,PC_MONTO,PC_NOART FROM PEDIDO_CLIENTE ORDER BY PC_FECHA asc") - - - ListView1.Clear - If c.RowCount>0 Then - For i=0 To c.RowCount -1 - c.Position=i - Dim label1 As Label - label1 = ListView1.TwoLinesLayout.Label - label1.TextSize = 10 - label1.TextColor = Colors.Black - Dim label2 As Label - label2 = ListView1.TwoLinesLayout.SecondLabel - label2.TextSize = 13 - label2.TextColor = Colors.Blue - ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),"Cantidad #"& c.GetString("PC_NOART")& " SubTotal $"& c.GetString("PC_MONTO")) - Next - End If +' c = B4XPages.MainPage.skmt.ExecQuery("select PC_CLIENTE,PC_MONTO,PC_NOART FROM PEDIDO_CLIENTE ORDER BY PC_FECHA asc") +' ListView1.Clear +' If c.RowCount>0 Then +' For i=0 To c.RowCount -1 +' c.Position=i +' Dim label1 As Label +' label1 = ListView1.TwoLinesLayout.Label +' label1.TextSize = 10 +' label1.TextColor = Colors.Black +' Dim label2 As Label +' label2 = ListView1.TwoLinesLayout.SecondLabel +' label2.TextSize = 13 +' label2.TextColor = Colors.Blue +' ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),"Cantidad #"& c.GetString("PC_NOART")& " SubTotal $"& c.GetString("PC_MONTO")) +' Next +' End If End Sub 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage. @@ -61,6 +59,7 @@ Sub B4XPage_Appear ListView1.Clear If c.RowCount>0 Then + ListView1.TwoLinesLayout.ItemHeight = 70dip For i=0 To c.RowCount -1 c.Position=i Dim x As Cursor = B4XPages.MainPage.skmt.ExecQuery($"select IFNULL(sum(PE_CANT),0) as PC_NOART from PEDIDO where PE_CLIENTE = '${c.GetString("PC_CLIENTE")}' AND PE_PROID NOT IN (SELECT CAT_PA_ID FROM PROMOS_COMP)"$) @@ -71,13 +70,40 @@ Sub B4XPage_Appear End If Dim label1 As Label label1 = ListView1.TwoLinesLayout.Label + label1.Height = 15dip label1.TextSize = 10 + label1.Gravity = Gravity.TOP label1.TextColor = Colors.Black Dim label2 As Label label2 = ListView1.TwoLinesLayout.SecondLabel label2.TextSize = 13 + label2.Gravity = Gravity.TOP label2.TextColor = Colors.Blue - ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),c.GetString("NOMBRE") &" Cantidad #"& noArticulos & " SubTotal $"& c.GetString("PC_MONTO")) + label2.Height = 50dip + label2.Top = 15dip +' label2.Color = Colors.Cyan + Private ts As Cursor = Starter.skmt.ExecQuery($"select ifnull(pc_envio_ok, 0) as estatus from pedido_cliente where pc_cliente = '${c.GetString("PC_CLIENTE")}'"$) + Private estatus As String = "Pendiente" + Private color As Int + If ts.RowCount > 0 Then + ts.Position = 0 + If ts.GetString("estatus") = 0 Then + estatus = "Guardando" + color = Colors.red + else if ts.GetString("estatus") = 1 Or ts.GetString("estatus") = 2 Then + estatus = "En proceso" + color = Colors.RGB(255,175,1) + else if ts.GetString("estatus") = 3 Then + estatus = "Validado" + color = Colors.RGB(0,146,1) + End If + End If + Log(estatus) + Private cs As CSBuilder + cs.Initialize + ListView1.AddTwoLines(c.GetString("PC_CLIENTE"), _ + cs.Color(Colors.blue).append(c.GetString("NOMBRE") &" Cantidad #"& noArticulos & " SubTotal $"& c.GetString("PC_MONTO")).Color(color).append(" - " & estatus).popall) + Next End If c.Close @@ -126,7 +152,7 @@ Sub b_noventa_Click b_noventa.Text ="VENTA" c=B4XPages.MainPage.skmt.ExecQuery("select NV_CLIENTE,NV_MOTIVO,NV_COMM, (select CAT_CL_NOMBRE from kmt_info where cat_cl_codigo = NV_CLIENTE ) as NOMBRE FROM NOVENTA ORDER BY NV_CLIENTE asc") ListView1.Clear - If c.RowCount>0 Then + If c.RowCount > 0 Then For i=0 To c.RowCount -1 c.Position=i Dim label1 As Label diff --git a/B4A/INTMEX.b4a.meta b/B4A/INTMEX.b4a.meta index aefea40..052fbec 100644 --- a/B4A/INTMEX.b4a.meta +++ b/B4A/INTMEX.b4a.meta @@ -73,7 +73,7 @@ ModuleClosedNodes17= ModuleClosedNodes18= ModuleClosedNodes19= ModuleClosedNodes2= -ModuleClosedNodes20= +ModuleClosedNodes20=6 ModuleClosedNodes21= ModuleClosedNodes22= ModuleClosedNodes23= @@ -91,6 +91,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_RespaldoDiario,agregaColumna,127,0,C_Validador,timerValidador_Tick,47,6,C_Validador,iniciaValidacion,34,6,Subs,totalPedido,702,0,Subs,traeRuta,707,6,C_Principal,cargar_Click,890,0,C_Validador,Class_Globals,5,0,C_Validador,Initialize,21,0,B4XMainPage,B4XPage_Created,180,0,C_Principal,JobDone,1558,0,C_Cliente,Guardar_Click,621,0 +NavigationStack=C_TicketsDia,b_noventa_Click,156,0,C_TicketsDia,B4XPage_Created,28,0,C_TicketsDia,B4XPage_Appear,92,6,C_Principal,JobDone,1558,0,C_Principal,Subir_Click,695,0,C_Validador,revisaCantsYMontosTotales,149,0,C_Validador,timerValidador_Tick,52,0,C_Validador,revisaGuardados,93,0,C_Validador,iniciaValidacion,37,0,C_Validador,mandaGuardados,92,0,C_Validador,JobDone,159,0 SelectedBuild=0 VisibleModules=2,28,13,14,4,20,29,15,16,18