From 8cf3b1c0538a26aa1c1fb7f7222b7eab3f4914ff Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期五, 17 十月 2025 08:28:01 +0800
Subject: [PATCH] ID而不是时间和CjNum查询数采记录
---
Services/WomdaaManager.cs | 29 ++++++++---------------------
1 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/Services/WomdaaManager.cs b/Services/WomdaaManager.cs
index 303cb2a..4445f5d 100644
--- a/Services/WomdaaManager.cs
+++ b/Services/WomdaaManager.cs
@@ -171,31 +171,18 @@
var sqlQuerySingle = Db.Ado.SqlQuerySingle<string>(sql);
VOrdrerBycl.finalResult = sqlQuerySingle;
- // 鏂板锛氭煡璇㈡暟閲囪褰曪紙澶勭悊鍚屼竴CjNum鍦ㄤ笉鍚屾椂闂撮噸澶嶇殑鎯呭喌锛�
+ // 鏂板锛氭寜ID鑰屼笉鏄椂闂村拰CjNum鏌ヨ鏁伴噰璁板綍
var baseQuery = Db.Queryable<MesNumericalBycl>()
.Where(n => n.OrderId == Convert.ToDecimal(query.OrderId)
- && n.MachineNo == VOrdrerBycl.MachineNo
- && !string.IsNullOrEmpty(n.CjTiem));
+ && n.MachineNo == VOrdrerBycl.MachineNo);
- // 鏈�鏃╀竴鏉¤褰曪紙鎸夐噰闆嗘椂闂村崌搴忥級
- var startRecord = baseQuery
- .OrderBy(n => SqlFunc.Oracle_ToDate(n.CjTiem, "yyyy-MM-dd HH24:mi:ss"))
- .Select(n => new { n.CjNum, n.CjTiem })
- .First();
+ // 鎸塈D鍗囧簭鍙栨渶鏃╄褰�
+ var startRecordById = baseQuery.OrderBy(n => n.Id).First();
+ // 鎸塈D闄嶅簭鍙栨渶鏂拌褰�
+ var latestRecordById = baseQuery.OrderBy(n => n.Id, OrderByType.Desc).First();
- // 鏈�鏂版椂闂寸偣鐨勮褰曪紙鎸夐噰闆嗘椂闂撮檷搴忓彇鏁存潯锛�
- var latestRecord = baseQuery
- .OrderBy(n => SqlFunc.Oracle_ToDate(n.CjTiem, "yyyy-MM-dd HH24:mi:ss"), OrderByType.Desc)
- .Select(n => new { n.CjNum, n.CjTiem })
- .First();
-
- // 鎵�鏈夎褰曚腑鐨勬渶澶jNum锛堝鏋滈渶瑕佲�滃綋鍓嶇疮璁℃渶澶у�尖�濓級
- var maxCjNum = baseQuery.Max(n => n.CjNum);
-
- // 濡傛灉甯屾湜鈥滃綋鍓嶆暟閲団�濇樉绀烘渶鏂版椂闂村搴旂殑CjNum锛岀敤 latestRecord.CjNum
- // 濡傛灉甯屾湜鏄剧ず绱鏈�澶у�硷紙澶勭悊鍚屼竴缂栧彿澶氭鍑虹幇锛夛紝鐢� maxCjNum
- VOrdrerBycl.StartCjNum = startRecord?.CjNum;
- VOrdrerBycl.CurrentCjNum = latestRecord?.CjNum; // 鎴栨浛鎹负 maxCjNum 鏍规嵁涓氬姟瀹氫箟
+ VOrdrerBycl.StartCjNum = startRecordById?.CjNum;
+ VOrdrerBycl.CurrentCjNum = latestRecordById?.CjNum;
return VOrdrerBycl;
}
--
Gitblit v1.9.3