From 96bfcd8a3c8a5f7d383d2c890e0c9b59ee34b7c1 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期六, 01 十一月 2025 19:22:35 +0800
Subject: [PATCH] 优化代码
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_Core/Extensions/WebSocketHostedService.cs | 44 ++++++++++++++++++++++----------------------
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs | 1 +
新建文件夹/WIDESEA_WMSServer/ClassLibrary2/MessageInfoService.cs | 3 ---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs | 1 +
新建文件夹/WIDESEA_WMSServer/ClassLibrary2/Inventory_BatchServices.cs.cs | 2 +-
5 files changed, 25 insertions(+), 26 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/Inventory_BatchServices.cs.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/Inventory_BatchServices.cs.cs"
index 536d322..5a10030 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/Inventory_BatchServices.cs.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/Inventory_BatchServices.cs.cs"
@@ -35,7 +35,7 @@
var day = (item.ValidityPeriod - DateTime.Now).Days;
string d = $"杩樻湁{day}澶╄繃鏈�";
if (day < 0) d = $"宸茶繃鏈焮Math.Abs(day)}澶�";
- _messageInfoService.AddMessageInfo(MessageGroupByEnum.InventoryExceedAlarm, "鐗╂枡鍚嶇О:" + item.MaterielName, $"鐗╂枡缂栧彿銆恵item.MaterielCode}銆戠墿鏂欐壒娆°�恵item.BatchNo}銆憑d}");
+ _messageInfoService.AddMessageInfo(MessageGroupByEnum.InventoryExceedAlarm, "鐗╂枡鍚嶇О:" + item.MaterielName, $"鐗╂枡缂栧彿銆恵item.MaterielCode}銆戠墿鏂欐壒娆°�恵item.BatchNo}銆憑d}", messageRemark: $"鐗╂枡缂栧彿銆恵item.MaterielCode}銆戠墿鏂欐壒娆°�恵item.BatchNo}銆�");
}
}
catch (Exception ex)
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..55e2047 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;
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Core/Extensions/WebSocketHostedService.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Core/Extensions/WebSocketHostedService.cs"
index 686f7e5..07e73f2 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Core/Extensions/WebSocketHostedService.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Core/Extensions/WebSocketHostedService.cs"
@@ -57,28 +57,28 @@
public async Task StartAsync(CancellationToken cancellationToken)
{
- WebSocketSession? webSocketSession = _webSocketServer.OnlineSessions.FirstOrDefault(x => x.Url.Contains(App.User.UserName));
- string MessageInfo = _cacheService.Get("MessageInfo");
- if (!string.IsNullOrEmpty(MessageInfo))
- {
- List<Message>? messages = JsonConvert.DeserializeObject<List<Message>>(MessageInfo);
- if (messages != null && messages.Count > 0)
- {
- foreach (var item in messages)
- {
- object obj = new
- {
- title = item.MessageGroupBy,
- name = item.MessageName,
- message = item.MessageInfo,
- date = item.Date,
- };
- //_webSocketServer.PublishAllClientPayload(obj.Serialize());
- if (webSocketSession != null)
- _webSocketServer.SendClientPayload(webSocketSession, obj.Serialize());
- }
- }
- }
+ //WebSocketSession? webSocketSession = _webSocketServer.OnlineSessions.FirstOrDefault(x => x.Url.Contains(App.User.UserName));
+ //string MessageInfo = _cacheService.Get("MessageInfo");
+ //if (!string.IsNullOrEmpty(MessageInfo))
+ //{
+ // List<Message>? messages = JsonConvert.DeserializeObject<List<Message>>(MessageInfo);
+ // if (messages != null && messages.Count > 0)
+ // {
+ // foreach (var item in messages)
+ // {
+ // object obj = new
+ // {
+ // title = item.MessageGroupBy,
+ // name = item.MessageName,
+ // message = item.MessageInfo,
+ // date = item.Date,
+ // };
+ // //_webSocketServer.PublishAllClientPayload(obj.Serialize());
+ // if (webSocketSession != null)
+ // _webSocketServer.SendClientPayload(webSocketSession, obj.Serialize());
+ // }
+ // }
+ //}
await Task.CompletedTask;
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
index 1c40815..2b8f8b7 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
@@ -488,6 +488,7 @@
catch (Exception ex)
{
_unitOfWorkManage.RollbackTran();
+ _messageInfoService.AddMessageInfo(MessageGroupByEnum.InOrderAlarm, (order.order_type == "2" ? "鍑哄簱閫�璐�" : "姝ｅ父鍏ュ簱") + $"锛氬崟鍙枫�恵order.order_no}銆�", ex.Message);
webResponseContent.Error(ex.Message);
}
return webResponseContent;
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
index c28476c..b9b42b1 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
@@ -479,6 +479,7 @@
}
catch (Exception ex)
{
+ _messageInfoService.AddMessageInfo(MessageGroupByEnum.OutOrderAlarm, (outorder.order_type == "3" ? "鍏ュ簱閫�璐�" : "姝ｅ父鍑哄簱") + $"锛氬崟鍙枫�恵outorder.order_no}銆�", ex.Message);
_unitOfWorkManage.RollbackTran();
webResponseContent.Error(ex.Message);
}
--
Gitblit v1.9.3