.

SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs

@@ -314,7 +314,8 @@ namespace SlnMesnac.WPF.Page
                         DmsRecordShutDown newRecord = new DmsRecordShutDown();
                         newRecord.DeviceId = machineStatusDto.deviceId;
                         newRecord.ShutType = shutType;
-                        newRecord.ShutReason = shutType==1 ? "正常停机" : "报警停机";
+                       // newRecord.ShutReason = shutType==1 ? "正常停机" : "报警停机";
+                        newRecord.ShutReason = machineStatusDto.warnStatus.ToString();
                         newRecord.ShutBeginTime = DateTime.Now;
                         newRecord.CreateBy = "SlnMesnac";
                         newRecord.CreateTime = DateTime.Now;
@@ -415,10 +416,10 @@ namespace SlnMesnac.WPF.Page
                         sqlClient.AsTenant().CommitTran();
                         WarningList = dmsRecordAlarmTimeService.GetMachineWarnList();
 
-                        #region 停止当前设备
+                        #region 停止设备
+                        recipeManageCache.SystemStatus = "0";
                         StopAndMessageWarn(machineStatusDto.warnStatus);
-                        //添加报警停机记录
+                       
-                        OeeCollection(machineStatusDto, 2);
                         #endregion
                     }
                     else