From 95078f750e4d0035d274b7ba8e9af409794f9256 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Fri, 9 Oct 2026 15:54:21 +0800
Subject: [PATCH] fix(pda): prevent stale and ambiguous dispatch scan
 selections

---
 src/pages/dispatch/dispatch.vue             | 16 ++++++----
 src/pages/return-receipt/return-receipt.vue |  2 +-
 tests/fulfillment-workflows.test.mjs        | 33 ++++++++++++++++++++-
 3 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/src/pages/dispatch/dispatch.vue b/src/pages/dispatch/dispatch.vue
index 033ed8a..723da3c 100644
--- a/src/pages/dispatch/dispatch.vue
+++ b/src/pages/dispatch/dispatch.vue
@@ -5,14 +5,14 @@
 			<view class="portal-content fulfillment-content">
 				<view class="fulfillment-heading">
 					<text class="fulfillment-title">排车拣货与发车</text>
-					<text class="fulfillment-subtitle">客户与当前海外仓由登录令牌和服务端确定；扫描排车单号或任务中的托盘码开始作业</text>
+					<text class="fulfillment-subtitle">扫描排车单号打开任务，再扫描任务中的托盘码进行拣货</text>
 				</view>
 				<view v-if="current" class="detail-toolbar"><view><text class="detail-kicker">当前任务</text><text class="detail-title">排车拣货详情</text></view><button :disabled="busy" @tap="closeTask">‹ 返回列表</button></view>
 
 				<view class="fulfillment-card">
 					<ScanTargetInput name="dispatch" :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>
@@ -21,7 +21,7 @@
 					<text v-if="error.code">错误码：{{ error.code }}</text>
 					<text v-if="error.requestId">requestId：{{ error.requestId }}</text>
 					<text v-if="error.traceId">traceId：{{ error.traceId }}</text>
-					<text v-if="error.network" class="offline-note">网络连接失败，未完成作业与幂等键已保留。</text>
+					<text v-if="error.network" class="offline-note">网络连接失败，当前作业已保留，请恢复网络后重试。</text>
 					<button class="secondary-button" :disabled="loading || busy" @tap="retry">重试</button>
 				</view>
 
@@ -154,17 +154,21 @@
 				const code = String(raw?.detail?.value ?? raw ?? this.scanCode).trim(); if (!code || this.busy || this.loading) return
 				console.info('[Overseas PDA dispatch] scan', { code, task: this.current?.dispatchNo || '' })
 				this.scanCode = code
+				this.error = null; this.successMessage = ''
+				updateFulfillmentDraft('dispatch', { palletCode: '', dispatchItemId: '', cartonCode: '', packages: 1 })
 				if (!this.current || code === this.current.dispatchNo || code === this.current.taskNo) return this.openTask(code === this.current?.taskNo ? this.current.dispatchNo : code)
 				const cartonItem = this.current.items.find((item) => item.returnCartons?.some((carton) => carton.cartonMark === code))
 				if (cartonItem) {
 					if (cartonItem.returnCartons.find((carton) => carton.cartonMark === code)?.status !== 'OUTBOUND_PENDING') return this.setError(new Error('该箱已拣货或不可出库'), '扫码未匹配')
 					this.selectPallet(cartonItem); updateFulfillmentDraft('dispatch', { cartonCode: code, packages: 1 }); this.scanCode = ''; playSuccessSound(); return
 				}
-				const item = this.current.items.find((value) => [value.palletNo, value.fbaWarehouseCode].includes(code))
-				if (!item) return this.setError(new Error('扫码未匹配当前排车任务的托盘或稳定业务码'), '扫码未匹配')
+				const matches = this.current.items.filter((value) => value.palletNo === code && value.scheduledPackages > value.pickedPackages)
+				if (matches.length > 1) return this.setError(new Error('此托盘包含多条待拣明细，请选择对应货物卡片'), '请选择拣货明细')
+				const item = matches[0]
+				if (!item) return this.setError(new Error(this.current.items.some((value) => value.palletNo === code) ? '该托盘已完成拣货，请勿重复操作' : '扫码未匹配当前任务的托盘码或来源箱唛'), '扫码未匹配')
 				this.selectPallet(item); this.scanCode = ''; playSuccessSound()
 			},
