From 019e4abb6181b3dbb662d6d9f6ae1b0aa7d520ff Mon Sep 17 00:00:00 2001
From: mairuiming <rm.mai@kinlim.com>
Date: Fri, 20 Mar 2026 17:13:55 +0800
Subject: [PATCH] 1

1
---
 src/App.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/App.tsx b/src/App.tsx
index 4423ad5..5814757 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -3617,11 +3617,13 @@ export default function App() {
               endDate: timelineResult.endDate.includes('未找到') ? timelineResult.endDate : formatDate(nodeEndTime, 'STORAGE_FORMAT')
             };
           }
+          nodeEndTime = adjustToNextWorkingHour(nodeEndTime, nodeCalculationMethod, processNode.weekendDays, nodeExcludedDates);
         } else {
           nodeEndTime = new Date(cumulativeTime);
           if (forceEndTimeTo18 && nodeEndTime && !isNaN(nodeEndTime.getTime())) {
             nodeEndTime = setTimeOfDay(nodeEndTime, 18, 0);
           }
+          nodeEndTime = adjustToNextWorkingHour(nodeEndTime, nodeCalculationMethod, processNode.weekendDays, nodeExcludedDates);
           if (timelineValue) {
             if (nodeCalculationMethod === '内部') {
               nodeStartTime = addInternalBusinessTime(nodeEndTime, -timelineValue, processNode.weekendDays, nodeExcludedDates);
@@ -3893,6 +3895,7 @@ export default function App() {
       if (shouldForceEndTimeTo18(result) && nodeEndTime && !isNaN(nodeEndTime.getTime())) {
         nodeEndTime = setTimeOfDay(nodeEndTime, 18, 0);
       }
+      nodeEndTime = adjustToNextWorkingHour(nodeEndTime, nodeCalculationMethod, nodeWeekendDays, nodeExcludedDates);
 
       const actualEnd = opts?.ignoreActualCompletionDates
         ? null