2 Коммиты 3f99ca8e4b ... a91b5cdf85

Автор SHA1 Сообщение Дата
  jiangjy a91b5cdf85 临时处理 foupId事件未上报逻辑 дней назад: 4
  jiangjy 59e45531ef Rename部分情况下 会失败 дней назад: 4

+ 10 - 0
Furnace/FurnaceRT/Devices/IoLP.cs

@@ -458,6 +458,16 @@ namespace FurnaceRT.Devices
             EV.PostInfoLog(LPModuleName.ToString(), $"{LPModuleName} ReadIDComplete");
             Singleton<FAJobController>.Instance.Eqp_NoteCarrierIdRead(PortID, id);
             _carrierId = id;
+
+
+            SerializableDictionary<string, object> dvid = new SerializableDictionary<string, object>();
+            dvid["CarrierID"] = _carrierId ?? "";
+            dvid["CAR_ID"] = _carrierId ?? "";
+            dvid["PORT_ID"] = PortID;
+            dvid["PortID"] = PortID;
+            dvid["PORT_CTGRY"] = SpecPortName;
+            dvid["PORT_CARRIER_TYPE"] = InfoPadCarrierType;
+            EV.Notify(EventCarrierIdRead, dvid);
         }
         public void Terminate()
         {

+ 2 - 2
Furnace/FurnaceUI/Views/Recipes/RecipeJobViewModel.cs

@@ -1344,8 +1344,8 @@ namespace FurnaceUI.Views.Recipes
                 DialogBox.ShowWarning($"Can not create folder {newName}, Folder name too long, should be less 200.");
                 return;
             }
-            prefix = GetPrefix(prefix, CurrentFileNode);
-            if (_recipeProvider.RenameRecipe(prefix, CurrentFileNode.Name, recipeName))
+            prefix = dialog.FilePath;
+            if (_recipeProvider.RenameRecipe(dialog.FilePath, CurrentFileNode.Name, recipeName))
             {
                 UIGlobalVariable.Instance.ProcessModifiedRecipe[CurrentFileNode.FullPath] = $"Rename Recipe from [{CurrentFileNode.FullPath}] to [{recipeName}] {DateTime.Now}";
             }

+ 2 - 2
Furnace/FurnaceUI/Views/Recipes/RecipeLayoutViewModel.cs

@@ -1355,8 +1355,8 @@ namespace FurnaceUI.Views.Recipes
                 DialogBox.ShowWarning($"Can not create folder {newName}, Folder name too long, should be less 200.");
                 return;
             }
-            prefix = GetPrefix(prefix, CurrentFileNode);
-            if (_recipeProvider.RenameRecipe(prefix, CurrentFileNode.Name, recipeName))
+            prefix = dialog.FilePath;
+            if (_recipeProvider.RenameRecipe(dialog.FilePath, CurrentFileNode.Name, recipeName))
             {
                 UIGlobalVariable.Instance.ProcessModifiedRecipe[CurrentFileNode.FullPath] = $"Rename Recipe from [{CurrentFileNode.FullPath}] to [{recipeName}] {DateTime.Now}";
             }

+ 3 - 3
Furnace/FurnaceUI/Views/Recipes/RecipeViewModel.cs

@@ -1417,15 +1417,15 @@ namespace FurnaceUI.Views.Recipes
                 DialogBox.ShowWarning($"Can not create folder {newName}, Folder name too long, should be less 200.");
                 return;
             }
-            prefix = GetPrefix(prefix, CurrentFileNode);
-            if (_recipeProvider.RenameRecipe(prefix, CurrentFileNode.Name, recipeName))
+            prefix = dialog.FilePath;
+            if (_recipeProvider.RenameRecipe(dialog.FilePath, CurrentFileNode.Name, recipeName))
             {
                 UIGlobalVariable.Instance.ProcessModifiedRecipe[CurrentFileNode.FullPath] = $"Rename Recipe from [{CurrentFileNode.FullPath}] to [{recipeName}] {DateTime.Now}";
             }
             CurrentRecipe.Name = newName;
             CurrentRecipe.Description = dialog.Comment;
             CurrentRecipe.ReviseTime = DateTime.Now;
-            CurrentRecipe.PrefixPath = CurrentChamberType + "\\" + CurrentProcessType;
+            CurrentRecipe.PrefixPath = CurrentChamberType + "\\" + CurrentProcessType; ;
             //ReloadRecipeFileList(CurrentChamberType, CurrentProcessType, newName, false);
             ProcessTypeFileItem item = ProcessTypeFileList.FirstOrDefault(x => x.ProcessType == CurrentProcessType);
             item.FileListByProcessType = RecipeSequenceTreeBuilder.GetFileNodeParameterList($"{ChamberType[ChamberTypeIndexSelection]}\\{item.ProcessType}");// RecipeSequenceTreeBuilder.BuildFileNode(prefix, selectedFile, selectionIsFolder, recipes)[0].Files;