Browse Source

是否提前上报RecipeComplete事件,达到分割Processlog的目的

jiangjy 1 week ago
parent
commit
899612bac3

+ 7 - 2
Furnace/FurnaceRT/Config/System.sccfg

@@ -18,8 +18,6 @@
 		<config default="false" name="AxisMonShowKey" description="" max="" min="" paramter="" tag="" unit="" type="Bool" visible="false" />
 		<!--是否检查Recipe文件夹结构不正确-->
 		<config default="true" name="EnableCheckRecipe" description="" max="" min="" paramter="" tag="" unit="" type="Bool"   />
-		<!--fdc ProcessRecipeStepName与SubName是否去除StepName中的 数字与:-->
-		<config default="true" name="SplitRecipeName" description="Split Recipe Name" max="" min="" paramter="" tag="" unit="" type="Bool"  visible="false"/>
 
 		<!--Valve是否展示新版图标-->
 		<config default="false" name="IsShowJetValve" description="" max="" min="" paramter="" tag="" unit="" type="Bool" visible="false" />
@@ -314,9 +312,16 @@
 		</configs>
 
 		<configs name="FDC" visible="false">
+			
 			<config default="Process" name="DataGroupName" description="FDC data group" max="" min="" paramter="" tag="" visible="false" unit="" type="String" />
 			<config default="1000" name="DelayTime" description="Step Delay time before collection data" max="10000" min="0" paramter="" tag="" unit="ms" type="Integer" />
 			<config default="100" name="SampleInterval" description="interval time collection sample data" max="10000" min="0" paramter="" tag="" unit="ms" type="Integer" />
+			<!--fdc ProcessRecipeStepName与SubName是否去除StepName中的 数字与:-->
+			<config default="true" name="SplitRecipeName" description="Split Recipe Name" max="" min="" paramter="" tag="" unit="" type="Bool"  visible="false"/>
+			<config default="true" name="SplitProcessLog" description="Split Process Log" max="" min="" paramter="" tag="" unit="" type="Bool"  visible="false"/>
+
+
+
 		</configs>
 		<configs name="Job"  visible="false">
 			<config default="10" name="BuzzerTimeWhenJobDone" description="buzzer time after job done, -1=never stop, 0=silent,xxx=buzzer time" max="300" min="0" paramter="" tag="" unit="s" type="Integer" />

+ 1 - 1
Furnace/FurnaceRT/Equipments/PMs/PMModule.cs

@@ -1775,7 +1775,7 @@ namespace FurnaceRT.Equipments.PMs
 
         public string GetProcessRecipeStepName(string value)
         {
-            if (SC.ContainsItem("System.SplitRecipeName") && SC.GetValue<bool>("System.SplitRecipeName"))
+            if (SC.ContainsItem("System.FDC.SplitRecipeName") && SC.GetValue<bool>("System.FDC.SplitRecipeName"))
             {
                 if (string.IsNullOrEmpty(value) || !value.Contains(":"))
                     return value;

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

@@ -397,6 +397,19 @@ namespace FurnaceRT.Equipments.PMs.RecipeExecutions
 
                                 if (IsSubReciep)
                                 {
+                                    if (SC.ContainsItem("System.FDC.SplitProcessLog") && SC.GetValue<bool>("System.FDC.SplitProcessLog"))
+                                    {
+                                        if (PMModule.RecipeRunningInfo.RecipeStepList[_currentStepNumber].StepName == "End" && PMModule.RecipeRunningInfo.RecipeStepList.Count - 1 == _currentStepNumber)
+                                        {
+                                            _faCallback.RecipeComplete(PMModule.Module, PMModule.RecipeRunningInfo.RecipeName);
+                                            Task.Delay(1000).ContinueWith(a =>
+                                            {
+                                                _faCallback.RecipeStart(PMModule.Module, PMModule.RecipeRunningInfo.RecipeName);
+                                            });
+                                        }
+                                    }
+
+
                                     if (curSteps[_currentSubRecipeStepNumber].IsLoopStartStep)
                                     {
                                         CurrentSubRecipeLoopCount++;