From a5c1170da6b3c12c60285a70ca0662eb67a9e439 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Mon, 7 Sep 2026 20:47:55 +0800
Subject: [PATCH] fix(pda): resolve dispatch scans from outbound

---
 src/api/fulfillment.js               |  4 ++++
 src/pages/operation/operation.vue    |  3 ++-
 src/pages/outbound/outbound.vue      | 28 ++++++++++++++++++++++------
 tests/fulfillment-workflows.test.mjs | 17 +++++++++++++++--
 4 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/src/api/fulfillment.js b/src/api/fulfillment.js
index 3fdaef1..85c1f89 100644
--- a/src/api/fulfillment.js
+++ b/src/api/fulfillment.js
@@ -104,6 +104,10 @@ export async function getOutboundTask(taskNo) {
 	return normalizeOutboundTask(await overseasRequest('GET', `${OUTBOUND_BASE}/${encoded(taskNo)}`))
 }
 
+export function resolveOutboundTask(businessNo) {
+	return overseasRequest('GET', `${OUTBOUND_BASE}/resolve/${encoded(businessNo)}`)
+}
+
 export function pickOutboundTask(taskNo, request) {
 	return overseasRequest('POST', `${OUTBOUND_BASE}/${encoded(taskNo)}/pick`, request)
 }
diff --git a/src/pages/operation/operation.vue b/src/pages/operation/operation.vue
index cb0973e..ccd223c 100644
--- a/src/pages/operation/operation.vue
+++ b/src/pages/operation/operation.vue
@@ -160,7 +160,7 @@
 			async bootstrap() { if (this.loading) return; this.loading = true; this.error = null; this.detailOpen = false; try { await this.refreshBoundWarehouse(); try { const current = await getCurrentReceiving(); await this.applyCurrentReceiving(current); this.candidateError = null } catch (error) { if (!isNoCurrentReceiving(error)) throw error; resetReceivingDraft(); await this.loadCandidates(false, false) } this.bootstrapped = true } catch (error) { this.candidateError = error } finally { this.loading = false } },
 			async recoverCurrentAfterConflict(error, preserveEvidence = false) { if (!isReceivingConflict(error)) return false; try { const current = await getCurrentReceiving(); await this.applyCurrentReceiving(current); this.detailOpen = false; this.error = preserveEvidence ? error : null; this.showToast(`账号已有未完成柜 ${current.containerNo}，已返回当前柜`, 'warning'); return true } catch (recoveryError) { if (isNoCurrentReceiving(recoveryError)) { this.detailOpen = false; receiving.selected = null; await this.loadCandidates(false); this.candidateError = preserveEvidence ? error : null; this.error = preserveEvidence ? error : null; this.showToast('柜状态已变化，列表已刷新', 'warning'); return true } this.error = error; return false } },
 			async loadCandidates(feedback = true, refreshWarehouse = true) { if (this.candidateLoading) return; this.candidateLoading = true; this.candidateError = null; this.error = null; try { if (refreshWarehouse) await this.refreshBoundWarehouse(); const values = await listReceivingCandidates(); receiving.candidates = values.map((item) => this.validateReceivingWarehouse(item, `柜号 ${item.containerNo || '—'}`)); if (feedback) this.showToast('刷新待卸柜成功', 'success') } catch (error) { receiving.candidates = []; this.candidateError = error; if (feedback) { playErrorSound(); this.showToast(error.message || '刷新待卸柜失败', 'error') } } finally { this.candidateLoading = false } },
