From 1763b20ea47e9977021fe1d1a2cd1561302a9290 Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Sat, 29 Jun 2024 17:15:39 -0600 Subject: [PATCH] =?UTF-8?q?-=20Se=20modific=C3=B3=20el=20resumen=20de=20gr?= =?UTF-8?q?upos=20para=20que=20se=20agrupe=20por=20una=20columna=20nueva?= =?UTF-8?q?=20(CAT=5FGP=5FTIPO2)=20a=20peticion=20de=20Mario?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Lanterna2.b4a | 9 ++++----- Lanterna2.b4a.meta | 2 +- Principal.bas | 28 ++++++++++++++-------------- Subs.bas | 1 + 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Lanterna2.b4a b/Lanterna2.b4a index 630797b..68a7b4c 100644 --- a/Lanterna2.b4a +++ b/Lanterna2.b4a @@ -102,8 +102,6 @@ Version=12.8 '########################################################################################################### #End Region -'4625 y 25 - #Region Activity Attributes #FullScreen: False #IncludeTitle: False @@ -343,12 +341,13 @@ Sub JobDone(Job As HttpJob) Dim CAT_GP_FECHA_MOD As String = records(result.Columns.Get("CAT_GP_FECHA_MOD")) Dim CAT_GP_CLASIF As String = records(result.Columns.Get("CAT_GP_CLASIF")) Dim CAT_GP_TIPO As String = records(result.Columns.Get("CAT_GP_TIPO")) + Dim CAT_GP_TIPO2 As String = records(result.Columns.Get("CAT_GP_TIPO2")) Dim CAT_GP_ORDENAMIENTO As Int = records(result.Columns.Get("CAT_GP_ORDENAMIENTO")) - Starter.skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_PRECIO,CAT_GP_ALMACEN,CAT_GP_IMG,CAT_GP_FECHA,CAT_GP_FECHA_MOD, CAT_GP_CLASIF, CAT_GP_TIPO, CAT_GP_ORDENAMIENTO) VALUES (?,?,?,?,?,?,?,?,?,?)", Array As Object (CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_PRECIO,CAT_GP_ALMACEN,CAT_GP_IMG,CAT_GP_FECHA,CAT_GP_FECHA_MOD,CAT_GP_CLASIF,CAT_GP_TIPO,CAT_GP_ORDENAMIENTO)) + Starter.skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_PRECIO,CAT_GP_ALMACEN,CAT_GP_IMG,CAT_GP_FECHA,CAT_GP_FECHA_MOD, CAT_GP_CLASIF, CAT_GP_TIPO, CAT_GP_TIPO2, CAT_GP_ORDENAMIENTO) VALUES (?,?,?,?,?,?,?,?,?,?,?)", Array As Object (CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_PRECIO,CAT_GP_ALMACEN,CAT_GP_IMG,CAT_GP_FECHA,CAT_GP_FECHA_MOD,CAT_GP_CLASIF,CAT_GP_TIPO,CAT_GP_TIPO2,CAT_GP_ORDENAMIENTO)) Next For v = 1 To 20 'Agregamos productos varios (editables) - Starter.skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_PRECIO,CAT_GP_ALMACEN,CAT_GP_IMG,CAT_GP_FECHA,CAT_GP_FECHA_MOD, CAT_GP_CLASIF, CAT_GP_TIPO) VALUES (?,?,?,?,?,?,?,?,?)", Array As Object ($"AVAR${NumberFormat2(v, 2, 0, 0, False)}"$,$"Alimentos Varios ${NumberFormat2(v, 2, 0, 0, False)}"$,"1","10000",Null,"2024-02-04 17:00:00","2024-02-04 17:00:00","VARIOS","ALIMENTOS")) - Starter.skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_PRECIO,CAT_GP_ALMACEN,CAT_GP_IMG,CAT_GP_FECHA,CAT_GP_FECHA_MOD, CAT_GP_CLASIF, CAT_GP_TIPO) VALUES (?,?,?,?,?,?,?,?,?)", Array As Object ($"VVAR${NumberFormat2(v, 2, 0, 0, False)}"$,$"Bebidas Varias ${NumberFormat2(v, 2, 0, 0, False)}"$,"1","10000",Null,"2024-02-04 17:00:00","2024-02-04 17:00:00","VARIOS","VINOS Y LICORES")) + Starter.skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_PRECIO,CAT_GP_ALMACEN,CAT_GP_IMG,CAT_GP_FECHA,CAT_GP_FECHA_MOD, CAT_GP_CLASIF, CAT_GP_TIPO, CAT_GP_TIPO2) VALUES (?,?,?,?,?,?,?,?,?,?)", Array As Object ($"AVAR${NumberFormat2(v, 2, 0, 0, False)}"$,$"Alimentos Varios ${NumberFormat2(v, 2, 0, 0, False)}"$,"1","10000",Null,"2024-02-04 17:00:00","2024-02-04 17:00:00","VARIOS","ALIMENTOS","ALIMENTOS")) + Starter.skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_PRECIO,CAT_GP_ALMACEN,CAT_GP_IMG,CAT_GP_FECHA,CAT_GP_FECHA_MOD, CAT_GP_CLASIF, CAT_GP_TIPO, CAT_GP_TIPO2) VALUES (?,?,?,?,?,?,?,?,?,?)", Array As Object ($"VVAR${NumberFormat2(v, 2, 0, 0, False)}"$,$"Bebidas Varias ${NumberFormat2(v, 2, 0, 0, False)}"$,"1","10000",Null,"2024-02-04 17:00:00","2024-02-04 17:00:00","VARIOS","VINOS Y LICORES","VINOS Y LICORES")) Next Starter.skmt.TransactionSuccessful 'Si no se pone TransactionSuccessful no se escribe NADA!! Starter.skmt.EndTransaction diff --git a/Lanterna2.b4a.meta b/Lanterna2.b4a.meta index 59bbeee..c1cb371 100644 --- a/Lanterna2.b4a.meta +++ b/Lanterna2.b4a.meta @@ -22,6 +22,6 @@ ModuleClosedNodes4= ModuleClosedNodes5= ModuleClosedNodes6= ModuleClosedNodes7= -NavigationStack=Principal,b_pagoCerrar_Click,1461,6,Principal,b_imp_Click,1828,3,Principal,b_reimprimirTicket_Click,3681,1,Visual Designer,login.bal,-100,3,Visual Designer,principal.bal,-100,6,Principal,cb_opcionEfectivo_CheckedChange,2852,0,Principal,b_abrirMesa_Click,1268,6,Principal,lv_historial_ItemClick,2861,4,Principal,b_leyendaDescuento_Click,3009,6,Principal,b_imp2_Click,2089,0 +NavigationStack=Visual Designer,login.bal,-100,3,Principal,cb_opcionEfectivo_CheckedChange,2852,0,Principal,b_abrirMesa_Click,1268,6,Principal,lv_historial_ItemClick,2861,4,Principal,b_leyendaDescuento_Click,3009,6,Main,b_envioBD_Click,184,0,Visual Designer,principal.bal,-100,6,Subs,revisaBD,205,0,Principal,b_imp2_Click,1975,0,Main,JobDone,254,0 SelectedBuild=0 VisibleModules=6,5,7 diff --git a/Principal.bas b/Principal.bas index 8bc2210..983cc10 100644 --- a/Principal.bas +++ b/Principal.bas @@ -1955,7 +1955,7 @@ Sub b_imp2_Click Private c As Cursor = Starter.skmt.ExecQuery($"select M_ESTATUS from CAT_MESAS where M_ESTATUS = 'ABIERTA'"$) ' Log(c.RowCount) ' If c.RowCount = 0 Then 'Si no hay mesas abiertas entonces ... - Private c As Cursor = Starter.skmt.ExecQuery("select distinct CAT_GP_CLASIF, PE_PRONOMBRE, sum(pe_cant) as cuantos, sum(pe_costo_tot) as monto from pedido join CAT_GUNAPROD on cat_gp_id = PE_PROID where PE_TIPO <> 'VENTA' group by PE_PRONOMBRE order by CAT_GP_CLASIF, PE_PRONOMBRE") 'Este query quita los "Consumo de alimentos", que son los tickets que se generan con el multi-ticket, porque en CAT_GUNAPROD no existe el ID CDA01. + Private c As Cursor = Starter.skmt.ExecQuery("select distinct CAT_GP_TIPO2, CAT_GP_CLASIF, PE_PRONOMBRE, sum(pe_cant) as cuantos, sum(pe_costo_tot) as monto from pedido join CAT_GUNAPROD on cat_gp_id = PE_PROID where PE_TIPO <> 'VENTA' group by CAT_GP_TIPO2, PE_PRONOMBRE order by CAT_GP_TIPO2, PE_PRONOMBRE") 'Este query quita los "Consumo de alimentos", que son los tickets que se generan con el multi-ticket, porque en CAT_GUNAPROD no existe el ID CDA01. ' Log(c.RowCount) If c.RowCount > 0 Then c.Position = 0 @@ -1969,8 +1969,8 @@ Sub b_imp2_Click Printer1.WriteString(Printer1.NOBOLD) For i = 0 To c.RowCount - 1 c.Position = i -' Log($"${catAnt} - ${c.GetString("CAT_GP_CLASIF")}"$) - If catAnt <> c.GetString("CAT_GP_CLASIF") Then +' Log($"${catAnt} - ${c.GetString("CAT_GP_TIPO2")}"$) + If catAnt <> c.GetString("CAT_GP_TIPO2") Then ' Private tm As Cursor = Starter.skmt.ExecQuery($"select sum(PT_MONTO) as totalMesa from PEDIDO_TICKET where PT_MESA = '${c.GetString("PE_MESA")}' and PT_PAGO <> 'MULTI-TICKET'"$) ' tm.Position = 0 If catAnt <> "" Then @@ -1982,10 +1982,10 @@ Sub b_imp2_Click End If ' Log($">>>>>>> CAT TOTAL ${catAnt}: ${catTotal}"$ ) End If - cs.Color(Colors.red).Append($"++ ${c.GetString("CAT_GP_CLASIF")} ++${CRLF}"$).pop - Log($"++ ${c.GetString("CAT_GP_CLASIF")} ++${CRLF}"$) + cs.Color(Colors.red).Append($"++ ${c.GetString("CAT_GP_TIPO2")} ++${CRLF}"$).pop + Log($"++ ${c.GetString("CAT_GP_TIPO2")} ++${CRLF}"$) Printer1.WriteString(Printer1.BOLD) - If imprimirAqui Then Printer1.WriteString($"++ ${c.GetString("CAT_GP_CLASIF")} ++${CRLF}"$) + If imprimirAqui Then Printer1.WriteString($"++ ${c.GetString("CAT_GP_TIPO2")} ++${CRLF}"$) Printer1.WriteString(Printer1.NOBOLD) Private tipoAnt As String = "" catTotal = 0 @@ -2007,23 +2007,23 @@ Sub b_imp2_Click ' If imprimirAqui Then Printer1.WriteString($"${elNombre}${Subs.alineaDerecha(c.GetString("cuantos"), (31 - elNombre.Length), ".")} ${CRLF}"$) If imprimirAqui Then Printer1.WriteString($"${elNombre}${primerEspacio}${c.GetString("cuantos")}..${monto} ${CRLF}"$) catTotal = catTotal + c.GetString("cuantos") -' Log($">>>> ${catAnt} - ${c.GetString("CAT_GP_CLASIF")}"$) +' Log($">>>> ${catAnt} - ${c.GetString("CAT_GP_TIPO2")}"$) If i = c.RowCount - 1 Then - Log($"Total ${c.GetString("CAT_GP_CLASIF")}: ${catTotal}${CRLF}"$) - cs.Color(Colors.Green).Append($"Total ${c.GetString("CAT_GP_CLASIF")}: ${catTotal}${CRLF}"$).pop + Log($"Total ${c.GetString("CAT_GP_TIPO2")}: ${catTotal}${CRLF}"$) + cs.Color(Colors.Green).Append($"Total ${c.GetString("CAT_GP_TIPO2")}: ${catTotal}${CRLF}"$).pop If imprimirAqui Then Printer1.WriteString(Printer1.BOLD) - Printer1.WriteString($"Total ${c.GetString("CAT_GP_CLASIF")}: ${catTotal}${CRLF}"$) + Printer1.WriteString($"Total ${c.GetString("CAT_GP_TIPO2")}: ${catTotal}${CRLF}"$) Printer1.WriteString(Printer1.NOBOLD) End If End If Private tipoAnt As String = "" - catAnt = c.GetString("CAT_GP_CLASIF") + catAnt = c.GetString("CAT_GP_TIPO2") ' Log(i) Next If imprimirAqui Then Printer1.WriteString(CRLF) -' l_resumen.Text = cs +' l_resumen.Text = cs l_resumen.Height = su.MeasureMultilineTextHeight(l_resumen, l_resumen.Text) sv_resumen.Panel.Height = l_resumen.Height End If @@ -2031,7 +2031,7 @@ Sub b_imp2_Click 'RESUMEN LogColor("sleeping ....", Colors.Magenta) If imprimirAqui Then Sleep(4000) - Private rsm As Cursor = Starter.skmt.ExecQuery($"select distinct CAT_GP_CLASIF, sum(pe_cant) as cuantos, sum(pe_costo_tot) as monto from pedido join CAT_GUNAPROD on cat_gp_id = PE_PROID group by CAT_GP_CLASIF order by CAT_GP_CLASIF"$) 'Este query quita los "Consumo de alimentos", que son los tickets que se generan con el multi-ticket, porque en CAT_GUNAPROD no existe el ID CDA01. + Private rsm As Cursor = Starter.skmt.ExecQuery($"select distinct CAT_GP_TIPO2, sum(pe_cant) as cuantos, sum(pe_costo_tot) as monto from pedido join CAT_GUNAPROD on cat_gp_id = PE_PROID group by CAT_GP_TIPO2 order by CAT_GP_TIPO2"$) 'Este query quita los "Consumo de alimentos", que son los tickets que se generan con el multi-ticket, porque en CAT_GUNAPROD no existe el ID CDA01. ' Log(rsm.RowCount) If rsm.RowCount > 0 Then Printer1.WriteString(Printer1.BOLD) @@ -2041,7 +2041,7 @@ Sub b_imp2_Click Printer1.WriteString(Printer1.NOBOLD) For i = 0 To rsm.RowCount - 1 rsm.Position = i - Private laCat As String = rsm.GetString("CAT_GP_CLASIF") + Private laCat As String = rsm.GetString("CAT_GP_TIPO2") If laCat.Length > 20 Then laCat = laCat.SubString2(0, 20) ' Log($"${rsm.Position} - ${laCat.Length} - ${laCat}"$) Private monto As String = NumberFormat2(rsm.GetString("monto"), 1, 0, 0, True) diff --git a/Subs.bas b/Subs.bas index 832801c..bcd04a9 100644 --- a/Subs.bas +++ b/Subs.bas @@ -220,6 +220,7 @@ Sub revisaBD 'ignore agregaColumna("cat_gunaprod", "CAT_GP_FECHA", "TEXT") agregaColumna("cat_gunaprod", "CAT_GP_FECHA_MOD", "TEXT") agregaColumna("cat_gunaprod", "CAT_GP_ORDENAMIENTO", "NUMERIC") + agregaColumna("cat_gunaprod", "CAT_GP_TIPO2", "TEXT") 'Tabla para la bitacora de errores If Not(errorLog.IsInitialized) Then errorLog.Initialize(Starter.ruta, "errorLog.db", True) errorLog.ExecNonQuery("CREATE TABLE IF NOT EXISTS errores(fecha INTEGER, error TEXT)")