From 2577a348d234c714ccb9195b62d2637f8baa5b55 Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期四, 30 十月 2025 19:55:57 +0800
Subject: [PATCH] 修改检验线体的选择，根据人员权限返回线体
---
MES.Service/service/QC/XJService.cs | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs
index 220c7cf..2749b53 100644
--- a/MES.Service/service/QC/XJService.cs
+++ b/MES.Service/service/QC/XJService.cs
@@ -14,7 +14,7 @@
private readonly BaseService _baseService = new();
- private readonly string[] statusArray = ["寮�宸�", "寰呭紑宸�"];
+ private readonly string[] statusArray = ["寮�宸�", "寰呭紑宸�","宸插紑宸�"];
//鐢熸垚鏈�鏂扮殑妫�楠屽崟鍙�
public string getMaxReleaseNo()
@@ -52,23 +52,17 @@
.ToList();
}
- public List<MesLine> getLineAll()
+ public List<QCUserLine> getLineAll(string UserNo)
{
var db = SqlSugarHelper.GetInstance();
-
- return db.Queryable<Womdaa, MesLine>((a, b) =>
- new JoinQueryInfos(JoinType.Left, a.Daa015 == b.LineNo))
- .Where((a, b) => b.LineName != null &&
- statusArray.Contains(a.Daa018))
- .GroupBy((a, b) => new
+
+ return db.Queryable<QCUserLine>()
+ .Where(a => a.UserCode == UserNo)
+ .Select(a => new QCUserLine
{
- b.LineNo, b.LineName
- })
- .Select((a, b) => new MesLine
- {
- LineNo = b.LineNo,
- LineName = b.LineName
- }).OrderBy("b.LINE_NO").ToList();
+ LineNo = a.LineNo,
+ LineName = a.LineName
+ }).OrderBy("LINENO").ToList();
}
public List<Womdaa> getDaa001(string daa020, string item)
--
Gitblit v1.9.3