|
|
@@ -1755,7 +1755,7 @@ namespace FurnaceRT.Equipments.PMs
|
|
|
{
|
|
|
if (isSub)
|
|
|
{
|
|
|
- _subRecipeStepName = stepName;
|
|
|
+ _subRecipeStepName = GetProcessRecipeStepName(stepName);
|
|
|
_subRecipeStepNumber = stepNo;
|
|
|
_isInSubProcessing = true;
|
|
|
_processRecipeStepName = "";
|
|
|
@@ -1763,14 +1763,30 @@ namespace FurnaceRT.Equipments.PMs
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
+
|
|
|
_isInSubProcessing = false;
|
|
|
- _processRecipeStepName = stepName;
|
|
|
+ _processRecipeStepName = GetProcessRecipeStepName(stepName);
|
|
|
_processRecipeStepNumber = stepNo;
|
|
|
_subRecipeStepName = string.Empty;
|
|
|
_subRecipeStepNumber = string.Empty;
|
|
|
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ public string GetProcessRecipeStepName(string value)
|
|
|
+ {
|
|
|
+ if (SC.ContainsItem("System.SplitRecipeName") && SC.GetValue<bool>("System.SplitRecipeName"))
|
|
|
+ {
|
|
|
+ if (string.IsNullOrEmpty(value) || !value.Contains(":"))
|
|
|
+ return value;
|
|
|
+
|
|
|
+ var strList = value.Split(':').ToList();
|
|
|
+
|
|
|
+ return strList.LastOrDefault();
|
|
|
+ }
|
|
|
+ return value;
|
|
|
+
|
|
|
+ }
|
|
|
#endregion
|
|
|
|
|
|
public void ResetFDCRecipeStepName()
|