1.同步手动Ror更新功能

Modules/Mainframe/PMs/PMModule.cs

@@ -515,12 +515,6 @@ namespace SicModules.PMs
             OP.Subscribe($"{Module}.Vent", (string cmd, object[] args) => CheckToPostMessage((int)MSG.Vent));
             OP.Subscribe($"{Module}.Purge", (string cmd, object[] args) => CheckToPostMessage((int)MSG.Purge));
 
-            OP.Subscribe($"{Module}.MfcRor", (string cmd, object[] args) =>
-            {
-                return  CheckToPostMessage((int)MSG.MfcRor,args);
-             });
-            
-
             OP.Subscribe($"{Module}.OpenLid", (string cmd, object[] args) => CheckToPostMessage((int)MSG.OpenLid));
             OP.Subscribe($"{Module}.Isolation", (string cmd, object[] args) => CheckToPostMessage((int)MSG.Isolation));
             OP.Subscribe($"{Module}.Clean", (string cmd, object[] args) => CheckToPostMessage((int)MSG.Clean));
@@ -565,6 +559,8 @@ namespace SicModules.PMs
             OP.Subscribe($"{Module}.MfcValueTest", (string cmd, object[] args) => CheckToPostMessage((int)MSG.MfcValueTest, (string)args[0]));
             OP.Subscribe($"{Module}.MfcTest.DeleteMfcTest", (string cmd, object[] args) => MfcTestDelectData());
 
+            OP.Subscribe($"{Module}.MfcRor", (string cmd, object[] args) => CheckToPostMessage((int)MSG.MfcRor, args));
+
             OP.Subscribe($"{Module}.ClearMfcRorData", (string cmd, object[] args) => ClearMfcRorData());
 
         }
@@ -1016,9 +1012,7 @@ namespace SicModules.PMs
 
         private bool FsmStartMfcRor(object[] param)
         {
-            MfcRorData mfcRorData = JsonConvert.DeserializeObject<MfcRorData>(param[0].ToString());
-
-            Result ret = StartRoutine(_mfcRorRoutine, mfcRorData);
+            Result ret = StartRoutine(_mfcRorRoutine, param);
 
             if (ret == Result.FAIL || ret == Result.DONE)
                 return false;

Modules/Mainframe/PMs/Routines/PMMfcRorRoutine.cs

@@ -344,7 +344,7 @@ namespace SicModules.PMs.Routines
                 MfcRorList.Add(new MfcRorData() { Name = item.Key });
             }
 
-            //DB.ExcuteTransAction(new List<string> { "truncate pm_mfcror"});
+            //DB.ExcuteTransAction(new List<string> { $"delete from pm_mfcror where \"module\" = '{Module}'" });
         }
 
         public List<T> TableToListModel<T>(DataTable dt) where T : new()
@@ -384,7 +384,7 @@ namespace SicModules.PMs.Routines
         {
             Reset();
 
-            _mfcData = (MfcRorData)objs[0];
+            _mfcData = JsonConvert.DeserializeObject<MfcRorData>(objs[0].ToString());
 
             _pressureMaxDiff = SC.GetValue<double>($"PM.{Module}.ThrottlePressureMaxDiff");
             _throttleTimeout = SC.GetValue<int>($"PM.{Module}.ThrottlePressureTimeout");
@@ -402,19 +402,18 @@ namespace SicModules.PMs.Routines
             try
             {
                 //检查是否退出
-                //if(_pmModule.GetChamberPressure() >980)
-                //{
-                //    //设置对应的MFC流量为0
-                //    SetMfcFlow((int)RoutineStep.SetMfcFlow_3, _mfcData.Name, 0, 3);
+                if (_pmModule.GetChamberPressure() > 980)
+                {
+                    //设置对应的MFC流量为0
+                    SetMfcFlow((int)RoutineStep.SetMfcFlow_3, _mfcData.Name, 0, 3);
 
-                //    TimeDelay((int)RoutineStep.TimeDelay10, 3);
+                    TimeDelay((int)RoutineStep.TimeDelay10, 3);
 
-                //    EV.PostWarningLog(Module, "Chamber Pressure above 980mbar,Mfc Ror Routine Abort!");
+                    EV.PostWarningLog(Module, "Chamber Pressure above 980mbar,Mfc Ror Routine Abort!");
 
-                //    throw (new RoutineFaildException());
-                //}
+                    throw (new RoutineFaildException());
+                }
 
-                //CheckRoutineTimeOut();
                 if (_flag1)
                 {
                     //打开EPV2