From dabfdd9dbf0364b1134daaad86af7e13f6437295 Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期四, 30 十月 2025 12:40:30 +0800
Subject: [PATCH] XJ,SJ,RKJ检验项目序号，LLJ单个检验项目FTP附件信息
---
StandardInterface/MES.Service/service/QC/XJService.cs | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/StandardInterface/MES.Service/service/QC/XJService.cs b/StandardInterface/MES.Service/service/QC/XJService.cs
index df2f739..210860e 100644
--- a/StandardInterface/MES.Service/service/QC/XJService.cs
+++ b/StandardInterface/MES.Service/service/QC/XJService.cs
@@ -153,10 +153,23 @@
)
);
- // 娣诲姞绾夸綋绛涢�夋潯浠�
+ // 娣诲姞绾夸綋绛涢�夋潯浠讹紙鍩轰簬鐢ㄦ埛鏉冮檺锛�
if (lineNo != null && lineNo.Length > 0)
{
query = query.Where((s, a, c, b) => lineNo.Contains(c.LineNo));
+ }
+
+ // 娣诲姞QC绛涢�夋潯浠讹細杞﹂棿鍜岀嚎浣�
+ if (!string.IsNullOrEmpty(queryObj.departmentId))
+ {
+ // 濡傛灉鎸囧畾浜嗚溅闂达紝绛涢�夎杞﹂棿涓嬬殑绾夸綋
+ query = query.Where((s, a, c, b) => c.DepotId.ToString() == queryObj.departmentId);
+ }
+
+ if (!string.IsNullOrEmpty(queryObj.lineId))
+ {
+ // 濡傛灉鎸囧畾浜嗙嚎浣擄紝鐩存帴绛涢�夌嚎浣�
+ query = query.Where((s, a, c, b) => c.LineNo == queryObj.lineId);
}
// 娣诲姞鐘舵�佺瓫閫夋潯浠� - 鏄庣‘鍖归厤鍓嶇浼犻�掔殑鍊�
@@ -287,6 +300,7 @@
var qsQaItemXj01s = db.Queryable<QsQaItemXj01>()
.WhereIF(pid > 0, a => a.Pid == pid)
.WhereIF(id > 0, a => a.Id == id)
+ .OrderBy(a => a.Forder ?? 0)
.ToList();
var array = qsQaItemXj01s.Select(s => s.Id).ToArray();
@@ -323,8 +337,10 @@
s.imageData = Convert.ToBase64String(s.Picture);
});
- //鎺掑簭锛屾湭瀹屾垚鐨勬帓鍦ㄥ墠闈�
- qsQaItemXj01s = qsQaItemXj01s.OrderBy(s => s.isCheck).ToList();
+ //鎺掑簭锛氬彧鎸塅ORDER椤哄簭鎺掑簭
+ qsQaItemXj01s = qsQaItemXj01s
+ .OrderBy(s => s.Forder ?? 0)
+ .ToList();
return qsQaItemXj01s;
}
--
Gitblit v1.9.3