Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZh...

dengjunjie

10 天以前 dd05ce0fe597c0f4c9e3a02228e1b4f6188546aa

 新建文件夹/WIDESEA_WMSServer/ClassLibrary2/EquipmentAlarmInforService.cs

@@ -7,6 +7,7 @@
using System.Security.Policy;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Common;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
@@ -20,8 +21,11 @@
{
    public class EquipmentAlarmInforService : ServiceBase<Dt_EquipmentAlarmInfor, IRepository<Dt_EquipmentAlarmInfor>>, IEquipmentAlarmInforService
    {
        public EquipmentAlarmInforService(IRepository<Dt_EquipmentAlarmInfor> BaseDal) : base(BaseDal)
        private readonly IMessageInfoService _messageInfoService;

        public EquipmentAlarmInforService(IRepository<Dt_EquipmentAlarmInfor> BaseDal, IMessageInfoService messageInfoService) : base(BaseDal)
        {
            _messageInfoService = messageInfoService;
        }


@@ -71,6 +75,10 @@
                                Creater = "System"
                            };
                            BaseDal.AddData(newRecord);
                            if(robot.status== "error")
                            {
                                _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, robot.robotName,$"{ robot.robotName}鍙戠敓閿欒", MessageStatusEnum.Emergency);
                            }
                        }
                        else
                        {
@@ -81,6 +89,10 @@
                            existingRecord.ModifyDate = syncTime;
                            existingRecord.Modifier = "System";
                            BaseDal.UpdateData(existingRecord);
                            if (robot.status == "error")
                            {
                                _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, robot.robotName, $"{robot.robotName}鍙戠敓閿欒", MessageStatusEnum.Emergency);
                            }
                        }
                        saveCount++;
                    }
@@ -107,6 +119,10 @@
                                Creater = "System"
                            };
                            BaseDal.AddData(newRecord);
                            if (sorter.status == "error")
                            {
                                _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, sorter.sorterName, $"{sorter.sorterName}鍙戠敓閿欒", MessageStatusEnum.Emergency);
                            }
                        }
                        else
                        {
@@ -117,6 +133,10 @@
                            existingRecord.ModifyDate = syncTime;
                            existingRecord.Modifier = "System";
                            BaseDal.UpdateData(existingRecord);
                            if (sorter.status == "error")
                            {
                                _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, sorter.sorterName, $"{sorter.sorterName}鍙戠敓閿欒", MessageStatusEnum.Emergency);
                            }
                        }
                        saveCount++;
                    }