-			async openContainer(candidate) { const containerNo = String(candidate?.containerNo || '').trim(); if (!containerNo || this.busy) return; this.error = null; try { this.validateReceivingWarehouse(candidate, `柜号 ${containerNo}`); if (!candidate.operable) { receiving.selected = candidate; this.detailOpen = true; return } const detail = await this.run('查询柜号', async () => this.validateReceivingWarehouse(await getReceivingContainer(containerNo), `柜号 ${containerNo}`)); receiving.selected = { ...candidate, ...detail, allPlansReady: candidate.allPlansReady, operable: candidate.operable, blockReason: candidate.blockReason }; this.detailOpen = true; playSuccessSound() } catch (error) { if (!await this.recoverCurrentAfterConflict(error)) { this.error = error; this.showToast(error.message || '查询柜号失败', 'error') } } },
+			async openContainer(candidate) { const containerNo = String(candidate?.containerNo || '').trim(); if (!containerNo || this.busy) return; this.error = null; try { this.validateReceivingWarehouse(candidate, `柜号 ${containerNo}`); if (!candidate.operable) { receiving.selected = candidate; this.detailOpen = true; return } const detail = await this.run('查询柜号', async () => this.validateReceivingWarehouse(await getReceivingContainer(containerNo), `柜号 ${containerNo}`)); receiving.selected = { ...candidate, ...detail, allPlansReady: candidate.allPlansReady, operable: candidate.operable, blockReason: candidate.blockReason }; this.detailOpen = true; playSuccessSound() } catch (error) { if (!await this.recoverCurrentAfterConflict(error, true)) { this.error = error; this.showToast(error.message || '查询柜号失败', 'error') } } },
 			cancelDetail() { this.detailOpen = false; receiving.selected = null },
 			async prepareContainer() { if (!this.selected?.containerNo || !this.selected?.allPlansReady || !this.selected?.operable || this.busy) return; const key = idempotencyKey('prepare', { containerNo: this.selected.containerNo }); try { this.validateReceivingWarehouse(this.selected, `柜号 ${this.selected.containerNo}`); const value = await this.run('选择当前柜', async () => this.validateReceivingWarehouse(await prepareReceivingContainer(this.selected.containerNo, { idempotencyKey: key.value }), '新建接柜会话')); releaseIdempotencyKey(key.signature); await this.applyCurrentReceiving(value); this.detailOpen = false } catch (error) { if (!await this.recoverCurrentAfterConflict(error, true)) this.error = error } },
 			choosePhoto(index) { if (this.busy) return; uni.chooseImage({ count: 1, sourceType: ['camera'], success: ({ tempFilePaths, tempFiles }) => { const path = tempFilePaths?.[0]; const size = Number(tempFiles?.[0]?.size || 0); if (size > MAX_UNLOAD_PHOTO_BYTES) { const message = '照片不能超过10MB'; this.error = Object.assign(new Error(message), { code: 'A0400' }); this.showToast(message, 'error'); playErrorSound(); return } if (path) this.replacePhoto(index, path) } }) },
