From a3a5db87cd11f10efd42eee49e7977c5360e1b55 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 06 八月 2025 15:11:51 +0800
Subject: [PATCH] 首检巡检，入库检验
---
MES.Service/service/QC/XJService.cs | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs
index 3870859..52fe9bc 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;
@@ -83,7 +84,8 @@
{
Id = a.Id,
Daa001 = a.Daa001,
- Daa003 = a.Daa003
+ Daa003 = a.Daa003,
+ Daa008 = a.Daa008
}).ToList();
}
@@ -98,33 +100,37 @@
.Select<MesItems>((a, b) =>
new MesItems
{
+ Id = b.Id,
ItemNo = b.ItemNo,
- ItemName = b.ItemName
+ ItemName = b.ItemName,
+ ItemModel = b.ItemModel
}).ToList();
}
- public List<QsQaItemXj> getPage(XJPageResult queryObj)
+ public (List<QsQaItemXj> items, int totalCount) getPage(XJPageResult queryObj)
{
var db = SqlSugarHelper.GetInstance();
+
+ int totalCount = 0;
var id = Convert.ToDecimal(queryObj.id);
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(
JoinType.Inner, s.BillNo == a.Daa001,
JoinType.Left, a.Daa015 == c.LineNo,
- JoinType.Left, s.ItemNo == b.ItemNo
+ 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),
@@ -136,20 +142,23 @@
.WhereIF(id > 0, (s, a, c, b) => s.Id == id)
.Select((s, a, c, b) => new QsQaItemXj
{
- MoidNum = s.MoidNum,
Daa020 = c.LineNo,
Id = s.Id,
+ PlanQty = a.Daa008,
CreateBy = s.CreateBy,
CreateDate = s.CreateDate,
ReleaseNo = s.ReleaseNo,
ItemNo = s.ItemNo,
- ItemUnit = s.ItemUnit,
BillNo = s.BillNo,
+ ItemName = b.ItemName,
+ ItemModel = b.ItemModel,
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 items = query.ToPageList(queryObj.PageIndex, queryObj.Limit,ref totalCount);
+
+ return (items, totalCount);
}
--
Gitblit v1.9.3