From 7ee2e58c300374a15c212f9145ba9d762d64e0e6 Mon Sep 17 00:00:00 2001
From: fcx <2246384483@qq.com>
Date: 星期六, 20 十二月 2025 15:58:11 +0800
Subject: [PATCH] 1.新增MES_PROJECT.cs
---
StandardPda/MES.Service/service/QC/XJService.cs | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/StandardPda/MES.Service/service/QC/XJService.cs b/StandardPda/MES.Service/service/QC/XJService.cs
index 68b0d77..d370a2f 100644
--- a/StandardPda/MES.Service/service/QC/XJService.cs
+++ b/StandardPda/MES.Service/service/QC/XJService.cs
@@ -89,7 +89,7 @@
Daa001 = a.Daa001,
Daa003 = a.Daa003,
Daa008 = a.Daa008
- }).ToList();
+ }).Distinct().ToList();
}
public List<MesItems> getBoardItem(string lineNo)
@@ -107,7 +107,7 @@
ItemNo = b.ItemNo,
ItemName = b.ItemName,
ItemModel = b.ItemModel
- }).ToList();
+ }).Distinct().ToList();
}
//public (List<QsQaItemXj> item, int TotalCount) getPage(XJPageResult queryObj)
@@ -176,40 +176,45 @@
var totalCount = 0;
var pageList = db
- .Queryable<QsQaItemXj, Womdaa, MesItems>((s, a, b) =>
+ .Queryable<QsQaItemXj, Womdaa, MesItems, Womcaa, MES_PROJECT>((s, a, b,c,d) =>
new JoinQueryInfos(
JoinType.Inner, s.BillNo == a.Daa001,
- JoinType.Left, s.ItemId == b.Id
+ JoinType.Left, s.ItemId == b.Id,
+ JoinType.Left,a.Daa021 == c.Caa001,
+ JoinType.Left ,d.Id == c.Project
)
)
// 猸� 妯＄硦鎼滅储锛圔illNo 鎴� ItemNo 鏂板
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.SearchValue),
- (s, a, b) =>
+ (s, a, b,c,d) =>
s.BillNo.Contains(queryObj.SearchValue) ||
- s.ItemNo.Contains(queryObj.SearchValue)
+ s.ItemNo.Contains(queryObj.SearchValue) ||
+ b.ItemName.Contains(queryObj.SearchValue)||
+ a.Daa020.Contains(queryObj.SearchValue)||
+ d.PROJECT_CODE.Contains(queryObj.SearchValue)
)
// 猸� 鐘舵�佺瓫閫夛細鏈畬鎴�
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
"鏈畬鎴�".Equals(queryObj.result),
- (s, a, b) => s.Fsubmit == null || s.Fsubmit == 0
+ (s, a, b,c,d) => s.Fsubmit == null || s.Fsubmit == 0
)
// 猸� 鐘舵�佺瓫閫夛細宸插畬鎴�
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
!"鏈畬鎴�".Equals(queryObj.result),
- (s, a, b) => s.Fsubmit == 1
+ (s, a, b,c,d) => s.Fsubmit == 1
)
// 猸� ID 鏌ヨ锛堝崟鏉★級
- .WhereIF(id > 0, (s, a, b) => s.Id == id)
+ .WhereIF(id > 0, (s, a, b,c,d) => s.Id == id)
// 猸� select 瀹炰綋杩斿洖
- .Select((s, a, b) => new QsQaItemXj
+ .Select((s, a, b,c,d) => new QsQaItemXj
{
Id = s.Id,
ReleaseNo = s.ReleaseNo,
@@ -234,7 +239,9 @@
// 猸� 棰濆瀛楁锛堟潵鑷繛琛級
PlanQty = a.Daa008,
ItemName = b.ItemName,
- ItemModel = b.ItemModel
+ ItemModel = b.ItemModel,
+ DAA020 = a.Daa020,
+ PROJECT_CODE = d.PROJECT_CODE
})
.OrderBy(s => s.CreateDate, OrderByType.Desc)
--
Gitblit v1.9.3