From 51bc5b6789f3ec81bbba2748813368a72eb4ec03 Mon Sep 17 00:00:00 2001 From: cvaldes1201 Date: Tue, 7 May 2024 10:09:05 -0600 Subject: [PATCH] ... --- B4A/C_Cliente.bas | 4 ++-- B4A/C_NoVenta.bas | 2 +- B4A/C_Nota.bas | 2 +- B4A/C_Productos.bas | 2 +- B4A/INTMEX.b4a.meta | 4 ++-- B4A/Subs.bas | 37 ++++++++++++++++++++++++++++++------- 6 files changed, 37 insertions(+), 14 deletions(-) diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 7e69c64..212f8c8 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -561,8 +561,8 @@ Sub Guardar_Click Subs.actualizaTET(la_cuenta.text) DateTime.TimeFormat = "HH:mm:ss" -' mandaPendientes 'LO COMENTAMOS PARA PRUEBAS, ACTIVAR AL FINAL!!! -' mandapiezas + mandaPendientes 'LO COMENTAMOS PARA PRUEBAS, ACTIVAR AL FINAL!!! + mandapiezas B4XPages.MainPage.productos.reiniciarlistaProds = True B4XPages.MainPage.productos.prodsMap.Initialize B4XPages.MainPage.promos.promosMap.Initialize diff --git a/B4A/C_NoVenta.bas b/B4A/C_NoVenta.bas index 788acb7..f5a548c 100644 --- a/B4A/C_NoVenta.bas +++ b/B4A/C_NoVenta.bas @@ -126,7 +126,7 @@ Sub GUARDA_Click B4XPages.MainPage.skmt.ExecNonQuery2("update PEDIDO_INICIO_FINAL set PIF_HORA_FINAL = ? where PIF_CLIENTE = ? and PIF_HORA_FINAL = 0", Array As Object (DateTime.Now, cuenta)) LogColor($"actualizamos "${cuenta}, hora_final=${DateTime.now}"$,Colors.Red) -' mandaPendientesnoventa + mandaPendientesnoventa B4XPages.ShowPage("Principal") End Sub diff --git a/B4A/C_Nota.bas b/B4A/C_Nota.bas index a1c6641..af36780 100644 --- a/B4A/C_Nota.bas +++ b/B4A/C_Nota.bas @@ -208,7 +208,7 @@ Sub ListView1_ItemLongClick (Position As Int, Value As Object) B4XPage_Appear End If Else - ToastMessageShow("Pedido guardado, NO se puede editar.",false) + ToastMessageShow("Pedido guardado, NO se puede editar.",False) End If End Sub diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index bfb9594..e91fbd8 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -613,7 +613,7 @@ Sub b_terminar1_Click If c_prods.GetString("PE_FOLIO") = "VENTA" Then textColor = Colors.RGB(48,3,195) - Else If c_prods.GetString("PE_FOLIO") = "PREVENTA" or c_prods.GetString("PE_FOLIO") = "ABORDO" Then + Else If c_prods.GetString("PE_FOLIO") = "PREVENTA" Or c_prods.GetString("PE_FOLIO") = "ABORDO" Then textColor = Colors.RGB(166,0,0) End If If Not(IsNumber(c_prods.GetString("PE_CEDIS"))) And c_prods.GetString("PE_FOLIO") = "VENTA" Then diff --git a/B4A/INTMEX.b4a.meta b/B4A/INTMEX.b4a.meta index 3ff0f6c..d3a56a6 100644 --- a/B4A/INTMEX.b4a.meta +++ b/B4A/INTMEX.b4a.meta @@ -85,6 +85,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9=1 -NavigationStack=C_Principal,B_OK_PANEL5_Click,2509,0,Diseñador Visual,cliente.bal,-100,1,C_Principal,Class_Globals,206,0,C_Principal,B4XPage_Created,284,0,C_Principal,B4XPage_Appear,522,6,Diseñador Visual,principal.bal,-100,3,Diseñador Visual,login.bal,-100,1,C_Cliente,B4XPage_Appear,371,0,C_Cliente,B4XPage_CloseRequest,488,6,B4XMainPage,B4XPage_Created,179,0,Starter,Process_Globals,16,0 +NavigationStack=C_Productos,B4XPage_Appear,127,0,C_Productos,cuentaProds,566,0,C_Productos,lv_prodsPedido_ItemLongClick,764,0,C_Productos,b_terminar1_Click,590,0,C_Principal,B4XPage_Appear,347,0,C_Nota,B4XPage_Appear,98,0,C_Nota,ListView1_ItemLongClick,187,0,C_Nota,borra_Click,144,0,Subs,traeTablaProds,1279,0,Subs,borraPedidoClienteActual,1286,0 SelectedBuild=0 -VisibleModules=2,26,13,16,14,4,27,15,9,6 +VisibleModules=2,26,13,16,14,4,27,15,9,6,10,17 diff --git a/B4A/Subs.bas b/B4A/Subs.bas index 0dfc446..9ee6680 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -1262,21 +1262,44 @@ End Sub 'Borra los registros de la tabla "pedido" y "pedido_cliente" 'Actualiza las tablas "cat_gunaprod" y "kmt_info". Sub borraPedidoClienteActual As String +' Private thisC As Cursor +' thisC=B4XPages.MainPage.skmt.ExecQuery("select PE_PROID,PE_CANT FROM PEDIDO where pe_cliente in (Select CUENTA from cuentaa) ") +' If thisC.RowCount>0 Then +' For i=0 To thisC.RowCount -1 +' thisC.Position=i +' B4XPages.MainPage.skmt.ExecNonQuery2($"update ${Starter.tabla} set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?"$, Array As Object(thisC.GetString("PE_CANT"),thisC.GetString("PE_PROID"))) +' B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO INVENT_X_ENVIAR (ALMACEN , PROID , CANTIDAD ) VALUES(?,?,?) ", Array As Object (traeAlmacen, thisC.GetString("PE_PROID"),thisC.GetString("PE_CANT")* -1)) +' Next +' End If +' B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where pc_cliente in (Select CUENTA from cuentaa)") +' B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido where pe_cliente in (Select CUENTA from cuentaa)") +' B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)") +' Return 1 Private thisC As Cursor - thisC=B4XPages.MainPage.skmt.ExecQuery("select PE_PROID,PE_CANT FROM PEDIDO where pe_cliente in (Select CUENTA from cuentaa) ") +' Private tablaProds As String = "cat_gunaprod2" + thisC=Starter.skmt.ExecQuery("select PE_PROID, PE_CANT, PE_FOLIO FROM PEDIDO where pe_cliente in (Select CUENTA from cuentaa) ") If thisC.RowCount>0 Then For i=0 To thisC.RowCount -1 - thisC.Position=i - B4XPages.MainPage.skmt.ExecNonQuery2($"update ${Starter.tabla} set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?"$, Array As Object(thisC.GetString("PE_CANT"),thisC.GetString("PE_PROID"))) - B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO INVENT_X_ENVIAR (ALMACEN , PROID , CANTIDAD ) VALUES(?,?,?) ", Array As Object (traeAlmacen, thisC.GetString("PE_PROID"),thisC.GetString("PE_CANT")* -1)) + thisC.Position = i +' Log(thisC.GetString("PE_TIPO") & "|" & traeTablaProds(thisC.GetString("PE_TIPO"))) + Starter.skmt.ExecNonQuery($"update ${traeTablaProds(thisC.GetString("PE_FOLIO"))} set cat_gp_almacen = cat_gp_almacen + ${thisC.GetString("PE_CANT")} where cat_gp_id = '${thisC.GetString("PE_PROID")}'"$) + LogColor($"update ${traeTablaProds(thisC.GetString("PE_FOLIO"))} set cat_gp_almacen = cat_gp_almacen + ${thisC.GetString("PE_CANT")} where cat_gp_id = '${thisC.GetString("PE_PROID")}'"$, Colors.red) +' Starter.skmt.ExecNonQuery2("INSERT INTO INVENT_X_ENVIAR (ALMACEN , PROID , CANTIDAD ) VALUES(?,?,?) ", Array As Object (traeAlmacen, thisC.GetString("PE_PROID"),thisC.GetString("PE_CANT")* -1)) Next End If - B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where pc_cliente in (Select CUENTA from cuentaa)") - B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido where pe_cliente in (Select CUENTA from cuentaa)") - B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)") + Starter.skmt.ExecNonQuery("delete from pedido_cliente where pc_cliente in (Select CUENTA from cuentaa)") + Starter.skmt.ExecNonQuery("delete from pedido where pe_cliente in (Select CUENTA from cuentaa)") + Starter.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)") Return 1 End Sub +Sub traeTablaProds(tipoventa As String) As String + Private tablaProds As String = "cat_gunaprod2" + If tipoventa = "ABORDO" Or tipoventa = "PREVENTA" Then tablaProds = "cat_gunaprod" +' LogColor($"Tipo= ${tipoventa}, tabla=${tablaProds}"$, Colors.RGB(200,136,0)) + Return tablaProds +End Sub + 'Regresa verdadero si la columna gestion en la tabla "kmt_info" tene valor 2. 'si no, entonces regresa falso. Sub pedidoGuardado As Boolean