From f6f760c7a7d4f2cdc1e847e39dea3af8da527274 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期六, 18 十月 2025 16:12:12 +0800
Subject: [PATCH] 送检呼叫时间必须大于或等于调机开始时间，以此来筛选首检单
---
Services/MesQaItemsDetect02Manager.cs | 54 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/Services/MesQaItemsDetect02Manager.cs b/Services/MesQaItemsDetect02Manager.cs
index a6ccb43..a382c3a 100644
--- a/Services/MesQaItemsDetect02Manager.cs
+++ b/Services/MesQaItemsDetect02Manager.cs
@@ -12,32 +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
+ 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)
{
@@ -88,9 +106,9 @@
return UseTransaction(db =>
{
-// 宸ュ崟澶勭悊
+ // 宸ュ崟澶勭悊
//if (departmentNo == "XS0101")
- if (departmentNo == "MS0102")
+ if (departmentNo == "MS0102" || departmentNo == "MS01" || departmentNo == "MS0103")//閮ㄩ棬鍏煎
{
// 妫�鏌ユ槸鍚﹀凡瀛樺湪棣栨鍗�
// var existingCheck = Db.Queryable<MesQaItemsDetect02>()
--
Gitblit v1.9.3