From 18d2fc894b4c1f1990d8b0594189af33bb72d95a Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Wed, 5 Mar 2025 13:46:35 +0800
Subject: [PATCH] =?UTF-8?q?fix-=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E7=8A=B6=E6=80=81=E5=BC=82=E5=B8=B8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs    | 30 +++++++++++++++++---
 SlnMesnac.WPF/ViewModel/ProdMgmtViewModel.cs |  1 +
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs b/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs
index ea83278..c278d7d 100644
--- a/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs
+++ b/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs
@@ -47,7 +47,14 @@ namespace SlnMesnac.WPF.Page
         // 设备参数实时状态
         private List<DmsRealtimeStatus>? realtimeStatusList = null;
 
-        
+        /// <summary>
+        /// 刷新日志信息
+        /// </summary>
+        /// <param name="msg"></param>
+        public delegate void PrintMessageToListBox(string msg);
+        public static event PrintMessageToListBox? PrintMessageToListBoxEvent;
+
+
         private ISqlSugarClient? sqlClient = null;
         private BaseBusiness? baseBusiness = null;
         private readonly ConfigInfoBusiness? _configInfoBusiness;
@@ -258,8 +265,19 @@ namespace SlnMesnac.WPF.Page
                 double Cache_MaxWeight = recipeManageCache.MaxBufferWeight;
                 double Cache_MinWeight = recipeManageCache.MinBufferWeight;
                 double Cache_Weight = recipeManageCache.BufferWeight;
+
+                //阈值预警消息，100范围，推送到首页系统监控提示
+                if(Cache_Weight - Cache_MinWeight >0 && Cache_Weight - Cache_MinWeight <= 100)
+                {
+                    PrintMessageToListBoxEvent?.Invoke("");
+                }
+                if (Cache_MaxWeight - Cache_Weight > 0 && Cache_MaxWeight - Cache_Weight <= 100)
+                {
+                    PrintMessageToListBoxEvent?.Invoke("");
+                }
+
                 bool unPackStatus = plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("拆包机系统运行状态"));
-                if (recipeManageCache.SystemStatus == "1" && unPackStatus && (Cache_MaxWeight <= Cache_Weight))
+                if (unPackStatus && (Cache_MaxWeight <= Cache_Weight))
                 {
                     // 停所有设备
                     StopMachine(99);
@@ -417,7 +435,8 @@ namespace SlnMesnac.WPF.Page
                         WarningList = dmsRecordAlarmTimeService.GetMachineWarnList();
 
                         #region 停止设备
-                        recipeManageCache.SystemStatus = "0";
+                        
+                       
                         StopAndMessageWarn(machineStatusDto.warnStatus);
                         //添加报警停机记录
                        // OeeCollection(machineStatusDto, 2);
@@ -475,6 +494,7 @@ namespace SlnMesnac.WPF.Page
             //    });
             if (status >= 0)
             {
+                
                 Application.Current.Dispatcher.Invoke(() =>
                 {
                     Msg.MsgShow($"{warnStatusEnum.ToString()}", 2, 8);
@@ -1134,7 +1154,8 @@ namespace SlnMesnac.WPF.Page
         {
            
             bool result = false;
-
+           
+           
             plc.writeBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("拆包机远程启动"), false);
             SendPulseSignal("拆包机远程停止");
             Thread.Sleep(MachineSleep);
@@ -1186,6 +1207,7 @@ namespace SlnMesnac.WPF.Page
             Thread.Sleep(MachineSleep);
             plc.writeBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("螺旋2启动"), false);
             result = true;
+            recipeManageCache.SystemStatus = "0";
             // MessageBoxAndLog("一键停止所有机器成功!");
             return result;
         }
diff --git a/SlnMesnac.WPF/ViewModel/ProdMgmtViewModel.cs b/SlnMesnac.WPF/ViewModel/ProdMgmtViewModel.cs
index 7b0baf2..ba3469f 100644
--- a/SlnMesnac.WPF/ViewModel/ProdMgmtViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/ProdMgmtViewModel.cs
@@ -224,6 +224,7 @@ namespace SlnMesnac.WPF.ViewModel
                 _prodMgmtBusiness.RefreshProdPlanListEvent += RefreshPlanDataGrid;
                 _prodMgmtBusiness.MatPutInValidEvent += MatPutInValidHandleEvent;
                 _prodMgmtBusiness.PrintMessageToListBoxEvent += PrintMessageToListBox;
+                DevMonitorPage.PrintMessageToListBoxEvent += PrintMessageToListBox;
                 _prodMgmtBusiness.InitProdPlan();
             });