From a8f45fa02822529485ea0bf08ee1d5d5d1a35e15 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期五, 21 十一月 2025 15:34:20 +0800
Subject: [PATCH] 更换提示顺序
---
Services/MesQaItemsDetect02Manager.cs | 51 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/Services/MesQaItemsDetect02Manager.cs b/Services/MesQaItemsDetect02Manager.cs
index 6b4c198..a382c3a 100644
--- a/Services/MesQaItemsDetect02Manager.cs
+++ b/Services/MesQaItemsDetect02Manager.cs
@@ -12,33 +12,50 @@
//鏍规嵁宸ュ崟鍙锋煡棣栨
public MesQaItemsDetect02 FindSJByOrderNo(OrderMachineDto query)
{
- return Db.Queryable<MesQaItemsDetect02>()
- .Where(s => s.Ftype == "棣栨" && s.Aufnr == query.orderNo)
- .Select(s => new MesQaItemsDetect02
+ var list = Db.Queryable<MesQaItemsDetect02>()
+ .LeftJoin<MesStaff>((sj, staff) => sj.FcheckBy == staff.StaffNo)
+ .Where((sj, staff) =>
+ sj.Ftype == "棣栨" && sj.Aufnr == query.orderNo &&
+ sj.FcheckDate != null)
+ .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)
- .First();
+ .OrderBy(sj => sj.FcheckDate, OrderByType.Desc);
+
+ if (list == null || list.Count() == 0)
+ {
+ var empty = new MesQaItemsDetect02();
+ empty.xjCount = 0; // 鍙敼涓� sjCount锛屾洿璇箟鍖�
+ return empty;
+ }
+
+ var entity = list.First();
+ entity.xjCount = list.Count(); // 鍙敼涓� sjCount锛屾洿璇箟鍖�
+ return entity;
}
//鏍规嵁宸ュ崟鍙锋煡宸℃
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