diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
index 92c3c8d..a92ed44 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
@@ -1021,7 +1021,7 @@
-
+
-
+
@@ -1344,7 +1344,7 @@
-
+
@@ -1353,6 +1353,19 @@
+
+
+
+
+
+
+
+
diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
index a32e66a..31b5158 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
@@ -39,6 +39,7 @@ using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Media3D;
+using System.Windows.Shapes;
using System.Windows.Threading;
using Z.EntityFramework.Plus;
using static HandyControl.Tools.Interop.InteropValues;
@@ -5534,49 +5535,10 @@ namespace Khd.Core.Wpf.Form
private void Refulsh_Click(object sender, RoutedEventArgs e)
{
- UpdateLocations(GetLocations());
- }
-
- private void UpdateLocations(List wmsBaseLocations)
- {
- try
- {
- using var scope = _host.Services.CreateScope();
- using var dbContext = scope.ServiceProvider.GetRequiredService();
- var baseEquips = dbContext.BaseEquip.Where(t => t.equipType == 20).OrderBy(t => t.agvPositionCode).ToList();
- foreach (var item in this.LocaltionGrid.Children)
- {
- if (item is Grid grid)
- {
- foreach (var btn in grid.Children)
- {
- if (btn is Button button)
- {
- var location = wmsBaseLocations.Where(t => t.locationCode == button.Name.Replace("Location", "")).FirstOrDefault();
- if (location != null)
- {
- button.Background = string.IsNullOrEmpty(location.containerCode) ? new SolidColorBrush((Color)ColorConverter.ConvertFromString("#4789AE")) : new SolidColorBrush((Color)ColorConverter.ConvertFromString("#75F76D"));
- }
- else
- {
- BaseEquip? baseEquip = baseEquips.Where(t => t.agvPositionCode == button.Name).FirstOrDefault();
- if (baseEquip != null)
- {
- button.Content = baseEquip.agvPositionCode + $"({baseEquip.emptyCount})";
- button.Background = baseEquip.emptyCount > 0 ? new SolidColorBrush((Color)ColorConverter.ConvertFromString("#75F76D")) : new SolidColorBrush((Color)ColorConverter.ConvertFromString("#4789AE"));
- }
- }
- }
- }
- }
- }
- }
- catch
- {
-
- }
+ DrawLocaitons();
}
+
private List GetLocations()
{
try
@@ -5673,8 +5635,36 @@ namespace Khd.Core.Wpf.Form
Tag = location.locationId,
Background = string.IsNullOrEmpty(location.containerCode) ? new SolidColorBrush((Color)ColorConverter.ConvertFromString("#4789AE")) : new SolidColorBrush((Color)ColorConverter.ConvertFromString("#75F76D"))
};
+
+ // 添加小红点逻辑
+ if (location.locationStatus != "1")
+ {
+ var redDot = new Ellipse()
+ {
+ Width = 7,
+ Height = 7,
+ Fill = Brushes.Red,
+ VerticalAlignment = VerticalAlignment.Top,
+ HorizontalAlignment = HorizontalAlignment.Right,
+ Margin = new Thickness(0, -5, 0, 2) // 调整位置使其在右上角
+ };
+ button.Content = new Grid()
+ {
+ Children =
+ {
+ new TextBlock() { Text = location.locationCode },
+ redDot
+ }
+ };
+ }
+
+
+
button.Click += OnLocationButton_Click;
Grid.SetColumn(button, location.locColumn.Value - 1);
+
+
+
if (list[0] == 231)
{
Grid.SetRow(button, -(location.locRow.Value - row.Value) + 2);
@@ -5698,6 +5688,7 @@ namespace Khd.Core.Wpf.Form
}
else
{
+
Grid.SetRow(button, -(location.locRow.Value - row.Value));
if (list[0] == 311)
{
diff --git a/src/Khd.Core.Wpf/WindowPage/StockWindow.xaml b/src/Khd.Core.Wpf/WindowPage/StockWindow.xaml
index e3243ce..f182630 100644
--- a/src/Khd.Core.Wpf/WindowPage/StockWindow.xaml
+++ b/src/Khd.Core.Wpf/WindowPage/StockWindow.xaml
@@ -29,26 +29,55 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
();
+ var record = dbContext.WmsBaseLocation.Where(x => x.locationId == LocationId).First();
+ record.locationStatus = "3";
+ dbContext.WmsBaseLocation.Update(record);
+ dbContext.SaveChanges();
+ Init(LocationId);
+ }
+
+ private void UnLockLocation_Click(object sender, RoutedEventArgs e)
+ {
+ using var scope = host.Services.CreateScope();
+ var dbContext = scope.ServiceProvider.GetRequiredService();
+ var record = dbContext.WmsBaseLocation.Where(x => x.locationId == LocationId).First();
+ record.locationStatus = "1";
+ dbContext.WmsBaseLocation.Update(record);
+ dbContext.SaveChanges();
+ Init(LocationId);
+ }
}
}
diff --git a/src/Khd.Core.Wpf/appsettings.json b/src/Khd.Core.Wpf/appsettings.json
index e47318c..be89e91 100644
--- a/src/Khd.Core.Wpf/appsettings.json
+++ b/src/Khd.Core.Wpf/appsettings.json
@@ -52,7 +52,7 @@
},
"MenuList": [
"任务管理",
- "库存信息",
+ // "库存信息",
"辅料库位",
"库位状态",
"人工叫料",