diff --git a/Files/layout1.bal b/Files/layout1.bal index 23a2587..c7c29aa 100644 Binary files a/Files/layout1.bal and b/Files/layout1.bal differ diff --git a/Subs.bas b/Subs.bas index 07c5eec..330ab14 100644 --- a/Subs.bas +++ b/Subs.bas @@ -185,8 +185,8 @@ End Sub 'Muestra en el Log los campos y valores que regresan en el JobDone. Sub logJobDoneResultados(resultado As DBResult) + LogColor($"====== ${resultado.Tag} - REGISTROS = ${resultado.Rows.Size}"$, Colors.RGB(215,37,0)) 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 diff --git a/soporteKMS.b4a b/soporteKMS.b4a index 32c67fd..1246017 100644 --- a/soporteKMS.b4a +++ b/soporteKMS.b4a @@ -34,7 +34,7 @@ Version=12.8 @EndOfDesignText@ #Region Project Attributes #ApplicationLabel: Soporte Keymonsoft - #VersionName: 4.08.11 + #VersionName: 4.11.18 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False @@ -197,6 +197,7 @@ Sub Globals Private p_resVenta As Panel Private p_resVentaTransparente As Panel Private l_version1 As Label + Private b_resDuplicadosKell As Button End Sub Sub Activity_Create(FirstTime As Boolean) @@ -1191,6 +1192,23 @@ Sub JobDone(Job As HttpJob) ' p_resVentaTransparente.BringToFront ' p_resVentaTransparente.Visible = True End If + + If result.Tag = "revisaDuplicados_Kelloggs" Then +' Subs.logJobDoneResultados(result) + If result.Rows.Size > 0 Then + Log("=====> Hay Duplicados <======") + b_resDuplicadosKell.Enabled = True + b_resDuplicadosKell.Text = "HAY DUPLICADOS"& CRLF &"=> QUITARLOS <=" + Else + Log("=====> NO Hay Duplicados <======") + b_resDuplicadosKell.Enabled = False + b_resDuplicadosKell.Text = "Sin duplicados" + End If + End If + + If result.Tag = "quitarDuplicados_Kelloggs" Then + Subs.logJobDoneResultados(result) + End If End If Job.Release End If @@ -1288,6 +1306,16 @@ Private Sub b_revisaVenta2_Click Log($"mandamos: ruta=${rut}, almacen=${almacenKelloggs}"$) reqManager.ExecuteQuery(cmd, 0 , "select_ventaXrutaKelloggs_soporte", 0) + + reqManager.Initialize(Me, DBRS_1781) + cmd.Name = "revisaDuplicados_Kelloggs" + cmd.Parameters = Array As Object(almacenKelloggs, rut) + b_resDuplicadosKell.Enabled = False + b_resDuplicadosKell.Text = "Buscando duplicados ..." + Log($"mandamos: ruta=${rut}, almacen=${almacenKelloggs}"$) + reqManager.ExecuteQuery(cmd, 0 , "revisaDuplicados_Kelloggs", 0) + Log($"################ REVISAMOS DUPLICADOS ${almacenKelloggs}, ${rut} ########################"$) + reqManager.Initialize(Me, DBRS_1781) cmd.Name = "revisaArqueoYLiquidacion_Kelloggs" cmd.Parameters = Array As Object(almacenKelloggs, rut, almacenKelloggs, rut) @@ -1582,4 +1610,15 @@ End Sub Private Sub p_resVentaTransparente_Click p_resVentaTransparente.Visible = False +End Sub + +Private Sub b_resDuplicadosKell_Click + reqManager.Initialize(Me, DBRS_1781) + cmd.Name = "quitarDuplicados_Kelloggs" + cmd.Parameters = Array As Object(almacenKelloggs, et_ruta2.text.Trim, "appSoporte") + b_resDuplicadosKell.Enabled = False + b_resDuplicadosKell.Text = "Sin Duplicados" + Log($"mandamos: ruta=${et_ruta2.text.Trim}, almacen=${almacenKelloggs}"$) + reqManager.ExecuteCommand(cmd, "quitarDuplicados_Kelloggs") + Log($"################ QUITAMOS DUPLICADOS ${almacenKelloggs}, ${et_ruta2.text.Trim} ########################"$) End Sub \ No newline at end of file diff --git a/soporteKMS.b4a.meta b/soporteKMS.b4a.meta index dfe9084..eb1b26c 100644 --- a/soporteKMS.b4a.meta +++ b/soporteKMS.b4a.meta @@ -10,6 +10,6 @@ ModuleClosedNodes0=2 ModuleClosedNodes1= ModuleClosedNodes2=1 ModuleClosedNodes3=1,9,11 -NavigationStack=Main,Activity_Create,256,6,Main,b_revisaVenta2_Click,1257,6,Visual Designer,layout1.bal,-100,6,Main,Process_Globals,33,0,Main,b_revisaVenta_Click,1236,0,Main,b_cerrar_Click,1538,0,Main,p_resVentaTransparente_Click,1542,0,Main,b_pasarInfoMovilDurakeloRep_Click,1523,0,Main,Globals,123,0,Main,JobDone,934,6 +NavigationStack=Main,b_forzarVenta1_Click,530,0,Main,b_forzarVenta2_Click,549,0,Main,borrarVentaForzadaKelloggs,560,0,Main,p_resVentaTransparente_Click,1573,0,Subs,generaSaludo,171,0,Main,b_borrarVenta2_Click,535,0,Visual Designer,layout1.bal,-100,6,Main,b_revisaVenta2_Click,1275,6,Main,b_resDuplicadosKell_Click,1581,4,Main,JobDone,1173,6 SelectedBuild=0 VisibleModules=2,3,1