diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 0af817a..ca3a2be 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -1040,14 +1040,35 @@ Sub cargar_Click pedidodiaanterior = True End If End If + If Not (pedidodiaanterior) Then - + Dim rCargada As Cursor= Starter.skmt.ExecQuery("SELECT * FROM RUTAA") + Dim variable As Boolean = False + If rCargada.RowCount > 0 Then + rCargada.Position = 0 + Dim exruta As String = rCargada.GetString("RUTAA") + If exruta = e_ruta.Text Then + variable = True + Else + 'no cargamos' + variable = False + Log("Ya existe una ruta") + MsgboxAsync("No puedes cargar día con una ruta diferente, Por favor haz FIN DIA e intenta nuevamente.","Atención") + End If +' + Else If rCargada.RowCount = 0 Then + variable = True + End If + If variable Then + If Not(IsConnectedToInternet) Then MsgboxAsync("No hay conexión a Internet", "Revisa tu conexión") Dim cmd As DBCommand cmd.Initialize cmd.Name = "select_ruta_entrega_cargada" cmd.Parameters = Array As Object(ALMACEN, e_ruta.text) reqManager.ExecuteQuery(cmd ,0, "entrega_cargada") + End If + @@ -1738,6 +1759,8 @@ Sub JobDone(Job As HttpJob) cmd.Name = "update_ruta_entrega_cargada" cmd.Parameters = Array As Object(ALMACEN,e_ruta.text) reqManager.ExecuteCommand(cmd , "update_rrcargada") + Starter.skmt.ExecNonQuery("DELETE FROM RUTAA") + Starter.skmt.ExecNonQuery2("INSERT INTO RUTAA(RUTAA) VALUES (?)", Array As Object (e_ruta.TEXT)) Log("CUMPLE") EJECUTANDO = 1 @@ -1950,8 +1973,7 @@ Sub connecta_Click ' Log($"${ALMACEN}, ${e_ruta.text}, ${imei}"$) reqManager.ExecuteQuery(cmd , 0, "ruta") ToastMessageShow("Validando Conexión." , True) - Starter.skmt.ExecNonQuery("DELETE FROM RUTAA") - Starter.skmt.ExecNonQuery2("INSERT INTO RUTAA(RUTAA) VALUES (?)", Array As Object (e_ruta.TEXT)) + B4XPages.MainPage.rutaPreventa = e_ruta.TEXT End If End Sub diff --git a/B4A/Mariana_Reparto.b4a b/B4A/Mariana_Reparto.b4a index 75ba873..f0c1128 100644 --- a/B4A/Mariana_Reparto.b4a +++ b/B4A/Mariana_Reparto.b4a @@ -216,7 +216,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: MARIANA Reparto #VersionCode: 1 - #VersionName: 6.03.2 + #VersionName: 6.03.03 '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 745eadb..c442b75 100644 --- a/B4A/Mariana_Reparto.b4a.meta +++ b/B4A/Mariana_Reparto.b4a.meta @@ -91,6 +91,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9=8,9 -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 +NavigationStack=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,B4XMainPage,b_arqueocieego_Click,731,0,B4XMainPage,Class_Globals,22,0,C_Principal,connecta_Click,1946,0,C_Principal,JobDone,1736,0,C_Principal,cargar____Click,1055,0,C_Principal,cargar_Click,1053,0 SelectedBuild=0 VisibleModules=28,2,3,4,5,6,7,8,9,10,16,29,1