From 9e9692d63b95d3ce5d917b3fa74dad8ec4a4e008 Mon Sep 17 00:00:00 2001
From: HCL <1625932291@qq.com>
Date: Fri, 17 May 2024 11:08:51 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0Gem=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SicRT/Config/Menu.xml                         |  1 +
 SicUI/MainViewModel.cs                        |  3 ++
 SicUI/Models/Maintenances/TM/TMViewModel.cs   |  3 ++
 .../Operations/Overviews/OverViewViewModel.cs | 38 +++++++++++++++++++
 SicUI/Models/PMs/PMOperationViewModel.cs      |  3 ++
 5 files changed, 48 insertions(+)

diff --git a/SicRT/Config/Menu.xml b/SicRT/Config/Menu.xml
index fc660ec..fc61ff7 100644
--- a/SicRT/Config/Menu.xml
+++ b/SicRT/Config/Menu.xml
@@ -3,6 +3,7 @@
 	<menuItem id="Operation" resKey="Operation">
 		<menuItem id="Overview" resKey="Overview" viewmodel="SicUI.Models.Operations.Overviews.OverViewViewModel,SicUI" />
 		<menuItem id="Coating" resKey="Coating" viewmodel="MECF.Framework.UI.Client.TrayThickness.HistoryData.HistoryDataViewModel,MECF.Framework.UI.Client" />
+    <menuItem id="Gem" resKey="Gem" viewmodel="SicUI.Models.Operations.Gem.GemViewModel,SicUI" />
 	</menuItem>
 
 	<menuItem id="Platform" resKey="Platform">
diff --git a/SicUI/MainViewModel.cs b/SicUI/MainViewModel.cs
index 6c5f827..1983b60 100644
--- a/SicUI/MainViewModel.cs
+++ b/SicUI/MainViewModel.cs
@@ -494,6 +494,9 @@ namespace SicUI.Client
         public void Reset()
         {
             InvokeClient.Instance.Service.DoOperation("System.Reset");
+
+            //清除GEM报警
+            InvokeClient.Instance.Service.DoOperation("GEM_ClearAllAlarm");
         }
 
         public void BuzzerOff()
diff --git a/SicUI/Models/Maintenances/TM/TMViewModel.cs b/SicUI/Models/Maintenances/TM/TMViewModel.cs
index ba3dcb0..5683565 100644
--- a/SicUI/Models/Maintenances/TM/TMViewModel.cs
+++ b/SicUI/Models/Maintenances/TM/TMViewModel.cs
@@ -942,6 +942,9 @@ namespace SicUI.Client.Models.Platform.TM
             {
                 TMProvider.Instance.Reset(module);
             }
+
+            //清除GEM报警
+            InvokeClient.Instance.Service.DoOperation("GEM_ClearModuleAlarm", module);
         }
         public void Home(string module)
         {
diff --git a/SicUI/Models/Operations/Overviews/OverViewViewModel.cs b/SicUI/Models/Operations/Overviews/OverViewViewModel.cs
index 280cb3d..475ba99 100644
--- a/SicUI/Models/Operations/Overviews/OverViewViewModel.cs
+++ b/SicUI/Models/Operations/Overviews/OverViewViewModel.cs
@@ -532,6 +532,44 @@ namespace SicUI.Models.Operations.Overviews
         [Subscription("UnLoad.IsOnline")]
         public bool UnLoadIsOnline { get; set; }
 
+        private string _gemPPID;
+        [Subscription("GEM.PPID")]
+        public string GEM_PPID
+        {
+            get
+            {
+                return _gemPPID;
+            }
+            set
+            {
+                if (_gemPPID != value)
+                {
+                    LoadWaferAssociation.SequenceName = value;
+                }
+
+                _gemPPID = value;
+            }
+        }
+
+        private string _gemLotID;
+        [Subscription("GEM.LotID")]
+        public string GEM_LotID
+        {
+            get
+            {
+                return _gemLotID;
+            }
+            set
+            {
+                if (_gemLotID != value)
+                {
+                    LoadWaferAssociation.LotId = value;
+                }
+
+                _gemLotID = value;
+            }
+        }
+
         #endregion
 
         #region Button Logic
diff --git a/SicUI/Models/PMs/PMOperationViewModel.cs b/SicUI/Models/PMs/PMOperationViewModel.cs
index 65e9c38..b3a6216 100644
--- a/SicUI/Models/PMs/PMOperationViewModel.cs
+++ b/SicUI/Models/PMs/PMOperationViewModel.cs
@@ -1643,6 +1643,9 @@ namespace SicUI.Models.PMs
         public void Reset()
         {
             InvokeClient.Instance.Service.DoOperation($"{Module}.Reset");
+
+            //清除GEM报警
+            InvokeClient.Instance.Service.DoOperation("GEM_ClearModuleAlarm", Module);
         }
 
         public void ToService()