From 98cab1dd78b1d309a93a57c1bdaa5dd1e6c4e1df Mon Sep 17 00:00:00 2001
From: "DESKTOP-GPE37UV\\THINKAPD" <tw919@qq.com>
Date: Thu, 24 Nov 2022 13:34:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9TrayRobot=E5=92=8CWaferRobot?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=90=8D=E7=A7=B0=EF=BC=8C=E4=BD=BF=E5=85=B6?=
 =?UTF-8?q?=E6=9B=B4=E7=AE=80=E7=9F=AD=E3=80=82=20=E4=BF=AE=E6=94=B9AutoTr?=
 =?UTF-8?q?ansfer=E4=B8=AD=E5=A6=82=E6=9E=9CBuffer=E4=B8=AD=E6=9C=89?=
 =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E4=BB=A5=E4=B8=8AProcessCount=E4=B8=BA0?=
 =?UTF-8?q?=E7=9A=84Tray=E6=97=B6=EF=BC=8C=E7=AC=AC=E4=B8=80=E4=B8=AATray?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5Load=E5=90=8E=EF=BC=8C=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=90=8E=E7=BB=AD=E5=8A=A8=E4=BD=9C=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UIClient/Themes/SeaBlue/TextBox.xaml      |  3 ++-
 Modules/Mainframe/EFEMs/TrayRobotModule.cs    | 24 +++++++++----------
 Modules/Mainframe/EFEMs/WaferRobotModule.cs   | 24 +++++++++----------
 SicRT/Equipments/AutoTransfer.cs              |  5 ++++
 4 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/FrameworkLocal/UIClient/Themes/SeaBlue/TextBox.xaml b/FrameworkLocal/UIClient/Themes/SeaBlue/TextBox.xaml
index 4d3318a..7cc23d9 100644
--- a/FrameworkLocal/UIClient/Themes/SeaBlue/TextBox.xaml
+++ b/FrameworkLocal/UIClient/Themes/SeaBlue/TextBox.xaml
@@ -192,7 +192,7 @@
     <Style x:Key="TextBox_Top" TargetType="{x:Type TextBox}">
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="FontFamily" Value="Arial" />
-        <Setter Property="FontSize" Value="12" />
+        <Setter Property="FontSize" Value="11" />
         <Setter Property="Margin" Value="0,2,2,2" />
         <Setter Property="BorderThickness" Value="0,1,1,1" />
         <Setter Property="Background" Value="{DynamicResource TextBox_Top_BG}" />
@@ -201,6 +201,7 @@
         <Setter Property="Border.CornerRadius" Value="0,6,6,0" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Stretch" />
+        <Setter Property="IsReadOnly" Value="True" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
         <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
diff --git a/Modules/Mainframe/EFEMs/TrayRobotModule.cs b/Modules/Mainframe/EFEMs/TrayRobotModule.cs
index bdf142b..63a62bd 100644
--- a/Modules/Mainframe/EFEMs/TrayRobotModule.cs
+++ b/Modules/Mainframe/EFEMs/TrayRobotModule.cs
@@ -24,9 +24,9 @@ namespace Mainframe.EFEMs
             Error,
 
             RobotHoming,
-            TrayRobotPick, 
-            TrayRobotPlace,
-            TrayRobotMap,
+            Picking, 
+            Placing,
+            Mapping,
         }
 
         public enum MSG
@@ -171,18 +171,18 @@ namespace Mainframe.EFEMs
             Transition(STATE.RobotHoming, FSM_MSG.TIMER, FsmMonitorTask, STATE.Idle);
             Transition(STATE.RobotHoming, MSG.Abort, FsmAbortTask, STATE.Idle);
 
-            Transition(STATE.Idle, MSG.TrayRobotMap, FsmStartTrayRobotMap, STATE.TrayRobotMap);
-            Transition(STATE.TrayRobotMap, FSM_MSG.TIMER, FsmMonitorTask, STATE.Idle);
-            Transition(STATE.TrayRobotMap, MSG.Abort, FsmAbortTask, STATE.Idle);
+            Transition(STATE.Idle, MSG.TrayRobotMap, FsmStartTrayRobotMap, STATE.Mapping);
+            Transition(STATE.Mapping, FSM_MSG.TIMER, FsmMonitorTask, STATE.Idle);
+            Transition(STATE.Mapping, MSG.Abort, FsmAbortTask, STATE.Idle);
 
 
-            Transition(STATE.Idle, MSG.TrayRobotPick, FsmStartTrayRobotPick, STATE.TrayRobotPick);
-            Transition(STATE.TrayRobotPick, FSM_MSG.TIMER, FsmMonitorTask, STATE.Idle);
-            Transition(STATE.TrayRobotPick, MSG.Abort, FsmAbortTask, STATE.Idle);
+            Transition(STATE.Idle, MSG.TrayRobotPick, FsmStartTrayRobotPick, STATE.Picking);
+            Transition(STATE.Picking, FSM_MSG.TIMER, FsmMonitorTask, STATE.Idle);
+            Transition(STATE.Picking, MSG.Abort, FsmAbortTask, STATE.Idle);
 
