From 000aa71c48e6bda6a37278b914c16be14e50153a Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期五, 17 十月 2025 10:37:25 +0800
Subject: [PATCH] 逻辑优化
---
Services/WomdaaManager.cs | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/Services/WomdaaManager.cs b/Services/WomdaaManager.cs
index 019afce..0ca31f1 100644
--- a/Services/WomdaaManager.cs
+++ b/Services/WomdaaManager.cs
@@ -123,26 +123,25 @@
vOrderBycl.CurrentCjNum = 0;
}
- // 鏌ヨ鎶ュ伐璁板綍锛岃幏鍙栨渶鍚庝竴娆℃姤宸ユ椂闂�
+ // 鏌ヨ鎶ュ伐璁板綍锛岃幏鍙栨渶鍚庝竴鏉℃姤宸ヨ褰曪紙鎸夋姤宸ユ椂闂撮檷搴忔帓鍒楋紝鍙栫涓�鏉★級
var lastReport = Db.Queryable<MesReporting>()
.Where(r => r.BillNo != null && r.BillNo.Contains(query.orderNo))
.OrderBy(r => r.BgDate, OrderByType.Desc)
.First();
- if (lastReport == null)
+ if (lastReport == null || !lastReport.BgDate.HasValue)
{
- // 娌℃湁鎶ュ伐璁板綍锛屽垵濮嬮噰闆嗘暟涓哄紑宸ラ噰鏁�
+ // 娌℃湁鎶ュ伐璁板綍鎴栨姤宸ユ椂闂存棤鏁堬紝鍒濆閲囬泦鏁颁负寮�宸ラ噰鏁�
vOrderBycl.InitCjNum = vOrderBycl.StartCjNum;
}
else
{
// 鏈夋姤宸ヨ褰曪紝鍒濆閲囬泦鏁颁负涓婁竴娆℃姤宸ユ椂闂村悗鏈�杩戜竴鏉￠娇杞暟閲囪〃鐨勯噰闆嗘暟閲�
var afterReportNum = numericalList
- .Where(x =>
- DateTime.TryParse(x.CjTiem, out var cjTiemDt) &&
- lastReport.BgDate.HasValue &&
- cjTiemDt > lastReport.BgDate.Value)
- .OrderBy(x => DateTime.Parse(x.CjTiem))
+ .Select(x => new { Item = x, ParsedTime = DateTime.TryParse(x.CjTiem, out var dt) ? dt : (DateTime?)null })
+ .Where(x => x.ParsedTime.HasValue && x.ParsedTime.Value > lastReport.BgDate.Value)
+ .OrderBy(x => x.ParsedTime)
+ .Select(x => x.Item)
.FirstOrDefault();
vOrderBycl.InitCjNum = afterReportNum?.CjNum ?? vOrderBycl.StartCjNum;
--
Gitblit v1.9.3