优化

tests/page-contract.test.mjs

@@ -47,6 +47,9 @@ test('picking task list uses remote loading orders and never falls back to demo
 	assert.match(tasks, /集装箱号 \{\{ task\.currentContainerNo \}\}/)
 	assert.match(tasks, /柜次号 \{\{ task\.cabinetNo \}\}/)
 	assert.match(tasks, /records\.filter\(\(task\) => this\.isTaskReady\(task\)\)/)
+	assert.match(tasks, /isTaskReady\(task\)[\s\S]*?task\.recordStatus === 'ACTIVE'[\s\S]*?!task\.mergedIntoContainerBookingId/)
+	assert.match(tasks, /records\.filter\(\(task\) => this\.isMergedTask\(task\)\)\.forEach\(\(task\) => this\.clearMergedTaskDraft\(task\)\)/)
+	assert.match(tasks, /clearMergedTaskDraft\(task\)[\s\S]*?clearPickingDraft\(\{ operatorId, taskId: task\.taskId, loadingPlanId: task\.loadingPlanId, containerBookingId: task\.containerBookingId/)
 	assert.match(tasks, /task\.taskId[\s\S]*?task\.loadingPlanId[\s\S]*?task\.containerBookingId[\s\S]*?task\.currentContainerNo[\s\S]*?task\.version[\s\S]*?task\.assignmentVersion/)
 	assert.doesNotMatch(tasks, /task\.taskStatus === 'LOADING'/)
 	assert.doesNotMatch(tasks, /demo-data|DEMO_/)

tests/pda-loading-api.test.mjs

@@ -48,6 +48,13 @@ test('C02 identifiers and separate picking/inbound versions are normalized expli
   assert.match(page, /状态尚未同步，请刷新重试/)
 })
 
+test('PDA normalizes the frozen active and merged container identity fields', () => {
+	for (const field of ['sourceType', 'recordStatus', 'mergedIntoContainerBookingId']) {
+		assert.match(source, new RegExp(`${field}: row\\.${field} \\?\\? row\\.container\\?\\.${field}`))
+		assert.match(source, new RegExp(`${field}: task\\.${field} \\?\\? task\\.container\\?\\.${field}`))
+	}
+})
+
 test('picking page exposes five evidence slots, retry and remote completion states', () => {
   for (const text of ['PHOTO_STEP_1', 'PHOTO_STEP_4', 'SEAL', '网络失败', '确认装柜完成', 'loadingVersion']) {
     assert.match(`${source}\n${page}`, new RegExp(text))

tests/picking-evidence-stage.test.mjs

@@ -59,6 +59,20 @@ test('evidence identity is bound to task, inbound, loading plan and container bo
 	assert.match(page, /this\.evidenceIdentity = this\.captureEvidenceIdentity\(\)/)
 })
 
+test('merged or non-active cabinet details are rejected before claim and clear stale local state', () => {
+	const sync = page.match(/async syncRemoteTask\(\) \{[\s\S]*?\n\t\t\t\},/)?.[0] || ''
+	assert.match(sync, /if \(this\.isMergedContainerRecord\(task\)\)[\s\S]*?this\.clearMergedTask\(task, previousIdentity\)[\s\S]*?return[\s\S]*?task\.recordStatus !== 'ACTIVE'[\s\S]*?claimContainerPickingTask/)
+	const clear = page.match(/clearMergedTask\(task, previousIdentity\) \{[\s\S]*?\n\t\t\t\},/)?.[0] || ''
+	assert.match(clear, /taskId: previousIdentity\?\.taskId \?\? task\?\.taskId/)
+	assert.match(clear, /inboundId: previousIdentity\?\.inboundId \?\? task\?\.inboundId/)
+	assert.match(clear, /loadingPlanId: previousIdentity\?\.loadingPlanId \?\? task\?\.loadingPlanId/)
+	assert.match(clear, /containerBookingId: previousIdentity\?\.containerBookingId \?\? task\?\.containerBookingId/)
+	assert.match(clear, /clearPickingDraft\(staleIdentity\)/)
+	assert.match(clear, /this\.evidenceDrafts = Object\.fromEntries/)
+	assert.match(clear, /this\.evidencePreviewCache = Object\.fromEntries/)
+	for (const reset of ['remoteLoading = false', 'submitting = false', 'remoteTaskId = null', 'loadingVersion = null', 'scanHistory = []', 'currentBox.containerBookingId = null', 'currentBox.currentContainerNo = null', 'resetEvidenceState()']) assert.match(clear, new RegExp(reset.replace(/[.()[\]]/g, '\\$&')))
+})
+
 test('server evidence mutations remain closed before the loading stage is ready', () => {
 	assert.match(page, /requireEvidenceStage\(\)[\s\S]*?if \(!this\.pickingCompleted\)[\s\S]*?请先提交拣货完成[\s\S]*?if \(!this\.loadingStageReady\)/)
 	const queue = page.match(/async queueEvidenceUpload\([^)]*\) \{[\s\S]*?\n\t\t\t\},/)?.[0] || ''