优化

pages/picking/picking.vue

@@ -150,7 +150,7 @@
 				</view>
 				<view v-if="!loadingStageReady" class="evidence-stage-hint" role="status">当前可先拍照留存；拣货完成并同步装柜状态后，照片会自动上传绑定。</view>
 				<view v-if="remoteError" class="remote-error-row"><text class="remote-error" role="alert">{{ remoteError }}</text><button class="evidence-retry-btn" :disabled="remoteLoading" @tap="refreshTask">刷新任务</button></view>
-				<button class="loading-complete-btn" :disabled="submitting || loadingVersion === null || !evidenceComplete" @tap="completeLoadingTask">确认装柜完成</button>
+				<button class="loading-complete-btn" :disabled="submitting || pickingVersion === null || loadingVersion === null || !evidenceComplete" @tap="completeLoadingTask">确认装柜完成</button>
 				<view v-if="loadingVersion === null" class="remote-error-row">
 					<text class="version-hint" role="status">状态尚未同步，请刷新重试</text>
 					<button class="evidence-retry-btn" :disabled="remoteLoading" @tap="refreshTask">刷新任务</button>
@@ -344,7 +344,7 @@
 	import { navigateBackOr } from '@/utils/navigation.js'
 	import { startScanBroadcast } from '@/utils/scan-broadcast.js'
 	import { playErrorSound, playSuccessSound } from '@/utils/audio-feedback.js'
-	import { claimContainerPickingTask, completeLoading, completePicking, downloadEvidencePreview, EVIDENCE_SLOTS, getContainerPickingTask, getEvidence, getEvidencePreviewUrl, getPickingInventorySnapshot, getPickingTask, isRemoteReady, normalizePickingTask, submitContainerPickingBatch, uploadEvidenceFile, upsertEvidence, voidEvidence } from '@/api/pda-loading.js'
+	import { claimContainerPickingTask, completeContainerPickingTask, completePicking, downloadEvidencePreview, EVIDENCE_SLOTS, getContainerPickingTask, getEvidence, getEvidencePreviewUrl, getPickingInventorySnapshot, getPickingTask, isRemoteReady, normalizePickingTask, submitContainerPickingBatch, uploadEvidenceFile, upsertEvidence, voidEvidence } from '@/api/pda-loading.js'
 	import { createEvidenceUploadQueue } from '@/utils/evidence-upload-queue.js'
 	import { isOnline } from '@/utils/network.js'
 	import { stableOperationId } from '@/utils/idempotency.js'
@@ -1140,17 +1140,30 @@
 			async completeLoadingTask() {
 				if (!this.requireEvidenceStage()) return
 				if (!this.evidenceIdentity?.inboundId || !isRemoteReady(this.evidenceIdentity.inboundId)) { this.showToast('装柜任务尚未同步，请刷新后重试', 'warning'); return }
-				if (this.loadingVersion === null) { this.showToast(VERSION_SYNC_MESSAGE, 'warning'); return }
+				if (this.pickingVersion === null || this.loadingVersion === null) { this.showToast(VERSION_SYNC_MESSAGE, 'warning'); return }
 				if (!this.evidenceComplete) { this.showToast('五类有效照片和封签号均为必填', 'warning'); return }
 				const contextId = this.evidenceContextId
 				const identity = { ...this.evidenceIdentity }
-				const inboundId = identity.inboundId
-				const tenantId = this.currentBox.tenantId
-				const loadingVersion = this.loadingVersion
+				const expectedTaskVersion = Number(this.pickingVersion)
+				const operationIdentity = stableTaskOperationIdentity(this.draftIdentity())
+				const operationId = stableOperationId('complete', operationIdentity, {
+					taskId: this.remoteTaskId,
+					expectedTaskVersion,
+					loadingPlanId: identity.loadingPlanId,
+					containerBookingId: identity.containerBookingId
+				})
 				this.submitting = true
 				try {
-					await completeLoading(inboundId, { expectedVersion: loadingVersion, remark: 'PDA确认装柜完成' }, tenantId)
+					const completedTask = await completeContainerPickingTask(this.remoteTaskId, {
+						expectedTaskVersion,
+						operationId,
+						remark: 'PDA确认装柜完成'
+					})
 					if (!this.isEvidenceContextActive(contextId, identity)) return
+					if (completedTask) {
+						this.remotePick = normalizePickingTask({ ...this.remotePick, ...completedTask })
+						this.pickingVersion = this.remotePick.pickingVersion ?? this.remotePick.version ?? this.pickingVersion
+					}
 					this.showToast('已确认装柜完成', 'success')
 				} catch (error) {
 					if (!this.isEvidenceContextActive(contextId, identity)) return