From 8ba0722979e389a8a2f5835022a7d305ab215c08 Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期四, 24 七月 2025 17:52:26 +0800
Subject: [PATCH] 来料检增加字段
---
StandardInterface/MES.Service/service/QC/XJService.cs | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/StandardInterface/MES.Service/service/QC/XJService.cs b/StandardInterface/MES.Service/service/QC/XJService.cs
index 9ed2beb..b94657d 100644
--- a/StandardInterface/MES.Service/service/QC/XJService.cs
+++ b/StandardInterface/MES.Service/service/QC/XJService.cs
@@ -13,7 +13,7 @@
private readonly BaseService _baseService = new();
- private readonly string[] statusArray = ["寮�宸�", "寰呭紑宸�"];
+ private readonly string[] statusArray = ["宸插紑宸�", "鏈紑宸�", "寰呭紑宸�"];
//鐢熸垚鏈�鏂扮殑妫�楠屽崟鍙�
public string getMaxReleaseNo()
@@ -106,7 +106,7 @@
}).ToList();
}
- public List<QsQaItemXj> getPage(XJPageResult queryObj)
+ public (List<QsQaItemXj> item, int TotalCount) getPage(XJPageResult queryObj)
{
var db = SqlSugarHelper.GetInstance();
@@ -117,7 +117,8 @@
if (StringUtil.IsNotNullOrEmpty(queryObj.createUser))
lineNo = _baseService.getUserLineNo(queryObj.createUser);
- return db
+ var totalCount = 0;
+ var data = db
.Queryable<QsQaItemXj, Womdaa, MesLine,
MesItems>((s, a, c, b) =>
new JoinQueryInfos(
@@ -153,7 +154,9 @@
FcheckResu = s.FcheckResu,
Remarks = s.Remarks
}).OrderBy(s => s.CreateDate, OrderByType.Desc)
- .ToPageList(queryObj.PageIndex, queryObj.Limit);
+ .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
+
+ return (data, totalCount);
}
@@ -528,4 +531,5 @@
.ExecuteCommand();
});
}
+
}
\ No newline at end of file
--
Gitblit v1.9.3