-			selectPallet(item) { if (!item?.palletNo || item.scheduledPackages <= item.pickedPackages) return; updateFulfillmentDraft('dispatch', { palletCode: item.palletNo, dispatchItemId: item.dispatchItemId, cartonCode: '', packages: Math.max(1, Math.min(item.scheduledPackages - item.pickedPackages, item.positions?.[0]?.availablePackages || 1)) }) },
+			selectPallet(item) { if (!item?.palletNo || item.scheduledPackages <= item.pickedPackages) return; this.error = null; this.successMessage = ''; updateFulfillmentDraft('dispatch', { palletCode: item.palletNo, dispatchItemId: item.dispatchItemId, cartonCode: '', packages: Math.max(1, Math.min(item.scheduledPackages - item.pickedPackages, item.positions?.[0]?.availablePackages || 1)) }) },
 			async submitPick() {
 				if (!this.canPick) return
 				const pick = this.selectedReturnCarton ? { positionId: null, cartonMark: this.selectedReturnCarton.cartonMark, packages: 1, productQuantity: this.selectedReturnCarton.productQuantity } : { positionId: this.selectedPosition.id, packages: Number(this.packages), productQuantity: 0 }
diff --git a/src/pages/return-receipt/return-receipt.vue b/src/pages/return-receipt/return-receipt.vue
index 2fd2f72..4470d52 100644
--- a/src/pages/return-receipt/return-receipt.vue
+++ b/src/pages/return-receipt/return-receipt.vue
@@ -24,7 +24,7 @@
 					<view v-if="unitType === 'PARCEL'"><text class="field-label">包裹码/快递单号</text><ScanTargetInput name="unit" v-model="unitCode" label="包裹码/快递单号" placeholder="扫描快递面单" :active="activeTarget === 'unit'" @activate="activeTarget = 'unit'" @submit="acceptUnit" /></view>
 					<template v-else>
 						<view><text class="field-label">托盘码（{{ unitType === 'BOX' ? '选填' : '必填' }}）</text><ScanTargetInput name="pallet" v-model="palletCode" label="托盘码" placeholder="扫描已有托盘或新托盘标签" :active="activeTarget === 'pallet'" @activate="activeTarget = 'pallet'" @submit="acceptPallet" /><text v-if="palletCheck" class="scan-hint">{{ palletCheck.empty ? '空托盘，可绑定当前退货单和 SKU' : `当前单托盘，已有 ${palletCheck.skuCodes.join('、')}，共 ${palletCheck.quantity} 件` }}</text><button class="secondary pallet-generate" :disabled="busy" @tap="generatePallet">生成新托盘</button></view>
-						<view v-if="unitType === 'PALLET'" class="dimension-grid"><label><text>托盘长（cm）</text><input class="number-input" type="digit" v-model="palletLength" /></label><label><view class="dimension-label"><text>托盘宽（cm）</text><text class="volume-text">体积 {{ palletVolume }} cm³</text></view><input class="number-input" type="digit" v-model="palletWidth" /></label><label><text>托盘高（cm）</text><input class="number-input" type="digit" v-model="palletHeight" /></label><label><text>托盘重量（kg）</text><input class="number-input" type="digit" v-model="palletWeight" /></label></view>
+						<view v-if="unitType === 'PALLET'" class="dimension-grid"><label><text>托盘长（cm）</text><input class="number-input" type="digit" v-model="palletLength" placeholder="请输入长度（cm）" /></label><label><view class="dimension-label"><text>托盘宽（cm）</text><text class="volume-text">体积 {{ palletVolume }} cm³</text></view><input class="number-input" type="digit" v-model="palletWidth" placeholder="请输入宽度（cm）" /></label><label><text>托盘高（cm）</text><input class="number-input" type="digit" v-model="palletHeight" placeholder="请输入高度（cm）" /></label><label><text>托盘重量（kg）</text><input class="number-input" type="digit" v-model="palletWeight" placeholder="请输入重量（kg）" /></label></view>
 						<view><text class="field-label">快递单号（选填）</text><ScanTargetInput name="tracking" v-model="trackingNo" label="快递单号" placeholder="扫描快递面单" :active="activeTarget === 'tracking'" @activate="activeTarget = 'tracking'" @submit="acceptTracking" /></view>
 					</template>
 				</view>
diff --git a/tests/fulfillment-workflows.test.mjs b/tests/fulfillment-workflows.test.mjs
index 00d63c0..fef2092 100644
--- a/tests/fulfillment-workflows.test.mjs
+++ b/tests/fulfillment-workflows.test.mjs
@@ -219,7 +219,7 @@ test('pages expose loading empty error offline and permission diagnostics with g
 		assert.match(page, /正在加载/)
 		assert.match(page, /暂无/)
 		assert.match(page, /requestId[\s\S]*traceId/)
-		assert.match(page, /error\.network[\s\S]*幂等键/)
+		assert.match(page, /error\.network[\s\S]*保留/)
 		assert.match(page, /fulfillmentIdempotencyKey/)
 		assert.match(page, /releaseFulfillmentKey/)
 		assert.match(page, /if \(!this\.can/)
@@ -297,3 +297,34 @@ test('dispatch review gate preserves the server decision without treating a stri
     assert.match(source, /canPick\(\) \{ return this.current\?\.canPick === true/)
     assert.match(source, /canComplete\(\) \{ return this.current\?\.canPick === true/)
 })
+
+async function dispatchScanHarness(items) {
+ const source = (await read('../src/pages/dispatch/dispatch.vue')).match(/<script>([\s\S]*?)<\/script>/)[1]
+ const draft = { palletCode: 'OLD', dispatchItemId: 'old', cartonCode: '' }; let sounds = 0
+ const deps = { PortalHeader: {}, ScanTargetInput: {}, DispatchHandoverStatus: {},
+  updateFulfillmentDraft: (_, value) => Object.assign(draft, value), playSuccessSound: () => { sounds++ },
+  console: { info() {} } }
+ const definition = new Function(...Object.keys(deps), source.replace(/^\s*import .*$/gm, '').replace('export default', 'return'))(...Object.values(deps))
+ const state = { current: { dispatchNo: 'DS-TEST', items }, error: { message: 'previous error' }, successMessage: '',
+  setError(error) { this.error = { message: error.message } } }
+ state.selectPallet = definition.methods.selectPallet.bind(state)
+ return { state, draft, scan: definition.methods.handleScan.bind(state), sounds: () => sounds }
+}
+
+test('dispatch wrong scan clears prior selection and a valid pallet clears the old error', async () => {
+ const h = await dispatchScanHarness([{ palletNo: 'PALLET-A', dispatchItemId: 'a', scheduledPackages: 1, pickedPackages: 0, positions: [{ availablePackages: 1 }] }])
+ h.scan('UNKNOWN'); assert.equal(h.draft.dispatchItemId, ''); assert.ok(h.state.error)
+ h.scan('PALLET-A'); assert.equal(h.state.error, null); assert.equal(h.draft.dispatchItemId, 'a'); assert.equal(h.sounds(), 1)
+})
+
+test('dispatch cannot use a shared destination code to choose a physical pallet', async () => {
+ const h = await dispatchScanHarness(['A', 'B'].map(x => ({ palletNo: `PALLET-${x}`, fbaWarehouseCode: 'ONT8', dispatchItemId: x, scheduledPackages: 1, pickedPackages: 0 })))
+ h.scan('ONT8'); assert.equal(h.draft.dispatchItemId, ''); assert.ok(h.state.error); assert.equal(h.sounds(), 0)
+})
+
+test('dispatch completed or ambiguous pallet scan never silently selects a row', async () => {
+ const done = await dispatchScanHarness([{ palletNo: 'PALLET-A', dispatchItemId: 'a', scheduledPackages: 1, pickedPackages: 1 }])
+ done.scan('PALLET-A'); assert.match(done.state.error.message, /已完成拣货/); assert.equal(done.draft.dispatchItemId, ''); assert.equal(done.sounds(), 0)
+ const shared = await dispatchScanHarness(['A','B'].map(x => ({ palletNo: 'PALLET-SHARED', dispatchItemId: x, scheduledPackages: 1, pickedPackages: 0 })))
+ shared.scan('PALLET-SHARED'); assert.match(shared.state.error.message, /多条待拣明细/); assert.equal(shared.draft.dispatchItemId, ''); assert.equal(shared.sounds(), 0)
+})