From 78a8f54c1d21333034100901c615373f6a14a505 Mon Sep 17 00:00:00 2001 From: cvaldes1201 Date: Mon, 8 Apr 2024 10:33:25 -0600 Subject: [PATCH] cambios en la carga --- B4A/B4XMainPage.bas | 6 +++--- B4A/C_Cliente.bas | 17 +++++++++++++---- B4A/C_Principal.bas | 16 ++++++++-------- B4A/GUNA_Reparto.b4a.meta | 4 ++-- B4A/Starter.bas | 2 +- B4A/Subs.bas | 4 ++-- 6 files changed, 29 insertions(+), 20 deletions(-) diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index 974cce9..5d369d6 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -5,7 +5,7 @@ Type=Class Version=9.85 @EndOfDesignText@ #Region Shared Files -#CustomBuildAction: folders ready, %WINDIR%\System32\Robocopy.exe,"..\..\Shared Files" "..\Files" +'#CustomBuildAction: folders ready, %WINDIR%\System32\Robocopy.exe,"..\..\Shared Files" "..\Files" 'Ctrl + click to sync files: ide://run?file=%WINDIR%\System32\Robocopy.exe&args=..\..\Shared+Files&args=..\Files&FilesSync=True '########################################################################################################### '###################### PULL ############################################################# @@ -147,7 +147,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS wayPoints (codigo TEXT, indice INT)") ' Dim server As String = "http://11.0.0.151:1782" Dim server As String = "http://187.189.244.154:1782" -' Dim server As String = "http://11.0.0.253:1782" +' Dim server As String = "http://11.0.0.222:1782" ' server = "http://10.0.0.205:1782" ' server = "http://11.0.0.44:1782" reqManager.Initialize(Me, B4XPages.MainPage.server) @@ -303,7 +303,7 @@ Private Sub i_engrane_Click Subs.centraBoton(b_server, p_serverList.Width) lv_server.Clear lv_server.AddSingleLine("http://keymon.lat:1782") - If user.Text = "KMTS1" Then lv_server.AddSingleLine("http://11.0.0.151:1782") + If user.Text = "KMTS1" Then lv_server.AddSingleLine("http://11.0.0.222:1782") ' l_server.Text = Starter.server et_server.Text = server Subs.panelVisible(p_appUpdate, 0, 0) diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index f1eda05..612b945 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -150,10 +150,19 @@ Sub B4XPage_Appear ' l_total.Text = s.GetString("TOTAL_CLIE") CREDITO = C.GetString("CAT_CL_BCREDITO") - - Private cym As Map = Subs.traeCantYMonto2(Subs.traeCliente) - L_CANT.Text = cym.Get("cantidad") - l_total.Text = Round2(cym.Get("monto"), 2) + c=Starter.skmt.ExecQuery("select count(*) as EXISTE from HIST_VENTAS WHERE HVD_CLIENTE IN (Select CUENTA from cuentaa) and HVD_RECHAZO = 0 ") + C.Position=0 + Dim Existe As String = C.GetString("EXISTE") + C.Close + If Existe <> 0 Then + c = Starter.skmt.ExecQuery("select SUM(HVD_CANT) AS PC_NOART, SUM(HVD_COSTO_TOT) AS PC_MONTO from HIST_VENTAS where HVD_CLIENTE in (Select CUENTA from cuentaa) and HVD_RECHAZO = 0 and hvd_codpromo <> HVD_PROID ") + C.Position=0 + L_CANT.Text = c.GetString("PC_NOART") + l_total.Text = Round2(c.GetString("PC_MONTO"), 2) + End If +' Private cym As Map = Subs.traeCantYMonto2(Subs.traeCliente) +' L_CANT.Text = cym.Get("cantidad") +' l_total.Text = Round2(cym.Get("monto"), 2) If CREDITO = "1" Then Msgbox("AVISO","SE TIENE QUE IMPRIMIR PAGARÉ") 'ignore diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index efb120e..8c7df99 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -631,7 +631,7 @@ Sub cargar_Click cmd.Initialize cmd.Name = "select_punteo_guna_re_REPG2" - cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,ALMACEN) + cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,ALMACEN, ALMACEN,ALMACEN) reqManager.ExecuteQuery(cmd , 0, "punteo") Log($"Pedimos Punteo"$) reqs.Add("punteo") @@ -639,7 +639,7 @@ Sub cargar_Click If l_ruta.Text = "0" Then cmd.Initialize cmd.Name = "select_almacen_guna_re_REPG2" - cmd.Parameters = Array As Object(ALMACEN, e_ruta.text, ALMACEN) + cmd.Parameters = Array As Object(ALMACEN, e_ruta.text, ALMACEN, ALMACEN) reqManager.ExecuteQuery(cmd , 0, "gunaprod") Log($"Pedimos gunaprod - ${ALMACEN}, ${e_ruta.text}"$) reqs.Add("gunaprod") @@ -648,14 +648,14 @@ Sub cargar_Click cmd.Initialize cmd.Name = "select_cliente_guna_re_REPG2" - cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,ALMACEN,e_ruta.text, ALMACEN) + cmd.Parameters = Array As Object(e_ruta.text, ALMACEN, ALMACEN,ALMACEN,e_ruta.text, ALMACEN, ALMACEN) reqManager.ExecuteQuery(cmd , 0, "kmt_datos") Log($"Pedimos kmt_datos"$) reqs.Add("kmt_datos") cmd.Initialize cmd.Name = "select_ventad_guna_re_REPG2" - cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) + cmd.Parameters = Array As Object(e_ruta.text, ALMACEN, ALMACEN) reqManager.ExecuteQuery(cmd , 0, "hist_datos") Log($"Pedimos hist_datos"$) reqs.Add("hist_datos") @@ -665,25 +665,25 @@ Sub cargar_Click cargo = 2 cmd.Initialize cmd.Name = "select_punteo_guna_re_REPG2" - cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,ALMACEN) + cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,ALMACEN, ALMACEN,ALMACEN) reqManager.ExecuteQuery(cmd , 0, "punteo") reqs.Add("punteo") cmd.Initialize cmd.Name = "select_almacen_guna_re_REPG2" - cmd.Parameters = Array As Object(ALMACEN, e_ruta.text, ALMACEN) + cmd.Parameters = Array As Object(ALMACEN, e_ruta.text, ALMACEN, ALMACEN) reqManager.ExecuteQuery(cmd , 0, "gunaprod") reqs.Add("gunaprod") cmd.Initialize cmd.Name = "select_cliente_guna_re_REPG2" - cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,ALMACEN,e_ruta.text, ALMACEN) + cmd.Parameters = Array As Object(e_ruta.text, ALMACEN, ALMACEN,ALMACEN,e_ruta.text, ALMACEN, ALMACEN) reqManager.ExecuteQuery(cmd , 0, "kmt_datos") reqs.Add("kmt_datos") cmd.Initialize cmd.Name = "select_ventad_guna_re_REPG2" - cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) + cmd.Parameters = Array As Object(e_ruta.text, ALMACEN, ALMACEN) reqManager.ExecuteQuery(cmd , 0, "hist_datos") reqs.Add("hist_datos") 'reparto rechazo REP_CLIENTE, REP_PRONOMBRE, REP_CANT, REP_COSTO_TOT diff --git a/B4A/GUNA_Reparto.b4a.meta b/B4A/GUNA_Reparto.b4a.meta index e869add..53b9a86 100644 --- a/B4A/GUNA_Reparto.b4a.meta +++ b/B4A/GUNA_Reparto.b4a.meta @@ -82,6 +82,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=Diseñador Visual,mapa_cliente.bal,-100,2,C_Cliente,Class_Globals,0,0,Diseñador Visual,cliente.bal,-100,2,Diseñador Visual,productos.bal,-100,3,C_Cliente,Tar_Click,223,0,C_Cliente,gest_Click,203,0,C_Cliente,b_noEntrega_Click,215,0,C_Clientes,Mods,0,0,appUpdater,SetFileUriAsIntentData,275,0,C_Clientes,traeRutaDia,358,1 +NavigationStack=Diseñador Visual,detalleVenta.bal,-100,2,Diseñador Visual,cliente.bal,-100,3,C_Cliente,HIST_Click,240,0,C_DetalleVenta,B4XPage_Appear,175,0,Subs,traemosCantYMonto,747,0,Subs,traeCantYMonto2,782,0,C_Cliente,B4XPage_Appear,151,6,C_Cliente,GPS_LocationChanged,175,0,B4XMainPage,B4XPage_Created,143,0,B4XMainPage,i_engrane_Click,299,0,Starter,Process_Globals,29,0 SelectedBuild=0 -VisibleModules=1,2,15,3,4,5,6,7,8,9 +VisibleModules=1,2,15,3,4,5,6,7,8,9,25 diff --git a/B4A/Starter.bas b/B4A/Starter.bas index 6d9b738..5847470 100644 --- a/B4A/Starter.bas +++ b/B4A/Starter.bas @@ -33,7 +33,7 @@ Sub Process_Globals Dim cedisLocation As Location Dim reqManager As DBRequestManager Dim server As String = "http://187.189.244.154:1782" -' Dim server As String = "http://11.0.0.151:1782" +' Dim server As String = "http://11.0.0.222:1782" Dim muestraProgreso = 0 Dim c As Cursor End Sub diff --git a/B4A/Subs.bas b/B4A/Subs.bas index 399fc4f..d885002 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -779,11 +779,11 @@ Sub traeCantYMonto2(cliente As String) As Map ccym.Position = i If ccym.GetString("HVD_CODPROMO") <> ccym.GetString("HVD_PROID") And ccym.GetString("precio") <> Null Then 'Si no es el header de una promo... cant = cant + ccym.GetString("HVD_CANT") -' Log($"${ccym.GetString("HVD_CANT")} * ${ccym.GetString("precio")}"$) + Log($"${ccym.GetString("HVD_CANT")} * ${ccym.GetString("precio")}"$) monto = monto + (ccym.GetString("HVD_CANT") * traePrecio(ccym.GetString("HVD_PROID"), ccym.GetString("HVD_CODPROMO"))) End If Next -' Log($"CANT=${cant}, MONTO=${monto}"$) + Log($"CANT=${cant}, MONTO=${monto}"$) End If ccym = Starter.skmt.ExecQuery($"Select rep_prodid, rep_cant, (Select CAT_GP_PRECIO from cat_gunaprod where cat_gp_id = rep_prodid) As precio from REPARTO where REP_CLIENTE in (Select cuenta from cuentaa) And REP_RECHAZO = '0' and REP_CANT > 0"$)