From 934c57635b05680e9ce3fca53d109a77e8da5b9a Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期二, 16 九月 2025 13:11:07 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/HM_JK
---
StandardInterface/MES.Service/service/QC/LljService.cs | 70 ++++++++++++++++++++++++++++++++++-
1 files changed, 68 insertions(+), 2 deletions(-)
diff --git a/StandardInterface/MES.Service/service/QC/LljService.cs b/StandardInterface/MES.Service/service/QC/LljService.cs
index 37567ba..c84c883 100644
--- a/StandardInterface/MES.Service/service/QC/LljService.cs
+++ b/StandardInterface/MES.Service/service/QC/LljService.cs
@@ -1,5 +1,6 @@
锘縰sing System.Data;
using System.Xml;
+using System.Linq;
using Masuit.Tools;
using MES.Service.DB;
using MES.Service.Dto.service;
@@ -24,6 +25,7 @@
var totalCount = 0;
+ // 浣跨敤鏁版嵁搴撳垎椤垫煡璇紝涓�娆℃煡璇�50鏉★紝鎻愬崌鎬ц兘
var pageList = db.Queryable<LtsLlj, V_LljUser>((a, v) =>
new JoinQueryInfos(JoinType.Left, a.ItemNo == v.ItemNo))
.WhereIF(
@@ -86,9 +88,15 @@
// 娣诲姞鎵�灞炶溅闂�
SSCJ = a.SSCJ,
// 娣诲姞璇勫鐘舵��
- PSZT = a.PSZT
+ PSZT = a.PSZT,
+ // 娣诲姞妫�楠岄」鐩淮鎶ょ姸鎬�
+ Jyxm = a.Jyxm
})
- .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")
+ .OrderBy("CASE WHEN EMERGENCY = 1 THEN 0 ELSE 1 END")
+ .OrderBy("CASE WHEN JYXM = 0 THEN 0 ELSE 1 END")
+ .OrderBy("CASE WHEN STATUS = '宸叉彁浜�' THEN 1 ELSE 0 END")
+ .OrderBy("IQC_DATE DESC")
+ .OrderBy("CREATE_DATE")
.ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
// 鎵归噺鑾峰彇妫�楠岄」鐩暟閲忥紝閬垮厤N+1鏌ヨ闂
@@ -1087,4 +1095,62 @@
throw new Exception(ex.Message);
}
}
+ public List<MesItems> GetWomdab(string daa001)
+ {
+ //if (string.IsNullOrEmpty(ItemNo))
+ //{
+ // throw new ArgumentException("妫�楠屽崟鍙蜂笉鑳戒负绌�");
+ //}
+
+ var db = SqlSugarHelper.GetInstance();
+ try
+ {
+ return db.Queryable<Womdab>()
+ .LeftJoin<MesItems>((w, m) => w.Dab003 == m.ItemId.ToString()) // 闇�瑕佹浛鎹负瀹為檯鐨勫叧鑱斿瓧娈�
+ .Where((w, m) => w.Dab001 == daa001)
+ .OrderBy((w, m) => w.Dab003, OrderByType.Desc)
+ // .ThenBy((w, m) => w.CreateDate, OrderByType.Desc)
+ .Select((w, m) => new MesItems
+ {
+ ItemNo = m.ItemNo,
+ ItemName = m.ItemName,
+ ItemModel = m.ItemModel
+ }).ToList();
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"鏌ヨ闄勪欢淇℃伅澶辫触: {ex.Message}");
+ }
+
+ }
+
+ public List<MesItems> GetWomdabById(string daa001,string ItemNo)
+ {
+ //if (string.IsNullOrEmpty(ItemNo))
+ //{
+ // throw new ArgumentException("妫�楠屽崟鍙蜂笉鑳戒负绌�");
+ //}
+
+ var db = SqlSugarHelper.GetInstance();
+ try
+ {
+ return db.Queryable<Womdab>()
+ .LeftJoin<MesItems>((w, m) => w.Dab003 == m.ItemId.ToString()) // 闇�瑕佹浛鎹负瀹為檯鐨勫叧鑱斿瓧娈�
+ .Where((w, m) => w.Dab001 == daa001 && m.ItemNo.Contains(ItemNo))
+ .OrderBy((w, m) => w.Dab003, OrderByType.Desc)
+ // .ThenBy((w, m) => w.CreateDate, OrderByType.Desc)
+ .Select((w, m) => new MesItems
+ {
+ ItemNo = m.ItemNo,
+ ItemName = m.ItemName,
+ ItemModel = m.ItemModel
+ }).ToList();
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"鏌ヨ闄勪欢淇℃伅澶辫触: {ex.Message}");
+ }
+
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3