From 6d3eca191a75ab2f4229e4514b36f04ec79bc0fe Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期三, 09 七月 2025 13:58:46 +0800
Subject: [PATCH] llj排序

---
 StandardInterface/MES.Service/service/QC/LljService.cs |   14 +++-----------
 StandardInterface/MES.Service/service/QC/RKJService.cs |    6 +-----
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/StandardInterface/MES.Service/service/QC/LljService.cs b/StandardInterface/MES.Service/service/QC/LljService.cs
index 29de55e..57e31ce 100644
--- a/StandardInterface/MES.Service/service/QC/LljService.cs
+++ b/StandardInterface/MES.Service/service/QC/LljService.cs
@@ -65,17 +65,9 @@
                         .Contains(queryObj.SearchValue.ToLower())
                      || a.ItemModel.ToLower()
                         .Contains(queryObj.SearchValue.ToLower()))
-          //  .OrderByDescending((a, b,
-            
-            .OrderBy ((a, b,e, f, g, i) => a.Id)
-            //.Select((a, b,
-            //        e, f, g, i) => new LtsLlj
-            //        {
-            //            //UserName = g.Fname,
-            //            //UserName = (i.Fname!=null ||i.Fname!="") ? i.Fname : g.Fname,
-            //            UserName = i.Fname != null || i.Fname != "" ? i.Fname : g.Fname,
-            //            CreateUserName = e.Fname
-            //        }, true)
+            //  .OrderByDescending((a, b,
+
+            .OrderBy("CASE WHEN a.STATUS = '宸叉彁浜�' THEN 0 ELSE 1 END, a.IQC_DATE desc, a.ID asc")
             .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount); 
 
         var emergencyValues = pageList.Select(item => item.EMERGENCY).ToList(); 
diff --git a/StandardInterface/MES.Service/service/QC/RKJService.cs b/StandardInterface/MES.Service/service/QC/RKJService.cs
index 8656f8a..07260a8 100644
--- a/StandardInterface/MES.Service/service/QC/RKJService.cs
+++ b/StandardInterface/MES.Service/service/QC/RKJService.cs
@@ -39,16 +39,12 @@
     {
         var db = SqlSugarHelper.GetInstance();
         return db.Queryable<MesLine>()
-            .Where(t =>
-                t.LineStyle == "鍖呰" ||
-                SqlFunc.ContainsArray(new[] { "V1", "V3", "V5", "V6" },
-                    t.LineNo))
             .OrderBy(t => t.LineNo)
             .Select(t => new MesLine
             {
                 LineNo = t.LineNo,
                 LineName = t.LineName
-            }).OrderBy("LINE_NO")
+            })
             .ToList();
     }
 

--
Gitblit v1.9.3