Sfoglia il codice sorgente

1、recipe页面chuck、dechuck选项名称缩略并设置最大最小长度
2、Venus、Kepler2300、2200A界面中添加刷新内容,补全修改
3、修正Sequence中切换后选不到的bug

zhouhr 1 anno fa
parent
commit
296cd4b8a4

+ 14 - 6
Venus/Venus_MainPages/ViewModels/OperationOverViewModel.cs

@@ -369,6 +369,8 @@ namespace Venus_MainPages.ViewModels
         public DelegateCommand EnableManualCommand =>
             _EnableManualCommand ?? (_EnableManualCommand = new DelegateCommand(OnEnableManual));
 
+        public bool SwitchFlag;
+
         #endregion
 
         #region 构造函数
@@ -395,18 +397,24 @@ namespace Venus_MainPages.ViewModels
 
             UIEvents.LLEDoorRaiseChangedEvent += UIEvents_LLEDoorRaiseChangedEvent;
 
+            SwitchFlag = false;
         }
         #endregion
 
         #region 命令方法
         private void OnLoad()
         {
-            LP1WaferAssociation = new WaferAssociationInfo();
-            LP1WaferAssociation.ModuleData = ModuleManager.ModuleInfos["LP1"];
-            LP2WaferAssociation = new WaferAssociationInfo();
-            LP2WaferAssociation.ModuleData = ModuleManager.ModuleInfos["LP2"];
-            LP3WaferAssociation = new WaferAssociationInfo();
-            LP3WaferAssociation.ModuleData = ModuleManager.ModuleInfos["LP3"];
+            if (!SwitchFlag)
+            {
+                LP1WaferAssociation = new WaferAssociationInfo();
+                LP3WaferAssociation = new WaferAssociationInfo();
+                LP2WaferAssociation = new WaferAssociationInfo();
+                LP1WaferAssociation.ModuleData = ModuleManager.ModuleInfos["LP1"];
+                LP2WaferAssociation.ModuleData = ModuleManager.ModuleInfos["LP2"];
+                LP3WaferAssociation.ModuleData = ModuleManager.ModuleInfos["LP3"];
+                SwitchFlag = true;
+            }
+            
         }
 
         private void OnLoadWafer(object obj)

+ 5 - 3
Venus/Venus_MainPages/ViewModels/OverKepler2200AViewModel.cs

