From 8f25fecab6e6a79096b9940ab3432401b9045b39 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期四, 10 七月 2025 18:00:14 +0800
Subject: [PATCH] 首检\巡检\入库检适配
---
MES.Service/service/QC/XJService.cs | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs
index 9ed2beb..000ce6d 100644
--- a/MES.Service/service/QC/XJService.cs
+++ b/MES.Service/service/QC/XJService.cs
@@ -3,6 +3,7 @@
using MES.Service.Modes;
using MES.Service.util;
using SqlSugar;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
namespace MES.Service.service.QC;
@@ -106,7 +107,7 @@
}).ToList();
}
- public List<QsQaItemXj> getPage(XJPageResult queryObj)
+ public (List<QsQaItemXj> items, int totalCount) getPage(XJPageResult queryObj)
{
var db = SqlSugarHelper.GetInstance();
@@ -114,10 +115,10 @@
string[]? lineNo = null;
- if (StringUtil.IsNotNullOrEmpty(queryObj.createUser))
- lineNo = _baseService.getUserLineNo(queryObj.createUser);
+ //if (StringUtil.IsNotNullOrEmpty(queryObj.createUser))
+ // lineNo = _baseService.getUserLineNo(queryObj.createUser);
- return db
+ var query= db
.Queryable<QsQaItemXj, Womdaa, MesLine,
MesItems>((s, a, c, b) =>
new JoinQueryInfos(
@@ -126,8 +127,8 @@
JoinType.Left, s.ItemId == b.Id
)
)
- .WhereIF(lineNo != null && lineNo.Length > 0,
- (s, a, c, b) => lineNo.Contains(c.LineNo))
+ //.WhereIF(lineNo != null && lineNo.Length > 0,
+ // (s, a, c, b) => lineNo.Contains(c.LineNo))
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
"鏈畬鎴�".Equals(queryObj.result),
@@ -152,8 +153,11 @@
FcheckBy = s.FcheckBy,
FcheckResu = s.FcheckResu,
Remarks = s.Remarks
- }).OrderBy(s => s.CreateDate, OrderByType.Desc)
- .ToPageList(queryObj.PageIndex, queryObj.Limit);
+ }).OrderBy(s => s.CreateDate, OrderByType.Desc);
+ var totalCount = query.Count();
+ var items = query.ToPageList(queryObj.PageIndex, queryObj.Limit);
+
+ return (items, totalCount);
}
--
Gitblit v1.9.3