From be8647261e49d9dc9ee7815e66a3f005b24daa27 Mon Sep 17 00:00:00 2001 From: Javier Date: Tue, 30 Dec 2025 10:32:35 -0600 Subject: [PATCH] v5.12.10 Se cambia querie para clientes espejo Que no se borren las promos --- B4A/B4XMainPage.bas | 3 +++ B4A/C_Principal.bas | 24 +++++++++++++----------- B4A/Files/principal.bal | Bin 52030 -> 52030 bytes B4A/INTMEX.b4a | 2 +- B4A/INTMEX.b4a.meta | 2 +- 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index a25b5b6..ef402e1 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -197,6 +197,9 @@ Private Sub B4XPage_Created (Root1 As B4XView) Subs.agregaColumna("CAT_GUNAPROD", "CAT_GP_PRECIO10", "TEXT DEFAULT '0'") Subs.agregaColumna("PEDIDO_CLIENTE", "PC_GUARDADO", "TEXT DEFAULT '0'") Subs.agregaColumna("CAT_GUNAPROD2", "CAT_GP_VARREQ3", "TEXT DEFAULT '0'") + + Subs.agregaColumna("CAT_GUNAPROD2", "MARCA", "TEXT") + Subs.agregaColumna("CAT_GUNAPROD", "MARCA", "TEXT") c=skmt.ExecQuery("select COUNT(*) AS CUANTOS from HIST_STAY_OUT ") C.Position = 0 diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 116aebe..b0a4b94 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -975,9 +975,9 @@ Sub cargar_Click reqManager.ExecuteQuery(cmd , 0, "detallepaq") cmd.Initialize - cmd.Name = "select_cat_clientes2_INTMEX" - cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) - Log("select_cat_clientes2_INTMEX: " & e_ruta.text & "|" & ALMACEN) + cmd.Name = "select_cat_clientes3_INTMEX" + cmd.Parameters = Array As Object(e_ruta.text,e_ruta.text, ALMACEN,e_ruta.text,e_ruta.text) + Log("select_cat_clientes3_INTMEX: " & e_ruta.text & "|" & ALMACEN) reqManager.ExecuteQuery(cmd , 0, "kmt_datos") cmd.Initialize @@ -1042,8 +1042,8 @@ Sub cargar_Click ImageView9.Visible = False cmd.Initialize - cmd.Name = "select_cat_clientes2_INTMEX" - cmd.Parameters = Array As Object(E_RUTA2.text, ALMACEN) + cmd.Name = "select_cat_clientes3_INTMEX" + cmd.Parameters = Array As Object(E_RUTA2.text,E_RUTA2.text, ALMACEN,E_RUTA2.text,E_RUTA2.text) reqManager.ExecuteQuery(cmd , 0, "kmt_datos") cmd.Initialize @@ -1685,13 +1685,14 @@ Sub JobDone(Job As HttpJob) Dim CAT_GP_ALMACEN As Int = records(RESULT.Columns.Get("CAT_GP_ALMACEN")) Dim CAT_GP_TIPOPROD As Int = records(RESULT.Columns.Get("CAT_GP_TIPOPROD")) Dim CAT_GP_VARREQ3 As Int = records(RESULT.Columns.Get("CAT_GP_VARREQ3")) + Dim MARCA As String = records(RESULT.Columns.Get("MARCA")) CAT_GP_TIPOPROD = "5" If CAT_GP_ID = "PAQUNI003" Then CAT_GP_ALMACEN = 60 End If ' Log("XXXXXXX gunaprodp XXXXXXXXX " & CAT_GP_ID & "|" & CAT_GP_IMP1 & "|" & CAT_GP_IMP2) - B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG,CAT_GP_ALMACEN,CAT_GP_TIPOPROD) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object (CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG, CAT_GP_ALMACEN,CAT_GP_TIPOPROD)) - B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD2(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG,CAT_GP_ALMACEN,CAT_GP_TIPOPROD, CAT_GP_VARREQ3) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object (CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG, CAT_GP_ALMACEN,CAT_GP_TIPOPROD, CAT_GP_VARREQ3)) + B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG,CAT_GP_ALMACEN,CAT_GP_TIPOPROD,MARCA) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object (CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG, CAT_GP_ALMACEN,CAT_GP_TIPOPROD,MARCA)) + B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD2(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG,CAT_GP_ALMACEN,CAT_GP_TIPOPROD, CAT_GP_VARREQ3,MARCA) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object (CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG, CAT_GP_ALMACEN,CAT_GP_TIPOPROD, CAT_GP_VARREQ3,MARCA)) Next If PB2.Progress = 0 Then PB2.Progress = 30 @@ -2001,11 +2002,11 @@ Sub JobDone(Job As HttpJob) Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "hist_avance" Then 'query tag For Each records() As Object In RESULT.Rows - Dim marca As String = records(RESULT.Columns.Get("HIST_AM_MARCA")) + Dim marca2 As String = records(RESULT.Columns.Get("HIST_AM_MARCA")) Dim avance As String = records(RESULT.Columns.Get("HIST_AM_AVANCE")) Dim objetivo As String = records(RESULT.Columns.Get("HIST_AM_OBJETIVO")) Dim porcentaje1 As String = records(RESULT.Columns.Get("HIST_AM_PORCENTAJE")) - B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO HIST_AVANCE(HA_MARCA, HA_AVANCE, HA_OBJETIVO, HA_PORCENTAJE) VALUES (?,?,?,?)", Array As Object (marca, avance, objetivo, porcentaje1)) + B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO HIST_AVANCE(HA_MARCA, HA_AVANCE, HA_OBJETIVO, HA_PORCENTAJE) VALUES (?,?,?,?)", Array As Object (MARCA2, avance, objetivo, porcentaje1)) Next End If End If @@ -2593,8 +2594,9 @@ Sub hacer_ped_Click If c.RowCount > 0 Then Private MARCASQ As String = c.GetString("CAT_VA_VALOR") c.Close - Starter.skmt.ExecNonQuery("delete from CAT_GUNAPROD WHERE CAT_GP_CLASIF NOT IN (" & MARCASQ &")" ) - Starter.skmt.ExecNonQuery("delete from CAT_GUNAPROD WHERE CAT_GP_ID IN (SELECT CAT_DP_ID FROM CAT_DETALLES_PAQ WHERE CAT_DP_IDPROD NOT IN (SELECT CAT_GP_ID FROM CAT_GUNAPROD))") + Starter.skmt.ExecNonQuery("delete from CAT_GUNAPROD WHERE CAT_GP_CLASIF NOT IN (" & MARCASQ &", 'PROMOS')" ) + Starter.skmt.ExecNonQuery("delete from CAT_GUNAPROD WHERE CAT_GP_CLASIF IN ('PROMOS') AND MARCA NOT IN (" & MARCASQ &")" ) +' Starter.skmt.ExecNonQuery("delete from CAT_GUNAPROD WHERE CAT_GP_ID NOT IN (SELECT CAT_DP_ID FROM CAT_DETALLES_PAQ WHERE CAT_DP_IDPROD NOT IN (SELECT CAT_GP_ID FROM CAT_GUNAPROD))") B4XPages.ShowPage("Clientes") Else If Starter.marcaCel <> "LGE" Then ToastMessageShow("No hay marcas en la base de datos ... ya se cargo ruta??", True) diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal index e27985632e747a178a84c816f6de9c576bf93a32..19f9bcae56d4cbeb5faa9fbdc03cff9600ce1616 100644 GIT binary patch delta 39 rcmdltjd|ZR<_)S_Cj0jYP4-rdojjpkX!EiyLi|tx diff --git a/B4A/INTMEX.b4a b/B4A/INTMEX.b4a index abf8b91..9bd2def 100644 --- a/B4A/INTMEX.b4a +++ b/B4A/INTMEX.b4a @@ -164,7 +164,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Intmex #VersionCode: 1 - #VersionName: 5.12.3 + #VersionName: 5.12.10 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/INTMEX.b4a.meta b/B4A/INTMEX.b4a.meta index 628a257..a6ed1bc 100644 --- a/B4A/INTMEX.b4a.meta +++ b/B4A/INTMEX.b4a.meta @@ -91,6 +91,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=Main,Activity_Create,28,0,DBRequestManager,HandleJob,193,0,DBRequestManager,ReadByte,183,0,Diseñador Visual,nuevocliente.bal,-100,6,C_NuevoCliente,B4XPage_Appear,266,6,C_Principal,Class_Globals,0,0,C_Principal,cargar_Click,1067,6,C_Principal,hacer_ped_Click,2591,2,Diseñador Visual,principal.bal,-100,3,C_Principal,resdia_Click,2582,0 +NavigationStack=DBRequestManager,HandleJob,197,0,C_Cliente,B4XPage_Appear,298,0,Diseñador Visual,principal.bal,-100,6,C_Principal,B_OK_PAS_Click,2327,0,C_Principal,checaPedido,2834,0,C_Principal,nvo_cliente_Click,2597,0,B4XMainPage,B4XPage_Created,195,3,C_Principal,cargar_Click,955,6,C_Principal,resdia_Click,2565,0,C_Principal,JobDone,1688,6,C_Principal,hacer_ped_Click,2592,6 SelectedBuild=0 VisibleModules=28,2,13,20,14,29,15,4,11,21