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