jiangjy 1 month ago
parent
commit
dc273e3ecb

BIN
Furnace/FurnaceRT/Config/VIDs/Equipment_VIDs_20250519.xlsx


+ 5 - 4
Furnace/FurnaceUI/Views/Recipes/RecipeJobViewModel.cs

@@ -925,15 +925,15 @@ namespace FurnaceUI.Views.Recipes
             bool? dialogReturn = wm.ShowDialog(dialog);
             if (!dialogReturn.HasValue || !dialogReturn.Value)
                 return;
-
-            string recipeName = dialog.FileName.Trim();
-            string filepath = dialog.FilePath;
-            string description = dialog.Comment;
             if (string.IsNullOrEmpty(dialog.FileName))
             {
                 DialogBox.ShowWarning("Recipe file name should not be empty");
                 return;
             }
+            string recipeName = dialog.FileName.Trim();
+            string filepath = dialog.FilePath;
+            string description = dialog.Comment;
+         
 
             string prefix;
             if (filepath.Contains("\\"))
@@ -1415,6 +1415,7 @@ namespace FurnaceUI.Views.Recipes
                     return;
                 }
             });
+            CurrentFileNode=null;
         }
 
         public void ReloadRecipe()

+ 5 - 22
Furnace/FurnaceUI/Views/Recipes/RecipeLayoutViewModel.cs

@@ -1,42 +1,23 @@
 using Aitex.Core.RT.Log;
 using Caliburn.Micro;
 using Caliburn.Micro.Core;
-using MECF.Framework.Common.DataCenter;
-using MECF.Framework.UI.Client.CenterViews.Editors;
-using MECF.Framework.UI.Client.CenterViews.Editors.Recipe;
-using MECF.Framework.UI.Client.CenterViews.Editors.Sequence;
-using MECF.Framework.UI.Client.ClientBase;
-using OpenSEMI.ClientBase;
-using OpenSEMI.ClientBase.Command;
-using RecipeEditorLib.RecipeModel.Params;
-
-using Aitex.Core.RT.Log;
-using Aitex.Sorter.Common;
-using Caliburn.Micro;
-using Caliburn.Micro.Core;
 using FurnaceUI.Common;
 using FurnaceUI.Models;
 using FurnaceUI.Views.Editors;
-using MECF.Framework.Common.CommonData;
 using MECF.Framework.Common.DataCenter;
-using MECF.Framework.Common.Utilities;
 using MECF.Framework.UI.Client.CenterViews.Editors;
 using MECF.Framework.UI.Client.CenterViews.Editors.Recipe;
 using MECF.Framework.UI.Client.CenterViews.Editors.Sequence;
 using MECF.Framework.UI.Client.ClientBase;
 using OpenSEMI.ClientBase;
 using OpenSEMI.ClientBase.Command;
-using RecipeEditorLib.RecipeModel.Params;
-using SciChart.Charting.Common.Extensions;
 using SciChart.Core.Extensions;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Input;
-using System.Windows.Media;
 
 namespace FurnaceUI.Views.Recipes
 {
@@ -934,14 +915,15 @@ namespace FurnaceUI.Views.Recipes
             if (!dialogReturn.HasValue || !dialogReturn.Value)
                 return;
 
-            string recipeName = dialog.FileName.Trim();
-            string filepath = dialog.FilePath;
-            string description = dialog.Comment;
             if (string.IsNullOrEmpty(dialog.FileName))
             {
                 DialogBox.ShowWarning("Recipe file name should not be empty");
                 return;
             }
+            string recipeName = dialog.FileName.Trim();
+            string filepath = dialog.FilePath;
+            string description = dialog.Comment;
+         
 
             string prefix;
             if (filepath.Contains("\\"))
@@ -1440,6 +1422,7 @@ namespace FurnaceUI.Views.Recipes
                     return;
                 }
             });
+            CurrentFileNode = null;
         }
 
         public void ReloadRecipe()

+ 5 - 4
Furnace/FurnaceUI/Views/Recipes/RecipeViewModel.cs

@@ -967,15 +967,15 @@ namespace FurnaceUI.Views.Recipes
             bool? dialogReturn = wm.ShowDialog(dialog);
             if (!dialogReturn.HasValue || !dialogReturn.Value)
                 return;
-
-            string recipeName = dialog.FileName.Trim();
-            string filepath = dialog.FilePath;
-            string description = dialog.Comment;
             if (string.IsNullOrEmpty(dialog.FileName))
             {
                 DialogBox.ShowWarning("Recipe file name should not be empty");
                 return;
             }
+            string recipeName = dialog.FileName.Trim();
+            string filepath = dialog.FilePath;
+            string description = dialog.Comment;
+         
 
             string prefix;
             if (filepath.Contains("\\"))
@@ -1468,6 +1468,7 @@ namespace FurnaceUI.Views.Recipes
                     return;
                 }
             });
+            CurrentFileNode=null;
         }
 
         public void ReloadRecipe()