From 7bb3fd91a51c09762c7aa9986e5ec9c0cde854c4 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GPE37UV\\THINKAPD" <tw919@qq.com>
Date: Tue, 14 Mar 2023 16:12:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=89=E8=89=B2=E7=81=AF?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=82=20=E4=BF=AE=E6=AD=A3TMBaseRoutine=E4=B8=ADSetRobortEx?=
 =?UTF-8?q?tendToDO()=E5=87=BD=E6=95=B0=E5=87=BA=E9=94=99=E6=97=B6?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=8A=A5Alarm=EF=BC=8C=E8=80=8C=E6=98=AF?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=BAInfo=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UICore/DeviceControl/AITSignalTower.xaml         | 10 +++++-----
 FrameworkLocal/UICore/UICore.csproj                  |  2 +-
 Modules/Mainframe/TMs/TMBaseRoutine.cs               | 12 ++++++------
 Modules/Mainframe/TMs/TMRobotPickRoutine.cs          |  2 +-
 Modules/Mainframe/TMs/TMRobotPlaceRoutine.cs         |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/FrameworkLocal/UICore/DeviceControl/AITSignalTower.xaml b/FrameworkLocal/UICore/DeviceControl/AITSignalTower.xaml
index 7c83c2eb..6398c01a 100644
--- a/FrameworkLocal/UICore/DeviceControl/AITSignalTower.xaml
+++ b/FrameworkLocal/UICore/DeviceControl/AITSignalTower.xaml
@@ -24,7 +24,7 @@
             Width="30"
             Height="20"
             VerticalAlignment="Top"
-            Source="pack://application:,,,/MECF.Framework.Common;component/Resources/red.png"
+            Source="pack://application:,,,/MECF.Framework.UI.Core;component/Resources/red.png"
             Stretch="Fill">
             <Image.Effect>
                 <DropShadowEffect
@@ -45,7 +45,7 @@
             Height="20"
             VerticalAlignment="Bottom"
             PreviewMouseDown="rectangle2_PreviewMouseDown"
-            Source="pack://application:,,,/MECF.Framework.Common;component/Resources/yellow.png"
+            Source="pack://application:,,,/MECF.Framework.UI.Core;component/Resources/yellow.png"
             Stretch="Fill">
             <Image.Effect>
                 <DropShadowEffect
@@ -65,7 +65,7 @@
             Canvas.Left="0"
             Canvas.Top="0"
             Width="30"
-            Source="pack://application:,,,/MECF.Framework.Common;component/Resources/Lime.png"
+            Source="pack://application:,,,/MECF.Framework.UI.Core;component/Resources/Lime.png"
             Stretch="Fill">
             <Image.Effect>
                 <DropShadowEffect
@@ -86,7 +86,7 @@
             Canvas.Top="0"
             Width="30"
             Height="20"
-            Source="pack://application:,,,/MECF.Framework.Common;component/Resources/Blue.png"
+            Source="pack://application:,,,/MECF.Framework.UI.Core;component/Resources/Blue.png"
             Stretch="Fill"
             Visibility="Hidden">
             <Image.Effect>
@@ -108,7 +108,7 @@
             Canvas.Top="0"
             Width="30"
             Height="30"
-            Source="pack://application:,,,/MECF.Framework.Common;component/Resources/lights.png"
+            Source="pack://application:,,,/MECF.Framework.UI.Core;component/Resources/lights.png"
             Stretch="Fill">
             <Image.Effect>
                 <DropShadowEffect
diff --git a/FrameworkLocal/UICore/UICore.csproj b/FrameworkLocal/UICore/UICore.csproj
index 0964c5c2..d06f4d3b 100644
--- a/FrameworkLocal/UICore/UICore.csproj
+++ b/FrameworkLocal/UICore/UICore.csproj
@@ -1214,7 +1214,7 @@
     <Resource Include="Resources\HeaterShining.png" />
     <Resource Include="Resources\lights.png" />
     <Resource Include="Resources\Lime.png" />
-    <Content Include="Resources\default_ui.ico" />
+    <Resource Include="Resources\default_ui.ico" />
     <Resource Include="Resources\Loading1.gif" />
     <Resource Include="Resources\Login\按钮.png" />
     <Resource Include="Resources\Login\按钮_悬停.png" />