-            Transition(STATE.Idle, MSG.TrayRobotPlace, FsmStartTrayRobotPlace, STATE.TrayRobotPlace);
-            Transition(STATE.TrayRobotPlace, FSM_MSG.TIMER, FsmMonitorTask, STATE.Idle);
-            Transition(STATE.TrayRobotPlace, MSG.Abort, FsmAbortTask, STATE.Idle);
+            Transition(STATE.Idle, MSG.TrayRobotPlace, FsmStartTrayRobotPlace, STATE.Placing);
+            Transition(STATE.Placing, FSM_MSG.TIMER, FsmMonitorTask, STATE.Idle);
+            Transition(STATE.Placing, MSG.Abort, FsmAbortTask, STATE.Idle);
 
 
 
diff --git a/Modules/Mainframe/EFEMs/WaferRobotModule.cs b/Modules/Mainframe/EFEMs/WaferRobotModule.cs
index 9596b35..8afafa0 100644
--- a/Modules/Mainframe/EFEMs/WaferRobotModule.cs
+++ b/Modules/Mainframe/EFEMs/WaferRobotModule.cs
@@ -22,9 +22,9 @@ namespace Mainframe.EFEMs
             Homing,
             Error,
 
-            WaferRobotPick, 
-            WaferRobotPlace,
-            WaferRobotMap,
+            Picking, 
+            Placing,
+            Mapping,
             RobotHoming,
         }
 
@@ -164,17 +164,17 @@ namespace Mainframe.EFEMs
             Transition(STATE.Idle, MSG.SetOffline, FsmStartSetOffline, STATE.Idle);
 
 
-            Transition(STATE.Idle, MSG.WaferRobotMap, FsmStartWaferRobotMap, STATE.WaferRobotMap);
-            Transition(STATE.WaferRobotMap, FSM_MSG.TIMER, FsmMonitorTask, STATE.Idle);
-            Transition(STATE.WaferRobotMap, MSG.Abort, FsmAbortTask, STATE.Idle);
+            Transition(STATE.Idle, MSG.WaferRobotMap, FsmStartWaferRobotMap, STATE.Mapping);
+            Transition(STATE.Mapping, FSM_MSG.TIMER, FsmMonitorTask, STATE.Idle);
+            Transition(STATE.Mapping, MSG.Abort, FsmAbortTask, STATE.Idle);
 
-            Transition(STATE.Idle, MSG.WaferRobotPick, FsmStartWaferRobotPick, STATE.WaferRobotPick);
-            Transition(STATE.WaferRobotPick, FSM_MSG.TIMER, FsmMonitorTask, STATE.Idle);
-            Transition(STATE.WaferRobotPick, MSG.Abort, FsmAbortTask, STATE.Idle);
+            Transition(STATE.Idle, MSG.WaferRobotPick, FsmStartWaferRobotPick, STATE.Picking);
+            Transition(STATE.Picking, FSM_MSG.TIMER, FsmMonitorTask, STATE.Idle);
+            Transition(STATE.Picking, MSG.Abort, FsmAbortTask, STATE.Idle);
 
-            Transition(STATE.Idle, MSG.WaferRobotPlace, FsmStartWaferRobotPlace, STATE.WaferRobotPlace);
-            Transition(STATE.WaferRobotPlace, FSM_MSG.TIMER, FsmMonitorTask, STATE.Idle);
-            Transition(STATE.WaferRobotPlace, MSG.Abort, FsmAbortTask, STATE.Idle);
+            Transition(STATE.Idle, MSG.WaferRobotPlace, FsmStartWaferRobotPlace, STATE.Placing);
+            Transition(STATE.Placing, FSM_MSG.TIMER, FsmMonitorTask, STATE.Idle);
+            Transition(STATE.Placing, MSG.Abort, FsmAbortTask, STATE.Idle);
 
             Transition(STATE.Idle, MSG.RobotHome, FsmStartRobotHome, STATE.RobotHoming);
             Transition(STATE.RobotHoming, FSM_MSG.TIMER, FsmMonitorTask, STATE.Idle);
diff --git a/SicRT/Equipments/AutoTransfer.cs b/SicRT/Equipments/AutoTransfer.cs
index aa4a3e8..2fa0daf 100644
--- a/SicRT/Equipments/AutoTransfer.cs
+++ b/SicRT/Equipments/AutoTransfer.cs
@@ -1697,6 +1697,11 @@ namespace SicRT.Modules
                         return;
                 }
             }
+            else if (_load.HasTrayAndExceedProcessCount(0))
+            {
+                if (!_load.IsReadyForPick(ModuleName.TrayRobot, 0) && !_unload.IsInPumping)
+                    _load.PrepareTransfer(ModuleName.TrayRobot, EnumTransferType.Pick, 0);
+            }
             else if ((_tmRobot.NoWafer(0) && _tmRobot.HasTrayAndExceedProcessCount(0))
                     || (_buffer.NoWafer(0) && _buffer.HasTrayAndExceedProcessCount(0))
                     || (_buffer.NoWafer(1) && _buffer.HasTrayAndExceedProcessCount(1))