diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index 8c27f19..9317199 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -165,6 +165,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_ENCUESTA_PREGUNTA (CAT_EP_ID TEXT,CAT_EP_IDTIPOPREGUNTA TEXT,CAT_CE_DESCRIPCION TEXT,CAT_EP_PREGUNTA TEXT,CAT_EP_RES1_PRED TEXT,CAT_EP_RES2_PRED TEXT,CAT_EP_RES3_PRED TEXT,CAT_EP_ORDEN_PREGUNTA TEXT)") Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_ENCUESTA_PREGUNTA5P (CAT_EP_ID TEXT,CAT_EP_IDTIPOPREGUNTA TEXT,CAT_CE_DESCRIPCION TEXT,CAT_EP_PREGUNTA TEXT,CAT_EP_RES1_PRED TEXT,CAT_EP_RES2_PRED TEXT,CAT_EP_RES3_PRED TEXT,CAT_EP_ORDEN_PREGUNTA TEXT)") Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_CLASF_PROD (CAT_CP_ID TEXT, CAT_CP_NOMPROD TEXT)") + Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS BANDERA_RMI (BR_BANDERA INT)") Subs.agregaColumna("CAT_ENCUESTA_PREGUNTA", "CAT_EP_IDGRUPO", "TEXT") Subs.agregaColumna("HIST_ENCUESTA", "HE_LAT", "TEXT") Subs.agregaColumna("HIST_ENCUESTA", "HE_LON", "TEXT") diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 7a2130a..e29f8c7 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -1202,10 +1202,13 @@ Sub JobDone(Job As HttpJob) If Job.JobName = "DBRequest" Then Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) If RESULT.Tag = "usuarioA" Then 'query tag + skmt.ExecNonQuery("delete from BANDERA_RMI") Private n As String = "Sin Usuario" For Each records() As Object In RESULT.Rows n = records(RESULT.Columns.Get("USUARIO")) + Dim ban_RMI As String = records(RESULT.Columns.Get("CAT_LO_RMI")) Next + skmt.ExecNonQuery2("INSERT INTO BANDERA_RMI (BR_BANDERA) VALUES (?)", Array As Object (ban_RMI)) Log(n) 'Logcolor("**************************"&n, Colors.Green) If n = "OKActivo" Then diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index 2772024..f45a250 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -1144,57 +1144,67 @@ End Sub Private Sub l_prodX_LongClick Log("longClic = "&Sender.as(Label).Text) + c = Starter.skmt.ExecQuery("Select BR_BANDERA From BANDERA_RMI") + If c.RowCount > 0 Then + c.Position = 0 + Dim ban As Int = c.GetString("BR_BANDERA") + End If If Subs.traeCliente <> 0 Then - Dim index As Int = clv_prods_ll.GetItemFromView(Sender) - nuevaCantRMI = 0 - Private pId As String = clv_prods_ll.GetValue(index).As(Map).Get("id") - Log(clv_prods_ll.GetValue(index)) - Private pNombre As String = clv_prods_ll.GetValue(index).As(Map).Get("prod") - Private t As Cursor = Starter.skmt.ExecQuery($"select sum(PE_CANT) as cuantosProds from pedido where PE_CEDIS <> 'DUR' and PE_CLIENTE in (Select CUENTA from cuentaa)"$) - t.Position = 0 - Private ventaT As String = t.GetString("cuantosProds") - If ventaT = Null Then ventaT = 0 + If ban <> 0 Then + Dim index As Int = clv_prods_ll.GetItemFromView(Sender) + nuevaCantRMI = 0 + Private pId As String = clv_prods_ll.GetValue(index).As(Map).Get("id") + Log(clv_prods_ll.GetValue(index)) + Private pNombre As String = clv_prods_ll.GetValue(index).As(Map).Get("prod") + Private t As Cursor = Starter.skmt.ExecQuery($"select sum(PE_CANT) as cuantosProds from pedido where PE_CEDIS <> 'DUR' and PE_CLIENTE in (Select CUENTA from cuentaa)"$) + t.Position = 0 + Private ventaT As String = t.GetString("cuantosProds") + If ventaT = Null Then ventaT = 0 ' If Starter.tipov = "PREVENTA" Then ' ToastMessageShow("¡¡En preventa NO hay cambios!!", True) ' Return ' End If - Private rmis As Cursor =Starter.skmt.ExecQuery($"select CAT_GP_DEV from ${Subs.traeTablaProds(Starter.tipov)} where CAT_GP_ID = '${pId}'"$) + Private rmis As Cursor =Starter.skmt.ExecQuery($"select CAT_GP_DEV from ${Subs.traeTablaProds(Starter.tipov)} where CAT_GP_ID = '${pId}'"$) ' If rmis.RowCount > 0 Then ' rmis.Position = 0 ' Log(rmis.GetString("CAT_GP_DEV")) ' End If - rmis.Position = 0 - If rmis.RowCount > 0 And rmis.GetString("CAT_GP_DEV") = 1 Then - t = Starter.skmt.ExecQuery($"select sum(PE_CANT) as totalRMI from pedido where PE_PROID = '${pId}' and PE_CEDIS = 'DUR' and PE_CLIENTE in (Select CUENTA from cuentaa)"$) - t.Position = 0 - Private totalRMI As String = t.GetString("totalRMI") - Log($"Prods: ${ventaT}, RMIs: ${totalRMI}"$) - If totalRMI = Null Then totalRMI = 0 - Log($"Prods: ${ventaT}, RMIs: ${totalRMI}"$) - l_rmi_nombre.Text = Sender.as(Label).Text - Private pu0() As String = Regex.Split("\$", Sender.as(Label).Text) - Private pu As String - If pu0.Length > 1 Then pu = pu0(pu0.Length-1) Else pu = 0 - 'Log(ventaT & ", " & totalRMI & ", " & Sender.as(Label).tag & ", " & pu) + rmis.Position = 0 + If rmis.RowCount > 0 And rmis.GetString("CAT_GP_DEV") = 1 Then + t = Starter.skmt.ExecQuery($"select sum(PE_CANT) as totalRMI from pedido where PE_PROID = '${pId}' and PE_CEDIS = 'DUR' and PE_CLIENTE in (Select CUENTA from cuentaa)"$) + t.Position = 0 + Private totalRMI As String = t.GetString("totalRMI") + Log($"Prods: ${ventaT}, RMIs: ${totalRMI}"$) + If totalRMI = Null Then totalRMI = 0 + Log($"Prods: ${ventaT}, RMIs: ${totalRMI}"$) + l_rmi_nombre.Text = Sender.as(Label).Text + Private pu0() As String = Regex.Split("\$", Sender.as(Label).Text) + Private pu As String + If pu0.Length > 1 Then pu = pu0(pu0.Length-1) Else pu = 0 + 'Log(ventaT & ", " & totalRMI & ", " & Sender.as(Label).tag & ", " & pu) ' l_rmi_usado.Text = $"RMI usado: $1.0{(ventaT - totalRMI)}"$ - l_montoDisponible.Text = $"DEVOLUCIONES"$ - Private esteInv As Int = Subs.traeInventario(pId, Starter.tipov) - If esteInv < ventaT Then ventaT = esteInv 'Si el inventario disponble es menor a los productos del pedido, entoncs tomamos ese valor. - Private m As Map = CreateMap("disponible":clv_prods_ll.GetValue(index).As(Map).Get("almacen"), "inv":clv_prods_ll.GetValue(index).As(Map).Get("almacen"), "totalRMI":totalRMI, "pu":pu, "id":pId, "nombre":pNombre) - rmiMap = m - Log(rmiMap) - ' b_rmi_mas.Tag = m - ' b_rmi_menos.Tag = m - ' b_rmi_aceptar.Tag = m - Subs.centraPanel(p_rmi, Root.Width) - l_rmi_cant.Text = totalRMI + l_montoDisponible.Text = $"DEVOLUCIONES"$ + Private esteInv As Int = Subs.traeInventario(pId, Starter.tipov) + If esteInv < ventaT Then ventaT = esteInv 'Si el inventario disponble es menor a los productos del pedido, entoncs tomamos ese valor. + Private m As Map = CreateMap("disponible":clv_prods_ll.GetValue(index).As(Map).Get("almacen"), "inv":clv_prods_ll.GetValue(index).As(Map).Get("almacen"), "totalRMI":totalRMI, "pu":pu, "id":pId, "nombre":pNombre) + rmiMap = m + Log(rmiMap) + ' b_rmi_mas.Tag = m + ' b_rmi_menos.Tag = m + ' b_rmi_aceptar.Tag = m + Subs.centraPanel(p_rmi, Root.Width) + l_rmi_cant.Text = totalRMI ' l_rmi_total.text = "" - p_rmi.BringToFront - p_rmi.Visible = True + p_rmi.BringToFront + p_rmi.Visible = True + Else + ToastMessageShow("No hay devoluciones para este producto", True) + End If Else - ToastMessageShow("No hay devoluciones para este producto", True) + ToastMessageShow("No esta autorizado para devoluciones", True) End If End If + c.Close End Sub Private Sub clv_prods_ll_VisibleRangeChanged (FirstIndex As Int, LastIndex As Int) diff --git a/B4A/Durakelo.b4a b/B4A/Durakelo.b4a index 1f193f8..34177b0 100644 --- a/B4A/Durakelo.b4a +++ b/B4A/Durakelo.b4a @@ -1402,7 +1402,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Durakelo #VersionCode: 1 - #VersionName: 4.06.16 + #VersionName: 4.07.25 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/Durakelo.b4a.meta b/B4A/Durakelo.b4a.meta index 78d6fe4..be683fd 100644 --- a/B4A/Durakelo.b4a.meta +++ b/B4A/Durakelo.b4a.meta @@ -73,6 +73,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=Subs,traeMaxPromos,983,0,C_Principal,B4XPage_Created,228,0,C_Principal,B4XPage_Appear,395,0,Diseñador Visual,principal.bal,-100,6,C_Principal,Resumen_Click,2464,4,C_Principal,JobDone,1188,2,C_Principal,connecta_Click,1967,3,C_Clientes,Class_Globals,0,0,C_Cliente,Class_Globals,0,0,C_Cliente,gest_Click,409,0,C_Cliente,B_VENTA_Click,1244,0 +NavigationStack=C_Productos,clv_prods_ll_ItemLongClick,1090,0,Diseñador Visual,productos.bal,-100,5,C_Principal,cargar_Click,814,0,B4XMainPage,Entrar_Click,303,0,C_Principal,connecta_Click,1993,6,C_Principal,JobDone,1195,6,C_Productos,l_prodX_Click,1136,0,C_Productos,l_prodX_LongClick,1145,6,B4XMainPage,B4XPage_Created,108,0,B4XMainPage,Class_Globals,94,0,B4XMainPage,Initialize,101,0 SelectedBuild=0 VisibleModules=2,10,4,19,5,6,8,9,11,24 diff --git a/B4A/Files/guardagestion.bal b/B4A/Files/guardagestion.bal index 6272b4e..9156db1 100644 Binary files a/B4A/Files/guardagestion.bal and b/B4A/Files/guardagestion.bal differ diff --git a/B4A/Files/pedido.bal b/B4A/Files/pedido.bal index 30db91e..0ef438f 100644 Binary files a/B4A/Files/pedido.bal and b/B4A/Files/pedido.bal differ