diff --git a/Modules/Mainframe/TMs/TMBaseRoutine.cs b/Modules/Mainframe/TMs/TMBaseRoutine.cs
index c32d7359..f0af5f60 100644
--- a/Modules/Mainframe/TMs/TMBaseRoutine.cs
+++ b/Modules/Mainframe/TMs/TMBaseRoutine.cs
@@ -217,7 +217,7 @@ namespace Mainframe.TMs
         /// 发送DO信号
         /// </summary>
         /// <param name="id"></param>
-        protected void SetRobortExtendToDO(int id, ModuleName target, int timeout)
+        protected void SetRobotExtendToDO(int id, ModuleName target, int timeout)
         {
             Tuple<bool, Result> ret = ExecuteAndWait(id, () =>
             {
@@ -234,7 +234,7 @@ namespace Mainframe.TMs
                 {
                     if (!_tmIoInterLock.SetRobotExtenLLEnable(true, out string reasen))
                     {
-                        Notify(reasen);
+                        Stop(reasen);
                         return false;
                     }
                 }
@@ -242,7 +242,7 @@ namespace Mainframe.TMs
                 {
                     if (!_tmIoInterLock.SetRobotExtendUnLoadEnable(true, out string reasen))
                     {
-                        Notify(reasen);
+                        Stop(reasen);
                         return false;
                     }
                 }
@@ -250,7 +250,7 @@ namespace Mainframe.TMs
                 {
                     if (!_tmIoInterLock.SetRobotExtendBufferEnable(true, out string reasen))
                     {
-                        Notify(reasen);
+                        Stop(reasen);
                         return false;
                     }
                 }
@@ -258,7 +258,7 @@ namespace Mainframe.TMs
                 {
                     if (!_tmIoInterLock.SetRobotExtendPMAEnable(true, out string reasen))
                     {
-                        Notify(reasen);
+                        Stop(reasen);
                         return false;
                     }
 
@@ -267,7 +267,7 @@ namespace Mainframe.TMs
                 {
                     if (!_tmIoInterLock.SetRobotExtendPMBEnable(true, out string reasen))
                     {
-                        Notify(reasen);
+                        Stop(reasen);
                         return false;
                     }
 
diff --git a/Modules/Mainframe/TMs/TMRobotPickRoutine.cs b/Modules/Mainframe/TMs/TMRobotPickRoutine.cs
index c3c80f04..906907fc 100644
--- a/Modules/Mainframe/TMs/TMRobotPickRoutine.cs
+++ b/Modules/Mainframe/TMs/TMRobotPickRoutine.cs
@@ -262,7 +262,7 @@ namespace Mainframe.TMs
                 RobotRequestWaferPresent((int)RoutineStep.BeforePickRequestWaferPresent, RobotDevice, _blade, _pickTimeout);
                 CheckWaferInfoByRobotRQ((int)RoutineStep.AfterPickCheckWaferInfoByRobotSensor, RobotDevice, _blade, 1000);
                 WaitPMReadySensor((int)RoutineStep.WaitPMSensor, _target,5);
-                SetRobortExtendToDO((int)RoutineStep.SetRobortExtendToDo, _target, 2);
+                SetRobotExtendToDO((int)RoutineStep.SetRobortExtendToDo, _target, 2);
                 CheckRobotReady((int)RoutineStep.CheckRobotReady, RobotDevice, _pickTimeout);
                 Pick((int)RoutineStep.Pick, RobotDevice, _target, _targetSlot, _blade, _pickTimeout);
                 IsPicking = false;
diff --git a/Modules/Mainframe/TMs/TMRobotPlaceRoutine.cs b/Modules/Mainframe/TMs/TMRobotPlaceRoutine.cs
index caeb4521..1e4a252a 100644
--- a/Modules/Mainframe/TMs/TMRobotPlaceRoutine.cs
+++ b/Modules/Mainframe/TMs/TMRobotPlaceRoutine.cs
@@ -250,7 +250,7 @@ namespace Mainframe.TMs
                 CheckWaferInfoByRobotRQ((int)RoutineStep.BeforePlaceCheckWaferInfoByRobotSensor, RobotDevice, _blade, 10);
 
                 WaitPMReadySensor((int)RoutineStep.WaitPMSensor, _target, 5);
-                SetRobortExtendToDO((int)RoutineStep.SetRobortExtendToDo, _target, 2);
+                SetRobotExtendToDO((int)RoutineStep.SetRobortExtendToDo, _target, 2);
 
                 CheckRobotReady((int)RoutineStep.CheckRobotReady, RobotDevice, _placeTimeout);
                 Place((int)RoutineStep.Place, RobotDevice, _target, _targetSlot, _blade, _placeTimeout);