diff --git a/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs b/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs
index cecc470..d34c110 100644
--- a/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs
+++ b/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs
@@ -340,6 +340,7 @@ namespace Rs.MotionPlat.Flow
                                             //Stock2Flow.Instance.PrepareTray();
                                             StockManager.PrepareTray(2);
                                             TakeTrayFlow.Instance.Take(ETrayType.Input, ETrayType.Empty);
+                                            takeSlotIndex = 1;
                                         }
                                         else if (btn == EButtonType.EndInput)
                                         {
diff --git a/Rs.DeweyTester/Flow/NormalFlow/TakeTrayFlow.cs b/Rs.DeweyTester/Flow/NormalFlow/TakeTrayFlow.cs
index a76c36e..ab65d4b 100644
--- a/Rs.DeweyTester/Flow/NormalFlow/TakeTrayFlow.cs
+++ b/Rs.DeweyTester/Flow/NormalFlow/TakeTrayFlow.cs
@@ -276,7 +276,14 @@ namespace Rs.MotionPlat.Flow
                         {
                             logInfo = GetClassName() + $"料盘已被抓起 OK";
                             MessageQueue.Instance.Insert(logInfo);
-                            step = ETakeTrayFlowStep.上升一层;
+                            if ( StockManager.GetCurrentLayer(fromStockIndex) == 1)
+                            {
+                                step = ETakeTrayFlowStep.到放料盘上方;
+                            }
+                            else
+                            {
+                                step = ETakeTrayFlowStep.上升一层;
+                            }
                         }
                         else
                         {
diff --git a/Rs.DeweyTester/Properties/AssemblyInfo.cs b/Rs.DeweyTester/Properties/AssemblyInfo.cs
index 7490d05..f142c28 100644
--- a/Rs.DeweyTester/Properties/AssemblyInfo.cs
+++ b/Rs.DeweyTester/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
 //
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
- [assembly: AssemblyVersion("20.25.22.1")]
+ [assembly: AssemblyVersion("20.25.23.2")]
 //[assembly: AssemblyVersion("1.0.0.0")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]