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/MaintenanceTeamService.cs | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs
index 48b67cc..54adc25 100644
--- a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs
@@ -80,22 +80,22 @@
query = query.OrderByDescending((a, b) => b.Creater);
}
- // 濡傛灉涓嶆槸绠＄悊鍛橈紝鏍规嵁閮ㄩ棬杩囨护
- if (pagination.account != "admin")
- {
- var currentUser = _user.Db.Queryable<Sys_User>()
- .Where(u => u.UserName == pagination.account)
- .First();
+ //// 濡傛灉涓嶆槸绠＄悊鍛橈紝鏍规嵁閮ㄩ棬杩囨护
+ //if (pagination.account != "admin")
+ //{
+ // var currentUser = _user.Db.Queryable<Sys_User>()
+ // .Where(u => u.UserName == pagination.account)
+ // .First();
- if (currentUser == null)
- {
- return new WebResponseContent { Status = false, Data = "鏈幏鍙栧埌鐢ㄦ埛淇℃伅" };
- }
+ // if (currentUser == null)
+ // {
+ // return new WebResponseContent { Status = false, Data = "鏈幏鍙栧埌鐢ㄦ埛淇℃伅" };
+ // }
- int? deptId = currentUser.Dept_Id;
+ // int? deptId = currentUser.Dept_Id;
- query = query.Where((a, b) => a.Dept_Id == deptId);
- }
+ // query = query.Where((a, b) => a.Dept_Id == deptId);
+ //}
//杩斿洖缁撴灉
@@ -113,6 +113,7 @@
b.Creater,
a.HeadImageUrl,
b.DistributionTime,
+ b.EndTime,
b.Modifier,
}).ToPageList(pagination.pageIndex, pagination.pageSize, ref totalCount);
return new WebResponseContent
--
Gitblit v1.9.3