From 5201decaedb0aee4184e587077866a026375da73 Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Mon, 6 May 2024 16:54:12 -0600 Subject: [PATCH] - Se corrigio un error que permitia que el disponible para el abordo esta en negativo, dejaba meter mas producto - Se agrego el color rojo de fodo a los prioritarios del pedido sugerido --- B4A/C_Productos.bas | 28 +++++++++++++++++++++------- B4A/KelloggsV4.b4a | 2 +- B4A/KelloggsV4.b4a.meta | 2 +- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index f63d088..e743087 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -625,10 +625,10 @@ Sub b_prodMas_Click Private iq As Cursor = Starter.skmt.ExecQuery($"select cat_gp_almacen from ${Subs.traeTablaProds(Starter.tipov)} where cat_gp_id = '${clv_prods_ll.GetValue(index).As(Map).Get("id")}'"$) If iq.RowCount > 0 Then iq.Position = 0 - Log($"INV ${clv_prods_ll.GetValue(index).As(Map).Get("id")} = ${iq.GetString("CAT_GP_ALMACEN")}"$) +' Log($"INV ${clv_prods_ll.GetValue(index).As(Map).Get("id")} = ${iq.GetString("CAT_GP_ALMACEN")}"$) End If - Log(tmpMap) +' Log(tmpMap) If buttonTag = "vendido" Then ' Log("VENDIDO") ' Log($"${(laCant.Text + 1 <= inv)} And ${(Subs.totalPedido - precio > 1)}"$) @@ -670,15 +670,16 @@ Sub b_prodMas_Click et_pCant_TextChanged(100, 0) End If dispAbordo = kh.traeDisponibleAbordo + Log("DISPONIBLE ABORDO: " & dispAbordo) If Subs.traeCliente = 0 And dispAbordo < 1 Then +' Log("######### "& NumberFormat2((kh.traeLimiteAbordoWeb - (kh.traeLimiteAbordoXInventario - kh.traeVenta) - kh.traeVentaAbordo), 0, 2, 2, False)) Try + laCant.Text = NumberFormat2((laCant.Text - 1), 1, 0, 0, False) + Subs.actualizaProducto(almacenX, precioX, laCant.text, nombreX, id, clienteId, Subs.traeFecha, Subs.traeUsuarioDeBD, rutaUsuario, 0, Starter.tipov) ToastMessageShow("No hay mas disponible para el abordo", False) Sender.As(EditText).TextColor = Colors.Red Sender.As(EditText).TextSize = 14 Log("######### "& NumberFormat2((kh.traeLimiteAbordoWeb - (kh.traeLimiteAbordoXInventario - kh.traeVenta) - kh.traeVentaAbordo), 0, 2, 2, False)) - laCant.Text = NumberFormat2((laCant.Text - 1), 1, 0, 0, False) - Subs.actualizaProducto(almacenX, precioX, laCant.text, nombreX, id, clienteId, Subs.traeFecha, Subs.traeUsuarioDeBD, rutaUsuario, 0, Starter.tipov) - Log("######### "& NumberFormat2((kh.traeLimiteAbordoWeb - (kh.traeLimiteAbordoXInventario - kh.traeVenta) - kh.traeVentaAbordo), 0, 2, 2, False)) Sleep(400) Sender.As(EditText).TextColor = Colors.black Sender.As(EditText).TextSize = 10 @@ -687,6 +688,7 @@ Sub b_prodMas_Click Log(LastException) End Try End If + Log("VAMOS A CUENTAPRIDS") cuentaProds If lfila.Text <> "RMI" Then Private cs As CSBuilder @@ -806,9 +808,10 @@ Sub cuentaProds ' Venta Abordo: ${kh.traeVentaAbordo} "$, Colors.red) l_infoPedido.Text = $"LimiteAbordo: ${NumberFormat2(kh.traeLimiteAbordoWeb,1,2,1,True)} TotalInv: ${NumberFormat2(kh.traeLimiteAbordoXInventario,1,2,1,True)} Venta: ${NumberFormat2(kh.traeVenta,1,2,1,True)} VentaAbordo: ${NumberFormat2(kh.traeVentaAbordo,1,2,1,True)} "$ - Log($"${kh.traeLimiteAbordoXInventario} - ${kh.traeVenta} - ${kh.traeLimiteAbordoWeb}"$) - Log($"LIMITE ABORDO DISPONIBLE: ${NumberFormat2((kh.traeLimiteAbordoWeb - (kh.traeLimiteAbordoXInventario - kh.traeVenta) - kh.traeVentaAbordo), 0, 2, 2, False)}"$) +' Log($"${kh.traeLimiteAbordoXInventario} - ${kh.traeVenta} - ${kh.traeLimiteAbordoWeb}"$) +' Log($"LIMITE ABORDO DISPONIBLE: ${NumberFormat2((kh.traeLimiteAbordoWeb - (kh.traeLimiteAbordoXInventario - kh.traeVenta) - kh.traeVentaAbordo), 0, 2, 2, False)}"$) dispAbordo = kh.traeDisponibleAbordo +' Log("DISPONIBLE ABORDO: " & kh.traeDisponibleAbordo) l_limiteAbordoDisp.Text = $"Disp Abordo: $${dispAbordo}"$ If dispAbordo < 1 And kh.traeCliente = 0 Then ' Log("SI ABORDO") @@ -1156,6 +1159,7 @@ Private Sub clv_prods_ll_VisibleRangeChanged (FirstIndex As Int, LastIndex As In ' Log($"clv_prods_ll_VisibleRangeChanged : ${FirstIndex}, ${LastIndex} "$) Dim ExtraSize As Int = 30 'List size For i = Max(0, FirstIndex - ExtraSize) To Min(LastIndex + ExtraSize, clv_prods_ll.Size - 1) +' Log(clv_prods_ll.GetValue(i)) Dim Pnl As B4XView = clv_prods_ll.GetPanel(i) If i > FirstIndex - ExtraSize And i < LastIndex + ExtraSize Then ' Log(listaRenglones) @@ -1170,6 +1174,16 @@ Private Sub clv_prods_ll_VisibleRangeChanged (FirstIndex As Int, LastIndex As In l_prodX.SetTextSizeAnimated(0, 13) If clv_prods_ll.GetValue(i).As(Map).Get("cant") <> Null And clv_prods_ll.GetValue(i).As(Map).Get("cant") > 0 Then p_prods.Color=0xFFE2EEFF + Private p1 As Cursor = Starter.skmt.ExecQuery($"select CAT_GP_TIPOPROD2 from CAT_GUNAPROD where CAT_GP_ID = '${clv_prods_ll.GetValue(i).As(Map).Get("id")}'"$) + Private prioridad As Int = 0 +' Log($"select CAT_GP_TIPOPROD2 from CAT_GUNAPROD where CAT_GP_ID = '${clv_prods_ll.GetValue(i).As(Map).Get("id")}'"$) +' Log(p1.RowCount) + If p1.RowCount > 0 Then + p1.Position = 0 + prioridad = p1.GetInt("CAT_GP_TIPOPROD2") +' Log(prioridad) + End If + If prioridad = 3 Then p_prods.Color= Colors.RGB(239, 213, 213) et_pCant.TextColor=Colors.Red ' Log("VENDIDO ") b_prodMenos.Tag = "vendido" diff --git a/B4A/KelloggsV4.b4a b/B4A/KelloggsV4.b4a index 4f2c3ab..ec4e55c 100644 --- a/B4A/KelloggsV4.b4a +++ b/B4A/KelloggsV4.b4a @@ -869,7 +869,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Kelloggs Venta #VersionCode: 3000 - #VersionName: 4.05.02 + #VersionName: 4.05.04 #SupportedOrientations: portrait #CanInstallToExternalStorage: False #BridgeLogger:true diff --git a/B4A/KelloggsV4.b4a.meta b/B4A/KelloggsV4.b4a.meta index 3644c4e..3541f31 100644 --- a/B4A/KelloggsV4.b4a.meta +++ b/B4A/KelloggsV4.b4a.meta @@ -88,6 +88,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Nota,B4XPage_Appear,102,1,Subs,actualizaProducto,955,6,C_Principal,B_PROXIMA_Click,2563,6,kms_helperSubs,clienteConDOE,898,0,C_Cliente,B4XPage_Created,348,3,C_Nota,B4XPage_Created,74,0,C_Cliente,B_IMP_Click,1085,0,C_Cliente,B4XPage_Appear,401,1,kms_helperSubs,traeDisponibleAbordo,796,0,C_Cliente,B_IMP2_Click,1087,6,Main,Process_Globals,22,0 +NavigationStack=kms_helperSubs,etiquetaCentrada,574,0,Main,Process_Globals,22,0,Visual Designer,cliente.bal,-100,1,Visual Designer,pedidoItem.bal,-100,1,C_Productos,LlenaProdsLL,1315,3,C_Productos,clv_prods_ll_VisibleRangeChanged,1170,6,C_Productos,cuentaProds,809,6,C_Productos,et_pCant_TextChanged,755,0,C_Productos,b_prodMas_Click,670,6,Subs,actualizaProducto,960,0 SelectedBuild=0 VisibleModules=1,27,11,3,12,4,28,17,23,29,7