MachineRunState1移动到ProRuntimeService

CapMachine.Wpf/Services/ProRuntimeService.cs

@@ -38,17 +38,20 @@ namespace CapMachine.Wpf.Services
         /// <summary>
         /// 实例化函数
         /// </summary>
-        public ProRuntimeService(IFreeSql freeSql, IMapper mapper, IEventAggregator eventAggregator, MachineRtDataService machineRtDataService, ILogService logService)
+        public ProRuntimeService(IFreeSql freeSql, IMapper mapper, IEventAggregator eventAggregator, 
+            MachineRtDataService machineRtDataService,ConfigService configService, CanDriveService canDriveService, LinDriveService linDriveService,
+            ILogService logService)
         {
             FreeSql = freeSql;
             Mapper = mapper;
             EventAggregator = eventAggregator;
             MachineRtDataService = machineRtDataService;
-
+            ConfigService = configService;
+            CanDriveService = canDriveService;
+            LinDriveService = linDriveService;
             ProRunChannel = MachineRtDataService.ProRunChannel;
             LogService = logService;
 
-
             //实例化函数
             ListProExModel = new List<ProExModel>();
             #region 初始化程序执行模型
@@ -152,9 +155,6 @@ namespace CapMachine.Wpf.Services
 
             #endregion
 
-
-
-
             //从变量集合中加载PLC转制的配置数据
             ListPlcLoadConfigCell = new List<PlcLoadConfigCell>();
             foreach (var itemKeyValue in MachineRtDataService.TagManger.DicTags)
@@ -191,10 +191,11 @@ namespace CapMachine.Wpf.Services
             //反写给MachineRtDataService，MachineRtDataService也要写到PLC中
             MachineRtDataService.ListPlcLoadConfigCell = ListPlcLoadConfigCell;
 
-
             //驱动实例
             SiemensDrive = MachineRtDataService.SiemensDrive;
 
+            MachineRunState1 = new MachineRunState("M1", EventAggregator, ConfigService, canDriveService, linDriveService);
+
             //程序运行实时管道数据监听
             //Task.Run(() => ListenProRunChannelAction());
 
@@ -209,7 +210,9 @@ namespace CapMachine.Wpf.Services
         public IMapper Mapper { get; }
         public IEventAggregator EventAggregator { get; }
         public MachineRtDataService MachineRtDataService { get; }
-
+        public ConfigService ConfigService { get; }
+        public CanDriveService CanDriveService { get; }
+        public LinDriveService LinDriveService { get; }
         public ILogService LogService { get; }
 
         /// <summary>
@@ -232,6 +235,12 @@ namespace CapMachine.Wpf.Services
         /// </summary>
         public List<PlcLoadConfigCell> ListPlcLoadConfigCell { get; set; }
 
+        /// <summary>
+        /// 设备运行状态
+        /// </summary>
+        public MachineRunState MachineRunState1 { get; set; }
+
+
         /// <summary>
         /// 加载选中的程序运行集合
         /// 目前步骤设置常值，是OK的，但是在斜坡多步骤里面也可以设置 50-50 10秒的常值设置，那么在打点时，上面的两个常值都能识别
@@ -3212,9 +3221,11 @@ namespace CapMachine.Wpf.Services
         private void ProRuntimeService_SpeedRunEndEvent(object? sender, string e)
         {
             Console.WriteLine($"【时间】{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss fff")} 【Msg】：程序运行结束  《《《《-------------------");
-            EndProRun();
-
+            //EndProRun();
+                      
             EventAggregator.GetEvent<ProRunEvent>().Publish(new ProRunEventMsg() { Machine = "M1", Msg = "执行完毕" });
+
+            MachineRunState1.RunStateMsg = "执行完毕";
         }
 
         /// <summary>