@@ -201,6 +201,7 @@
 	.matched-inbound-code{display:block;color:#17324d;font-size:15px;font-weight:800}
 	.matched-inbound-progress{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:6px;margin-top:8px;color:#5f7185;font-size:10px}
 	.matched-inbound-progress text{padding:6px 4px;border-radius:6px;text-align:center;background:#edf3f9}
+	.error-card text{overflow-wrap:anywhere;word-break:break-word}
 	@media(max-width:360px){.photo-role{grid-template-columns:68px minmax(0,1fr) 64px;gap:7px;padding:8px}.photo-preview{width:68px;height:64px}.photo-actions button{min-height:34px;padding:0 2px;line-height:34px}.photo-state{font-size:9px;line-height:13px}}
 	.receiving-page{padding-bottom:env(safe-area-inset-bottom,0px)}
 	.receiving-content{box-sizing:border-box;padding-bottom:calc(24px + env(safe-area-inset-bottom,0px))}
diff --git a/src/pages/outbound/outbound.vue b/src/pages/outbound/outbound.vue
index 3c8cfd8..03b0b3c 100644
--- a/src/pages/outbound/outbound.vue
+++ b/src/pages/outbound/outbound.vue
@@ -3,11 +3,11 @@
 		<PortalHeader title="出库作业" :user="user" />
 		<scroll-view class="fulfillment-scroll" scroll-y>
 			<view class="portal-content fulfillment-content">
-				<view class="fulfillment-heading"><text class="fulfillment-title">出库任务</text><text class="fulfillment-subtitle">包含排车转出的出库任务和一件代发出库任务；派送单与派送状态不进入 PDA</text></view>
+				<view class="fulfillment-heading"><text class="fulfillment-title">出库任务</text><text class="fulfillment-subtitle">列表仅显示普通/一件代发出库任务；扫描排车业务号会转入“排车拣货”</text></view>
 				<view class="fulfillment-card">
-					<ScanTargetInput name="outbound" :model-value="scanCode" label="任务号、托盘码或箱码" placeholder="扫描任务号 / 托盘码 / 箱码" :active="true" @update:modelValue="updateScanCode" @submit="handleScan" />
+					<ScanTargetInput name="outbound" :model-value="scanCode" label="任务号、出库单号、排车单号、托盘码或箱码" placeholder="扫描任务号 / 出库单号 / 排车单号 / 托盘码 / 箱码" :active="true" @update:modelValue="updateScanCode" @submit="handleScan" />
 					<button class="secondary-button" :disabled="!scanCode || loading || busy" @tap="handleScan(scanCode)">{{ current ? '匹配出库货物' : '打开出库任务' }}</button>
-					<text class="scan-help">扫描只接受服务端任务内的稳定业务码；网络失败可用原幂等键安全重试。</text>
+					<text class="scan-help">任务号直接恢复；出库单号或排车单号先由服务端解析流程，不会作为出库任务号误查。</text>
 				</view>
 
 				<view v-if="loading" class="fulfillment-state"><text>正在加载出库任务…</text></view>
@@ -49,7 +49,7 @@
 <script>
 	import PortalHeader from '@/components/PortalHeader.vue'
 	import ScanTargetInput from '@/components/ScanTargetInput.vue'
-	import { completeOutboundTask, getOutboundTask, listOutboundTasks, pickOutboundTask } from '@/api/fulfillment.js'
+	import { completeOutboundTask, getOutboundTask, listOutboundTasks, pickOutboundTask, resolveOutboundTask } from '@/api/fulfillment.js'
 	import { fulfillment, fulfillmentIdempotencyKey, releaseFulfillmentKey, restoreFulfillmentDraft, updateFulfillmentDraft } from '@/stores/fulfillment.js'
 	import { requireSession, session } from '@/stores/session.js'
 	import { playErrorSound, playSuccessSound } from '@/utils/audio-feedback.js'
@@ -77,11 +77,27 @@
 			updatePackages(event) { const value = Math.trunc(Number(event.detail.value || 0)); updateFulfillmentDraft('outbound', { packages: Number.isFinite(value) ? Math.max(0, value) : 0 }) },
 			async loadTasks() { await this.run('加载出库任务', async () => { this.tasks = await listOutboundTasks(); this.current = null }, true) },
 			async openTask(taskNo) { const code = String(taskNo || '').trim(); if (!code) return; await this.run('恢复出库任务', async () => { const pendingScan = fulfillment.outbound.currentTaskNo === code ? fulfillment.outbound.scanCode : ''; this.current = await getOutboundTask(code); this.selectedItem = null; this.selectedPosition = null; this.scanCode = pendingScan; updateFulfillmentDraft('outbound', { currentTaskNo: this.current.taskNo, scanCode: pendingScan, packages: pendingScan ? fulfillment.outbound.packages : 1 }); if (pendingScan) this.findAndSelectPosition(pendingScan, false) }, true) },
+			async openScannedTask(businessNo) {
+				await this.run('解析出库作业', async () => {
+					const resolution = await resolveOutboundTask(businessNo)
+					if (resolution?.workflow === 'DISPATCH' && resolution.dispatchNo) {
+						updateFulfillmentDraft('outbound', { currentTaskNo: '', scanCode: '', packages: 1 })
+						updateFulfillmentDraft('dispatch', { currentNo: resolution.dispatchNo, palletCode: '', packages: 1 })
+						uni.navigateTo({ url: '/pages/dispatch/dispatch' })
+						return
+					}
+					if (resolution?.workflow !== 'OUTBOUND' || !resolution.taskNo) throw new Error('服务端未返回可执行的出库任务')
+					this.current = await getOutboundTask(resolution.taskNo)
+					this.selectedItem = null; this.selectedPosition = null; this.scanCode = ''
+					updateFulfillmentDraft('outbound', { currentTaskNo: this.current.taskNo, scanCode: '', packages: 1 })
+				}, true)
+			},
 			closeTask() { this.current = null; this.selectedItem = null; this.selectedPosition = null; this.error = null; this.successMessage = ''; updateFulfillmentDraft('outbound', { currentTaskNo: '', scanCode: '', packages: 1 }); this.loadTasks() },
 			handleScan(raw) {
 				const code = String(raw?.detail?.value ?? raw ?? this.scanCode).trim(); if (!code || this.busy || this.loading) return
 				console.info('[Overseas PDA outbound] scan', { code, task: this.current?.taskNo || '' }); this.scanCode = code; updateFulfillmentDraft('outbound', { scanCode: code })
-				if (!this.current || code === this.current.taskNo || code === this.current.outboundNo) return this.openTask(code === this.current?.outboundNo ? this.current.taskNo : code)
+				if (!this.current) return this.openScannedTask(code)
+				if (code === this.current.taskNo || code === this.current.outboundNo) return this.openTask(this.current.taskNo)
 				if (this.findAndSelectPosition(code)) return
 				this.setError(new Error('扫码未匹配当前出库任务的托盘码、箱码、SKU 或入仓码'), '扫码未匹配')
 			},
@@ -97,7 +113,7 @@
 				const key = fulfillmentIdempotencyKey('outbound', 'complete', { taskNo: this.current.taskNo })
 				await this.run('完成出库任务', async () => { await completeOutboundTask(this.current.taskNo, { idempotencyKey: key.value }); this.current = await getOutboundTask(this.current.taskNo); releaseFulfillmentKey('outbound', key.signature); this.successMessage = '出库任务已完成'; playSuccessSound() })
 			},
-			async retry() { if (this.current?.taskNo) await this.openTask(this.current.taskNo); else if (fulfillment.outbound.currentTaskNo) await this.openTask(fulfillment.outbound.currentTaskNo); else await this.loadTasks() },
+			async retry() { if (this.current?.taskNo) await this.openTask(this.current.taskNo); else if (fulfillment.outbound.currentTaskNo) await this.openTask(fulfillment.outbound.currentTaskNo); else if (this.scanCode) await this.openScannedTask(this.scanCode); else await this.loadTasks() },
 			async run(action, work, loading = false) { if (this.busy || this.loading) return; this.error = null; this.successMessage = ''; if (loading) this.loading = true; else { this.busy = true; this.busyAction = action.includes('完成') ? 'complete' : 'pick' } try { await work() } catch (error) { this.setError(error, `${action}失败`) } finally { this.loading = false; this.busy = false; this.busyAction = '' } },
 			setError(error, fallback) { const forbidden = ['403', 'A0403'].includes(String(error?.code || '')); this.error = { message: forbidden ? '当前账号没有海外仓 PDA 作业权限，请联系管理员授权' : error?.message || fallback, code: error?.code, requestId: error?.requestId, traceId: error?.traceId, network: Boolean(error?.network) }; console.error('[Overseas PDA outbound] failed', this.error); playErrorSound() },
 			lineBusinessCode(position) { return position?.cartonMark || position?.palletNo || position?.skuCode || position?.inboundCode || '业务码缺失' },
diff --git a/tests/fulfillment-workflows.test.mjs b/tests/fulfillment-workflows.test.mjs
index 1ee7cfb..00dc3a0 100644
--- a/tests/fulfillment-workflows.test.mjs
+++ b/tests/fulfillment-workflows.test.mjs
@@ -6,7 +6,7 @@ import { fulfillment, fulfillmentIdempotencyKey, releaseFulfillmentKey, resetFul
 import {
 	completeDispatchPicking, completeOutboundTask, departDispatch, getDispatchTask, getOutboundTask,
 	listDispatchTasks, listOutboundTasks, normalizeDispatchTask, normalizeOutboundTask,
-	pickDispatchItem, pickOutboundTask
+	pickDispatchItem, pickOutboundTask, resolveOutboundTask
 } from '../src/api/fulfillment.js'
 import { session } from '../src/stores/session.js'
 
@@ -49,6 +49,7 @@ test('fulfillment API calls the frozen list detail pick complete and depart rout
 			if (options.method === 'GET' && /\/dispatches(?:\?|$)/.test(options.url)) data = []
 			else if (options.method === 'GET' && /\/outbound-tasks(?:\?|$)/.test(options.url)) data = []
 			else if (options.method === 'GET' && options.url.includes('/dispatches/')) data = { dispatchNo: 'DSP-1', taskNo: 'TASK-1', items: [] }
+			else if (options.method === 'GET' && options.url.includes('/outbound-tasks/resolve/')) data = { workflow: 'DISPATCH', dispatchNo: 'DSP-1', outboundNo: 'OUT-1' }
 			else if (options.method === 'GET' && options.url.includes('/outbound-tasks/')) data = { task: { taskNo: 'OUT-TASK-1', outboundNo: 'OUT-1' }, items: [] }
 			options.success({ statusCode: 200, data: { code: '200', data }, header: {} })
 		}
@@ -59,14 +60,16 @@ test('fulfillment API calls the frozen list detail pick complete and depart rout
 	await completeDispatchPicking('DSP/1', { idempotencyKey: 'complete-key' })
 	await departDispatch('DSP/1', { idempotencyKey: 'depart-key' })
 	await listOutboundTasks('PENDING'); await getOutboundTask('OUT/TASK/1')
+	await resolveOutboundTask('OUT/1')
 	await pickOutboundTask('OUT/TASK/1', { outboundPalletItemId: '33', inventoryPositionId: '44', packages: 1, idempotencyKey: 'out-pick-key' })
 	await completeOutboundTask('OUT/TASK/1', { idempotencyKey: 'out-complete-key' })
 
-	assert.equal(calls.length, 9)
+	assert.equal(calls.length, 10)
 	assert.ok(calls.some((call) => call.url.endsWith('/dispatches?status=PICKING')))
 	assert.ok(calls.some((call) => call.url.includes('/dispatches/DSP%2F1/items/11/pick')))
 	assert.ok(calls.some((call) => call.url.endsWith('/dispatches/DSP%2F1/depart')))
 	assert.ok(calls.some((call) => call.url.includes('/outbound-tasks/OUT%2FTASK%2F1/pick')))
+	assert.ok(calls.some((call) => call.url.endsWith('/outbound-tasks/resolve/OUT%2F1')))
 	assert.ok(calls.every((call) => call.authorization === 'Bearer overseas-token'))
 	assert.ok(calls.every((call) => !/[?&](?:customerId|warehouseId)=/.test(call.url)))
 	for (const call of calls) {
@@ -139,9 +142,19 @@ test('pages expose loading empty error offline and permission diagnostics with g
 	assert.match(dispatch, /departDispatch/)
 	assert.doesNotMatch(dispatch, /departedNo/)
 	assert.match(outbound, /completeOutboundTask/)
+	assert.match(outbound, /resolveOutboundTask[\s\S]*workflow === 'DISPATCH'[\s\S]*pages\/dispatch\/dispatch/)
+	assert.match(outbound, /列表仅显示普通\/一件代发出库任务/)
+	assert.match(outbound, /if \(!this\.current\) return this\.openScannedTask\(code\)/)
+	assert.doesNotMatch(outbound, /if \(!this\.current\)[^\n]*openTask\(code\)/)
 	assert.match(outbound, /this\.remainingPackages === 0/)
 	assert.match(outbound, /position\.availablePackages <= 0/)
 	assert.doesNotMatch(outbound, /position\.availablePackages - position\.pickedPackages/)
 	for (const page of [dispatch, outbound]) assert.match(page, /await get(?:Dispatch|Outbound)Task[\s\S]*releaseFulfillmentKey/)
 	assert.doesNotMatch(dispatch + outbound, /DeliveryOrder|deliveryStatus|customerVisit|\/deliveries/)
 })
+
+test('receiving conflict recovery keeps request and trace evidence visible on narrow screens', async () => {
+	const operation = await read('../src/pages/operation/operation.vue')
+	assert.match(operation, /openContainer\(candidate\)[\s\S]*recoverCurrentAfterConflict\(error, true\)/)
+	assert.match(operation, /\.error-card text\{overflow-wrap:anywhere;word-break:break-word\}/)
+})