From 4f88a7d41fea9435c859e256c906a8daeed9953f Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期六, 15 三月 2025 16:37:15 +0800
Subject: [PATCH] 首件巡检优化更改
---
MES.Service/service/QC/XJService.cs | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs
index ad76d93..6bf77a2 100644
--- a/MES.Service/service/QC/XJService.cs
+++ b/MES.Service/service/QC/XJService.cs
@@ -83,7 +83,8 @@
{
Id = a.Id,
Daa001 = a.Daa001,
- Daa003 = a.Daa003
+ Daa003 = a.Daa003,
+ Daa008 = a.Daa008
}).ToList();
}
@@ -98,8 +99,10 @@
.Select<MesItems>((a, b) =>
new MesItems
{
+ Id = b.Id,
ItemNo = b.ItemNo,
- ItemName = b.ItemName
+ ItemName = b.ItemName,
+ ItemModel = b.ItemModel
}).ToList();
}
@@ -120,7 +123,7 @@
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,
@@ -134,20 +137,26 @@
!"鏈畬鎴�".Equals(queryObj.result),
(s, a, c, b) => s.FcheckResu != null)
.WhereIF(id > 0, (s, a, c, b) => s.Id == id)
+ //鍔犵瓫閫夋潯浠�,鏍规嵁渚涘簲鍟嗭紝鐗╂枡缂栫爜锛岀墿鏂欏悕绉版悳绱�
+ //.WhereIF(queryObj.SearchValue!=null && queryObj.SearchValue!="", (a) => a.SuppName == queryObj.SearchValue|| a.ItemName == queryObj.SearchValue || a.ItemNo == queryObj.SearchValue )
+ .WhereIF(queryObj.SearchValue != null && queryObj.SearchValue != "",
+ (s,a,c,b) => (b.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower())
+ || b.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower())))
.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,
+ Remarks = s.Remarks
}).OrderBy(s => s.CreateDate, OrderByType.Desc)
.ToPageList(queryObj.PageIndex, queryObj.Limit);
}
--
Gitblit v1.9.3