From 3b787c15c3d1640d1e6bbe3147206b852a47741f Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期五, 12 九月 2025 18:24:45 +0800
Subject: [PATCH] 未首检的工单现在不会出现在巡检创建选项中
---
MES.Service/service/QC/XJService.cs | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs
index 62d6fe8..d80e07d 100644
--- a/MES.Service/service/QC/XJService.cs
+++ b/MES.Service/service/QC/XJService.cs
@@ -73,7 +73,7 @@
public List<Womdaa> getDaa001(string daa020, string item)
{
var db = SqlSugarHelper.GetInstance();
- return db.Queryable<Womdaa, MesItems>((a, b) =>
+ /*return db.Queryable<Womdaa, MesItems>((a, b) =>
new JoinQueryInfos(JoinType.Inner, a.Daa002 == b.Id.ToString()))
.Where((a, b) =>
a.Daa015 == daa020 &&
@@ -85,16 +85,40 @@
Daa001 = a.Daa001,
Daa003 = a.Daa003,
Daa008 = a.Daa008
- }).ToList();
+ }).ToList();*/
+ var list = db.Queryable<Womdaa, MesItems, QsItemIpiReq>(
+ (a, b, c) => new JoinQueryInfos(
+ JoinType.Inner, a.Daa002 == b.Id.ToString(),
+ JoinType.Left, a.Id == c.Pbaid
+ )
+ )
+ .Where((a, b, c) =>
+ a.Daa015 == daa020 &&
+ b.ItemNo == item &&
+ statusArray.Contains(a.Daa018) && (c.Id > 0) //鍙煡璇㈡湁棣栨鍗曟嵁鐨勫伐鍗�
+ )
+ .GroupBy((a, b) => new { a.Id, a.Daa001, a.Daa003, a.Daa008 })
+ .Select((a, b) => new Womdaa
+ {
+ Id = a.Id,
+ Daa001 = a.Daa001,
+ Daa003 = a.Daa003,
+ Daa008 = a.Daa008
+ })
+ .ToList();
+ return list;
}
public List<MesItems> getBoardItem(string lineNo)
{
var db = SqlSugarHelper.GetInstance();
- return db.Queryable<Womdaa, MesItems>((a, b) =>
- new JoinQueryInfos(JoinType.Inner, a.Daa002 == b.Id.ToString()))
- .Where((a, b) => statusArray.Contains(a.Daa018) &&
- a.Daa015 == lineNo)
+ return db.Queryable<Womdaa, MesItems, QsItemIpiReq>((a, b, c) =>
+ new JoinQueryInfos(
+ JoinType.Inner, a.Daa002 == b.Id.ToString(),
+ JoinType.Left, a.Id == c.Pbaid))
+ .Where((a, b, c) => statusArray.Contains(a.Daa018) &&
+ a.Daa015 == lineNo && statusArray.Contains(a.Daa018) && (c.Id > 0))
+ .GroupBy((a, b) => new { b.Id, b.ItemNo, b.ItemName, b.ItemModel })
.OrderBy((a, b) => b.ItemName)
.Select<MesItems>((a, b) =>
new MesItems
--
Gitblit v1.9.3