Merge branch 'master' of https://gitee.com/ericxinstar/jywcs

src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs

@@ -3992,10 +3992,7 @@ namespace Khd.Core.Wpf.Form
                         var messageBoxResult = HandyControl.Controls.MessageBox.Show($"已创建{addList.Count}个料箱的任务，是否需要创建出空箱的任务？", "提示", MessageBoxButton.YesNo, MessageBoxImage.Question);
                         if (messageBoxResult == MessageBoxResult.Yes)
                         {
-                          
-
-                         
-
+     
 
                             EmptyCountForm emptyCountForm = new(1, 6 - addList.Count);
                             emptyCountForm.ShowDialog();
@@ -5828,8 +5825,28 @@ namespace Khd.Core.Wpf.Form
                             }
                             else
                             {
-                               
-                                Grid.SetRow(button, -(location.locRow.Value - row.Value));
+
+                                #region 五楼4、5行颠倒
+                                if (location.warehouseId == 511)
+                                {
+                                    int locRow = location.locRow.Value;
+                                    if (locRow == 1)
+                                    {
+                                        locRow = 2;
+                                    }
+                                    else if (locRow == 2)
+                                    {
+                                        locRow = 1;
+                                    }
+                                    Grid.SetRow(button, -(locRow - row.Value));
+                                }
+                                else
+                                {
+                                    Grid.SetRow(button, -(location.locRow.Value - row.Value));
+                                }
+                                //  Grid.SetRow(button, -(location.locRow.Value - row.Value));
+                                #endregion
+
                                 if (list[0] == 311)
                                 {
                                     for (var k = 0; k < 3; k++)