From c50a908b430f2f17eefe0dff33f7bffb4349d961 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期五, 17 十月 2025 08:22:42 +0800
Subject: [PATCH] 逻辑修改
---
Services/WomdaaManager.cs | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/Services/WomdaaManager.cs b/Services/WomdaaManager.cs
index a6c1c6f..303cb2a 100644
--- a/Services/WomdaaManager.cs
+++ b/Services/WomdaaManager.cs
@@ -171,23 +171,31 @@
var sqlQuerySingle = Db.Ado.SqlQuerySingle<string>(sql);
VOrdrerBycl.finalResult = sqlQuerySingle;
- // 鏂板锛氭煡璇㈡渶鏃╀笌鏈�鏂版暟閲囪褰曪紙鎸夐噰闆嗘椂闂存帓搴忥級
+ // 鏂板锛氭煡璇㈡暟閲囪褰曪紙澶勭悊鍚屼竴CjNum鍦ㄤ笉鍚屾椂闂撮噸澶嶇殑鎯呭喌锛�
var baseQuery = Db.Queryable<MesNumericalBycl>()
- .Where(n => n.OrderId == Convert.ToDecimal(query.OrderId) && n.MachineNo == VOrdrerBycl.MachineNo);
+ .Where(n => n.OrderId == Convert.ToDecimal(query.OrderId)
+ && n.MachineNo == VOrdrerBycl.MachineNo
+ && !string.IsNullOrEmpty(n.CjTiem));
- // 淇鍚庝唬鐮侊紙绮剧‘鏃堕棿鎺掑簭锛孫racle鏁版嵁搴撲笅瀛楃涓茶浆鏃堕棿锛�
- var startCjNum = baseQuery.OrderBy(n => SqlFunc.Oracle_ToDate(n.CjTiem, "yyyy-MM-dd HH24:mi:ss")).Select(n => n.CjNum).First();
- // 淇鍚庯紙鍙栨渶鏂版椂闂寸偣瀵瑰簲鐨凜jNum锛岀‘淇濆彇鍒版渶鏂颁竴鏉＄殑CjNum锛�
- var latest = baseQuery
- .Where(n => !string.IsNullOrEmpty(n.CjTiem))
+ // 鏈�鏃╀竴鏉¤褰曪紙鎸夐噰闆嗘椂闂村崌搴忥級
+ var startRecord = baseQuery
+ .OrderBy(n => SqlFunc.Oracle_ToDate(n.CjTiem, "yyyy-MM-dd HH24:mi:ss"))
+ .Select(n => new { n.CjNum, n.CjTiem })
+ .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();
- long? currentCjNum = latest?.CjNum;
+ // 鎵�鏈夎褰曚腑鐨勬渶澶jNum锛堝鏋滈渶瑕佲�滃綋鍓嶇疮璁℃渶澶у�尖�濓級
+ var maxCjNum = baseQuery.Max(n => n.CjNum);
- VOrdrerBycl.StartCjNum = startCjNum;
- VOrdrerBycl.CurrentCjNum = currentCjNum;
+ // 濡傛灉甯屾湜鈥滃綋鍓嶆暟閲団�濇樉绀烘渶鏂版椂闂村搴旂殑CjNum锛岀敤 latestRecord.CjNum
+ // 濡傛灉甯屾湜鏄剧ず绱鏈�澶у�硷紙澶勭悊鍚屼竴缂栧彿澶氭鍑虹幇锛夛紝鐢� maxCjNum
+ VOrdrerBycl.StartCjNum = startRecord?.CjNum;
+ VOrdrerBycl.CurrentCjNum = latestRecord?.CjNum; // 鎴栨浛鎹负 maxCjNum 鏍规嵁涓氬姟瀹氫箟
return VOrdrerBycl;
}
--
Gitblit v1.9.3