From d4d555cf75ef2dd2267dc165a198713fae0fadf9 Mon Sep 17 00:00:00 2001
From: fcx <2246384483@qq.com>
Date: 星期三, 26 十一月 2025 21:27:36 +0800
Subject: [PATCH] 首检（检验员）添加搜索框限制
---
StandardPda/MES.Service/service/QC/SJService.cs | 104 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 77 insertions(+), 27 deletions(-)
diff --git a/StandardPda/MES.Service/service/QC/SJService.cs b/StandardPda/MES.Service/service/QC/SJService.cs
index 2426cf7..acd61fa 100644
--- a/StandardPda/MES.Service/service/QC/SJService.cs
+++ b/StandardPda/MES.Service/service/QC/SJService.cs
@@ -35,46 +35,96 @@
}
//鑾峰彇鎵�鏈夋暟鎹垎椤�
+ //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;
+
+ // var data = 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.Result == queryObj.Result && (a.FSubmit == 0 || a.FSubmit == null))
+ // .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.Result != "鏈畬鎴�" && a.FSubmit == 1)
+ // .WhereIF(
+ // StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
+ // !"鏈畬鎴�".Equals(queryObj.Result),
+ // a => a.FSubmit == 1)
+ // .OrderBy(a => a.BillNo, OrderByType.Desc)
+ // .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
+
+ // return (data, totalCount);
+ //}
+
public (List<SJPageResult> item, int TotalCount) getPage(SJPageResult queryObj)
{
var db = SqlSugarHelper.GetInstance();
+ int totalCount = 0;
- string[]? lineNo = null;
+ string searchValue = queryObj.searchValue?.Trim();
- // if (StringUtil.IsNotNullOrEmpty(queryObj.StatusUser))
- // lineNo = _baseService.getUserLineNo(queryObj.StatusUser);
+ var query = db.Queryable<SJPageResult>();
- var totalCount = 0;
+ // 1锔忊儯 濡傛灉 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);
- var data = 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.Result == queryObj.Result && (a.FSubmit == 0 || a.FSubmit == null))
- .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.Result != "鏈畬鎴�" && a.FSubmit == 1)
- .WhereIF(
- StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
- !"鏈畬鎴�".Equals(queryObj.Result),
- a => a.FSubmit == 1)
+ return (allData, totalCount);
+ }
+
+ // 2锔忊儯 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(queryObj.PageIndex, queryObj.Limit, ref totalCount);
+ .ToPageList(
+ Math.Max(queryObj.PageIndex, 1),
+ Math.Max(queryObj.Limit, 1),
+ ref totalCount);
+
+ // 3锔忊儯 濡傛灉娌℃湁鍖归厤鏁版嵁 鈫� 杩斿洖绌哄垪琛�
+ if (totalCount == 0)
+ return (new List<SJPageResult>(), 0);
return (data, totalCount);
}
+
+
+
+
+
+
+
+
//SetQSItem
// public List<QsItemIpiItem> SetQSItems(string itemNo)
// {
--
Gitblit v1.9.3