From 567aa4ee65af4c2d2c97f7c14aa9181e5eabd852 Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期三, 03 九月 2025 14:58:42 +0800
Subject: [PATCH] 来料检排序，巡检FTP附件
---
StandardInterface/MES.Service/service/QC/LljService.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/StandardInterface/MES.Service/service/QC/LljService.cs b/StandardInterface/MES.Service/service/QC/LljService.cs
index 78dc03b..37567ba 100644
--- a/StandardInterface/MES.Service/service/QC/LljService.cs
+++ b/StandardInterface/MES.Service/service/QC/LljService.cs
@@ -88,7 +88,7 @@
// 娣诲姞璇勫鐘舵��
PSZT = a.PSZT
})
- .OrderBy("CASE WHEN EMERGENCY = 1 THEN 0 ELSE 1 END, CASE WHEN STATUS = '宸叉彁浜�' THEN 0 ELSE 1 END, IQC_DATE desc, ID asc")
+ .OrderBy("CASE WHEN EMERGENCY = 1 AND STATUS = '鏈彁浜�' THEN 0 ELSE 1 END, CASE WHEN STATUS = '鏈彁浜�' AND (SELECT COUNT(*) FROM MES_QA_ITEMS_DETECT_DETAIL5 WHERE RELEASE_NO = A.RELEASE_NO) = 0 THEN 0 ELSE 1 END, CASE WHEN STATUS = '鏈彁浜�' THEN A.CREATE_DATE ASC ELSE NULL END, CASE WHEN STATUS = '宸叉彁浜�' THEN A.IQC_DATE DESC ELSE NULL END")
.ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
// 鎵归噺鑾峰彇妫�楠岄」鐩暟閲忥紝閬垮厤N+1鏌ヨ闂
@@ -682,7 +682,7 @@
FcheckItemDesc = a.FspecRequ,
Funit = a.Funit,
Meom = a.Meom,
- }).ToList();
+ }).OrderBy(a => SqlFunc.IIF(a.Fstand != null, 0, 1)).OrderBy(a => a.FcheckItem, OrderByType.Desc).ToList();
}
public int SetQSItemDetail(MesQaItemsDetectDetail12 detail)
--
Gitblit v1.9.3