dengjunjie
5 天以前 96bfcd8a3c8a5f7d383d2c890e0c9b59ee34b7c1
优化代码
已修改5个文件
51 ■■■■ 文件已修改
新建文件夹/WIDESEA_WMSServer/ClassLibrary2/Inventory_BatchServices.cs.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
新建文件夹/WIDESEA_WMSServer/ClassLibrary2/MessageInfoService.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
新建文件夹/WIDESEA_WMSServer/WIDESEA_Core/Extensions/WebSocketHostedService.cs 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
н¨Îļþ¼Ð/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)
н¨Îļþ¼Ð/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;
н¨Îļþ¼Ð/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;
        }
н¨Îļþ¼Ð/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;
н¨Îļþ¼Ð/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);
            }