html/pda-uniapp
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(pda): validate live inventory before batch submit

Browse Source
This commit is contained in:
ouyangxq
2026-08-11 18:46:04 +08:00
parent f83a0c47c1
commit 41e83bf15f
3 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/picking/picking.vue
+8 -4
View File
@@ -324,7 +324,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, EVIDENCE_SLOTS, getContainerPickingTask, getEvidence, getPickingTask, isRemoteReady, normalizePickingTask, submitContainerPickingBatch, uploadEvidenceFile, upsertEvidence, voidEvidence } from '@/api/pda-loading.js'
import { claimContainerPickingTask, completeLoading, completePicking, EVIDENCE_SLOTS, getContainerPickingTask, getEvidence, 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'
@@ -909,6 +909,8 @@
if (this.pickingVersion === null) throw new Error('缺少拣货版本号 pickingVersion，无法提交')
const submitId = this.submitId || stableOperationId('submit', `${session.currentUser?.id || 'operator'}-${this.remoteTaskId}-${this.currentBox.boxNo}`, { itemStates: this.itemStates, partialQuantities: this.partialQuantities, incompleteReason })
this.submitId = submitId
const warehouseId = this.currentBox.warehouseId || session.currentUser?.warehouseId || session.currentUser?.warehouse
const inventorySnapshot = await getPickingInventorySnapshot(this.remoteTaskId, warehouseId)
const actions = this.currentBox.items.map((item) => {
const status = this.itemState(item)
const itemId = item.taskItemId ?? item.remoteItemId ?? item.id
@@ -918,12 +920,14 @@
if (incompleteReason) return { type: 'SKIP', itemId, reason: `${incompleteReason}（提交时确认未拣）`, version: Number(item.version || 0) }
return null
}).filter(Boolean)
await submitContainerPickingBatch({ taskId: this.remoteTaskId, containerNo: this.currentBox.boxNo, version: Number(this.pickingVersion) }, actions, { warehouseId: this.currentBox.warehouseId || session.currentUser?.warehouseId || session.currentUser?.warehouse, operationId: submitId })
await submitContainerPickingBatch({ taskId: this.remoteTaskId, containerNo: this.currentBox.boxNo, version: Number(this.pickingVersion) }, actions, { warehouseId, operationId: submitId, inventorySnapshotToken: inventorySnapshot?.snapshotToken })
// Legacy inbound completePicking(expectedVersion: Number(this.pickingVersion)) remains adapter-only; cabinet tasks use item actions.
} catch (error) {
const versionConflict = error.code === 'A0409' || error.statusCode === 409
this.remoteError = versionConflict ? '任务版本已变化，请刷新后重试' : (error.network ? '网络失败，拣货完成未提交，请重试' : (error.message || '拣货完成失败'))
this.showToast(versionConflict ? '任务版本已变化，请刷新后重试' : '拣货完成未提交', 'error')
const inventoryConflict = versionConflict && /库存/.test(error.message || '')
const conflictMessage = inventoryConflict ? '库存已变化，请刷新后重试' : '任务版本已变化，请刷新后重试'
this.remoteError = versionConflict ? conflictMessage : (error.network ? '网络失败，拣货完成未提交，请重试' : (error.message || '拣货完成失败'))
this.showToast(versionConflict ? conflictMessage : '拣货完成未提交', 'error')
return
} finally { this.submitting = false }
}