Explorar o código

除了Recipe command的事件,其余事件都需要上报RecipeAbnormalEnd

jiangjy hai 5 días
pai
achega
6d6a3ea502

+ 23 - 0
Furnace/FurnaceRT/Equipments/Jobs/AutoTransfer.cs

@@ -50,6 +50,7 @@ using MECF.Framework.Common.Extens;
 using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadPorts.TDK;
 using System.Windows.Ink;
 using Aitex.Core.UI.Control;
+using MECF.Framework.UI.Client.CenterViews.DataLogs.ProcessHistory;
 
 namespace FurnaceRT.Equipments.Jobs
 {
@@ -207,6 +208,12 @@ namespace FurnaceRT.Equipments.Jobs
                 {
                     var pj = GetFirstProcessJob(cjActive);
                     _faCallback.CJAbort(cjActive, pj);
+                    Task.Delay(1000).ContinueWith(x =>
+                    {
+                        var pm = (Singleton<EquipmentManager>.Instance.Modules[ModuleName.PM1] as PMModule);
+                        _faCallback.RecipeAbnormalEnd(pm.Module,pm.RecipeRunningInfo.RecipeName, pm.RecipeRunningInfo.StepNumber.ToString());
+                    });
+
                 }
             }
 
@@ -814,6 +821,11 @@ namespace FurnaceRT.Equipments.Jobs
                     {
                         _faCallback.JobAborted(cj, pj);
                         _faCallback.CJStop(cj, pj);
+                        Task.Delay(1000).ContinueWith(x =>
+                        {
+                            var pm = (Singleton<EquipmentManager>.Instance.Modules[ModuleName.PM1] as PMModule);
+                            _faCallback.RecipeAbnormalEnd(pm.Module, pm.RecipeRunningInfo.RecipeName, pm.RecipeRunningInfo.StepNumber.ToString());
+                        });
 
                     }
                     pj.SetState(EnumProcessJobState.Aborting);
@@ -877,6 +889,11 @@ namespace FurnaceRT.Equipments.Jobs
 
                         _faCallback.CJResume(cj, GetFirstProcessJob(cj));
                         _faCallback.JobResumed(cj, pj);
+                        Task.Delay(1000).ContinueWith(x =>
+                        {
+                            var pm = (Singleton<EquipmentManager>.Instance.Modules[ModuleName.PM1] as PMModule);
+                            _faCallback.RecipeAbnormalEnd(pm.Module, pm.RecipeRunningInfo.RecipeName, pm.RecipeRunningInfo.StepNumber.ToString());
+                        });
 
                     }
                 }
@@ -934,6 +951,12 @@ namespace FurnaceRT.Equipments.Jobs
 
                     _faCallback.CJPaused(cj, GetFirstProcessJob(cj));
                     _faCallback.JobPaused(cj, GetFirstProcessJob(cj));
+
+                    Task.Delay(1000).ContinueWith(x =>
+                    {
+                        var pm = (Singleton<EquipmentManager>.Instance.Modules[ModuleName.PM1] as PMModule);
+                        _faCallback.RecipeAbnormalEnd(pm.Module, pm.RecipeRunningInfo.RecipeName, pm.RecipeRunningInfo.StepNumber.ToString());
+                    });
                 }
             }
         }

+ 10 - 0
Furnace/FurnaceRT/Equipments/PMs/RecipeExecutions/Process.cs

@@ -1894,6 +1894,11 @@ namespace FurnaceRT.Equipments.PMs.RecipeExecutions
                         _faCallback.LeakCheckTriggerCallAbortRecipe(module, recipeName, recipeStep, otherRecipeName);
                         break;
                 }
+                Task.Delay(1000).ContinueWith(x =>
+                {
+                    _faCallback.RecipeAbnormalEnd(module, recipeName, recipeStep);
+                });
+
 
             }
             else if (triggerModule == ConstantsCommon.ManualTrigger)
@@ -1918,6 +1923,11 @@ namespace FurnaceRT.Equipments.PMs.RecipeExecutions
                         _faCallback.ManualTriggerRecipeAbort(module, recipeName, recipeStep, otherRecipeName);
                         break;
                 }
+                Task.Delay(1000).ContinueWith(x =>
+                {
+                    _faCallback.RecipeAbnormalEnd(module, recipeName, recipeStep);
+                });
+
             }
             else if (triggerModule == ConstantsCommon.RecipeTrigger)
             {

+ 8 - 0
Furnace/FurnaceRT/Equipments/Schedulers/SchedulerFACallback.cs

@@ -624,5 +624,13 @@ namespace FurnaceRT.Equipments.Schedulers
                 });
             }
         }
+
+        public void RecipeAbnormalEnd(string module, string recipeName, string stepNumber)
+        {
+            EV.Notify(UniversalEvents.RecipeAbnormalEnd, new SerializableDictionary<string, object>()
+            {
+                {DVIDName.RecipeID,  recipeName }
+            });
+        }
     }
 }