mirror of
https://github.com/KeymonSoft/Kelloggs_v4.git
synced 2026-04-17 18:26:11 +00:00
- VERSION 5.03.20
- Se agregó que ponga el segmento en cliente al "appear", porque antes etsaba solo en el "create". - Se puso un try/catch en "Foto" en "SetPictureSize" porque a veces mabdaba error al voltearvel celular.
This commit is contained in:
@@ -468,7 +468,7 @@ Sub B4XPage_Appear
|
||||
c=Starter.skmt.ExecQuery("SELECT CAT_EP_ID, CAT_EP_IDTIPOPREGUNTA, CAT_CE_DESCRIPCION, CAT_EP_PREGUNTA, CAT_EP_RES1_PRED, CAT_EP_RES2_PRED, CAT_EP_RES3_PRED, CAT_EP_ORDEN_PREGUNTA FROM CAT_ENCUESTA_PREGUNTA ORDER BY CAT_CE_DESCRIPCION, CAST(CAT_EP_ORDEN_PREGUNTA AS DECIMAL)")
|
||||
If c.RowCount > 0 Then c.Position = 1
|
||||
If TOMAR_FOTO = 0 Then
|
||||
c=Starter.skmt.ExecQuery("select CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO,CAT_CL_BFACTURA,CAT_CL_BCREDITO, IMPRESION from kmt_info where CAT_CL_CODIGO In (Select cuenta from cuentaa)")
|
||||
c=Starter.skmt.ExecQuery("select CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_SEGMENTO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO,CAT_CL_BFACTURA,CAT_CL_BCREDITO, IMPRESION from kmt_info where CAT_CL_CODIGO In (Select cuenta from cuentaa)")
|
||||
s=Starter.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)")
|
||||
s.Position=0
|
||||
S1=Starter.skmt.ExecQuery("select count(*) as CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)")
|
||||
@@ -493,6 +493,9 @@ Sub B4XPage_Appear
|
||||
If c.GetString("CAT_CL_ATIENDE1") <> Null And c.GetString("CAT_CL_ATIENDE1") <> "null" Then l_atiende.Text = c.GetString("CAT_CL_ATIENDE1")
|
||||
l_atiende2.Text = c.GetString("CAT_CL_ATIENTE2")
|
||||
|
||||
l_segmento2.text = "N/A"
|
||||
If c.GetString("CAT_CL_SEGMENTO") <> Null Then l_segmento2.text = c.GetString("CAT_CL_SEGMENTO")
|
||||
|
||||
b_inicioFinVenta.Text = "INICIAR VENTA"
|
||||
b_inicioFinVenta.BringToFront
|
||||
' LogColor(">>>>>> EN VENTA: " & Starter.enVenta, Colors.red)
|
||||
@@ -509,10 +512,8 @@ Sub B4XPage_Appear
|
||||
' If c.GetString("CAT_CL_LONG") <> Null And c.GetString("CAT_CL_LONG") <> "null" And IsNumber(c.GetString("CAT_CL_LONG")) Then LONGITUD = c.GetString("CAT_CL_LONG")
|
||||
' LATITUD = 0
|
||||
' If c.GetString("CAT_CL_LAT") <> Null And c.GetString("CAT_CL_LAT") <> "null" And IsNumber(c.GetString("CAT_CL_LAT")) Then LATITUD = c.GetString("CAT_CL_LAT")
|
||||
' l_categoria2.text = "N/A"
|
||||
' If c.GetString("CAT_CL_CATEGORIA") <> Null Then l_categoria2.text = c.GetString("CAT_CL_CATEGORIA")
|
||||
' l_segmento2.text = "N/A"
|
||||
' If c.GetString("CAT_CL_SEGMENTO") <> Null Then l_segmento2.text = c.GetString("CAT_CL_SEGMENTO")
|
||||
' l_categoria2.text = "N/A"
|
||||
|
||||
l_total.Text = kh.traeTotalCliente
|
||||
total_cliente = s.GetString("TOTAL_CLIE")
|
||||
|
||||
@@ -150,7 +150,7 @@ Sub Class_Globals
|
||||
Dim ENVIADA As String
|
||||
Dim PORENVIAR As String
|
||||
Private Btn_CheckList As Button
|
||||
Dim Cedis_Check As String
|
||||
Dim Cedis_Check As String = "0"
|
||||
Private TIEMPO As String
|
||||
Private RUTA1 As Label
|
||||
Private L_ABORDO As Label
|
||||
@@ -190,7 +190,7 @@ Sub Class_Globals
|
||||
Private p_progress1 As Panel
|
||||
Private l_porcentaje As Label
|
||||
Private detenerLoop As Boolean = False
|
||||
Dim logger As Boolean = True
|
||||
Dim logger As Boolean = False
|
||||
Private admin As BluetoothAdmin
|
||||
Public BluetoothState, ConnectionState As Boolean
|
||||
Private ion As Object
|
||||
@@ -243,13 +243,20 @@ Private Sub B4XPage_Created (Root1 As B4XView)
|
||||
b.Close
|
||||
e = Starter.skmt.ExecQuery("select count(*) as POR_VISITAR from kmt_info")
|
||||
e.Position = 0
|
||||
f = Starter.skmt.ExecQuery("select count(*) as CAT_CL_RUTA from kmt_info")
|
||||
f = Starter.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info limit 1")
|
||||
l_ruta.Text = "-"
|
||||
If f.RowCount > 0 Then
|
||||
Log(1)
|
||||
f.Position = 0
|
||||
Log($"Ruta desde BD: ${f.GetString("CAT_CL_RUTA")}"$)
|
||||
l_ruta.Text = f.GetString("CAT_CL_RUTA")
|
||||
End If
|
||||
f.Close
|
||||
If l_ruta.Text = 0 Then
|
||||
l_ruta.Text = 0
|
||||
If l_ruta.Text = "-" Then
|
||||
Log(2)
|
||||
l_ruta.Text = "-"
|
||||
Else
|
||||
Log(3)
|
||||
f = Starter.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info")
|
||||
f.Position = 0
|
||||
l_ruta.Text = f.GetString("CAT_CL_RUTA")
|
||||
@@ -385,16 +392,21 @@ Sub B4XPage_Appear
|
||||
b.Close
|
||||
e = Starter.skmt.ExecQuery2("select count(*) as POR_VISITAR from kmt_info where cat_cl_codigo <> 0 and CAT_CL_DIAS_VISITA = (SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?) ", Array As String("DIA_VISITA"))
|
||||
e.Position = 0
|
||||
f = Starter.skmt.ExecQuery("select count(*) as CAT_CL_RUTA from kmt_info where cat_cl_codigo <> 0")
|
||||
l_ruta.Text = "-"
|
||||
f = Starter.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info where cat_cl_codigo <> 0 limit 1")
|
||||
If f.RowCount > 0 Then
|
||||
f.Position = 0
|
||||
l_ruta.Text = f.GetString("CAT_CL_RUTA")
|
||||
End If
|
||||
f.Close
|
||||
If l_ruta.Text = 0 Then
|
||||
l_ruta.Text = 0
|
||||
Else
|
||||
f = Starter.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info")
|
||||
If f.RowCount > 0 Then
|
||||
f.Position = 0
|
||||
l_ruta.Text = f.GetString("CAT_CL_RUTA")
|
||||
End If
|
||||
f.Close
|
||||
End If
|
||||
c=Starter.skmt.ExecQuery("select usuario from usuarioa")
|
||||
@@ -423,7 +435,7 @@ Sub B4XPage_Appear
|
||||
' Log(">>>> CHECKLIST: |" & Cedis_Check & "|")
|
||||
Btn_CheckList.Visible = False
|
||||
If Cedis_Check = 0 Then ' And l_ruta.Text <> 0
|
||||
If l_ruta.Text <> 0 Then
|
||||
If l_ruta.Text <> 0 And l_ruta.Text <> "-" Then
|
||||
Btn_CheckList.BringToFront
|
||||
Btn_CheckList.Visible = True
|
||||
End If
|
||||
@@ -465,9 +477,9 @@ Sub B4XPage_Appear
|
||||
abordoImpreso = True
|
||||
End If
|
||||
End If
|
||||
Log($"##### ABORDO IMPRESO = ${abordoImpreso}"$)
|
||||
' Log($"##### ABORDO IMPRESO = ${abordoImpreso}"$)
|
||||
Private ab As ResultSet = Starter.skmt.ExecQuery("select * from PEDIDO where PE_CLIENTE = '0'")
|
||||
Log($"### HAY ABORDO: ${ab.RowCount}"$)
|
||||
' Log($"### HAY ABORDO: ${ab.RowCount}"$)
|
||||
Do While ab.NextRow
|
||||
If Not(abordoImpreso) Then
|
||||
LogColor("BORRAMOS PEDIDO DE ABORDO PORQUE NO ESTA IMPRESO", Colors.red)
|
||||
@@ -755,9 +767,7 @@ Sub cargar_Click
|
||||
cmd.Name = "SELECT_HIST_ENCUESTA_KELL"
|
||||
cmd.Parameters = Array As Object( e_ruta.text, ALMACEN,e_ruta.text, ALMACEN,e_ruta.text, ALMACEN,e_ruta.text, ALMACEN )
|
||||
reqManager.ExecuteQuery(cmd , 0, "HIST_ENCUESTA2")
|
||||
Log($"${e_ruta.text}, ${ALMACEN},${e_ruta.text}, ${ALMACEN},${e_ruta.text}, ${ALMACEN},${e_ruta.text}, ${ALMACEN}"$)
|
||||
|
||||
' ruta , ALMACEN, ruta , ALMACEN, ruta, ALMACEN, ruta, ALMACEN,
|
||||
' Log($"${e_ruta.text}, ${ALMACEN},${e_ruta.text}, ${ALMACEN},${e_ruta.text}, ${ALMACEN},${e_ruta.text}, ${ALMACEN}"$)
|
||||
|
||||
cmd.Initialize
|
||||
cmd.Name = "SELECT_EXHIBIDOR_RUTA_KELL"
|
||||
@@ -1730,7 +1740,7 @@ Sub JobDone(Job As HttpJob)
|
||||
If RESULT.Rows.Size = 0 Then ToastMessageShow("No hay ruta para ese usuario", True)
|
||||
For Each records() As Object In RESULT.Rows
|
||||
Dim VALIDO As String = records(RESULT.Columns.Get("VALIDO"))
|
||||
If Starter.Logger Then Log("|"&VALIDO&"|")
|
||||
' If Starter.Logger Then Log("|"&VALIDO&"|")
|
||||
' If Logger Then Log(records(RESULT.Columns.Get("CAT_RU_CATEGORIA")))
|
||||
Starter.rutaTipo = records(RESULT.Columns.Get("CAT_RU_CATEGORIA")) 'Traemos el tipo de ruta para que cuando sean foraneas no carguen la carta porte todos los dias.
|
||||
If Starter.Logger Then Log($"========= TIPO RUTA = ${Starter.rutaTipo}"$)
|
||||
@@ -2080,10 +2090,9 @@ Sub JobDone(Job As HttpJob)
|
||||
Job.Release
|
||||
|
||||
' if carga = "SUBIR" then logcolor(reqManager.reqsList, Colors.blue)
|
||||
|
||||
If Starter.Logger Then Log($"tiempo Request "${Job.Tag}": ${((reqManager.inicioJobDone - reqManager.inicioRequest)/1000)}"$)
|
||||
If Starter.Logger Then Log($"tiempo JobDone "${Job.Tag}": ${((DateTime.Now - reqManager.inicioJobDone)/1000)}"$)
|
||||
If Starter.Logger Then Log($"tiempo Total "${Job.Tag}": ${((DateTime.Now - inicioContador)/1000)}"$)
|
||||
' If Starter.Logger Then Log($"tiempo Request "${Job.Tag}": ${((reqManager.inicioJobDone - reqManager.inicioRequest)/1000)}"$)
|
||||
' If Starter.Logger Then Log($"tiempo JobDone "${Job.Tag}": ${((DateTime.Now - reqManager.inicioJobDone)/1000)}"$)
|
||||
' If Starter.Logger Then Log($"tiempo Total "${Job.Tag}": ${((DateTime.Now - inicioContador)/1000)}"$)
|
||||
|
||||
If CARGA = "CARGAR" And S_CP.Text = "LISTO" And S_CC.Text = "LISTO" And S_CH.Text = "LISTO" Then
|
||||
LogColor("TERMINAMOS", Colors.red)
|
||||
@@ -2091,7 +2100,6 @@ Sub JobDone(Job As HttpJob)
|
||||
End If
|
||||
|
||||
Log(reqManager.requestTimes(Job.Tag))
|
||||
|
||||
' Log($"tiempo Total "${Job.Tag}": ${((DateTime.Now - inicioContador)/1000)}"$)
|
||||
' reqManager.PrintTable(RESULT)2
|
||||
End Sub
|
||||
@@ -2194,7 +2202,7 @@ Sub connecta_Click
|
||||
cmd.Initialize
|
||||
cmd.Name = "select_ruta4_KELL"
|
||||
cmd.Parameters = Array As Object(ALMACEN, e_ruta.text, usuario)
|
||||
Log($"******* Almacen: ${ALMACEN}, ${e_ruta.text}, ${usuario}"$)
|
||||
' Log($"******* Almacen: ${ALMACEN}, ${e_ruta.text}, ${usuario}"$)
|
||||
reqManager.ExecuteQuery(cmd , 0, "ruta")
|
||||
e_ruta.Enabled = False
|
||||
If e_ruta.Text = "KMTSKLL1" Then e_ruta.Enabled = True
|
||||
|
||||
@@ -20,6 +20,7 @@ Sub Class_Globals
|
||||
Dim inicioRequest As Long 'ignore
|
||||
Dim inicioJobDone As Long 'ignore
|
||||
Dim inicioRequestMap, inicioJobDoneMap As Map
|
||||
Private logger As Boolean = False
|
||||
End Sub
|
||||
|
||||
'Target - The module that handles JobDone (usually Me).
|
||||
@@ -327,6 +328,7 @@ Sub requestTimes(tag As String) As Map 'ignore
|
||||
' Log($"${inicioJobDone} - ${inicioRequest}"$)
|
||||
Private requestTime As String = NumberFormat2(((inicioJobDone - inicioRequest) / 1000),1,5,0,False)
|
||||
Private JobDoneTime As String = NumberFormat2(((DateTime.Now - inicioJobDone) / 1000),1,5,0,False)
|
||||
times.Put("request", tag)
|
||||
times.Put("requestTime", requestTime)
|
||||
times.Put("jobDoneTime", JobDoneTime)
|
||||
times.Put("totalTime", NumberFormat2((JobDoneTime + requestTime),1,5,0,False))
|
||||
@@ -335,7 +337,7 @@ End Sub
|
||||
|
||||
'Initializes request tracking
|
||||
Sub trackInit 'ignore
|
||||
Log(">>>>>>>>> TRACKINIT ")
|
||||
If logger Then Log(">>>>>>>>> TRACKINIT ")
|
||||
reqsList.Initialize
|
||||
timesList.Initialize
|
||||
inicioRequestMap.Initialize
|
||||
@@ -354,7 +356,7 @@ Sub trackNext(job As HttpJob)
|
||||
End If
|
||||
quitamos = $"Quitamos ${job.tag} - "$
|
||||
End If
|
||||
LogColor(">>>>>> Requests: " & reqsList.Size & " - " & quitamos & reqsList, Colors.Blue)
|
||||
LogColor(">>>>>> inicioRequestMap:" & inicioRequestMap.Size & " - " & inicioRequestMap, Colors.Magenta)
|
||||
If logger Then LogColor(">>>>>> Requests: " & reqsList.Size & " - " & quitamos & reqsList, Colors.Blue)
|
||||
if logger then LogColor(">>>>>> inicioRequestMap:" & inicioRequestMap.Size & " - " & inicioRequestMap, Colors.Magenta)
|
||||
End If
|
||||
End Sub
|
||||
@@ -907,7 +907,7 @@ Version=12.8
|
||||
#Region Project Attributes
|
||||
#ApplicationLabel: Kelloggs Venta
|
||||
#VersionCode: 3000
|
||||
#VersionName: 5.03.08
|
||||
#VersionName: 5.03.20
|
||||
#SupportedOrientations: portrait
|
||||
#CanInstallToExternalStorage: False
|
||||
#BridgeLogger:true
|
||||
|
||||
@@ -83,7 +83,7 @@ ModuleClosedNodes26=
|
||||
ModuleClosedNodes27=
|
||||
ModuleClosedNodes28=
|
||||
ModuleClosedNodes29=
|
||||
ModuleClosedNodes3=1,3,5,6,7
|
||||
ModuleClosedNodes3=1,5,6,7
|
||||
ModuleClosedNodes30=
|
||||
ModuleClosedNodes4=
|
||||
ModuleClosedNodes5=
|
||||
@@ -91,6 +91,6 @@ ModuleClosedNodes6=
|
||||
ModuleClosedNodes7=
|
||||
ModuleClosedNodes8=
|
||||
ModuleClosedNodes9=
|
||||
NavigationStack=C_Principal,cargar_Click,748,6,kms_helperSubs,RD_respalda_cat_detalle_paq,303,1,C_Cliente,Cuestionario,2315,0,MAPA_RUTAS,MapFragment1_Ready,151,1,Subs,CreateBitmapWithNumber,1983,0,Subs,actualizaProducto,952,0,C_Principal,JobDone,1784,1,Subs,revisaHora,1963,6,Subs,revisaPromoPorMonto,1951,0,B4XMainPage,Class_Globals,34,0
|
||||
NavigationStack=Subs,bitacora,1714,0,C_Principal,JobDone,2095,1,Main,Globals,30,0,C_Cliente,Class_Globals,0,0,C_Cliente,B4XPage_Appear,488,1,foto,Globals,25,0,foto,Camera1_Ready,47,0,foto,btnTakePicture_Click,169,0,foto,b_guardar_Click,158,0,Main,Activity_Create,32,0
|
||||
SelectedBuild=0
|
||||
VisibleModules=1,28,11,3,29,12,4,13,7,9,23,25
|
||||
VisibleModules=1,28,11,3,29,12,7,9,22
|
||||
|
||||
@@ -196,7 +196,7 @@ Sub ENVIA_ULTIMA_GPS
|
||||
|
||||
cmd.Name = "select_hora"
|
||||
reqManager.ExecuteQuery(cmd , 0, "hora")
|
||||
log(subs.revisaHora)
|
||||
' log(subs.revisaHora)
|
||||
|
||||
' If Logger Then Log(reqManager)
|
||||
' If Logger Then Log("++ ++ ++ Envia_Ultima GPS - Inst_visitas - server: "& server)
|
||||
|
||||
@@ -1724,7 +1724,7 @@ Sub bitacora(fechab As String, usuariob As String, almacenb As String, rutab As
|
||||
If eventob = "Carga día" Then nombreCliente = "CARGA DIA"
|
||||
If eventob <> "Termina Venta" And eventob <> "No Venta" Then
|
||||
Starter.skmt.ExecNonQuery($"INSERT INTO BITACORAGPS (fechab, usuariob , almacenb , rutab , eventob , clienteb , iniciob , finb , latitudb, longitudb , precision , motivonoventa , motivonovisita) VALUES ('${fechab}' ,'${usuariob}' , '${almacenb}' , '${rutab}' , '${eventob}' , '${clienteb}' , '${iniciob}' , '${finb}' , '${latitudb}' , '${longitudb}' , '${precision}' , '${motivonoventa}' , '${motivonovisita}')"$)
|
||||
Log($"'${almacenb}', '${usuariob}', '${rutab}', '${eventob}', '${clienteb}', '${nombreCliente}','${ iniciob}', '${finb}','${ latitudb}','${ longitudb}', '${precision}', '${motivonoventa}', '${motivonovisita}', '${fechab}'"$)
|
||||
' Log($"'${almacenb}', '${usuariob}', '${rutab}', '${eventob}', '${clienteb}', '${nombreCliente}','${ 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, TMP_FECHA_MOVIL
|
||||
' cmd.Parameters = Array As Object(almacenb, usuariob, rutab, eventob, clienteb, nombreCliente, iniciob, finb, latitudb, longitudb, precision, motivonoventa, motivonovisita, fechab)
|
||||
' Starter.reqManager.ExecuteCommand(cmd , "mandaBitacora")
|
||||
@@ -1961,8 +1961,6 @@ Sub revisaHora As Boolean
|
||||
Private h As Cursor = Starter.skmt.ExecQuery("select CAT_VA_VALOR from CAT_VARIABLES where CAT_VA_DESCRIPCION = 'HORA'")
|
||||
If h.RowCount > 0 Then
|
||||
h.Position = 0
|
||||
Log(h.GetInt("CAT_VA_VALOR"))
|
||||
Log(h.GetString("CAT_VA_VALOR"))
|
||||
Private hr As Int = h.GetString("CAT_VA_VALOR")
|
||||
DateTime.DateFormat = "HH"
|
||||
Private ahora As String = DateTime.Date(DateTime.Now)
|
||||
|
||||
@@ -168,7 +168,12 @@ Sub btnTakePicture_Click
|
||||
Dim ps As CameraSize
|
||||
ps.Width =640'480 '1280
|
||||
ps.Height =480'360 '960
|
||||
Try
|
||||
camEx.SetPictureSize(ps.Width, ps.Height)
|
||||
camEx.CommitParameters
|
||||
camEx.TakePicture
|
||||
Catch
|
||||
camEx.Release
|
||||
B4XPages.ShowPage("CheckList")
|
||||
End Try
|
||||
End Sub
|
||||
Reference in New Issue
Block a user