From 4f363ea3401f5f0346817fd83f23fc295b4be464 Mon Sep 17 00:00:00 2001 From: Javier Date: Thu, 15 Jan 2026 08:43:12 -0600 Subject: [PATCH] 5.12.21 --- B4A/C_Cliente.bas | 7 ++++--- B4A/C_Principal.bas | 2 +- B4A/Guna Vistas V3.1.b4a | 2 +- B4A/Guna Vistas V3.1.b4a.meta | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index ed92454..db31bf7 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -1321,7 +1321,7 @@ Sub recalculoXcant Log(NumberFormat2(((c.GetString("PE_COSTOU") * rangosel.GetString("CAT_PD_DESCUENTO"))/100),0,2,2,False)) Log(rangosel.GetString("CAT_PD_DESCUENTO")) Private recalculototal As Float =c.GetString("PE_CANT") * recalculo - skmt.ExecNonQuery2("UPDATE PEDIDO set PE_RECALCULO = ?, PE_RECALCULOTOT = ?, PE_RECCEDIS = ?, PE_RECCANT = PE_CANT WHERE PE_PROID = ? AND PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA) ",Array As String(NumberFormat2(recalculo,0,2,2,False) ,NumberFormat2(recalculototal,0,2,2,False), rangosel.GetString("CAT_PD_COD_PROMO"),c.GetString("PE_PROID"))) + skmt.ExecNonQuery2("UPDATE PEDIDO set PE_RECALCULO = ?, PE_RECALCULOTOT = ?, PE_RECCEDIS = ?, PE_RECCANT = PE_CANT WHERE PE_PROID = ? AND PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA) AND PE_CEDIS = ?",Array As String(NumberFormat2(recalculo,0,2,2,False) ,NumberFormat2(recalculototal,0,2,2,False), rangosel.GetString("CAT_PD_COD_PROMO"),c.GetString("PE_PROID"), Subs.traeAlmacen)) End If Next Else ' No cumple el rango ... @@ -1342,17 +1342,18 @@ Sub recalculoXcant Private recalculototal As Float = rangosel2.GetString("CAT_PD_RANGO2") * recalculo ' Restar total cantidad menos rango mayor para obtener la diferencia y saber cuanto hay de mas ' INSERT de producto (diferencia entre el rango sup y cantidad de pedido - skmt.ExecNonQuery2("UPDATE PEDIDO set PE_RECALCULO = ?, PE_RECALCULOTOT = ?, PE_RECCEDIS = ?, PE_RECCANT = ? WHERE PE_PROID = ? AND PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA) ",Array As String(NumberFormat2(recalculo,0,2,2,False),NumberFormat2(recalculototal,0,2,2,False),rangosel2.GetString("CAT_PD_COD_PROMO"), rangosel2.GetString("CAT_PD_RANGO2"),c.GetString("PE_PROID"))) + skmt.ExecNonQuery2("UPDATE PEDIDO set PE_RECALCULO = ?, PE_RECALCULOTOT = ?, PE_RECCEDIS = ?, PE_RECCANT = ? WHERE PE_PROID = ? AND PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA) AND PE_CEDIS = ?",Array As String(NumberFormat2(recalculo,0,2,2,False),NumberFormat2(recalculototal,0,2,2,False),rangosel2.GetString("CAT_PD_COD_PROMO"), rangosel2.GetString("CAT_PD_RANGO2"),c.GetString("PE_PROID"),Subs.traeAlmacen)) End If Next Else - skmt.ExecNonQuery2("UPDATE PEDIDO set PE_RECALCULO = NULL, PE_RECALCULOTOT = NULL, PE_RECCEDIS = NULL, PE_RECCANT = NULL WHERE PE_PROID = ? AND PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA) ",Array As String(c.GetString("PE_PROID"))) + skmt.ExecNonQuery2("UPDATE PEDIDO set PE_RECALCULO = NULL, PE_RECALCULOTOT = NULL, PE_RECCEDIS = NULL, PE_RECCANT = NULL WHERE PE_PROID = ? AND PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA) AND PE_CEDIS = ?",Array As String(c.GetString("PE_PROID"), Subs.traeAlmacen)) End If rangosel2.Close End If rangosel.Close Next End If + skmt.ExecNonQuery2("UPDATE PEDIDO set PE_RECALCULO = NULL, PE_RECALCULOTOT = NULL, PE_RECCEDIS = NULL, PE_RECCANT = NULL WHERE PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA) AND PE_CEDIS <> ?",Array As String(Subs.traeAlmacen)) End Sub Private Sub LA_GPS_Click diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 806a415..558193c 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -752,7 +752,7 @@ Sub Subir_Click d.Close ' If ALMACEN = "88" Or ALMACEN = "6" Then - c=B4XPages.MainPage.skmt.ExecQuery2("SELECT PE_RECALCULO,PE_RECALCULOTOT,ifnull(PE_RECCEDIS,'') as PE_RECCEDIS,PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO, PE_COSTO_SIN, PE_RUTA, PE_DESC, PE_FOLIO, PE_RECCANT FROM PEDIDO WHERE PE_RECALCULO <> ? or PE_RECALCULO <> ? or PE_RECALCULO IS NOT NULL",Array As String("","null")) + c=B4XPages.MainPage.skmt.ExecQuery2("SELECT PE_RECALCULO,PE_RECALCULOTOT,ifnull(PE_RECCEDIS,'') as PE_RECCEDIS,PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,ifnull(PE_CANT,0) as PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO, PE_COSTO_SIN, PE_RUTA, PE_DESC, PE_FOLIO, IFNULL(PE_RECCANT,0) AS PE_RECCANT FROM PEDIDO WHERE PE_RECALCULO <> ? or PE_RECALCULO <> ? or PE_RECALCULO IS NOT NULL",Array As String("","null")) d=B4XPages.MainPage.skmt.ExecQuery($"SELECT COUNT(*) as CUANTOS_PEDIDO FROM PEDIDO where PE_RUTA = '${Subs.traeRuta}'"$) If c.RowCount>0 Then For i=0 To c.RowCount -1 diff --git a/B4A/Guna Vistas V3.1.b4a b/B4A/Guna Vistas V3.1.b4a index 7d6f51b..ffcc28c 100644 --- a/B4A/Guna Vistas V3.1.b4a +++ b/B4A/Guna Vistas V3.1.b4a @@ -294,7 +294,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Guna Preventa #VersionCode: 1 - #VersionName: 5.12.15 + #VersionName: 5.12.21 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/Guna Vistas V3.1.b4a.meta b/B4A/Guna Vistas V3.1.b4a.meta index 370c541..ae28dc4 100644 --- a/B4A/Guna Vistas V3.1.b4a.meta +++ b/B4A/Guna Vistas V3.1.b4a.meta @@ -88,6 +88,6 @@ ModuleClosedNodes6= ModuleClosedNodes7=6,8,9,10,11 ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=Tracker,StartFLPSmall,417,0,C_Principal,resdia_Click,2747,3,C_Cliente,Class_Globals,126,0,C_Cliente,InicializarLocalizacionMejorada,1391,0,Diseñador Visual,cliente.bal,-100,2,C_Cliente,HIST_Click,2829,0,C_historicobat,B4XPage_Created,52,0,C_historicobat,Class_Globals,0,0,C_historicobat,B4XPage_Appear,223,0,C_historicobat,CreateListItem,255,0 +NavigationStack=C_Promos,b_promoMas_Click,936,0,C_Productos,lv_catalogos_ItemClick,403,0,C_Productos,B4XPage_Appear,255,0,C_Productos,l_prodX_LongClick,2308,0,C_Cliente,Class_Globals,0,0,C_Cliente,B_IMP_Click,2895,0,C_Principal,Subir_Click,772,3,Subs,calculaTotalConPromoXRango,2233,0,C_Cliente,Impresion3,3126,0,C_Cliente,B4XPage_Appear,964,0,C_Cliente,recalculoXcant,1338,6 SelectedBuild=0 -VisibleModules=27,2,16,28,5,13,17,29,19,4,10 +VisibleModules=27,2,16,28,5,13,17,29,19,4