From 91d637fa470e46f70890e9f5ca812c6cd9c0f607 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期一, 20 十月 2025 09:03:32 +0800
Subject: [PATCH] 完工时间格式修改
---
Services/WomdaaManager.cs | 78 +++++++++++++++++++++++++-------------
1 files changed, 51 insertions(+), 27 deletions(-)
diff --git a/Services/WomdaaManager.cs b/Services/WomdaaManager.cs
index ebbdc0b..b2a50e0 100644
--- a/Services/WomdaaManager.cs
+++ b/Services/WomdaaManager.cs
@@ -119,10 +119,15 @@
var vOrderBycl = new VOrderBycl();
if (numericalList.Count > 0)
{
+ // 鎸夐噰闆嗘椂闂村崌搴忔帓搴�
+ var sortedList = numericalList
+ .OrderBy(x => DateTime.TryParse(x.CjTiem, out var dt) ? dt : DateTime.MinValue)
+ .ToList();
+
// 寮�宸ユ暟閲囷細鏈�鏃╀竴鏉�
- vOrderBycl.StartCjNum = numericalList.First().CjNum ?? 0;
+ vOrderBycl.StartCjNum = sortedList.First().CjNum ?? 0;
// 褰撳墠鏁伴噰锛氭渶鏂颁竴鏉�
- vOrderBycl.CurrentCjNum = numericalList.Last().CjNum ?? 0;
+ vOrderBycl.CurrentCjNum = sortedList.Last().CjNum ?? 0;
}
else
{
@@ -132,8 +137,9 @@
// 鏌ヨ鎶ュ伐璁板綍锛岃幏鍙栨渶鍚庝竴鏉℃姤宸ヨ褰�
var lastReport = Db.Queryable<MesReporting>()
- .Where(r => r.BillNo != null && r.BillNo.Contains(query.orderNo))
- .OrderBy(r => r.Id, OrderByType.Desc)
+ .AS("MES_REPORTING") // 寮哄埗琛ㄥ悕
+ .Where(r => r.BillNo == "MSD01-2507140001-g1-1")
+ .OrderBy(r => r.BgDate, OrderByType.Desc)
.First();
if (lastReport == null || !lastReport.BgDate.HasValue)
@@ -143,31 +149,15 @@
}
else
{
- // 鏈夋姤宸ヨ褰曪紝鍒濆閲囬泦鏁颁负涓婁竴娆℃姤宸ユ椂闂村悗鏈�杩戜竴鏉￠娇杞暟閲囪〃鐨勯噰闆嗘暟閲�
- // 1. 绮剧‘鍖归厤鎶ュ伐鏃堕棿
- var exactMatch = numericalList
+ // 鏈夋姤宸ヨ褰曪紝鍒濆閲囬泦鏁颁负鎶ュ伐鏃堕棿鐐瑰墠锛堝惈锛夋渶杩戜竴鏉￠娇杞暟閲囪〃鐨勯噰闆嗘暟閲�
+ var beforeOrEqualReportNum = numericalList
.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)
+ .Where(x => x.ParsedTime.HasValue && x.ParsedTime.Value <= lastReport.BgDate.Value)
+ .OrderByDescending(x => x.ParsedTime) // 闄嶅簭锛屽彇绗竴鏉�
.Select(x => x.Item)
.FirstOrDefault();
- if (exactMatch != null)
- {
- vOrderBycl.InitCjNum = exactMatch.CjNum ?? vOrderBycl.StartCjNum;
- }
- else
- {
- // 2. 鎵炬姤宸ユ椂闂翠箣鍚庣殑绗竴鏉�
- var afterReportNum = numericalList
- .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;
- }
+ vOrderBycl.InitCjNum = beforeOrEqualReportNum?.CjNum ?? vOrderBycl.StartCjNum;
}
var startCjNum = vOrderBycl.StartCjNum;
@@ -260,10 +250,15 @@
if (numericalList.Count > 0)
{
+ // 鍏堟寜閲囬泦鏃堕棿鍗囧簭鎺掑簭
+ var sortedList = numericalList
+ .OrderBy(x => DateTime.TryParse(x.CjTiem, out var dt) ? dt : DateTime.MinValue)
+ .ToList();
+
// 寮�宸ユ暟閲囷細鏈�鏃╀竴鏉�
- VOrdrerBycl.StartCjNum = numericalList.First().CjNum ?? 0;
+ VOrdrerBycl.StartCjNum = sortedList.First().CjNum ?? 0;
// 褰撳墠鏁伴噰锛氭渶鏂颁竴鏉�
- VOrdrerBycl.CurrentCjNum = numericalList.Last().CjNum ?? 0;
+ VOrdrerBycl.CurrentCjNum = sortedList.Last().CjNum ?? 0;
}
else
{
@@ -271,6 +266,35 @@
VOrdrerBycl.CurrentCjNum = 0;
}
+ Console.WriteLine($"orderNo: [{query.orderNo}]");
+
+ // 鏌ヨ鎶ュ伐璁板綍锛岃幏鍙栨渶鍚庝竴鏉℃姤宸ヨ褰�
+ var lastReport = Db.Queryable<MesReporting>()
+ .Where(r => r.BillNo.Trim().ToUpper() == query.orderNo.Trim().ToUpper())
+ .OrderBy(r => r.BgDate, OrderByType.Desc)
+ .First();
+
+ if (lastReport == null || !lastReport.BgDate.HasValue)
+ {
+ // 娌℃湁鎶ュ伐璁板綍锛屽垵濮嬮噰闆嗘暟涓哄紑宸ラ噰鏁�
+ VOrdrerBycl.InitCjNum = VOrdrerBycl.StartCjNum;
+ }
+ else
+ {
+ // 鏈夋姤宸ヨ褰曪紝鍒濆閲囬泦鏁颁负鎶ュ伐鏃堕棿鐐瑰墠锛堝惈锛夋渶杩戜竴鏉￠娇杞暟閲囪〃鐨勯噰闆嗘暟閲�
+ var beforeOrEqualReportNum = numericalList
+ .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)
+ .OrderByDescending(x => x.ParsedTime) // 闄嶅簭锛屽彇绗竴鏉�
+ .Select(x => x.Item)
+ .FirstOrDefault();
+
+ VOrdrerBycl.InitCjNum = beforeOrEqualReportNum?.CjNum ?? VOrdrerBycl.StartCjNum;
+ }
+
+ // 鎶ュ伐鏃堕噰闆嗘暟灏辨槸涓荤晫闈㈢殑褰撳墠閲囨暟
+ // VOrdrerBycl.CurrentCjNum 宸茶祴鍊硷紝鏃犻渶棰濆澶勭悊
+
return VOrdrerBycl;
}
--
Gitblit v1.9.3