优化

tests/page-contract.test.mjs

@@ -43,6 +43,10 @@ test('picking task list uses remote loading orders and never falls back to demo
 	assert.match(tasks, /listLoadingOrders/)
 	assert.match(tasks, /当前网络不可用，请联网后刷新/)
 	assert.match(tasks, /进入并开始拣货/)
+	assert.match(tasks, /AWAITING_REVIEW[\s\S]*?待上传证据\/确认装柜/)
+	assert.match(tasks, /task\.workflowStatus === 'AWAITING_REVIEW' \? '继续装柜取证'/)
+	assert.match(tasks, /\['UNASSIGNED', 'IN_PROGRESS', 'AWAITING_REVIEW'\]\.includes\(task\.workflowStatus\)/)
+	assert.match(tasks, /task\.workflowStatus === 'AWAITING_REVIEW' \|\| \(task\.assignmentVersion !== null/)
 	assert.match(tasks, /暂无可领取的拣货任务/)
 	assert.match(tasks, /集装箱号 \{\{ task\.currentContainerNo \}\}/)
 	assert.match(tasks, /柜次号 \{\{ task\.cabinetNo \}\}/)

tests/pda-loading-api.test.mjs

@@ -43,7 +43,7 @@ test('C02 identifiers and separate picking/inbound versions are normalized expli
 	assert.match(page, /submit\.batch/)
 	assert.match(page, /item\.itemStatus === 'PICKED'/)
 	assert.match(page, /item\.itemStatus === 'PARTIAL'/)
-	assert.match(page, /pickingCompleted \|\| !summary\.canSubmit/)
+	assert.match(page, /!pickingCompleted && !summary\.canSubmit/)
   assert.match(page, /this\.loadingVersion = this\.remotePick\.inboundVersion \?\? this\.remotePick\.loadingVersion/)
   assert.match(page, /状态尚未同步，请刷新重试/)
 })
@@ -62,7 +62,7 @@ test('picking page exposes five evidence slots, retry and remote completion stat
   assert.match(page, /createEvidenceUploadQueue/)
   assert.match(page, /retryEvidence/)
   assert.match(page, /uploadEvidenceFile/)
-  assert.match(page, /submitting \|\| pickingCompleted \|\| !summary\.canSubmit/)
+  assert.match(page, /submitting \|\| \(!pickingCompleted && !summary\.canSubmit\)/)
   assert.match(page, /completePicking\(/)
   assert.match(page, /sourceType: \['camera'\]/)
   assert.doesNotMatch(page, /sourceType: \['camera', 'album'\]/)

tests/picking-evidence-stage.test.mjs

@@ -14,15 +14,15 @@ test('picking and photo workspaces are independently selectable', () => {
 test('a server task never inherits a completed marker from the previously opened local cabinet', () => {
 	assert.match(page, /pickingCompleted\(\) \{[\s\S]*?this\.remoteTaskId \|\| this\.currentBox\.taskId[\s\S]*?if \(!this\.remotePick\) return false[\s\S]*?hasServerPending/)
 	assert.match(page, /if \(options\.taskId\) \{[\s\S]*?this\.completedBoxes = \{\}[\s\S]*?this\.boxes = \[/)
-	assert.match(page, /:disabled="submitting \|\| pickingCompleted \|\| !summary\.canSubmit"/)
-	assert.match(page, /submitButtonText\(\)[\s\S]*?return this\.pickingCompleted \? '该柜次已完成'/)
-	assert.match(page, /submitStatusHint\(\)[\s\S]*?if \(this\.pickingCompleted\) return '本柜次任务已完成'/)
-	const submit = page.match(/submitPicking\(\) \{[\s\S]*?\n\t\t\t\},/)?.[0] || ''
+	assert.match(page, /:disabled="submitting \|\| \(!pickingCompleted && !summary\.canSubmit\)"/)
+	assert.match(page, /submitButtonText\(\)[\s\S]*?return this\.pickingCompleted \? '继续装柜取证'/)
+	assert.match(page, /submitStatusHint\(\)[\s\S]*?if \(this\.pickingCompleted\) return '拣货已完成，请继续装柜取证'/)
+	const submit = page.match(/async submitPicking\(\) \{[\s\S]*?\n\t\t\t\},/)?.[0] || ''
 	assert.doesNotMatch(submit, /completedBoxes/)
 })
 
 test('loading evidence is not requested before picking completion', () => {
-	assert.match(page, /if \(this\.loadingStageReady\) await this\.loadLoadingEvidence\(\)/)
+	assert.match(page, /if \(this\.loadingStageReady\) \{[\s\S]*?await this\.loadLoadingEvidence\(\)/)
 	const loader = page.match(/async loadLoadingEvidence\(\) \{[\s\S]*?\n\t\t\t\},/)?.[0] || ''
 	assert.match(loader, /if \(!this\.loadingStageReady/)
 	assert.match(loader, /await getEvidence\(/)
@@ -80,6 +80,17 @@ test('incremental batch submits only current server-pending items and refreshes
 	assert.match(page, /this\.pickingVersion = this\.remotePick\.pickingVersion \?\? this\.remotePick\.version/)
 })
 
+test('completed detail overrides stale local state and an empty batch refreshes into evidence instead of submitting', () => {
+	assert.match(page, /if \(item\.itemStatus === 'PICKED'\) serverStates\[item\.id\] = ITEM_STATUS\.PICKED/)
+	assert.match(page, /if \(!this\.pickingCompleted\) this\.restoreRemoteDraft\(\)/)
+	assert.match(page, /if \(this\.loadingStageReady\) \{[\s\S]*?this\.activeStage = 'evidence'[\s\S]*?await this\.loadLoadingEvidence\(\)/)
+	const submit = page.match(/async submitPicking\(\) \{[\s\S]*?\n\t\t\t\},/)?.[0] || ''
+	assert.match(submit, /if \(this\.pickingCompleted\)[\s\S]*?await this\.syncRemoteTask\(\)[\s\S]*?this\.activeStage = 'evidence'[\s\S]*?return/)
+	const perform = page.match(/async performSubmit\([^)]*\) \{[\s\S]*?\n\t\t\t\},/)?.[0] || ''
+	assert.match(perform, /if \(!actions\.length\) \{[\s\S]*?submit\.empty-refresh[\s\S]*?await this\.syncRemoteTask\(\)[\s\S]*?return/)
+	assert.ok(perform.indexOf('if (!actions.length)') < perform.indexOf('submitContainerPickingBatch('))
+})
+
 test('final completion preserves backend gate errors and refreshes after an atomic A0409', () => {
 	const complete = page.match(/async completeLoadingTask\(\) \{[\s\S]*?\n\t\t\t\},/)?.[0] || ''
 	assert.match(complete, /this\.isTaskConflict\(error\)[\s\S]*?await this\.refreshAfterTaskConflict\(error\.message \|\| '订舱、装柜关联或证据状态已变化，请刷新后重试'\)/)
@@ -203,9 +214,10 @@ test('evidence save, void and loading completion ignore stale cabinet responses'
 
 test('completed server tasks restore evidence stage without being claimed again', () => {
 	assert.match(page, /const remoteTask = normalizePickingTask\(task\)/)
+	assert.match(page, /remoteTask\.workflowStatus !== 'AWAITING_REVIEW' && this\.assignmentVersion === null/)
 	assert.match(page, /if \(remoteTask\.workflowStatus === 'UNASSIGNED'\) \{[\s\S]*?claimContainerPickingTask/)
 	assert.match(page, /else if \(!isPickingCompleteTask\(remoteTask\)\)/)
-	assert.match(page, /if \(this\.loadingStageReady\) await this\.loadLoadingEvidence\(\)/)
+	assert.match(page, /if \(this\.loadingStageReady\) \{[\s\S]*?this\.activeStage = 'evidence'[\s\S]*?await this\.loadLoadingEvidence\(\)/)
 })
 
 test('picking mutations stay closed until the canonical task has been claimed', () => {