From a5019b475f8620dba3b495da983f4db9e32f7ca8 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期四, 10 七月 2025 08:18:36 +0800
Subject: [PATCH] AOI
---
MES.Service/service/QC/SJService.cs | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/MES.Service/service/QC/SJService.cs b/MES.Service/service/QC/SJService.cs
index 9362b8f..b83cc8e 100644
--- a/MES.Service/service/QC/SJService.cs
+++ b/MES.Service/service/QC/SJService.cs
@@ -1,4 +1,5 @@
-锘縰sing System.Data;
+锘縰sing System.Buffers;
+using System.Data;
using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
@@ -34,9 +35,11 @@
}
//鑾峰彇鎵�鏈夋暟鎹垎椤�
- public List<SJPageResult> getPage(SJPageResult queryObj)
+ public (List<SJPageResult> items, int TotalCount) getPage(SJPageResult queryObj)
{
var db = SqlSugarHelper.GetInstance();
+
+ var totalCount = 0;
string[]? lineNo = null;
@@ -58,10 +61,12 @@
!"鏈畬鎴�".Equals(queryObj.Result),
a => a.Result != "鏈畬鎴�")
.WhereIF(queryObj.Comments != null, a => a.Comments == queryObj.Comments)
+ .WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.SearchValue),a=>a.BillNo.Contains(queryObj.SearchValue)
+ || a.ItemNo.Contains(queryObj.SearchValue))
.OrderBy(a => a.BillNo, OrderByType.Desc)
- .ToPageList(queryObj.PageIndex, queryObj.Limit);
+ .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
- return data;
+ return (data, totalCount);
}
@@ -224,7 +229,7 @@
item.Items = getQSItems(qsItemIpiReq.Id, null);
var sjPageResult = new SJPageResult
{ Id = item.From.Id, Limit = 1, PageIndex = 1 };
- item.Result = getPage(sjPageResult)[0];
+ item.Result = getPage(sjPageResult).items[0];
return item;
}
--
Gitblit v1.9.3