diff --git a/src/App.tsx b/src/App.tsx index 73c5ab9..3205e80 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -206,8 +206,6 @@ export default function App() { const [actualCompletionDates, setActualCompletionDates] = useState<{[key: number]: Date | null}>({}); // 基础缓冲期天数(可配置),用于计算动态缓冲期,默认0天 const [baseBufferDays, setBaseBufferDays] = useState(0); - const [lockedExpectedDeliveryDateTs, setLockedExpectedDeliveryDateTs] = useState(null); - const [isExpectedDeliveryDateLocked, setIsExpectedDeliveryDateLocked] = useState(false); // 快照回填来源(foreign_id、款式、颜色、文本2) const [currentForeignId, setCurrentForeignId] = useState(null); const [currentStyleText, setCurrentStyleText] = useState(''); @@ -283,8 +281,6 @@ export default function App() { setIsRestoringSnapshot(false); setRestoredRecordIds([]); setRestoredRecordIdsText(''); - setLockedExpectedDeliveryDateTs(null); - setIsExpectedDeliveryDateLocked(false); // 重置初始快照捕获状态 try { @@ -475,8 +471,6 @@ export default function App() { // 切换功能时重置全局变量,但保留新的mode resetGlobalState({ resetMode: false }); setMode(m); - setIsExpectedDeliveryDateLocked(false); - setLockedExpectedDeliveryDateTs(null); setModeSelectionVisible(false); }; @@ -1068,26 +1062,6 @@ export default function App() { : deriveTimelineAdjustmentsFromResults(snapshot?.timelineResults); setTimelineAdjustments(normalized); } - { - const snapLockedFlag = snapshot?.isExpectedDeliveryDateLocked; - const snapLockedTs = snapshot?.lockedExpectedDeliveryDateTs; - const shouldLock = snapLockedFlag === true || (snapLockedFlag === undefined && snapLockedTs !== undefined && snapLockedTs !== null); - if (shouldLock) { - const ts = (typeof snapLockedTs === 'number' && Number.isFinite(snapLockedTs)) - ? snapLockedTs - : expectedDeliveryTsFromField; - if (ts !== null && ts !== undefined) { - setLockedExpectedDeliveryDateTs(ts); - setIsExpectedDeliveryDateLocked(true); - } else { - setLockedExpectedDeliveryDateTs(null); - setIsExpectedDeliveryDateLocked(false); - } - } else { - setLockedExpectedDeliveryDateTs(null); - setIsExpectedDeliveryDateLocked(false); - } - } restoreExcludedDatesOverrideFromSnapshot(snapshot, snapshot.timelineResults); restoreExcludedDatesByNodeOverrideFromSnapshot(snapshot, snapshot.timelineResults); if (snapshot.expectedDateTimestamp) { @@ -1238,18 +1212,6 @@ export default function App() { : deriveTimelineAdjustmentsFromResults(snapshot?.timelineResults); setTimelineAdjustments(normalized); } - { - const snapLockedFlag = snapshot?.isExpectedDeliveryDateLocked; - const snapLockedTs = snapshot?.lockedExpectedDeliveryDateTs; - const shouldLock = snapLockedFlag === true || (snapLockedFlag === undefined && snapLockedTs !== undefined && snapLockedTs !== null); - if (shouldLock && typeof snapLockedTs === 'number' && Number.isFinite(snapLockedTs)) { - setLockedExpectedDeliveryDateTs(snapLockedTs); - setIsExpectedDeliveryDateLocked(true); - } else { - setLockedExpectedDeliveryDateTs(null); - setIsExpectedDeliveryDateLocked(false); - } - } if (snapshot.expectedDateTimestamp) { setExpectedDate(new Date(snapshot.expectedDateTimestamp)); } else if (snapshot.expectedDateString) { @@ -1591,8 +1553,6 @@ export default function App() { text2: nodeSnapshot.text2, mode: nodeSnapshot.mode, timelineDirection: nodeSnapshot.timelineDirection, - lockedExpectedDeliveryDateTs: nodeSnapshot.lockedExpectedDeliveryDateTs, - isExpectedDeliveryDateLocked: nodeSnapshot.isExpectedDeliveryDateLocked, selectedLabels: nodeSnapshot.selectedLabels, expectedDateTimestamp: nodeSnapshot.expectedDateTimestamp, expectedDateString: nodeSnapshot.expectedDateString, @@ -1707,18 +1667,6 @@ export default function App() { setTimelineResults(nodeSnapshots); setTimelineVisible(true); - { - const snapLockedFlag = (globalSnapshotData as any)?.isExpectedDeliveryDateLocked; - const snapLockedTs = (globalSnapshotData as any)?.lockedExpectedDeliveryDateTs; - const shouldLock = snapLockedFlag === true || (snapLockedFlag === undefined && snapLockedTs !== undefined && snapLockedTs !== null); - if (shouldLock && typeof snapLockedTs === 'number' && Number.isFinite(snapLockedTs)) { - setLockedExpectedDeliveryDateTs(snapLockedTs); - setIsExpectedDeliveryDateLocked(true); - } else { - setLockedExpectedDeliveryDateTs(null); - setIsExpectedDeliveryDateLocked(false); - } - } // 恢复智能缓冲期状态(如果存在) if (globalSnapshotData.bufferManagement) { @@ -4153,24 +4101,6 @@ export default function App() { return Number.isFinite(ts) ? ts : null; }; - const handleExpectedDeliveryDateLockChange = (checked: boolean) => { - const nextLocked = !!checked; - setIsExpectedDeliveryDateLocked(nextLocked); - if (!nextLocked) { - setLockedExpectedDeliveryDateTs(null); - return; - } - if (!expectedDate || isNaN(expectedDate.getTime())) { - setIsExpectedDeliveryDateLocked(false); - setLockedExpectedDeliveryDateTs(null); - if (bitable.ui.showToast) { - bitable.ui.showToast({ toastType: ToastType.warning, message: '请先选择客户期望日期,再开启锁交付' }); - } - return; - } - setLockedExpectedDeliveryDateTs(expectedDate.getTime()); - }; - const computeDynamicBufferDaysUsingEndDelta = ( adjustments: Record, expectedDateOverride?: Date | null, @@ -4450,8 +4380,6 @@ export default function App() { timelineResults, timelineAdjustments, baseBufferDays, - lockedExpectedDeliveryDateTs, - isExpectedDeliveryDateLocked, actualCompletionDates, completionDateAdjustment, hasAppliedSuggestedBuffer, @@ -4470,7 +4398,6 @@ export default function App() { setCompletionDateAdjustment(0); // 重置最后流程完成日期调整 setActualCompletionDates({}); // 重置实际完成日期 setBaseBufferDays(0); // 重置固定缓冲期为默认值 - setIsExpectedDeliveryDateLocked(false); try { lastBufferDeficitRef.current = 0; } catch {} setHasAppliedSuggestedBuffer(false); // 重置建议缓冲期应用标志 setLastSuggestedApplied(null); // 清空上次建议值 @@ -4499,14 +4426,6 @@ export default function App() { const normalizedAdjustments = normalizeTimelineAdjustmentsFromSnapshot(s.timelineAdjustments || {}, s.timelineResults || []); setTimelineAdjustments(normalizedAdjustments); setBaseBufferDays(s.baseBufferDays ?? 0); - const shouldLock = s.isExpectedDeliveryDateLocked === true || (s.isExpectedDeliveryDateLocked === undefined && s.lockedExpectedDeliveryDateTs !== null && s.lockedExpectedDeliveryDateTs !== undefined); - if (shouldLock && typeof s.lockedExpectedDeliveryDateTs === 'number' && Number.isFinite(s.lockedExpectedDeliveryDateTs)) { - setLockedExpectedDeliveryDateTs(s.lockedExpectedDeliveryDateTs); - setIsExpectedDeliveryDateLocked(true); - } else { - setLockedExpectedDeliveryDateTs(null); - setIsExpectedDeliveryDateLocked(false); - } setActualCompletionDates(s.actualCompletionDates || {}); setCompletionDateAdjustment(s.completionDateAdjustment || 0); setHasAppliedSuggestedBuffer(!!s.hasAppliedSuggestedBuffer && s.hasAppliedSuggestedBuffer); @@ -4699,9 +4618,6 @@ export default function App() { // 获取预计交付日期(交期余量的日期版本:根据客户期望日期自动计算缓冲期) let expectedDeliveryDate = computeExpectedDeliveryDateTsFromResults(timelineResults, timelineAdjustments, overrides?.expectedDate ?? expectedDate, completionDateAdjustment); - if (isExpectedDeliveryDateLocked && lockedExpectedDeliveryDateTs !== null) { - expectedDeliveryDate = lockedExpectedDeliveryDateTs; - } // 获取客户期望日期:批量模式优先使用传入的expectedDate let customerExpectedDate = null; @@ -4787,8 +4703,6 @@ export default function App() { timelineDirection, excludedDatesOverride, excludedDatesByNodeOverride: excludedDatesByNodeOverrideRef.current || excludedDatesByNodeOverride, - lockedExpectedDeliveryDateTs, - isExpectedDeliveryDateLocked, selectedLabels: currentSelectedLabels, expectedDateTimestamp, expectedDateString, @@ -6396,8 +6310,6 @@ export default function App() {