From 4fa175cc93c9da4aa26715cace7bacf24eb98179 Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Mon, 20 May 2024 12:50:22 -0600 Subject: [PATCH] =?UTF-8?q?-=20Se=20cambio=20el=20tama=C3=B1o=20del=20pane?= =?UTF-8?q?l=20de=20"Resumen=20Acumulado"=20-=20Se=20agreg=C3=B3=20que=20e?= =?UTF-8?q?l=20envio=20de=20la=20informacion=20(boton=20conectar,=20ruta?= =?UTF-8?q?=20y=20enviar)=20tambien=20guarde=20en=20nombre=20del=20cliente?= =?UTF-8?q?=20los=20eventos=20como=20checklist,=20boleta,=20carga=20dia,?= =?UTF-8?q?=20etc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- B4A/C_Cliente.bas | 2 +- B4A/C_Principal.bas | 12 ++++++++++-- B4A/KelloggsV4.b4a | 2 +- B4A/KelloggsV4.b4a.meta | 4 ++-- B4A/Promociones.bas | 2 +- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index e3db926..1551565 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -1308,7 +1308,7 @@ Sub Imprime_ticket Private total3 As String = 0 If s.GETSTRING("TOTAL") <> Null And IsNumber(s.GETSTRING("TOTAL")) Then total3 = s.GETSTRING("TOTAL") Printer1.WriteString( Printer1.BOLD & "Total pedido: $" & NumberFormat2(total3, 1, 2, 2, False) & CRLF) - + s.Close s=Starter.skmt.ExecQuery2("select SUM(PE_CANT) AS TOTAL FROM PEDIDO WHERE PE_TIPO = ? AND PE_CLIENTE IN (Select CUENTA from cuentaa)", Array As String("ABORDO")) s.Position =0 diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 13327d3..db6c350 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -665,6 +665,8 @@ Sub cargar_Click cmd.Name = "SELECT_HIST_ENCUESTA_KELL" cmd.Parameters = Array As Object( e_ruta.text, ALMACEN) reqManager.ExecuteQuery(cmd , 0, "HIST_ENCUESTA2") + + cmd.Initialize cmd.Name = "SELECT_EXHIBIDOR_RUTA_KELL" @@ -2740,6 +2742,8 @@ Sub b_cuotas_Click L_META6.Text = 0 End If DDD.Close + p_resumenAcumulado.Top = 5dip : p_resumenAcumulado.left = 5dip + p_resumenAcumulado.Width = Root.Width - 10dip : p_resumenAcumulado.height = Root.height - 10dip p_resumenAcumulado.BringToFront p_resumenAcumulado.Visible = True Panel2.Visible = False @@ -2847,10 +2851,14 @@ Sub SUBIR_INFO_PEDIDO Do While h.nextrow cmd.Initialize If h.GetString("eventob") <> "Termina Venta" Then - Private nombreCliente As String = Subs.traeNombreCliente(h.GetString("usuariob")) - If h.GetString("eventob") = "Llega a almacen" Then nombreCliente = "BOLETA" +' Private nombreCliente As String = Subs.traeNombreCliente(h.GetString("usuariob")) cmd.Name = "mandaBitacora3" Log("BITACORA2") + Private nombreCliente As String = Subs.traeNombreCliente(h.GetString("clienteb")) + If h.GetString("eventob") = "Llega a almacen" Then nombreCliente = "BOLETA" + If h.GetString("eventob") = "Salida almacen" Then nombreCliente = "CHECKLIST" + If h.GetString("eventob") = "Fin Día" Then nombreCliente = "FIN DIA" + If h.GetString("eventob") = "Carga día" Then nombreCliente = "CARGA DIA" ' Log($"'${almacenb}', '${usuariob}', '${rutab}', '${eventob}', '${clienteb}', '${traeNombreCliente(clienteb)}','${ iniciob}', '${finb}','${ latitudb}','${ longitudb}', '${precision}', '${motivonoventa}', '${motivonovisita}', '${fechab}'"$) ' TMP_ALMACEN, TMP_USUARIO, TMP_RUTA, TMP_EVENTO, TMP_ID_CLIENTE, TMP_NOMBRE_CLIENTE, TMP_INICIO, TMP_FINAL, TMP_LATITUD, TMP_LONGITUD, TMP_PRESICION, TMP_MOTIVO_NO_VENTA, TMP_MOTIVO_NO_VISITA, TMP_FECHA_SINC cmd.Parameters = Array As Object(h.GetString("almacenb"), h.GetString("usuariob"), h.GetString("rutab"), h.GetString("eventob"), h.GetString("clienteb"), nombreCliente, h.GetString("iniciob"), h.GetString("finb"), h.GetString("latitudb"), h.GetString("longitudb"), h.GetString("precision"), h.GetString("motivonoventa"), h.GetString("motivonovisita"), h.GetString("fechab")) diff --git a/B4A/KelloggsV4.b4a b/B4A/KelloggsV4.b4a index d0cc8c6..912e63c 100644 --- a/B4A/KelloggsV4.b4a +++ b/B4A/KelloggsV4.b4a @@ -888,7 +888,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Kelloggs Venta #VersionCode: 3000 - #VersionName: 4.05.16 + #VersionName: 4.05.19 #SupportedOrientations: portrait #CanInstallToExternalStorage: False #BridgeLogger:true diff --git a/B4A/KelloggsV4.b4a.meta b/B4A/KelloggsV4.b4a.meta index 4e994a7..1a410f9 100644 --- a/B4A/KelloggsV4.b4a.meta +++ b/B4A/KelloggsV4.b4a.meta @@ -82,7 +82,7 @@ ModuleClosedNodes25= ModuleClosedNodes26= ModuleClosedNodes27= ModuleClosedNodes28= -ModuleClosedNodes29=69 +ModuleClosedNodes29= ModuleClosedNodes3= ModuleClosedNodes30= ModuleClosedNodes4= @@ -91,6 +91,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=kms_helperSubs,revisaImpresa,921,0,kms_helperSubs,traeUsarCartaPorte,886,0,kms_helperSubs,Class_Globals,22,0,B4XMainPage,B4XPage_Created,198,6,B4XMainPage,b_aceptarExtras_Click,854,0,B4XMainPage,cb_importarBDWA_CheckedChange,858,6,B4XMainPage,i_engranes_Click,627,0,kms_helperSubs,traeUsarIntentBDWA,888,0,Visual Designer,login.bal,-100,2,B4XMainPage,B4XPage_Appear,372,0,B4XMainPage,b_envioBD_Click,704,5 +NavigationStack=C_Cliente,Imprime_ticket,1539,0,kms_helperSubs,traeTotalCliente,673,0,Visual Designer,cliente.bal,-100,4,kms_helperSubs,revisaImpresa,929,0,kms_helperSubs,clienteConDOE,919,0,kms_helperSubs,traeMaxClientesNuevos,910,0,Subs,bitacora,1695,0,Visual Designer,login.bal,-100,3,Visual Designer,principal.bal,-100,4,C_Principal,SUBIR_INFO_PEDIDO,2822,3,C_Principal,b_cuotas_Click,2739,6 SelectedBuild=0 VisibleModules=1,28,11,3,26,23,29,12,4,13 diff --git a/B4A/Promociones.bas b/B4A/Promociones.bas index 4561736..3a37f6b 100644 --- a/B4A/Promociones.bas +++ b/B4A/Promociones.bas @@ -25,7 +25,7 @@ Public Sub Initialize (vCallback As Object, vEventName As String, db0 As SQL) As db.ExecNonQuery("CREATE TABLE IF NOT EXISTS PROMOCIONES_INFO (P_ID TEXT, P_ESTATUS TEXT, P_MAXXCLIENTE NUMERIC, P_MAXRECURRENTE NUMERIC, P_MAXPROMOS NUMERIC, HISTORICO TEXT, P_TIPOS TEXT, P_PRODSFIJOS TEXT, P_PRODSFIJOS_CANT NUMERIC, P_PRODSFIJOS_PIEZAS TEXT, P_PRODSFIJOS_PRECIOS TEXT, P_PRODSVARIABLES TEXT, P_PRODSVARIABLES_CANT NUMERIC, P_PRODSVARIABLES_PRECIOS TEXT, P_PRODSVARIABLES_REQUERIDOS NUMERIC)") db.ExecNonQuery("DELETE FROM PROMOCIONES_INFO") #if RELEASE - releaseMode = true + releaseMode = True #Else if DEBUG releaseMode = False #end if