From 240a4dc4318642ef7e1c48caadf9e9de890e5ee3 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期六, 18 十月 2025 13:17:11 +0800
Subject: [PATCH] 逻辑优化
---
Services/MesQaItemsDetect02Manager.cs | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/Services/MesQaItemsDetect02Manager.cs b/Services/MesQaItemsDetect02Manager.cs
index 6b4c198..7078ab8 100644
--- a/Services/MesQaItemsDetect02Manager.cs
+++ b/Services/MesQaItemsDetect02Manager.cs
@@ -28,17 +28,19 @@
public MesQaItemsDetect02 FindXJByOrderNo(OrderMachineDto query)
{
var list = Db.Queryable<MesQaItemsDetect02>()
- .Where(s =>
- s.Ftype == "宸℃" && s.Aufnr == query.orderNo &&
- s.FcheckDate != null)
- .Select(s => new MesQaItemsDetect02
+ .LeftJoin<MesStaff>((xj, staff) => xj.FcheckBy == staff.StaffNo)
+ .Where((xj, staff) =>
+ xj.Ftype == "宸℃" && xj.Aufnr == query.orderNo &&
+ xj.FcheckDate != null)
+ .Select((xj, staff) => new MesQaItemsDetect02
{
- Id = s.Id,
- FcheckDate = s.FcheckDate,
- FcheckResu = s.FcheckResu,
- FcheckBy = s.FcheckBy // 鏂板
+ Id = xj.Id,
+ FcheckDate = xj.FcheckDate,
+ FcheckResu = xj.FcheckResu,
+ // FcheckBy涓嶴taffName缁勫悎锛屽 "宸ュ彿-濮撳悕"
+ FcheckBy = xj.FcheckBy + (staff.StaffName != null ? "-" + staff.StaffName : "")
})
- .OrderBy(s => s.FcheckDate, OrderByType.Desc);
+ .OrderBy(xj => xj.FcheckDate, OrderByType.Desc);
if (list == null || list.Count() == 0)
{
--
Gitblit v1.9.3