From 2b49f7643d15b74889d190f216630559006ed93a Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期一, 01 十二月 2025 09:48:43 +0800
Subject: [PATCH] pad和后端的优化

---
 新建文件夹/WIDESEA_WMSServer/ClassLibrary2/MessageInfoService.cs |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/MessageInfoService.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/MessageInfoService.cs"
index 365a8ea..5ec07cc 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/MessageInfoService.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/MessageInfoService.cs"
@@ -48,10 +48,7 @@
             {
                 Dt_MessageInfo dt_MessageInfo = null;
                 if (groupByEnum == MessageGroupByEnum.InventoryExceedAlarm)
-                {
                     dt_MessageInfo = BaseDal.QueryFirst(x => x.MessageName == messageName && x.MessageRemark == messageRemark);
-                    if (dt_MessageInfo != null && dt_MessageInfo.MessageInfo == messageInfo) return content;
-                }
                 else
                     dt_MessageInfo = BaseDal.QueryFirst(x => x.MessageName == messageName && x.MessageInfo == messageInfo);
                 if (groupByEnum != MessageGroupByEnum.InventoryExceedAlarm && dt_MessageInfo != null) return content;
@@ -123,6 +120,9 @@
             return content;
         }
 
+        /// <summary>
+        /// 娑堟伅澶勭悊鍜屾帹閫� WebSocket瀹炴椂鎺ㄩ��
+        /// </summary>
         public void GetMessageInfo()
         {
             try
@@ -138,6 +138,7 @@
                     }
                 }
                 var messinfo = BaseDal.QueryData(x => x.MessageStatus < MessageStatusEnum.Wait.ObjToInt());
+                messagesinfo = messagesinfo.Where(x => !messinfo.Select(x => x.Id).Contains(x.Id)).ToList();
                 foreach (var item in messinfo)
                 {
                     Message message = new Message()

--
Gitblit v1.9.3