修改伸缩杆接口

yanjinhui

7 天以前 b9c76ce85e533250cd36de670146530f970859e7

 ÏîÄ¿´úÂë/ºó¶Ë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/AlarmResetHsyServer.cs

@@ -98,7 +98,7 @@
           


            var query = BaseDal.QueryData(x => x.ResetStatus == true && x.Deptid== deid).ToList();
            var query = BaseDal.QueryData(x => x.ResetStatus == true && x.Deptid== deid&&!x.AlarmContent.Contains("障碍")).ToList();
            // å¦‚果没有找到符合条件的数据
            if (query.Count == 0)
            {
@@ -106,7 +106,15 @@
            }
            try
            {
               
                var left = devices.Value.left.Communicator.Write<bool>("M105", true); //重启报警复位
                // ç­‰å¾…3秒
                Thread.Sleep(1000);
                if (devices.Value.left.Communicator.Read<bool>("M109") || devices.Value.left.Communicator.Read<bool>("M111") || devices.Value.left.Communicator.Read<bool>("M110"))
                {
                    devices.Value.left.Communicator.Write<bool>("M105", true); //重启报警复位
                    return WebResponseContent.Instance.Error("复位失败，请重新检查后重新复位（如：急停按钮是否松开）");
                }
                Console.WriteLine($"左报警信号复位写入{left}");
            }
            catch (Exception)
@@ -117,6 +125,13 @@
            try
            {
                var right = devices.Value.right.Communicator.Write<bool>("M105", true);
                Thread.Sleep(1000);
                if (devices.Value.right.Communicator.Read<bool>("M109") || devices.Value.right.Communicator.Read<bool>("M111") || devices.Value.right.Communicator.Read<bool>("M110"))
                {
                    devices.Value.right.Communicator.Write<bool>("M105", true);
                    return WebResponseContent.Instance.Error("复位失败，请重新检查后重新复位（如：急停按钮是否松开）");
                }

                Console.WriteLine($"右报警信号复位写入{right}");
            }
            catch (Exception)
@@ -179,6 +194,11 @@
                }
                //找到该轨道站的全部信息
                var alarm = BaseDal.QueryData(x => x.Deptid == deid).ToList();
                var deletableAlarms = alarm.Where(x => x.ResetStatus == true && !x.AlarmContent.Contains("障碍")).ToList();//
                if (deletableAlarms.Count>0)
                {
                    return WebResponseContent.Instance.Error("请先复位再删除数据");
                }
                if (alarm.Count<=0)
                {
                    return new WebResponseContent { Status = false, Message = $"没有要删除的{deid}轨道站的报警信息" };