From 82ecdb65c4b7fe6c8d3ff557c8ea155c8020e74e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=AF=E9=BE=99=20=E6=9B=B9?= <1805857645@QQ.com>
Date: Mon, 6 Jan 2025 16:58:37 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=E8=B0=83=E6=8D=A2=E8=BE=85=E6=96=99?=
 =?UTF-8?q?=E5=BA=93=E7=AB=8B=E5=BA=93=E5=8D=97=E5=8C=97=E4=BE=A7=EF=BC=8C?=
 =?UTF-8?q?=E5=BA=93=E4=BD=8D=E6=98=BE=E7=A4=BA=E4=B8=8E=E7=8E=B0=E5=9C=BA?=
 =?UTF-8?q?=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4=EF=BC=8C=E5=B1=82=E6=95=B0?=
 =?UTF-8?q?=E4=BB=8E=E4=B8=8B=E5=BE=80=E4=B8=8A=E9=80=92=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Khd.Core.Wpf/Form/FormBoardT.xaml    | 4 ++--
 src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

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 @@
                                             <StackPanel Orientation="Horizontal">
                                                 <TextBlock Text="仓库位置:" FontSize="25" VerticalAlignment="Center" Foreground="White" />
                                                 <ComboBox x:Name="QueryPositionCombox"  Height="50" Width="150" FontSize="25" SelectionChanged="QueryPositionCombox_SelectionChanged">
-                                                    <ComboBoxItem Content="南侧" Tag="1" />
-                                                    <ComboBoxItem Content="北侧" Tag="2" />
+                                                    <ComboBoxItem Content="北侧" Tag="1" />
+                                                    <ComboBoxItem Content="南侧" Tag="2" />
                                                 </ComboBox>
 
                                                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="600 0 0 0">
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<SelectItemModel> 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
 
        
         /// <summary>
-        /// 3楼向其他楼层输出托盘流程时，AGV把托盘放置到接驳位后，在调度界面增加“托盘入轿厢等待确认”提示信息
+        /// 3楼向其他楼层输出托盘流程时，AGV把托盘放置到接驳位后，在调度界面增加"托盘入轿厢等待确认"提示信息
         /// 计算任务等待时长
         ///
         /// </summary>
@@ -506,7 +506,9 @@ namespace Khd.Core.Wpf.Form
                 var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
                 // 该侧所有库位
                 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();
                 //在库里有库存的库位