From fcd49db2ee33ee2e1d33e5a41e53d9897a8a3b0f Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 05 六月 2025 19:19:10 +0800
Subject: [PATCH] 限制plc伸到位报警，和限制开始作业无限点击问题
---
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/AlarmResetHsyServer.cs | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/AlarmResetHsyServer.cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/AlarmResetHsyServer.cs
index b9bba81..12ee282 100644
--- a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/AlarmResetHsyServer.cs
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/AlarmResetHsyServer.cs
@@ -10,6 +10,7 @@
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
+using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_DTO.Telescopic;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
@@ -34,11 +35,12 @@
/// </summary>
/// <param name="entity"></param>
/// <returns></returns>
- public WebResponseContent AddAlarmHsy(string alarmContent, bool resetStatus)
+ public WebResponseContent AddAlarmHsy(int deptid,string alarmContent, bool resetStatus)
{
var alarm = new Dt_AlarmResetHsy
{
- AlarmContent= alarmContent,
+ Deptid= deptid,
+ AlarmContent = alarmContent,
ResetStatus= resetStatus,
AlarmTime=DateTime.Now,
@@ -49,7 +51,7 @@
}
- public WebResponseContent GetWebSocketInfo()
+ public WebResponseContent GetWebSocketInfo(int deptid)
{
try
{
@@ -57,7 +59,7 @@
// var query = Db.Queryable<Dt_AlarmResetHsy>()
// .OrderBy(x => new { ResetStatus = SqlFunc.IsNull(x.ResetStatus, false), x.CreateDate }, OrderByType.Desc); // 鎸� ResetStatus 涓� true 鎺掑湪鍓嶏紝骞舵寜 CreateDate 闄嶅簭
- var query = BaseDal.QueryData().OrderByDescending(x => x.ResetStatus). ThenByDescending(x => x.CreateDate); // 鍐嶆寜 CreateDate 闄嶅簭;
+ var query = BaseDal.QueryData(x=>x.Deptid==deptid).OrderByDescending(x => x.ResetStatus). ThenByDescending(x => x.CreateDate); // 鍐嶆寜 CreateDate 闄嶅簭;
// 濡傛灉闇�瑕佹牴鎹叾浠栧瓧娈佃繘琛岃繃婊ゆ垨妯＄硦鏌ヨ锛屽彲浠ュ湪姝ゆ坊鍔�
@@ -82,12 +84,16 @@
/// </summary>
/// <param name="status"></param>
/// <returns></returns>
- public WebResponseContent BecomeTrue(string account)
+ public WebResponseContent BecomeTrue()
{
- //鎵惧埌鐧诲叆浜虹殑deptid
- var loginer = _user.QueryFirst(x => x.UserName == account);
+ ////鎵惧埌鐧诲叆浜虹殑deptid
+ //var loginer = _user.QueryFirst(x => x.UserName == account);
+ if (!int.TryParse(AppSettings.Get("DepartmentID"), out int deid))
+ {
+ return new WebResponseContent { Status = false, Message = "閰嶇疆椤� DepartmentID 鏃犳硶杞崲涓烘暣鏁�" };
+ }
- var query = BaseDal.QueryData(x => x.ResetStatus == true && x.Deptid==loginer.Dept_Id ).ToList();
+ var query = BaseDal.QueryData(x => x.ResetStatus == true && x.Deptid== deid).ToList();
// 濡傛灉娌℃湁鎵惧埌绗﹀悎鏉′欢鐨勬暟鎹�
if (query.Count == 0)
{
@@ -137,6 +143,30 @@
}
}
-
+ public WebResponseContent DeleteAllinform()
+ {
+ try
+ {
+
+ if (!int.TryParse(AppSettings.Get("DepartmentID"), out int deid)) //鑾峰彇杞ㄩ亾绔欏彿
+ {
+ Console.WriteLine("閰嶇疆椤� DepartmentID 鏃犳硶杞崲涓烘暣鏁�");
+ }
+ //鎵惧埌璇ヨ建閬撶珯鐨勫叏閮ㄤ俊鎭�
+ var alarm = BaseDal.QueryData(x => x.Deptid == deid).ToList();
+ if (alarm.Count<=0)
+ {
+ return new WebResponseContent { Status = false, Message = $"娌℃湁瑕佸垹闄ょ殑{deid}杞ㄩ亾绔欑殑鎶ヨ淇℃伅" };
+ }
+ //鎵惧埌鍚庡叏閮ㄥ垹闄�
+ var reslut= BaseDal.DeleteData(alarm);
+ return new WebResponseContent { Status = true, Message = "鍒犻櫎鎴愬姛", Data = reslut };
+ }
+ catch (Exception ex)
+ {
+
+ return new WebResponseContent { Status = false, Message = ex.Message };
+ }
+ }
}
}
--
Gitblit v1.9.3