diff --git a/Files/layout1.bal b/Files/layout1.bal index c7c29aa..ef481eb 100644 Binary files a/Files/layout1.bal and b/Files/layout1.bal differ diff --git a/soporteKMS.b4a b/soporteKMS.b4a index bf1df43..c355a3b 100644 --- a/soporteKMS.b4a +++ b/soporteKMS.b4a @@ -34,7 +34,7 @@ Version=12.8 @EndOfDesignText@ #Region Project Attributes #ApplicationLabel: Soporte Keymonsoft - #VersionName: 4.11.29 + #VersionName: 5.05.20 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False @@ -112,7 +112,7 @@ Sub Globals Private s_tipoVenta As Spinner Private et_usuario As EditText Dim empresasMap As Map - Dim spinnerGunaMap, spinnerKelloggsMap, spinnerKelloggs2Map, spinnerSalmaMap, spinnerDanvitMap, spinnerDurakeloMap, spinnerMardsMap, spinnerEmpresaMap As Map + Dim spinnerGunaMap, spinnerKelloggsMap, spinnerKelloggs2Map, spinnerSalmaMap, spinnerDanvitMap, spinnerDurakeloMap, spinnerMardsMap, spinnerIntmexMap, spinnerEmpresaMap As Map Dim almacenGuna, almacenKelloggs, almacenKelloggs2, almacenSalma, almacenDanvit, almacenDurakelo, almacenDeRuta, almacenMards, almacenEmpresa As String Dim tipoVentaKelloggs As String = "VENTA" Private l_version As Label @@ -199,6 +199,11 @@ Sub Globals Private p_resVentaTransparente As Panel Private l_version1 As Label Private b_resDuplicadosKell As Button + Private s_empresaAA As Spinner + Private s_almacenAA As Spinner + Private et_rutaAA As EditText + Private b_abrirAvion As Button + dim empresaAA, almacenAA as string End Sub Sub Activity_Create(FirstTime As Boolean) @@ -253,13 +258,14 @@ Sub Activity_Create(FirstTime As Boolean) spinnerDanvitMap.Initialize spinnerDurakeloMap.Initialize spinnerMardsMap.Initialize + spinnerIntmexMap.Initialize spinnerEmpresaMap.Initialize s_empresaBV.Clear s_empresaBV.AddAll(Array As String("-= Seleccione =-", "Danvit", "Durakelo", "Guna", "Kelloggs", "Mards", "Salma")) + s_empresaAA.AddAll(Array As String("-= Seleccione =-", "Danvit", "Durakelo", "Guna", "Intmex", "Kelloggs", "Mards", "Salma")) s_tipoVentaBV.AddAll(Array As String("VENTA", "ABORDO")) s_tipoVentaBV.SelectedIndex = 0 - reqManager.Initialize(Me, DBRS_1782) 'Traemos los almacenes de Guna cmd.Initialize @@ -285,6 +291,8 @@ Sub Activity_Create(FirstTime As Boolean) reqManager.Initialize(Me, DBRS_1781) cmd.Name = "select_almacenes_Mards" reqManager.ExecuteQuery(cmd , 0, "almacenesMards", 0) + cmd.Name = "select_almacenes_Intmex" + reqManager.ExecuteQuery(cmd , 0, "almacenesIntmex", 0) kb.Initialize("kb") gv_gato.SetGif(File.DirAssets, "cat.gif") gv_bicho.SetGif(File.DirAssets, "ew.gif") @@ -433,6 +441,7 @@ Sub WobbleMenu1_Tab5Click 'Borrar Venta ' Subs.centraBotonEnPanel(b_borrarVenta3, Panel3) ' Subs.centraBotonEnPanel(b_forzarVenta3, Panel3) Subs.centraPanelEnPanel(p_botonesMards, p_borrarVenta) + Subs.centraBotonEnPanel(b_abrirAvion, p_borrarVenta) s_empresaBV.SelectedIndex = 0 s_almacenBV.SelectedIndex = 0 End Sub @@ -858,6 +867,15 @@ Sub JobDone(Job As HttpJob) s_almacenMards.Add(records(result.Columns.Get("CAT_AG_NOMBRE"))) spinnerMardsMap.Put(records(result.Columns.Get("CAT_AG_NOMBRE")), records(result.Columns.Get("CAT_AG_ID"))) empresasMap.Put("Mards", spinnerMardsMap) +' Log(spinnerMardsMap) + Next + End If + If result.Tag = "almacenesIntmex" Then 'query tag + s_almacenAA.Add("-= Selecciona =-") + For Each records() As Object In result.Rows +' s_almacenAA.Add(records(result.Columns.Get("CAT_AG_NOMBRE"))) + spinnerIntmexMap.Put(records(result.Columns.Get("CAT_AG_NOMBRE")), records(result.Columns.Get("CAT_AG_ID"))) + empresasMap.Put("Intmex", spinnerIntmexMap) ' Log(spinnerMardsMap) Next End If @@ -1243,7 +1261,7 @@ Sub JobDone(Job As HttpJob) b_pasarInfoMovilKellogs.Text = $"PasarInfoMovil Kelloggs"$ Toast("Corriendo PasarInfoMovil Kelloggs.", 0) End If - If result.Tag = "revisaArqueoYLiquidacion_Kelloggs" or result.Tag = "revisaArqueoYLiquidacion_Durakelo" Then + If result.Tag = "revisaArqueoYLiquidacion_Kelloggs" Or result.Tag = "revisaArqueoYLiquidacion_Durakelo" Then b_revisaVenta2.text = "Revisar Venta" Subs.logJobDoneResultados(result) For Each records() As Object In result.Rows @@ -1673,7 +1691,7 @@ Private Sub s_empresaBV_ItemClick (Position As Int, Value As Object) s_tipoVentaBV.Visible = False p_tipoVentaBV.Visible = False End If - If laEmpresa = "Mards" Or laEmpresa = "Kelloggs" Or laEmpresa = "Durakelo" Or laEmpresa = "Salma" Then + If laEmpresa = "Mards" Or laEmpresa = "Kelloggs" Or laEmpresa = "Durakelo" Or laEmpresa = "Salma" Or laEmpresa = "Intmex" Then reqManager.Initialize(Me, DBRS_1781) Log("Mards o Kelloggs") Else @@ -1755,4 +1773,56 @@ Private Sub b_resDuplicadosKell_Click Log($"mandamos QUITAR duplicados: ruta=${laRuta}, almacen=${almacenEmpresa}"$) reqManager.ExecuteCommand(cmd, $"quitarDuplicados_${laEmpresa}"$) Log($"################ QUITAMOS DUPLICADOS ${laEmpresa}, ${almacenEmpresa}, ${laRuta} ########################"$) +End Sub + +Private Sub s_empresaAA_ItemClick (Position As Int, Value As Object) + laEmpresa = Value +' If laEmpresa = "Kelloggs" Or laEmpresa = "Durakelo" Then +' l_tipoVentaBV.Visible = True +' s_tipoVentaBV.Visible = True +' p_tipoVentaBV.Visible = True +' Else +' l_tipoVentaBV.Visible = False +' s_tipoVentaBV.Visible = False +' p_tipoVentaBV.Visible = False +' End If + If laEmpresa = "Mards" Or laEmpresa = "Kelloggs" Or laEmpresa = "Durakelo" Or laEmpresa = "Salma" Or laEmpresa = "Intmex" Then + reqManager.Initialize(Me, DBRS_1781) + Log("Mards o Kelloggs") + Else + reqManager.Initialize(Me, DBRS_1782) + End If + spinnerEmpresaMap = empresasMap.Get(Value) +' Log(empresasMap & "|" & Value) +' Log($"${spinnerEmpresaMap}"$) + s_almacenAA.Clear + s_almacenAA.Add("-= Seleccione =-") + For Each e In empresasMap.Get(Value).As(Map).Keys +' Log(e) + s_almacenAA.Add(e) + Next + empresaAA = Value + s_almacenAA.SelectedIndex = 0 + Log($"Empresa seleccionada: ${Value}"$ ) +End Sub + +Private Sub s_almacenAA_ItemClick (Position As Int, Value As Object) + almacenEmpresa = spinnerEmpresaMap.Get(Value) + almacenDeRuta = Value + Log(Value) + almacenAA = almacenEmpresa + Log($"Almacén ${almacenEmpresa} de ${laEmpresa} seleccionado"$ ) +End Sub + +Private Sub b_abrirAvion_Click + Log(empresaAA) + Log(almacenAA) + Log(et_rutaAA.text) + reqManager.Initialize(Me, DBRS_1781) + cmd.Name = $"abrirAvion1_${empresaAA}"$ + cmd.Parameters = Array As Object(almacenAA, et_rutaAA.text) + reqManager.ExecuteCommand(cmd, $"abrirAvion1_${empresaAA}"$) + cmd.Name = $"abrirAvion2_${empresaAA}"$ + cmd.Parameters = Array As Object(et_rutaAA.text, almacenAA) + reqManager.ExecuteCommand(cmd, $"abrirAvion2_${empresaAA}"$) End Sub \ No newline at end of file diff --git a/soporteKMS.b4a.meta b/soporteKMS.b4a.meta index f7a3858..536e163 100644 --- a/soporteKMS.b4a.meta +++ b/soporteKMS.b4a.meta @@ -10,6 +10,6 @@ ModuleClosedNodes0=2 ModuleClosedNodes1= ModuleClosedNodes2=1 ModuleClosedNodes3=1,9,11 -NavigationStack=Main,borrarVentaForzadaGuna,616,1,Main,Process_Globals,33,0,Main,s_empresaBV_ItemClick,1643,0,Visual Designer,layout1.bal,-100,4,Main,b_borrarVentaBV_Click,1565,0,Main,JobDone,870,6,Main,borrarVentaForzadaDurakelo,598,0,Main,b_forzarVentaBV_Click,1523,0,Main,s_almacenBV_ItemClick,1623,0,Main,b_revisarVentaBV_Click,1587,2 +NavigationStack=Main,b_desbloquea_Click,489,0,Main,s_almacenBV_ItemClick,1640,0,Main,et_rutaBV_TextChanged,1639,0,Main,b_borrarVentaBV_Click,1549,0,Main,JobDone,842,0,Main,Globals,171,5,Main,s_empresaAA_ItemClick,1769,2,Diseñador Visual,layout1.bal,-100,1,Main,b_abrirAvion_Click,1788,6,Main,s_almacenAA_ItemClick,1778,2 SelectedBuild=0 VisibleModules=2,3,1