From b876edb8c9865d15a41cc0926cde34aa8c89c1f2 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期六, 18 十月 2025 13:28:12 +0800
Subject: [PATCH] 逻辑优化
---
Services/MesQaItemsDetect02Manager.cs | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/Services/MesQaItemsDetect02Manager.cs b/Services/MesQaItemsDetect02Manager.cs
index 7078ab8..225c7e7 100644
--- a/Services/MesQaItemsDetect02Manager.cs
+++ b/Services/MesQaItemsDetect02Manager.cs
@@ -12,16 +12,21 @@
//鏍规嵁宸ュ崟鍙锋煡棣栨
public MesQaItemsDetect02 FindSJByOrderNo(OrderMachineDto query)
{
- return Db.Queryable<MesQaItemsDetect02>()
- .Where(s => s.Ftype == "棣栨" && s.Aufnr == query.orderNo)
- .Select(s => new MesQaItemsDetect02
+ var entity = Db.Queryable<MesQaItemsDetect02>()
+ .LeftJoin<MesStaff>((sj, staff) => sj.FcheckBy == staff.StaffNo)
+ .Where((sj, staff) => sj.Ftype == "棣栨" && sj.Aufnr == query.orderNo)
+ .Select((sj, staff) => new MesQaItemsDetect02
{
- Id = s.Id,
- FcheckDate = s.FcheckDate,
- FcheckResu = s.FcheckResu
+ Id = sj.Id,
+ FcheckDate = sj.FcheckDate,
+ FcheckResu = sj.FcheckResu,
+ // FcheckBy涓嶴taffName缁勫悎锛屽 "宸ュ彿-濮撳悕"
+ FcheckBy = sj.FcheckBy + (staff.StaffName != null ? "-" + staff.StaffName : "")
})
- .OrderBy(s => s.FcheckDate, OrderByType.Desc)
+ .OrderBy(sj => sj.FcheckDate, OrderByType.Desc)
.First();
+
+ return entity;
}
//鏍规嵁宸ュ崟鍙锋煡宸℃
--
Gitblit v1.9.3