Browse Source

调整ProcessRecipeStepNumber,新增是否判断正在执行SubRecipe

jiangjy 1 week ago
parent
commit
da6efe9277

+ 2 - 0
FrameworkLocal/Common/FAServices/DataVariables.cs

@@ -93,9 +93,11 @@ namespace MECF.Framework.Common.FAServices
         public const string DryClearCount = "DryClearCount";
         public const string ProcessLotIdList = "ProcessLotIdList";
 
+        public const string ProcessRecipeStepNumber = "ProcessRecipeStepNumber";
         public const string ProcessRecipeStepName = "ProcessRecipeStepName";
         public const string SubRecipeStepName = "SubRecipeStepName";
         public const string SubRecipeStepNumber = "SubRecipeStepNumber";
+        public const string IsInSubProcessing = "IsInSubProcessing";
         public const string PJId = "PJId";
 
 

+ 2 - 0
FrameworkLocal/Common/FAServices/VIDManager2.cs

@@ -384,6 +384,8 @@ namespace MECF.Framework.Common.FAServices
             new VIDItem(){Name = DataVariables.SubRecipeStepName,Index = 23,DataType = "Ascii"},
             new VIDItem(){Name = DataVariables.SubRecipeStepNumber,Index = 24,DataType = "Ascii"},
             new VIDItem(){Name = DataVariables.PJId,Index = 25,DataType = "Ascii"},
+            new VIDItem(){Name = DataVariables.ProcessRecipeStepNumber,Index = 26,DataType = "Ascii"},
+            new VIDItem(){Name = DataVariables.IsInSubProcessing,Index = 27,DataType = "Boolean"},
             //new VIDItem(){Name = "System.SideDummyAccuThickness",Index = 15,DataType = "List"},
             //new VIDItem(){Name = "System.SideDummyUseCount",Index = 16,DataType = "List"},
             //new VIDItem(){Name = "System.ExtraDummyAccuThickness",Index = 17,DataType = "List"},

+ 11 - 0
Furnace/FurnaceRT/Equipments/PMs/PMModule.cs

@@ -1722,11 +1722,13 @@ namespace FurnaceRT.Equipments.PMs
         #region 
 
         #region 
+        private string _processRecipeStepNumber = "";
         private string _processRecipeStepName = "";
         private string _subRecipeStepName = "";
         private string _subRecipeStepNumber = "";
         private string _currentFilmThickness = "";
         private string _dryClearCount = "";
+        private bool _isInSubProcessing = false;
         /// <summary>
         /// 更新FDC采集的数据
         /// </summary>
@@ -1739,10 +1741,15 @@ namespace FurnaceRT.Equipments.PMs
             {
                 _subRecipeStepName = stepName;
                 _subRecipeStepNumber = stepNo;
+                _isInSubProcessing = true;
+                _processRecipeStepName = "";
+                _processRecipeStepNumber = "";
             }
             else
             {
+                _isInSubProcessing = false;
                 _processRecipeStepName = stepName;
+                _processRecipeStepNumber = stepNo;
                 _subRecipeStepName = string.Empty;
                 _subRecipeStepNumber = string.Empty;
 
@@ -1755,6 +1762,8 @@ namespace FurnaceRT.Equipments.PMs
             _subRecipeStepName = "";
             _subRecipeStepNumber = "";
             _processRecipeStepName = "";
+            _processRecipeStepNumber = "";
+            _isInSubProcessing = false;
         }
         public void SetCurrentFilmThickness(float value)
         {
@@ -1768,9 +1777,11 @@ namespace FurnaceRT.Equipments.PMs
         {
             DATA.Subscribe($"DryClearCount", () => _dryClearCount);
             DATA.Subscribe($"BoatCurrentFilmThickness", () => _currentFilmThickness);
+            DATA.Subscribe($"ProcessRecipeStepNumber", () => IsProcessing ? _processRecipeStepNumber : "");
             DATA.Subscribe($"ProcessRecipeStepName", () => IsProcessing ? _processRecipeStepName : "");
             DATA.Subscribe($"SubRecipeStepName", () => _subRecipeStepName);
             DATA.Subscribe($"SubRecipeStepNumber", () => _subRecipeStepNumber);
+            DATA.Subscribe($"IsInSubProcessing", () => _isInSubProcessing);
         }
         #endregion
         #region 

+ 2 - 1
Furnace/FurnaceUI/Views/Operations/StatusViewModel.cs

@@ -974,6 +974,8 @@ namespace FurnaceUI.Views.Operations
         [Subscription("SubRecipeStepNumber")]        public string SubRecipeStepNumber { get; set; }
         [Subscription("ProcessRecipeStepName")]        public string ProcessRecipeStepName { get; set; }
         [Subscription("PM1.RecipeStepNumber")]        public int RecipeStepNumber { get; set; }
+        [Subscription("ProcessRecipeStepNumber")]        public string ProcessRecipeStepNumber { get; set; }
+        [Subscription("IsInSubProcessing")]        public bool IsInSubProcessing { get; set; }
 
 
         [Subscription("Scheduler.ControlJobList")]
@@ -1741,7 +1743,6 @@ namespace FurnaceUI.Views.Operations
             }
 
             NotifyOfPropertyChange("IsStocker1Visibility");
-
         }
 
         private void UpdateStockerSlots()