|
|
@@ -18,6 +18,7 @@ using System.Windows;
|
|
|
using TeamAAS_VP;
|
|
|
using TeamAAS_VP.Controls;
|
|
|
using TeamAAS_VP.Core;
|
|
|
+using TeamAAS_VP.Core.Cameras;
|
|
|
using TeamAAS_VP.Events;
|
|
|
using TeamAAS_VP.Interfaces;
|
|
|
using TeamAAS_VP.Models;
|
|
|
@@ -264,15 +265,18 @@ namespace TeamAAS_VP.ViewModels.Product
|
|
|
var procedureId = (SelectedItem as ProcedureModel).Id;
|
|
|
if (MessageBox.Show(Lang.是否移除流程.Replace("{0}", (SelectedItem as ProcedureModel).Name) , Lang.移除流程, MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
|
|
|
{
|
|
|
- var camera = SelectProduct.CameraProcedures.FirstOrDefault(a => a.Camera == (SelectedItem as ProcedureModel).CameraName);
|
|
|
- if (camera != null)
|
|
|
+ ProcedureModel procedure = SelectedItem as ProcedureModel;
|
|
|
+ var procedureList = SelectProduct.CameraProcedures.FirstOrDefault(c => c.Camera == procedure.CameraName); //获取指定相机的流程集合
|
|
|
+ if (procedureList == null)
|
|
|
{
|
|
|
- if (((ProcedureModel)SelectedItem).ToolBlock!=null)
|
|
|
- {
|
|
|
- ((ProcedureModel)SelectedItem).ToolBlock.Dispose();
|
|
|
- }
|
|
|
- camera.RemoveProcedure(SelectedItem as ProcedureModel);
|
|
|
+ _eventAggregator.GetEvent<SnackbarMessageNotification>().Publish(new MessageParameter() { Msg = Lang.没有找到相机.Replace("{0}", procedure.CameraName), Duration = 1 });
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (((ProcedureModel)SelectedItem).ToolBlock != null)
|
|
|
+ {
|
|
|
+ ((ProcedureModel)SelectedItem).ToolBlock.Dispose();
|
|
|
}
|
|
|
+ procedureList.RemoveProcedure(procedure);
|
|
|
}
|
|
|
}
|
|
|
}
|