diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml b/src/Khd.Core.Wpf/Form/FormBoardT.xaml index 022dff2..59b145d 100644 --- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml +++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml @@ -1289,8 +1289,8 @@ - - + + diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs index 1c83533..256d042 100644 --- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs +++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs @@ -81,7 +81,7 @@ namespace Khd.Core.Wpf.Form private ObservableCollection itemsControlItems; //消息提示弹窗 private MessageBoxWindow messageBoxWindow ; - //3楼向其他楼层输出托盘流程时,AGV把托盘放置到接驳位后,在调度界面增加“托盘入轿厢等待确认”提示信息 + //3楼向其他楼层输出托盘流程时,AGV把托盘放置到接驳位后,在调度界面增加"托盘入轿厢等待确认"提示信息 int systemRunTimerCount = 0; System.Timers.Timer systemRunTimer = new System.Timers.Timer(1000 * 60); @@ -143,7 +143,7 @@ namespace Khd.Core.Wpf.Form /// - /// 3楼向其他楼层输出托盘流程时,AGV把托盘放置到接驳位后,在调度界面增加“托盘入轿厢等待确认”提示信息 + /// 3楼向其他楼层输出托盘流程时,AGV把托盘放置到接驳位后,在调度界面增加"托盘入轿厢等待确认"提示信息 /// 计算任务等待时长 /// /// @@ -506,7 +506,9 @@ namespace Khd.Core.Wpf.Form var dbContext = scope.ServiceProvider.GetRequiredService(); // 该侧所有库位 var allLocationLists = dbContext.WmsBaseLocation.Where(x => x.warehouseId == 512 && x.locRow == rowPosition).ToList(); - allLocationLists = allLocationLists.OrderBy(x => x.layerNum).ThenBy(x => x.locColumn).ToList(); + // 修改排序逻辑 - 按层号降序排列,然后按列号升序排列 + allLocationLists = allLocationLists.OrderByDescending(x => x.layerNum).ThenBy(x => x.locColumn).ToList(); + //在库里的库位 var inLocationList = allLocationLists.Where(x => x.ContainerStatus == "1").Select(x => x.locationCode).ToList(); //在库里有库存的库位