From 823e5cae379ee1a259f79060ca0015d381c61f79 Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期六, 16 八月 2025 08:32:11 +0800
Subject: [PATCH] 入库检，来料检显示权限
---
StandardInterface/MES.Service/service/QC/LljService.cs | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/StandardInterface/MES.Service/service/QC/LljService.cs b/StandardInterface/MES.Service/service/QC/LljService.cs
index 272b38a..2e9fae5 100644
--- a/StandardInterface/MES.Service/service/QC/LljService.cs
+++ b/StandardInterface/MES.Service/service/QC/LljService.cs
@@ -45,7 +45,7 @@
e, f, g, i) => a.FcheckResu != null)
.WhereIF(id > 0, (a, b,
e, f, g, i) => a.Id == id)
- .WhereIF(queryObj.createUser != "PL017" && queryObj.UserIndex == "0", (a, b,
+ .WhereIF(queryObj.createUser != "PL017" && queryObj.createUser != "HMLYY" && queryObj.UserIndex == "0", (a, b,
e, f, g, i) => (g.Fcode == queryObj.createUser || i.Fcode == queryObj.createUser ||
(g.Fcode == null && i.Fcode == null)))//鍒ゆ柇姝ゅ崟鐨勬楠屽憳锛屾垨鑰呮楠屼负绌哄氨鏄剧ず姝ゅ崟鎹�
@@ -67,9 +67,21 @@
.Contains(queryObj.SearchValue.ToLower()))
// .OrderByDescending((a, b,
- .OrderBy("CASE WHEN a.EMERGENCY = 1 THEN 0 ELSE 1 END, a.IQC_DATE desc, CASE WHEN a.STATUS = '宸叉彁浜�' THEN 0 ELSE 1 END, a.ID asc")
- .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
+ .OrderBy("CASE WHEN a.EMERGENCY = 1 THEN 0 ELSE 1 END, CASE WHEN a.STATUS = '宸叉彁浜�' THEN 0 ELSE 1 END, a.IQC_DATE desc, a.ID asc")
+ .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
+ // 涓烘瘡涓楠屽崟娣诲姞妫�楠岄」鐩暟閲忎俊鎭�
+ foreach (var item in pageList)
+ {
+ // 鑾峰彇璇ユ楠屽崟鐨勬楠岄」鐩暟閲�
+ var itemCount = db.Queryable<MesQaItemsDetectDetail5>()
+ .Where(x => x.ReleaseNo == item.ReleaseNo)
+ .Count();
+
+ // 璁剧疆妫�楠岄」鐩暟閲�
+ item.InspectionItemCount = itemCount;
+ }
+
var emergencyValues = pageList.Select(item => item.EMERGENCY).ToList();
return (pageList, totalCount);
}
--
Gitblit v1.9.3