@@ -1535,9 +1535,11 @@ namespace Venus_MainPages.ViewModels
             if (PMCurrentState == PMState.Processing)
             {
                 CurrentRecipeResult = CommonFunction.GetValue<RecipeResult>(RtDataValues, $"{ModuleName}.CurrentRecipeResult");
-                if (CurrentRecipeResult.RecipeStepNumber != null && CurrentRecipeResult.RecipeType == RecipeType.Process.ToString())
-                { 
-                 CurrentRecipeStep = CurrentRecipe.Steps[Convert.ToInt32( CurrentRecipeResult.RecipeStepNumber) - 1];
+                if (CurrentRecipeResult.RecipeStepNumber != null)
+                {
+                    var recipePath = Path.Combine(QueryDataClient.Instance.Service.GetData("GetRTPath").ToString(), "Recipes", ModuleName, CurrentRecipeResult.RecipeName + ".rcp");
+                    CurrentRecipe = Recipe.Load(File.ReadAllText(recipePath));
+                    CurrentRecipeStep = CurrentRecipe.Steps[Convert.ToInt32(CurrentRecipeResult.RecipeStepNumber) - 1];
                 }
             }
             else

+ 5 - 3
Venus/Venus_MainPages/ViewModels/OverKepler2300ViewModel.cs

@@ -1535,9 +1535,11 @@ namespace Venus_MainPages.ViewModels
             if (PMCurrentState == PMState.Processing)
             {
                 CurrentRecipeResult = CommonFunction.GetValue<RecipeResult>(RtDataValues, $"{ModuleName}.CurrentRecipeResult");
-                if (CurrentRecipeResult.RecipeStepNumber != null && CurrentRecipeResult.RecipeType == RecipeType.Process.ToString())
-                { 
-                 CurrentRecipeStep = CurrentRecipe.Steps[Convert.ToInt32( CurrentRecipeResult.RecipeStepNumber) - 1];
+                if (CurrentRecipeResult.RecipeStepNumber != null)
+                {
+                    var recipePath = Path.Combine(QueryDataClient.Instance.Service.GetData("GetRTPath").ToString(), "Recipes", ModuleName, CurrentRecipeResult.RecipeName + ".rcp");
+                    CurrentRecipe = Recipe.Load(File.ReadAllText(recipePath));
+                    CurrentRecipeStep = CurrentRecipe.Steps[Convert.ToInt32( CurrentRecipeResult.RecipeStepNumber) - 1];
                 }
             }
             else

+ 3 - 1
Venus/Venus_MainPages/ViewModels/OverVenusViewModel.cs

@@ -1569,8 +1569,10 @@ namespace Venus_MainPages.ViewModels
                     //}
 
                     CurrentRecipeResult = CommonFunction.GetValue<RecipeResult>(RtDataValues, $"{ModuleName}.CurrentRecipeResult");
-                    if (CurrentRecipeResult.RecipeStepNumber != null && CurrentRecipeResult.RecipeType == RecipeType.Process.ToString())
+                    if (CurrentRecipeResult.RecipeStepNumber != null)
                     {
+                        var recipePath = Path.Combine(QueryDataClient.Instance.Service.GetData("GetRTPath").ToString(), "Recipes", ModuleName, CurrentRecipeResult.RecipeName + ".rcp");
+                        CurrentRecipe = Recipe.Load(File.ReadAllText(recipePath));
                         CurrentRecipeStep = CurrentRecipe.Steps[Convert.ToInt32(CurrentRecipeResult.RecipeStepNumber) - 1];
                     }
                 }

+ 15 - 2
Venus/Venus_MainPages/ViewModels/RecipeViewModel.cs

@@ -448,7 +448,18 @@ namespace Venus_MainPages.ViewModels
                 TextBlock textBlock = new TextBlock();
                 textBlock.FontSize = 15;
                 //textBlock.Width = 100;
-                textBlock.Text = propertyInfo.Name + ":";
+                switch (propertyInfo.Name)
+                {
+                    case "ChuckRecipe":
+                        textBlock.Text = "Chuck:";
+                        break;
+                    case "DechuckRecipe":
+                        textBlock.Text = "DeChuck:";
+                        break;
+                    default:
+                        textBlock.Text = propertyInfo.Name + ":";
+                        break;
+                }
                 textBlock.Margin = new Thickness(15, 0, 0, 0);
                 textBlock.VerticalAlignment = VerticalAlignment.Center;
                 HeadWrapPanel.Children.Add(textBlock);
@@ -481,7 +492,7 @@ namespace Venus_MainPages.ViewModels
                         ItemsControlHelper.SetEnumValuesToItemsSource(control, true);
                         break;
                     case "ChuckRecipe":
-                        string[] chucklist = new string[] {"" };
+                        string[] chucklist = new string[] { "" };
                         ArrayList arrayList = new ArrayList(chucklist.ToList());
                         IEnumerable<string> chlist= GetFilesNames(Path.Combine(QueryDataClient.Instance.Service.GetData("GetRTPath").ToString(), "Recipes", ModuleName)).ToList().Where(item => item.ToLower().Contains("chuck") && (item.ToLower().Contains("dechuck") == false));
                         foreach (var i in chlist)
@@ -502,6 +513,7 @@ namespace Venus_MainPages.ViewModels
                         };
                         control.Height = 23;
                         control.MinWidth = 100;
+                        control.MaxWidth = 300;
                         control.SetBinding(ComboBox.SelectedItemProperty, binding);
                         break;
                     case "DechuckRecipe":
@@ -524,6 +536,7 @@ namespace Venus_MainPages.ViewModels
                         };
                         control.Height = 23;
                         control.MinWidth = 100;
+                        control.MaxWidth = 300;
                         control.SetBinding(ComboBox.SelectedItemProperty, binding);
 
                         break;

+ 3 - 0
Venus/Venus_RT/Modules/PMs/PMProcessRoutine.cs

@@ -321,6 +321,9 @@ namespace Venus_RT.Modules.PMs
         private bool RunRecipes()
         {     
             var step = _currentRecipe.Steps[_currentStep];
+            currentRecipeResult.RecipeStepCount = _currentRecipe.Steps.Count;
+            currentRecipeResult.RecipeName = _currentRecipe.Header.Name;
+            currentRecipeResult.RecipeType = _currentRecipe.Header.Type.ToString();
             currentRecipeResult.RecipeStepNumber = step.StepNo;
             currentRecipeResult.RecipeStepType=step.Type.ToString();
             currentRecipeResult.RecipeStepSetTime=step.Time;