diff --git a/SicRT/Equipments/AutoTransfer.cs b/SicRT/Equipments/AutoTransfer.cs
index 3f8530ad..ec030f36 100644
--- a/SicRT/Equipments/AutoTransfer.cs
+++ b/SicRT/Equipments/AutoTransfer.cs
@@ -2356,7 +2356,9 @@ namespace SicRT.Modules
                       && _load.IsReadyForPlace(ModuleName.TMRobot, 0)
                       && _load.NoTray(0)
                       && _load.HasWafer(0)
-                      && _load.CheckWaferNeedProcess(0, ModuleName.PM1);
+                      && _load.CheckWaferNeedProcess(0, ModuleName.PM1)
+                      && _buffer.HasTrayAndNotExceedProcessCount(0)
+                      && _buffer.NoWafer(0);
             if (canPick)
             {
                 if (_buffer.IsReadyForPick(ModuleName.TMRobot, 0))
@@ -2410,7 +2412,7 @@ namespace SicRT.Modules
 
             //第二种情况：工艺开始时,如果Buffer中有Tray时,优先取Buffer中的Tray,而不是Cassette中Tray
             canPick = _tmRobot.NoTray(0)
-                      && _buffer.HasTray(1)
+                      && _buffer.HasTrayAndNotExceedProcessCount(1)
                       && _buffer.NoWafer(1)
                       && _load.IsAvailable
                       && _load.IsReadyForPlace(ModuleName.TMRobot, 0)
diff --git a/SicRT/ReleaseNotes.md b/SicRT/ReleaseNotes.md
index b451956c..15fba63f 100644
--- a/SicRT/ReleaseNotes.md
+++ b/SicRT/ReleaseNotes.md
@@ -3,6 +3,14 @@
 Auto-GE 自动通用版（适用有EFEM设备）
 
 ----
+## Version 1.1.4.14
+**2024-01-05**
+
+- Bug修复
+	- 修改TMRobot Pick Buffer1层条件判断的BUG
+
+- 新特性
+	- ReturnAll里Unload冷却时间定为300s
 
 ## Version 1.1.4.13
 **2023-12-28**
diff --git a/SicUI/Properties/AssemblyInfo.cs b/SicUI/Properties/AssemblyInfo.cs
index 93a05620..ce45c0f2 100644
--- a/SicUI/Properties/AssemblyInfo.cs
+++ b/SicUI/Properties/AssemblyInfo.cs
@@ -54,5 +54,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.1.4.13")]
+[assembly: AssemblyVersion("1.1.4.14")]
 [assembly: AssemblyInformationalVersion("自动通用版（有EFEM）")]