diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 346b29a..0af817a 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -1041,131 +1041,15 @@ Sub cargar_Click End If End If If Not (pedidodiaanterior) Then - Log("CUMPLE") - EJECUTANDO = 1 - reqs.Initialize - TOPE = 0 - LogColor($"ReqServer = ${B4XPages.MainPage.server}"$, Colors.red) - reqManager.Initialize(Me, B4XPages.MainPage.server) - + + If Not(IsConnectedToInternet) Then MsgboxAsync("No hay conexión a Internet", "Revisa tu conexión") Dim cmd As DBCommand cmd.Initialize - cmd.Name = "insert_drop_rep_mards" - cmd.Parameters = Array As Object(Subs.dameUsuarioDeDB, l_ruta.Text, ALMACEN, l_ctast.text, Subs.traeEntregados, Subs.traeRechazados, "CARGA") - reqManager.ExecuteCommand(cmd , "inst_drop") -' reqs.Add("inst_noventa") - - Starter.skmt.ExecNonQuery("delete from kmt_info") - Starter.skmt.ExecNonQuery("delete from cod_result") - Starter.skmt.ExecNonQuery("delete from hist_gest") - Starter.skmt.ExecNonQuery("delete from CAT_DETALLES_PAQ") - Starter.skmt.ExecNonQuery("delete from telefonos") -' Starter.skmt.ExecNonQuery("delete from VENTAS") - Starter.skmt.ExecNonQuery("delete from PUNTEO_GPS") - If l_ruta.Text = "0" Then ' - Log("********************* No hay ruta, BORRAMOS TODO") - Starter.skmt.ExecNonQuery("delete from cat_gunaprod") - Starter.skmt.ExecNonQuery("delete from cat_gunaprod3") - Starter.skmt.ExecNonQuery("delete from REPARTO") - Starter.skmt.ExecNonQuery("delete from HIST_VENTAS") - Starter.skmt.ExecNonQuery("delete from HIST_VENTAS2") - Starter.skmt.ExecNonQuery("delete from NOVENTA") - Else - Log("********************* Hay ruta, NO BORRAMOS TODO") - End If - - ' NUEVOS CLIENTES - c=Starter.skmt.ExecQuery("select usuario from usuarioa") - c.Position = 0 - usuario = c.GetString("USUARIO") - - cmd.Initialize - cmd.Name = "select_punteo_mards_re_REPG" - cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,ALMACEN) - reqManager.ExecuteQuery(cmd , 0, "punteo") - Log($"Pedimos Punteo"$) - reqs.Add("punteo") - - If l_ruta.Text = "0" Then - cmd.Initialize - cmd.Name = "select_almacen_MARIANA_re_REPG2" - cmd.Parameters = Array As Object(ALMACEN) - reqManager.ExecuteQuery(cmd , 0, "gunaprod") - Log($"Pedimos gunaprod - ${ALMACEN}, ${e_ruta.text}"$) - reqs.Add("gunaprod") - End If - - - cmd.Initialize - cmd.Name = "select_cliente_mards_re_REPG" - cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,ALMACEN,e_ruta.text, ALMACEN) - reqManager.ExecuteQuery(cmd , 0, "kmt_datos") - Log($"Pedimos kmt_datos"$) - reqs.Add("kmt_datos") - - cmd.Initialize - cmd.Name = "select_ventad_mards_re_REPG" - cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) - reqManager.ExecuteQuery(cmd , 0, "hist_datos") - Log($"Pedimos hist_datos"$) - reqs.Add("hist_datos") - - cmd.Initialize - cmd.Name = "select_coords_almacen_mards" - cmd.Parameters = Array As Object(ALMACEN) - reqManager.ExecuteQuery(cmd , 0, "coords_almacen") + cmd.Name = "select_ruta_entrega_cargada" + cmd.Parameters = Array As Object(ALMACEN, e_ruta.text) + reqManager.ExecuteQuery(cmd ,0, "entrega_cargada") -' cmd.Initialize -' cmd.Name = "select_cat_gunaprod3_MAZAPA" -' cmd.Parameters = Array As Object(ALMACEN) -' reqManager.ExecuteQuery(cmd , 0, "gunaprod3") -' cmd.Initialize -' cmd.Name = "select_pagares_MAZAPA" -' cmd.Parameters = Array As Object(e_ruta.text,ALMACEN) -' reqManager.ExecuteQuery(cmd , 0, "PAGARES") - -' c=Starter.skmt.ExecQuery("SELECT REP_CLIENTE, REP_PRONOMBRE, REP_CANT, REP_COSTO_TOT, REP_FECHA FROM REPARTO") -' If c.RowCount > 0 Then -' For i=0 To c.RowCount -1 -' c.Position=i -' Dim cmd As DBCommand -' cmd.Initialize -' cmd.Name = "insert_reparto_rechazo_REPG" -' cmd.Parameters = Array As Object(C.GetString("REP_CLIENTE"),C.GetString("REP_PRONOMBRE"),C.GetString("REP_CANT"),C.GetString("REP_COSTO_TOT"),C.GetString("REP_FECHA"), ALMACEN) -' reqManager.ExecuteCommand(cmd , "inst_noventa") -' reqs.Add("inst_noventa") -' Next -' End If -' c.Close - - ' NOVENTA -' c=Starter.skmt.ExecQuery("SELECT NV_CLIENTE, NV_FECHA, NV_USER,NV_MOTIVO,NV_COMM,NV_LAT,NV_LON, NV_FOTO FROM NOVENTA") -' If c.RowCount > 0 Then -' For i=0 To c.RowCount -1 -' c.Position=i -' foto1 = c.GetBlob("NV_FOTO") -' Dim cmd As DBCommand -' cmd.Initialize -' cmd.Name = "insert_reparto_REPG" -' cmd.Parameters = Array As Object(C.GetString("NV_CLIENTE"),C.GetString("NV_FECHA"),C.GetString("NV_USER"),C.GetString("NV_MOTIVO"),C.GetString("NV_COMM"),C.GetString("NV_LAT"),C.GetString("NV_LON"), ALMACEN, l_ruta.Text, foto1) -' reqManager.ExecuteCommand(cmd , "inst_noventa") -' reqs.Add("inst_noventa") -' Next -' End If -' c.Close - - D=Starter.skmt.ExecQuery("SELECT COUNT(*) AS CUANTOS_NOVENTA FROM NOVENTA") - d.Position=0 - cuantos_noventa = D.GetString("CUANTOS_NOVENTA") - d.Close - cargar.Visible = False - Subir.Visible = False - connecta.Visible = True - inv.Visible = False - ToastMessageShow("Se actualizarán los datos, este proceso podria tardar hasta un minuto, gracias" , True) - ProgressDialogShow2("Descargando rutas, espere un momento.", False) - If Not(IsConnectedToInternet) Then MsgboxAsync("No hay conexión a Internet", "Revisa tu conexión") Else @@ -1784,6 +1668,10 @@ Sub JobDone(Job As HttpJob) reqs.RemoveAt(reqs.IndexOf("ruta")) Log(reqs.Size) End If + If result.Rows.Size = 0 Then + + Msgbox("La ruta que ha ingresado no corresponde a la que tiene programada. Le sugerimos validar", "ATENCIÓN") + End If For Each records() As Object In result.Rows Dim VALIDO As String = records(result.Columns.Get("VALIDO")) ' Log("VALIDO= " & VALIDO) @@ -1834,6 +1722,159 @@ Sub JobDone(Job As HttpJob) End If End If + If Job.JobName = "DBRequest" Then + Dim result As DBResult = reqManager.HandleJob(Job) + If result.Tag = "entrega_cargada" Then 'query tag + Subs.logJobDoneResultados(result) + For Each records() As Object In result.Rows + Dim rrcargada As String = records(result.Columns.Get("RUTA_CARGADA")) + + Next + If rrcargada > 0 Then + MsgboxAsync("Ya se cargo esta ruta, si deseas cargar nuevamente comunicate con tu supervisor","Atención") + Else + + cmd.Initialize + cmd.Name = "update_ruta_entrega_cargada" + cmd.Parameters = Array As Object(ALMACEN,e_ruta.text) + reqManager.ExecuteCommand(cmd , "update_rrcargada") + + Log("CUMPLE") + EJECUTANDO = 1 + reqs.Initialize + TOPE = 0 + LogColor($"ReqServer = ${B4XPages.MainPage.server}"$, Colors.red) + reqManager.Initialize(Me, B4XPages.MainPage.server) + + Dim cmd As DBCommand + cmd.Initialize + cmd.Name = "insert_drop_rep_mards" + cmd.Parameters = Array As Object(Subs.dameUsuarioDeDB, l_ruta.Text, ALMACEN, l_ctast.text, Subs.traeEntregados, Subs.traeRechazados, "CARGA") + reqManager.ExecuteCommand(cmd , "inst_drop") +' reqs.Add("inst_noventa") + + + + + + Starter.skmt.ExecNonQuery("delete from kmt_info") + Starter.skmt.ExecNonQuery("delete from cod_result") + Starter.skmt.ExecNonQuery("delete from hist_gest") + Starter.skmt.ExecNonQuery("delete from CAT_DETALLES_PAQ") + Starter.skmt.ExecNonQuery("delete from telefonos") +' Starter.skmt.ExecNonQuery("delete from VENTAS") + Starter.skmt.ExecNonQuery("delete from PUNTEO_GPS") + If l_ruta.Text = "0" Then ' + Log("********************* No hay ruta, BORRAMOS TODO") + Starter.skmt.ExecNonQuery("delete from cat_gunaprod") + Starter.skmt.ExecNonQuery("delete from cat_gunaprod3") + Starter.skmt.ExecNonQuery("delete from REPARTO") + Starter.skmt.ExecNonQuery("delete from HIST_VENTAS") + Starter.skmt.ExecNonQuery("delete from HIST_VENTAS2") + Starter.skmt.ExecNonQuery("delete from NOVENTA") + Else + Log("********************* Hay ruta, NO BORRAMOS TODO") + End If + + ' NUEVOS CLIENTES + c=Starter.skmt.ExecQuery("select usuario from usuarioa") + c.Position = 0 + usuario = c.GetString("USUARIO") + + cmd.Initialize + cmd.Name = "select_punteo_mards_re_REPG" + cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,ALMACEN) + reqManager.ExecuteQuery(cmd , 0, "punteo") + Log($"Pedimos Punteo"$) + reqs.Add("punteo") + + If l_ruta.Text = "0" Then + cmd.Initialize + cmd.Name = "select_almacen_MARIANA_re_REPG2" + cmd.Parameters = Array As Object(ALMACEN) + reqManager.ExecuteQuery(cmd , 0, "gunaprod") + Log($"Pedimos gunaprod - ${ALMACEN}, ${e_ruta.text}"$) + reqs.Add("gunaprod") + End If + + + cmd.Initialize + cmd.Name = "select_cliente_mards_re_REPG" + cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,ALMACEN,e_ruta.text, ALMACEN) + reqManager.ExecuteQuery(cmd , 0, "kmt_datos") + Log($"Pedimos kmt_datos"$) + reqs.Add("kmt_datos") + + cmd.Initialize + cmd.Name = "select_ventad_mards_re_REPG" + cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) + reqManager.ExecuteQuery(cmd , 0, "hist_datos") + Log($"Pedimos hist_datos"$) + reqs.Add("hist_datos") + + cmd.Initialize + cmd.Name = "select_coords_almacen_mards" + cmd.Parameters = Array As Object(ALMACEN) + reqManager.ExecuteQuery(cmd , 0, "coords_almacen") + +' cmd.Initialize +' cmd.Name = "select_cat_gunaprod3_MAZAPA" +' cmd.Parameters = Array As Object(ALMACEN) +' reqManager.ExecuteQuery(cmd , 0, "gunaprod3") + +' cmd.Initialize +' cmd.Name = "select_pagares_MAZAPA" +' cmd.Parameters = Array As Object(e_ruta.text,ALMACEN) +' reqManager.ExecuteQuery(cmd , 0, "PAGARES") + +' c=Starter.skmt.ExecQuery("SELECT REP_CLIENTE, REP_PRONOMBRE, REP_CANT, REP_COSTO_TOT, REP_FECHA FROM REPARTO") +' If c.RowCount > 0 Then +' For i=0 To c.RowCount -1 +' c.Position=i +' Dim cmd As DBCommand +' cmd.Initialize +' cmd.Name = "insert_reparto_rechazo_REPG" +' cmd.Parameters = Array As Object(C.GetString("REP_CLIENTE"),C.GetString("REP_PRONOMBRE"),C.GetString("REP_CANT"),C.GetString("REP_COSTO_TOT"),C.GetString("REP_FECHA"), ALMACEN) +' reqManager.ExecuteCommand(cmd , "inst_noventa") +' reqs.Add("inst_noventa") +' Next +' End If +' c.Close + + ' NOVENTA +' c=Starter.skmt.ExecQuery("SELECT NV_CLIENTE, NV_FECHA, NV_USER,NV_MOTIVO,NV_COMM,NV_LAT,NV_LON, NV_FOTO FROM NOVENTA") +' If c.RowCount > 0 Then +' For i=0 To c.RowCount -1 +' c.Position=i +' foto1 = c.GetBlob("NV_FOTO") +' Dim cmd As DBCommand +' cmd.Initialize +' cmd.Name = "insert_reparto_REPG" +' cmd.Parameters = Array As Object(C.GetString("NV_CLIENTE"),C.GetString("NV_FECHA"),C.GetString("NV_USER"),C.GetString("NV_MOTIVO"),C.GetString("NV_COMM"),C.GetString("NV_LAT"),C.GetString("NV_LON"), ALMACEN, l_ruta.Text, foto1) +' reqManager.ExecuteCommand(cmd , "inst_noventa") +' reqs.Add("inst_noventa") +' Next +' End If +' c.Close + + D=Starter.skmt.ExecQuery("SELECT COUNT(*) AS CUANTOS_NOVENTA FROM NOVENTA") + d.Position=0 + cuantos_noventa = D.GetString("CUANTOS_NOVENTA") + d.Close + cargar.Visible = False + Subir.Visible = False + connecta.Visible = True + inv.Visible = False + ToastMessageShow("Se actualizarán los datos, este proceso podria tardar hasta un minuto, gracias" , True) + ProgressDialogShow2("Descargando rutas, espere un momento.", False) + End If + + End If + + End If + + + If Job.JobName = "DBRequest" Then Dim result As DBResult = reqManager.HandleJob(Job) If result.Tag = "ins_reparto" Then 'query tag @@ -1904,8 +1945,8 @@ Sub connecta_Click reqManager.ExecuteQuery(cmd , 0, "version") Dim cmd As DBCommand cmd.Initialize - cmd.Name = "select_ruta_re_REPG" - cmd.Parameters = Array As Object(ALMACEN, e_ruta.text, imei) + cmd.Name = "select_ruta_re_REPG3" + cmd.Parameters = Array As Object(ALMACEN, e_ruta.text, Subs.traeUsuario) ' Log($"${ALMACEN}, ${e_ruta.text}, ${imei}"$) reqManager.ExecuteQuery(cmd , 0, "ruta") ToastMessageShow("Validando Conexión." , True) diff --git a/B4A/Files/check.bal b/B4A/Files/check.bal index 21945d1..899cfe9 100644 Binary files a/B4A/Files/check.bal and b/B4A/Files/check.bal differ diff --git a/B4A/Mariana_Reparto.b4a b/B4A/Mariana_Reparto.b4a index 62e8bda..75ba873 100644 --- a/B4A/Mariana_Reparto.b4a +++ b/B4A/Mariana_Reparto.b4a @@ -53,24 +53,25 @@ File55=marker-rojo.png File56=marker-rojo1.png File57=marker-rojo2.png File58=marker-verde.png -File59=no_venta.bal +File59=MARQUEZ_logo_192x192.jpg File6=buscar.bal -File60=nuevocliente.bal -File61=panel_pick_ciego.bal -File62=pedido.bal -File63=planfia_logo.png -File64=planfia_logo_old.png -File65=planfia_logo_old2.png -File66=principal.bal -File67=proditem.bal -File68=proditem2.bal -File69=productos.bal +File60=no_venta.bal +File61=nuevocliente.bal +File62=panel_pick_ciego.bal +File63=pedido.bal +File64=planfia_logo.png +File65=planfia_logo_old.png +File66=planfia_logo_old2.png +File67=principal.bal +File68=proditem.bal +File69=proditem2.bal File7=check.bal -File70=profina.jpg -File71=PROFINA.png -File72=sync.png -File73=tabulador.bal -File74=telefonos.bal +File70=productos.bal +File71=profina.jpg +File72=PROFINA.png +File73=sync.png +File74=tabulador.bal +File75=telefonos.bal File8=checklist.bal File9=cliente.bal FileGroup1=Default Group @@ -145,6 +146,7 @@ FileGroup71=Default Group FileGroup72=Default Group FileGroup73=Default Group FileGroup74=Default Group +FileGroup75=Default Group FileGroup8=Default Group FileGroup9=Default Group Group=Default Group @@ -206,7 +208,7 @@ Module6=C_Cliente Module7=C_Clientes Module8=C_Detalle_Promo Module9=C_DetalleVenta -NumberOfFiles=74 +NumberOfFiles=75 NumberOfLibraries=27 NumberOfModules=30 Version=12.8 @@ -214,7 +216,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: MARIANA Reparto #VersionCode: 1 - #VersionName: 5.11.01 + #VersionName: 6.03.2 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/Mariana_Reparto.b4a.meta b/B4A/Mariana_Reparto.b4a.meta index 4d238a5..745eadb 100644 --- a/B4A/Mariana_Reparto.b4a.meta +++ b/B4A/Mariana_Reparto.b4a.meta @@ -68,7 +68,7 @@ ModuleClosedNodes12= ModuleClosedNodes13= ModuleClosedNodes14= ModuleClosedNodes15= -ModuleClosedNodes16=11 +ModuleClosedNodes16= ModuleClosedNodes17= ModuleClosedNodes18= ModuleClosedNodes19= @@ -91,6 +91,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9=8,9 -NavigationStack=B4XMainPage,b_server_Click,579,0,B4XMainPage,b_apk_Click,576,0,B4XMainPage,JobDone,479,0,MAPA_RUTAS,Activity_KeyPress,356,0,MAPA_RUTAS,MapFragment1_Ready,259,4,C_Principal,JobDone,1638,0,B4XMainPage,i_engrane_Click,537,1,Starter,Process_Globals,29,0,B4XMainPage,B4XPage_Created,200,6,C_Principal,B4XPage_Appear,503,1 +NavigationStack=C_Principal,JobDone,1723,6,Diseñador Visual,principal.bal,-100,1,C_Principal,cargar_Click,1043,5,C_Cheklist,JobDone,770,0,C_Cheklist,B4XPage_Created,110,0,C_Cheklist,Class_Globals,16,0,C_Cheklist,b_guardar_Click,643,0,Diseñador Visual,checklist.bal,-100,2,Diseñador Visual,check.bal,-100,6,C_Cheklist,Camera1_PictureTaken,269,0 SelectedBuild=0 -VisibleModules=28,2,3,4,5,6,7,8,9,10,16 +VisibleModules=28,2,3,4,5,6,7,8,9,10,16,29,1 diff --git a/B4A/Subs.bas b/B4A/Subs.bas index 0817743..5f9f028 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -1034,4 +1034,14 @@ Sub CreateBitmapWithNumber(OriginalBitmap As Bitmap, Number As Int) As Bitmap 'i ' Dibujar el número en el centro del Bitmap y configurar el estilo del texto Canvas.DrawText(Number, (OriginalBitmap.Width / 2), (OriginalBitmap.Height / 2.4), Typeface.DEFAULT, 20, Colors.White, "CENTER") Return NewBitmap +End Sub + +'Muestra en el Log los campos y valores que regresan en el JobDone. +Sub logJobDoneResultados(resultado As DBResult) + For Each records() As Object In resultado.Rows + LogColor($"====== ${resultado.Tag} - REGISTROS = ${resultado.Rows.Size}"$, Colors.RGB(215,37,0)) + For Each k As String In resultado.Columns.Keys + LogColor(k & " = " & records(resultado.Columns.Get(k)), Colors.RGB(215,37,0)) + Next + Next End Sub \ No newline at end of file