From 5f7ba5dbc5ecbd4ae21d43449facc979f325f40c Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Thu, 27 Aug 2026 16:17:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/picking/picking.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pages/picking/picking.vue b/pages/picking/picking.vue
index 92d94fe..e4fb2d1 100644
--- a/pages/picking/picking.vue
+++ b/pages/picking/picking.vue
@@ -1395,7 +1395,12 @@
 				if (!this.evidenceComplete) { this.showToast('五类有效照片和封签号均为必填', 'warning'); return }
 				const contextId = this.evidenceContextId
 				const identity = { ...this.evidenceIdentity }
-				const savedAttempt = restoreLoadingCompletionAttempt(this.draftIdentity())
+				const serverAttempt = this.remotePick?.completionCommand
+				const savedAttempt = restoreLoadingCompletionAttempt(this.draftIdentity()) || (serverAttempt?.operationId ? {
+					operationId: serverAttempt.operationId,
+					expectedTaskVersion: serverAttempt.expectedTaskVersion,
+					remark: serverAttempt.remark || 'PDA确认装柜完成'
+				} : null)
 				const expectedTaskVersion = savedAttempt?.expectedTaskVersion ?? Number(this.pickingVersion)
 				const operationIdentity = stableTaskOperationIdentity(this.draftIdentity())
 				const operationId = savedAttempt?.operationId || stableOperationId('complete', operationIdentity, {