From 92e4d27f7083331fdffec1edb83211ad73ce51d6 Mon Sep 17 00:00:00 2001
From: fcx <2246384483@qq.com>
Date: 星期六, 06 十二月 2025 11:46:17 +0800
Subject: [PATCH] 新加首检搜索框查
---
StandardPda/MES.Service/service/QC/SJService.cs | 104 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 93 insertions(+), 11 deletions(-)
diff --git a/StandardPda/MES.Service/service/QC/SJService.cs b/StandardPda/MES.Service/service/QC/SJService.cs
index aa04f96..97357d1 100644
--- a/StandardPda/MES.Service/service/QC/SJService.cs
+++ b/StandardPda/MES.Service/service/QC/SJService.cs
@@ -74,7 +74,74 @@
// return (data, totalCount);
//}
- public (List<SJPageResult> item, int TotalCount) getPage(SJPageResult queryObj)
+ //public (List<SJPageResult> item, int TotalCount) getPage(SJPageResult queryObj)
+ //{
+ // var db = SqlSugarHelper.GetInstance();
+
+ // string[]? lineNo = null;
+
+ // // if (StringUtil.IsNotNullOrEmpty(queryObj.StatusUser))
+ // // lineNo = _baseService.getUserLineNo(queryObj.StatusUser);
+
+ // var totalCount = 0;
+ // string searchValue = queryObj.searchValue?.Trim();
+
+ // // ========= 鏋勫缓鍩虹 query =========
+ // var query = db.Queryable<SJPageResult>()
+ // .WhereIF(lineNo != null && lineNo.Length > 0,
+ // a => lineNo.Contains(a.line))
+ // .WhereIF(queryObj.Id != null,
+ // a => a.Id == queryObj.Id)
+ // .WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.BillNo),
+ // a => a.BillNo == queryObj.BillNo)
+ // // 鏈畬鎴�
+ // .WhereIF(
+ // StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
+ // "鏈畬鎴�".Equals(queryObj.Result),
+ // a => a.FSubmit == 0 || a.FSubmit == null)
+ // // 宸插畬鎴�
+ // .WhereIF(
+ // StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
+ // !"鏈畬鎴�".Equals(queryObj.Result),
+ // a => a.FSubmit == 1);
+
+ // // ========= SearchValue 鍒ゆ柇 =========
+
+ // // SearchValue 涓虹┖锛氳繑鍥炲叏閮�
+ // if (string.IsNullOrWhiteSpace(searchValue))
+ // {
+ // var allData = query
+ // .OrderBy(a => a.BillNo, OrderByType.Desc)
+ // .ToPageList(
+ // Math.Max(queryObj.PageIndex, 1),
+ // Math.Max(queryObj.Limit, 1),
+ // ref totalCount
+ // );
+
+ // return (allData, totalCount);
+ // }
+
+ // // SearchValue 涓嶄负绌猴細妯＄硦鏌� BILL_NO / ITEM_NO
+ // query = query.Where(a =>
+ // SqlFunc.Like(SqlFunc.Trim(a.BillNo).ToLower(), $"%{searchValue.ToLower()}%") ||
+ // SqlFunc.Like(SqlFunc.Trim(a.ItemNo).ToLower(), $"%{searchValue.ToLower()}%")
+ // );
+
+ // // ========= 鎵ц鍒嗛〉 =========
+ // var data = query
+ // .OrderBy(a => a.BillNo, OrderByType.Desc)
+ // .ToPageList(
+ // Math.Max(queryObj.PageIndex, 1),
+ // Math.Max(queryObj.Limit, 1),
+ // ref totalCount
+ // );
+
+ // return (data, totalCount);
+ //}
+
+
+
+ public (List<SJPageResult> item, int TotalCount) getPage(SJPageResult2 queryObj)
{
var db = SqlSugarHelper.GetInstance();
@@ -85,6 +152,9 @@
var totalCount = 0;
string searchValue = queryObj.searchValue?.Trim();
+
+ // 鑾峰彇鎼滅储閫夐」绱㈠紩 (0:椤圭洰, 1:绾夸綋, 2:宸ュ崟鍙�, 3:鐗╂枡鍙�, 4:鐗╂枡鍚�)
+ int selectedIndex = queryObj.selectedIndex ?? 0;
// ========= 鏋勫缓鍩虹 query =========
var query = db.Queryable<SJPageResult>()
@@ -121,11 +191,27 @@
return (allData, totalCount);
}
- // SearchValue 涓嶄负绌猴細妯＄硦鏌� BILL_NO / ITEM_NO
- query = query.Where(a =>
- SqlFunc.Like(SqlFunc.Trim(a.BillNo).ToLower(), $"%{searchValue.ToLower()}%") ||
- SqlFunc.Like(SqlFunc.Trim(a.ItemNo).ToLower(), $"%{searchValue.ToLower()}%")
- );
+ // SearchValue 涓嶄负绌猴細鏍规嵁selectedIndex杩涜涓嶅悓瀛楁鐨勬ā绯婃煡璇�
+ switch (queryObj.selectedIndex)
+ {
+ case 2: // 宸ュ崟鍙�
+ query = query.Where(a => SqlFunc.Like(a.daa001.ToLower(), $"%{searchValue.ToLower()}%"));
+ break;
+ case 3: // 鐗╂枡鍙�
+ query = query.Where(a => SqlFunc.Like(a.ItemNo.ToLower(), $"%{searchValue.ToLower()}%"));
+ break;
+ case 4: // 鐗╂枡鍚嶇О
+ query = query.Where(a => SqlFunc.Like(a.Daa003.ToLower(), $"%{searchValue.ToLower()}%"));
+ break;
+ case 0: // 椤圭洰缂栫爜
+ query = query.Where(a => SqlFunc.Like(a.PROJECT_CODE.ToLower(), $"%{searchValue.ToLower()}%"));
+ break;
+ case 1: // 绾夸綋
+ query = query.Where(a => SqlFunc.Like(a.line.ToLower(), $"%{searchValue.ToLower()}%"));
+ break;
+ default:
+ return (new List<SJPageResult>(), 0);
+ }
// ========= 鎵ц鍒嗛〉 =========
var data = query
@@ -138,10 +224,6 @@
return (data, totalCount);
}
-
-
-
-
@@ -306,7 +388,7 @@
});
item.Items = getQSItems(qsItemIpiReq.Id, null);
- var sjPageResult = new SJPageResult
+ var sjPageResult = new SJPageResult2
{ Id = item.From.Id, Limit = 1, PageIndex = 1 };
var pageResult = getPage(sjPageResult);
item.Result = pageResult.item[0];
--
Gitblit v1.9.3