From 8e5e2fb892df6cc8c61d7c03baa2412522ad11c4 Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期四, 25 九月 2025 19:17:11 +0800
Subject: [PATCH] SJ,XJ,RKJ优化
---
StandardInterface/MES.Service/service/QC/XJService.cs | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/StandardInterface/MES.Service/service/QC/XJService.cs b/StandardInterface/MES.Service/service/QC/XJService.cs
index 0d1564e..8d3ddfc 100644
--- a/StandardInterface/MES.Service/service/QC/XJService.cs
+++ b/StandardInterface/MES.Service/service/QC/XJService.cs
@@ -172,6 +172,49 @@
}
}
+ // 娣诲姞鎼滅储鏉′欢 - 鏍规嵁閫夋嫨鐨勬悳绱㈠瓧娈佃繘琛岀簿纭悳绱�
+ if (!string.IsNullOrEmpty(queryObj.SearchValue) && !string.IsNullOrEmpty(queryObj.searchField))
+ {
+ switch (queryObj.searchField)
+ {
+ case "billNo": // 宸ュ崟
+ query = query.Where((s, a, c, b) => s.BillNo.Contains(queryObj.SearchValue));
+ break;
+ case "releaseNo": // 妫�楠屽崟鍙�
+ query = query.Where((s, a, c, b) => s.ReleaseNo.Contains(queryObj.SearchValue));
+ break;
+ case "daa020": // 浜х嚎
+ query = query.Where((s, a, c, b) => c.LineNo.Contains(queryObj.SearchValue));
+ break;
+ case "itemNo": // 鐗╂枡缂栫爜
+ query = query.Where((s, a, c, b) => s.ItemNo.Contains(queryObj.SearchValue));
+ break;
+ case "itemName": // 鐗╂枡鍚嶇О
+ query = query.Where((s, a, c, b) => b.ItemName.Contains(queryObj.SearchValue));
+ break;
+ default:
+ // 濡傛灉娌℃湁鎸囧畾瀛楁鎴栧瓧娈典笉鍖归厤锛屼娇鐢ㄥ師鏈夌殑妯＄硦鏌ヨ閫昏緫浣滀负鍏滃簳鏂规
+ query = query.Where((s, a, c, b) =>
+ s.ItemNo.Contains(queryObj.SearchValue) ||
+ b.ItemName.Contains(queryObj.SearchValue) ||
+ s.BillNo.Contains(queryObj.SearchValue) ||
+ s.ReleaseNo.Contains(queryObj.SearchValue) ||
+ c.LineNo.Contains(queryObj.SearchValue));
+ break;
+ }
+ }
+ // 涓轰簡鍏煎鏃х増鏈紝濡傛灉娌℃湁浼犻�� searchField锛屼娇鐢ㄥ師鏉ョ殑鏌ヨ閫昏緫
+ else if (string.IsNullOrEmpty(queryObj.searchField) && !string.IsNullOrEmpty(queryObj.SearchValue))
+ {
+ // 淇濇寔鍘熸湁鐨勫瀛楁妯＄硦鏌ヨ閫昏緫
+ query = query.Where((s, a, c, b) =>
+ s.ItemNo.Contains(queryObj.SearchValue) ||
+ b.ItemName.Contains(queryObj.SearchValue) ||
+ s.BillNo.Contains(queryObj.SearchValue) ||
+ s.ReleaseNo.Contains(queryObj.SearchValue) ||
+ c.LineNo.Contains(queryObj.SearchValue));
+ }
+
// 娣诲姞ID绛涢�夋潯浠�
if (id > 0)
{
--
Gitblit v1.9.3