From f181afd39ebd5d1c2bed44a3bd15d5babdc00f6e Mon Sep 17 00:00:00 2001
From: HCL <1625932291@qq.com>
Date: Wed, 19 Aug 2026 14:08:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=A3=81=E6=B5=81?=
=?UTF-8?q?=E4=BD=93=E8=BD=AC=E9=80=9F=E8=B6=85=E6=97=B6=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App/SicRT/Config/System.sccfg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/App/SicRT/Config/System.sccfg b/App/SicRT/Config/System.sccfg
index 490961d..a346506 100644
--- a/App/SicRT/Config/System.sccfg
+++ b/App/SicRT/Config/System.sccfg
@@ -607,7 +607,7 @@
-
+
From 349730b7459d0a0aebc8b4e9c4f020306c6c8eed Mon Sep 17 00:00:00 2001
From: HCL <1625932291@qq.com>
Date: Wed, 19 Aug 2026 14:26:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9PM=20Routine=20MFC?=
=?UTF-8?q?=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App/Modules/SicModules/PMs/PMModuleDevice.cs | 14 +-
.../PMs/Routines/PMToAtmIdleRoutine.cs | 2 +-
.../PMs/Routines/PMToProcessIdleRoutine.cs | 2 +-
.../SicModules/PMs/Routines/PMVentRoutine.cs | 2 +-
.../LoginRequestConfirmationDialog.xaml | 78 +++--
.../Dialog/LoginRequestWaitDialog.xaml | 66 +++--
.../ClientBase/Dialog/MessageDialogView.xaml | 271 ++++++++++++------
7 files changed, 296 insertions(+), 139 deletions(-)
diff --git a/App/Modules/SicModules/PMs/PMModuleDevice.cs b/App/Modules/SicModules/PMs/PMModuleDevice.cs
index e86dbc9..e7642b0 100644
--- a/App/Modules/SicModules/PMs/PMModuleDevice.cs
+++ b/App/Modules/SicModules/PMs/PMModuleDevice.cs
@@ -1159,11 +1159,11 @@ namespace SicModules.PMs
}
else if (mGroupName == MfcGroupName.M2M9M15M19_M26)
{
- lst = new List() { 2, 9, 15, 19, 20, 21, 22, 23, 24, 25, 26};
+ lst = new List() { 9, 15, 19, 20, 21, 22, 23, 24, 25, 26};
}
else if (mGroupName == MfcGroupName.M5M21)
{
- lst = new List() { 5,21 };
+ lst = new List() { 21 };
}
else if (mGroupName == MfcGroupName.M17)
{
@@ -1187,7 +1187,7 @@ namespace SicModules.PMs
}
else if (mGroupName == MfcGroupName.M2toM40NoFinal1MFC)
{
- lst = new List() { 2, 9, 15, 19, 20, 22, 23, 25, 26, 27, 28, 29, 31, 33, 40 };
+ lst = new List() { 9, 15, 19, 20, 22, 23, 25, 26, 27, 28, 29, 31, 33, 40 };
}
else if (mGroupName == MfcGroupName.M27toM38)
{
@@ -1215,7 +1215,7 @@ namespace SicModules.PMs
}
else if (mGroupName == MfcGroupName.M19toM33)
{
- lst = new List() { 19, 20, 22, 23, 25, 26, 27, 28, 29, 40, 31, 32, 33, 2, 15, 9 };
+ lst = new List() { 19, 20, 22, 23, 25, 26, 27, 28, 29, 40, 31, 32, 33, 15, 9 };
}
else if (mGroupName == MfcGroupName.M32toM38)
{
@@ -1237,7 +1237,7 @@ namespace SicModules.PMs
{
lst = new List()
{
- 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 19, 20, 22, 23, 25, 26, 27, 32, 33, 35, 36,
+ 1, 3, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 19, 20, 22, 23, 25, 26, 27, 32, 33, 35, 36,
37, 38
};
}
@@ -1245,8 +1245,8 @@ namespace SicModules.PMs
{
lst = new List()
{
- 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 35, 36, 37, 38, 40, 41, 42
+ 1, 3, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 31,
+ 32, 33, 35, 36, 37, 38, 40
};
}
diff --git a/App/Modules/SicModules/PMs/Routines/PMToAtmIdleRoutine.cs b/App/Modules/SicModules/PMs/Routines/PMToAtmIdleRoutine.cs
index 0a08961..103c9c3 100644
--- a/App/Modules/SicModules/PMs/Routines/PMToAtmIdleRoutine.cs
+++ b/App/Modules/SicModules/PMs/Routines/PMToAtmIdleRoutine.cs
@@ -192,7 +192,7 @@ namespace SicModules.PMs.Routines
SetIoValueByGroup((int)RoutineStep.SetGroupG, IoGroupName.G, true, _IoValueOpenCloseTimeout);
//6、 M1-M17 设定为 default 值， 所有 PC 设定为 default 值（PC1-PC9） ，M18 - M40（除 M30\M34\M39） MFC 5s ramp 到 0。
- SetMfcModeToNormalByGroup((int)RoutineStep.SetMFCMode, MfcGroupName.M1toM17);
+ SetMfcModeToNormalByGroup((int)RoutineStep.SetMFCMode, MfcGroupName.All);
SetPcToDefault((int)RoutineStep.SetPC, _lstPcList);
SetMfcToDefaultByGroup((int)RoutineStep.SetM18toM40, MfcGroupName.M18toM40No303439, 5);
diff --git a/App/Modules/SicModules/PMs/Routines/PMToProcessIdleRoutine.cs b/App/Modules/SicModules/PMs/Routines/PMToProcessIdleRoutine.cs
index f6ead20..9a55e91 100644
--- a/App/Modules/SicModules/PMs/Routines/PMToProcessIdleRoutine.cs
+++ b/App/Modules/SicModules/PMs/Routines/PMToProcessIdleRoutine.cs
@@ -312,7 +312,7 @@ namespace SicModules.PMs.Routines
SetIoValueByGroup((int)RoutineStep.SetGroupG, IoGroupName.G, true, _IoValueOpenCloseTimeout);
//5、 M1-M17 设定为 default 值，所有 PC 设定为 default 值(PC1-PC9)。
- SetMfcModeToNormalByGroup((int)RoutineStep.SetMFCMode, MfcGroupName.M1toM17);
+ SetMfcModeToNormalByGroup((int)RoutineStep.SetMFCMode, MfcGroupName.All);
SetPcToDefault((int)RoutineStep.SetPC, _lstPcList);
//M1-M16设定为default值(M2、M9、M15除外)
diff --git a/App/Modules/SicModules/PMs/Routines/PMVentRoutine.cs b/App/Modules/SicModules/PMs/Routines/PMVentRoutine.cs
index 5bfc905..29a186a 100644
--- a/App/Modules/SicModules/PMs/Routines/PMVentRoutine.cs
+++ b/App/Modules/SicModules/PMs/Routines/PMVentRoutine.cs
@@ -193,7 +193,7 @@ namespace SicModules.PMs.Routines
SetIoValueByGroup((int)RoutineStep.SetGroupG, IoGroupName.G, true, _IoValueOpenCloseTimeout);
//6、 M1-M17 设定为 default 值， 所有 PC 设定为 default 值（PC1-PC9） ，M18 - M40（除 M30\M34\M39） MFC 5s ramp 到 0。
- SetMfcModeToNormalByGroup((int)RoutineStep.SetMFCMode, MfcGroupName.M1toM17);
+ SetMfcModeToNormalByGroup((int)RoutineStep.SetMFCMode, MfcGroupName.All);
SetPcToDefault((int)RoutineStep.SetPC, _lstPcList);
SetMfcToDefaultByGroup((int)RoutineStep.SetM18toM40, MfcGroupName.M18toM40No303439, 5);
diff --git a/Framework/MECF.Framework.UI.Client/ClientBase/Dialog/LoginRequestConfirmationDialog.xaml b/Framework/MECF.Framework.UI.Client/ClientBase/Dialog/LoginRequestConfirmationDialog.xaml
index 206a42c..32817d5 100644
--- a/Framework/MECF.Framework.UI.Client/ClientBase/Dialog/LoginRequestConfirmationDialog.xaml
+++ b/Framework/MECF.Framework.UI.Client/ClientBase/Dialog/LoginRequestConfirmationDialog.xaml
@@ -1,15 +1,17 @@
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+ TextWrapping="Wrap" />
-
-
-
+
+
+
diff --git a/Framework/MECF.Framework.UI.Client/ClientBase/Dialog/LoginRequestWaitDialog.xaml b/Framework/MECF.Framework.UI.Client/ClientBase/Dialog/LoginRequestWaitDialog.xaml
index 5792336..9633057 100644
--- a/Framework/MECF.Framework.UI.Client/ClientBase/Dialog/LoginRequestWaitDialog.xaml
+++ b/Framework/MECF.Framework.UI.Client/ClientBase/Dialog/LoginRequestWaitDialog.xaml
@@ -1,14 +1,16 @@
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+ TextWrapping="Wrap" />
-
-
-
+
+
+
diff --git a/Framework/MECF.Framework.UI.Client/ClientBase/Dialog/MessageDialogView.xaml b/Framework/MECF.Framework.UI.Client/ClientBase/Dialog/MessageDialogView.xaml
index a89dc9a..c3db992 100644
--- a/Framework/MECF.Framework.UI.Client/ClientBase/Dialog/MessageDialogView.xaml
+++ b/Framework/MECF.Framework.UI.Client/ClientBase/Dialog/MessageDialogView.xaml
@@ -1,233 +1,332 @@
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
-
-
+
+
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
-
-
+
+
+
-
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
-
+