From 859630fbbede12f6491a84f898abaf8fad9598cb Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Wed, 28 Oct 2026 17:17:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/receiving-adapter.js               | 10 ++--
 src/components/ReceivingSessionSummary.vue |  2 +
 src/pages/operation/operation.vue          | 26 ++++++++--
 tests/receiving-adapter.test.mjs           | 15 ++++++
 tests/receiving-lifecycle.test.mjs         | 56 +++++++++++++++++++++-
 5 files changed, 99 insertions(+), 10 deletions(-)

diff --git a/src/api/receiving-adapter.js b/src/api/receiving-adapter.js
index 629e429..95ca579 100644
--- a/src/api/receiving-adapter.js
+++ b/src/api/receiving-adapter.js
@@ -115,7 +115,9 @@ export function isReceivingConflict(error) {
 export function toReceivingError(error, fallback = '海外仓作业失败') {
 	const code = error?.code
 	const rawMessage = String(error?.message || '').trim()
-	const palletConflictMessages = {
+	const receivingMessages = {
+		'Carton mark must contain a non-empty inbound code prefix': '请扫描箱码或国内DP码',
+		'Pallet code is not part of the current FBA destination group': '托盘不属于当前目的仓，请重扫',
 		'Reserved pallet binding is incomplete': '预留托盘资料不完整，请联系管理员检查入仓计划',
 		'Reserved pallet customer binding is invalid': '预留托盘与当前客户不匹配，请联系管理员检查入仓计划',
 		'Scanned pallet does not match the reserved inbound plan resource': '扫描托盘与入仓计划预留资源不一致，请扫描已预留的托盘',
@@ -131,13 +133,13 @@ export function toReceivingError(error, fallback = '海外仓作业失败') {
 		'Pallet FBA destination does not match the inbound code': '该托盘的FBA目的仓与当前入仓码不一致，请更换托盘',
 		'FBA-designated pallet cannot receive an OVERSEAS destination carton': 'FBA专用托盘不能接收海外仓目的箱，请更换托盘'
 	}
-	const conflictMessage = ['409', 'A0409', 'B0409'].includes(String(code || ''))
-		? palletConflictMessages[rawMessage]
+	const businessMessage = ['404', 'A0404', 'B0404', '409', 'A0409', 'B0409'].includes(String(code || ''))
+		? receivingMessages[rawMessage]
 		: ''
 	const palletUnavailable = String(code || '') === 'S0503'
 		&& rawMessage === 'Warehouse pallet service returned no usable response'
 	const mapped = Object.assign(new Error(
-		conflictMessage || (palletUnavailable
+		businessMessage || (palletUnavailable
 			? '该托盘当前不可用于收货，请更换可用托盘或联系管理员检查托盘状态'
 			: rawMessage || fallback)
 	), {
diff --git a/src/components/ReceivingSessionSummary.vue b/src/components/ReceivingSessionSummary.vue
index 242d696..8fb4e80 100644
--- a/src/components/ReceivingSessionSummary.vue
+++ b/src/components/ReceivingSessionSummary.vue
@@ -47,6 +47,8 @@
 <style scoped>
 	.receiving-summary{box-sizing:border-box;margin-bottom:10px;padding:10px 12px;border:1px solid #b8d2f3;border-radius:13px;background:linear-gradient(145deg,#fff,#f2f7ff);box-shadow:0 3px 12px rgba(31,74,125,.08)}
 	.receiving-summary-head,.receiving-summary-progress>view:first-child{display:flex;align-items:center;justify-content:space-between;gap:10px}
+	.receiving-summary-head > view:first-child{flex:1;min-width:0}
+	.receiving-summary-container{white-space:normal;overflow-wrap:anywhere;word-break:break-all}
 	.receiving-summary-label,.receiving-summary-container,.metric-value,.metric-label{display:block}.receiving-summary-label{color:#718095;font-size:9px;line-height:13px}.receiving-summary-container{margin-top:1px;color:#17324d;font-size:17px;font-weight:850;line-height:22px}
 	.receiving-summary-status{flex-shrink:0;padding:4px 8px;border-radius:99px;color:#1668dc;font-size:9px;font-weight:700;background:#e3efff}
 	.receiving-summary-context{display:flex;flex-direction:column;gap:4px;margin-top:7px;color:#617389;font-size:9px;line-height:14px}.receiving-summary-destinations{display:flex;min-width:0;align-items:flex-start}.destination-label{flex-shrink:0}.destination-tags{display:flex;min-width:0;flex-wrap:wrap;gap:3px 4px}.destination-tags text{padding:0 5px;border-radius:99px;color:#42617f;line-height:14px;background:#e8f0fa;white-space:nowrap}
diff --git a/src/pages/operation/operation.vue b/src/pages/operation/operation.vue
index 111e944..dc44de1 100644
--- a/src/pages/operation/operation.vue
+++ b/src/pages/operation/operation.vue
@@ -85,7 +85,7 @@
 					</view>
 					<view class="scan-card">
 						<text class="section-label">1. 货物码</text>
-						<ScanTargetInput name="carton" v-model="cartonInput" label="货物码" placeholder="扫描 DP 或箱码" :active="activeTarget === 'carton'" @activate="activeTarget = 'carton'" @submit="resolveCarton" />
+						<ScanTargetInput name="carton" v-model="cartonInput" label="货物码" placeholder="扫描箱码或一件代发DP码" :active="activeTarget === 'carton'" @activate="activeTarget = 'carton'" @submit="resolveCarton" />
 						<button class="secondary-button" :disabled="busy || !cartonInput.trim()" @tap="resolveCarton(cartonInput)">解析货物码</button>
 
 						<template v-if="activeInbound">
@@ -98,9 +98,9 @@
 							</view>
 							<text class="section-label">2. 托盘码</text>
 
-							<ScanTargetInput name="pallet" v-model="palletInput" label="托盘码" placeholder="扫描或人工输入托盘码" :active="activeTarget === 'pallet'" @activate="activeTarget = 'pallet'" @submit="resolvePallet" />
+							<ScanTargetInput name="pallet" v-model="palletInput" label="托盘码" placeholder="扫描收货托盘码" :active="activeTarget === 'pallet'" @activate="activeTarget = 'pallet'" @submit="resolvePallet" />
 							<button class="secondary-button" :disabled="busy || !palletInput.trim()" @tap="resolvePallet(palletInput)">校验托盘</button>
-							<view v-if="resolvedPallet" class="resolved-card"><text>{{ resolvedPallet.palletCode }}</text><text>{{ resolvedPallet.compatible ? '预留托盘校验通过，可收货' : '托盘不匹配' }}</text><text v-if="resolvedPallet.locationCode">库位：{{ resolvedPallet.locationCode }}{{ resolvedPallet.locationType === 'SHARED_OVERFLOW' ? '（A0共享溢出位）' : '' }}</text><text v-else>库位：待现场确认</text></view>
+							<view v-if="resolvedPallet && palletInput.trim() === resolvedPallet.palletCode" class="resolved-card"><text>{{ resolvedPallet.palletCode }}</text><text>{{ resolvedPallet.compatible ? '预留托盘校验通过，可收货' : '托盘不匹配' }}</text><text v-if="resolvedPallet.locationCode">库位：{{ resolvedPallet.locationCode }}{{ resolvedPallet.locationType === 'SHARED_OVERFLOW' ? '（A0共享溢出位）' : '' }}</text><text v-else>库位：待现场确认</text></view>
 							<template v-if="activeInbound.destinationType === 'FBA'">
 								<text class="section-label">3. 该托累计箱数</text>
 								<input v-model.number="packageCount" class="quantity-input" type="number" inputmode="numeric" :placeholder="`该托当前累计箱数`" />
@@ -157,7 +157,7 @@
 			activeTarget: { get() { return receiving.activeScanTarget }, set(value) { receiving.activeScanTarget = value } },
 			phase() { return this.detailOpen && !this.current ? 'detail' : receivingPhase(this.current) }, progress() { return receivingProgress(this.current) }, activeInbound() { return this.resolvedCarton },
 			uploadedPhotoCount() { return this.photoSlots.filter((item) => item?.fileId).length }, photosReady() { return this.uploadedPhotoCount === 3 && !this.photoSlots.some((item) => item?.status === 'uploading') },
-			canSubmitReceipt() { if (!this.activeInbound || !this.resolvedPallet?.compatible) return false; if (this.activeInbound.destinationType === 'FBA') { const count = Number(this.packageCount); return Number.isInteger(count) && count > 0 } return Boolean(this.activeInbound.cartonMark) },
+			canSubmitReceipt() { if (!this.activeInbound || !this.resolvedPallet?.compatible || this.palletInput.trim() !== this.resolvedPallet.palletCode) return false; if (this.activeInbound.destinationType === 'FBA') { const count = Number(this.packageCount); return Number.isInteger(count) && count > 0 } return Boolean(this.activeInbound.cartonMark) },
 			allInboundsReconciled() { const values = this.current?.inbounds || []; return values.length > 0 && !this.current?.hasDifference && values.every((item) => Number(item.pendingPackages) === 0) },
 			canFinishOnsite() { return Boolean(this.current && ['SIGNED', 'RECEIVING'].includes(this.current.status)) },
 			pageTitle() { return { candidates: '待卸货集装箱', detail: '柜号详情', sign: '拆柜拍照签收', receive: '当前柜收货', completed: '入库完成' }[this.phase] }
@@ -202,7 +202,20 @@
 			async signContainer() { if (!this.photosReady) return; const photos = this.photoSlots.map((item, index) => ({ role: this.photoSteps[index].role, fileId: String(item.fileId) })); const key = idempotencyKey('sign', { containerNo: this.current.containerNo, photos }); try { const value = await this.run('签收当前柜', async () => this.validateReceivingWarehouse(await signCurrentReceiving({ photos, idempotencyKey: key.value }), '当前接柜会话')); releaseIdempotencyKey(key.signature); await this.applyCurrentReceiving(value); this.clearReceiptContext() } catch (_) {} },
 			clearReceiptContext() { receiving.resolvedCarton = null; receiving.resolvedPallet = null; this.cartonInput = ''; this.palletInput = ''; this.packageCount = ''; receiving.activeScanTarget = 'carton'; this.scheduleScanDrain() },
 			async resolveCarton(raw) { const cartonMark = String(raw?.detail?.value ?? raw ?? this.cartonInput).trim(); if (!cartonMark || !this._pageActive) return; const scanEpoch = this._scanEpoch || 0; if (this.busy) return this.handleHardwareScan(cartonMark); try { const outcome = await this.run('处理货物码', async () => { const value = await resolveCurrentCarton(cartonMark); if (value.operationMode !== 'DROPSHIP_PALLET') return { value }; if (!this._pageActive || scanEpoch !== (this._scanEpoch || 0)) throw new Error('页面已离开，请返回后重新扫码确认收货'); const payload = { sourcePalletNo: value.sourcePalletNo || cartonMark }; const key = idempotencyKey('whole-pallet-receipt', { containerNo: this.current?.containerNo, ...payload }); const result = await receiveCurrentWholePallet({ ...payload, idempotencyKey: key.value }); const current = this.validateReceivingWarehouse(await getCurrentReceiving(), '当前接柜会话'); releaseIdempotencyKey(key.signature); return { value, result, current } }); if (outcome.result) { receiving.lastReceipt = outcome.result; await this.applyCurrentReceiving(outcome.current); this.clearReceiptContext(); playSuccessSound(); return } receiving.resolvedCarton = outcome.value; receiving.resolvedPallet = null; this.cartonInput = outcome.value.cartonMark; this.palletInput = ''; this.packageCount = ''; receiving.activeScanTarget = 'pallet'; playSuccessSound() } catch (error) { console.error('[Overseas PDA cargo] failed', { cartonMark, message: error.message, code: error.code, requestId: error.requestId, traceId: error.traceId }) } },
-			async resolvePallet(raw) { const palletCode = String(raw?.detail?.value ?? raw ?? this.palletInput).trim(); if (!palletCode || !this.activeInbound || this.busy) return; try { const value = await this.run('校验托盘', () => resolveCurrentPallet(palletCode, this.activeInbound.inboundCode)); receiving.resolvedPallet = value; this.palletInput = value.palletCode; this.packageCount = Number(value.currentReceivedPackages || 0) || ''; if (!value.compatible) throw Object.assign(new Error('托盘不匹配'), { code: 'PALLET_INCOMPATIBLE' }); receiving.activeScanTarget = this.activeInbound.destinationType === 'FBA' ? 'quantity' : 'carton'; playSuccessSound() } catch (error) { if (!this.error) this.error = error } },
+			async resolvePallet(raw) {
+				const palletCode = String(raw?.detail?.value ?? raw ?? this.palletInput).trim()
+				if (!palletCode || !this.activeInbound || this.busy) return
+				receiving.resolvedPallet = null; this.palletInput = palletCode; this.packageCount = ''; receiving.activeScanTarget = 'pallet'
+				try {
+					const value = await this.run('校验托盘', async () => {
+						const result = await resolveCurrentPallet(palletCode, this.activeInbound.inboundCode)
+						if (!result.compatible) throw Object.assign(new Error('托盘不匹配，请重扫'), { code: 'PALLET_INCOMPATIBLE' })
+						return result
+					})
+					receiving.resolvedPallet = value; this.palletInput = value.palletCode; this.packageCount = Number(value.currentReceivedPackages || 0) || ''
+					receiving.activeScanTarget = this.activeInbound.destinationType === 'FBA' ? 'quantity' : 'carton'; playSuccessSound()
+				} catch (error) { if (!this.error) this.error = error }
+			},
 			async submitReceipt() { const isFba = this.activeInbound?.destinationType === 'FBA'; if (isFba && Number(this.packageCount) > MAX_PACKAGES_PER_PALLET) { this.error = Object.assign(new Error(PALLET_CAPACITY_MESSAGE), { code: 'A0409' }); playErrorSound(); this.showToast(PALLET_CAPACITY_MESSAGE, 'error'); return } if (!this.canSubmitReceipt) return; const payload = isFba ? { inboundCode: this.activeInbound.inboundCode, palletCode: this.resolvedPallet.palletCode, packageCount: Number(this.packageCount), expectedPalletVersion: this.resolvedPallet.version } : { cartonMark: this.activeInbound.cartonMark, palletCode: this.resolvedPallet.palletCode }; const key = idempotencyKey(isFba ? 'bulk-receipt' : 'carton-receipt', { containerNo: this.current?.containerNo, groupKey: this.activeInbound.groupKey, ...payload }); try { const result = await this.run('提交实收', async () => { const receipt = isFba ? await receiveCurrentBulk({ ...payload, idempotencyKey: key.value }) : await receiveCurrentCarton({ ...payload, idempotencyKey: key.value }); const current = this.validateReceivingWarehouse(await getCurrentReceiving(), '当前接柜会话'); return { receipt, current } }); releaseIdempotencyKey(key.signature); receiving.lastReceipt = result.receipt; await this.applyCurrentReceiving(result.current); this.clearReceiptContext(); playSuccessSound() } catch (_) {} },
 			async completeContainer() { if (!this.canFinishOnsite || this.activeTarget === 'quantity' || this.scanQueue.length) return; const payload = { allowDifference: !this.allInboundsReconciled }; const key = idempotencyKey('complete', { containerNo: this.current.containerNo, ...payload }); try { const value = await this.run(this.allInboundsReconciled ? '完成入库' : '结束现场收货', async () => this.validateReceivingWarehouse(await completeCurrentReceiving({ ...payload, idempotencyKey: key.value }), '当前接柜会话')); releaseIdempotencyKey(key.signature); await this.applyCurrentReceiving(value) } catch (_) {} },
 			async finishAndReturn() { resetReceivingDraft(); await this.loadCandidates(false) },
@@ -213,6 +226,9 @@
 
 <style scoped>
 	.reservation-hint{display:block;margin:6px 0;color:#64748b;font-size:12px;line-height:18px;overflow-wrap:anywhere}
+	.container-card .card-head > view:first-child{flex:1;min-width:0}
+	.container-no{white-space:normal;overflow-wrap:anywhere;word-break:break-all}
+	.completed-card text{max-width:100%;overflow-wrap:anywhere;word-break:break-all}
 	.receiving-page{padding-bottom:calc(88px + env(safe-area-inset-bottom,0px))}.receiving-content{max-width:640px}.receiving-heading,.card-head,.progress-row,.list-toolbar{display:flex;align-items:flex-start;justify-content:space-between;gap:12px}.receiving-heading{margin-bottom:14px}.receiving-title,.receiving-subtitle,.container-no,.container-meta,.card-title,.section-label,.resolved-card text,.completed-card text,.error-card text,.prototype-tip{display:block}.receiving-title{font-size:21px;font-weight:800}.receiving-subtitle{margin-top:4px;color:#6f8194;font-size:12px;line-height:18px}.real-badge,.prototype-badge,.status-tag{flex-shrink:0;padding:5px 8px;border-radius:7px;font-size:11px;font-weight:700}.real-badge{color:#1668dc;background:#eaf2ff}.prototype-badge{color:#6f8194;background:#edf1f5}.scan-card,.container-card,.inbound-card,.inbound-list-card,.photo-card,.state-card,.empty-card,.completed-card{margin-bottom:12px;padding:14px;border:1px solid #dfe7ef;border-radius:14px;background:#fff;box-shadow:0 2px 10px rgba(16,24,40,.05)}.section-label,.card-title{margin-bottom:9px;color:#17324d;font-size:14px;font-weight:800}.primary-button,.secondary-button,.ghost-button{box-sizing:border-box;min-height:46px;border-radius:9px;font-size:13px;font-weight:700}.primary-button{width:100%;margin-top:10px;color:#fff;background:#1668dc}.secondary-button{width:100%;margin-top:8px;color:#1668dc;border:1px solid #9dbce9;background:#f4f8ff}.ghost-button{color:#496176;border:1px solid #d3dce6;background:#fff}.primary-button[disabled],.secondary-button[disabled]{color:#8b96a3;background:#e6eaf0;opacity:1}.list-toolbar{align-items:center;margin:8px 2px 12px;color:#6f8194;font-size:12px}.list-toolbar button{min-height:40px;padding:0 12px;color:#1668dc;background:transparent}.container-no{font-size:18px;font-weight:800}.container-meta{margin-top:4px;color:#6f8194;font-size:11px;line-height:17px}.status-wait{color:#a35b0c;background:#fff1dd}.status-current{color:#1668dc;background:#eaf2ff}.status-good{color:#10856f;background:#e2f6f0}.progress-row{margin-top:14px;color:#6f8194;font-size:12px}.progress-row strong{color:#10856f;font-size:16px}.progress-track{height:7px;margin-top:8px;overflow:hidden;border-radius:99px;background:#e7edf3}.progress-fill{height:100%;border-radius:inherit;background:#10856f}.empty-card,.state-card,.completed-card{display:flex;align-items:center;flex-direction:column;gap:10px;padding:34px 18px;color:#6f8194;text-align:center}.summary-card{border-color:#a9c8f3}.inbound-row{display:flex;align-items:center;justify-content:space-between;gap:10px;padding:11px 0;border-top:1px solid #edf1f5}.inbound-code{display:block;font-size:13px;font-weight:750}.inbound-count{flex-shrink:0;color:#6f8194;font-size:11px}.inbound-count strong{color:#10856f;font-size:17px}.success-card,.error-card{margin-bottom:12px;padding:11px 12px;border-radius:9px;font-size:12px;line-height:18px}.success-card{color:#0b6c5d;background:#e6f7f1}.error-card{color:#b42318;background:#fff1f0}.error-message{font-weight:700}.photo-grid{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:8px;margin-top:14px}.photo-slot{display:flex;align-items:center;flex-direction:column;justify-content:center;min-height:112px;padding:8px;border:1px solid #d5dee8;border-radius:10px;color:#496176;font-size:11px;background:#f8fafc}.photo-slot.complete{border-color:#9cd0bf;color:#10856f;background:#effaf6}.photo-action{margin-top:6px;font-size:10px}.inbound-tabs{width:100%;white-space:nowrap}.inbound-tab{display:inline-flex;vertical-align:top;align-items:flex-start;flex-direction:column;min-width:190px;min-height:62px;margin-right:8px;padding:9px 11px;border:1px solid #d6e0eb;border-radius:9px;color:#496176;font-size:10px;text-align:left;background:#f8fafc}.inbound-tab text:first-child{margin-bottom:5px;color:#17324d;font-size:12px;font-weight:750}.inbound-tab.active{border:2px solid #1668dc;background:#f2f7ff}.inbound-tab.done{opacity:.65}.mode-banner{display:flex;justify-content:space-between;gap:8px;margin-bottom:13px;padding:10px;border-radius:9px;font-size:12px;font-weight:700}.mode-banner.fba{color:#8b5508;background:#fff1dd}.mode-banner.overseas{color:#08705f;background:#e2f6f0}.scan-card .section-label:not(:first-child){margin-top:14px}.resolved-card{margin-top:8px;padding:9px 11px;border-left:3px solid #10856f;color:#0b6c5d;font-size:11px;background:#eaf8f3}.resolved-card text:first-child{font-size:13px;font-weight:750}.quantity-input{box-sizing:border-box;width:100%;height:48px;padding:0 12px;border:2px solid #1668dc;border-radius:8px;font-size:18px;font-weight:750;background:#fff}.receipt-button{margin-top:14px}.sticky-action{position:fixed;z-index:8;right:10px;bottom:8px;left:10px;display:grid;grid-template-columns:1fr 2fr;gap:9px;max-width:620px;margin:auto;padding:10px;border:1px solid #dbe2ea;border-radius:14px;background:#fff;box-shadow:0 6px 20px rgba(31,41,55,.16)}.sticky-action.one{grid-template-columns:1fr}.sticky-action .primary-button{margin-top:0}.completed-icon{display:grid;place-items:center;width:56px;height:56px;border-radius:50%;color:#fff;font-size:30px;background:#10856f}.completed-title{color:#17324d;font-size:20px;font-weight:800}.prototype-tip{margin-top:10px;color:#8b610e;font-size:11px}
 	.blocked-card{display:flex;align-items:center;flex-direction:column;gap:10px;margin-bottom:12px;padding:34px 20px;border:1px solid #dfe7ef;border-radius:14px;color:#6f8194;text-align:center;line-height:20px;background:#fff;box-shadow:0 2px 10px rgba(16,24,40,.05)}.blocked-title{color:#17324d;font-size:17px;font-weight:800}.prototype-badge{color:#8b610e;background:#fff1dd}
 	.photo-grid{display:grid;grid-template-columns:1fr;gap:9px;margin-top:12px}
diff --git a/tests/receiving-adapter.test.mjs b/tests/receiving-adapter.test.mjs
index 339b3cf..b83717e 100644
--- a/tests/receiving-adapter.test.mjs
+++ b/tests/receiving-adapter.test.mjs
@@ -22,6 +22,21 @@ test('reservation mismatch asks for the reserved pallet and retains diagnostics'
 	assert.equal(result.traceId, 'trace-1')
 })
 
+test('cargo and destination-pallet scan errors use concise Chinese and retain diagnostics', () => {
+	for (const [code, message, expected] of [
+		['A0409', 'Carton mark must contain a non-empty inbound code prefix', '请扫描箱码或国内DP码'],
+		['A0404', 'Pallet code is not part of the current FBA destination group', '托盘不属于当前目的仓，请重扫'],
+		['B0404', 'Pallet code is not part of the current FBA destination group', '托盘不属于当前目的仓，请重扫'],
+		[404, 'Pallet code is not part of the current FBA destination group', '托盘不属于当前目的仓，请重扫'],
+	]) {
+		const result = toReceivingError({ code, message, requestId: 'scan-request', traceId: 'scan-trace' })
+		assert.equal(result.message, expected)
+		assert.equal(result.code, code)
+		assert.equal(result.requestId, 'scan-request')
+		assert.equal(result.traceId, 'scan-trace')
+	}
+})
+
 test('first scan and receipt requests confirm server reservations without resource assignment commands', async () => {
 	const source = await readFile(new URL('../src/api/inbound.js', import.meta.url), 'utf8')
 	const calls = []
diff --git a/tests/receiving-lifecycle.test.mjs b/tests/receiving-lifecycle.test.mjs
index daea2ce..5f3b27f 100644
--- a/tests/receiving-lifecycle.test.mjs
+++ b/tests/receiving-lifecycle.test.mjs
@@ -2,7 +2,7 @@ import test from 'node:test'
 import assert from 'node:assert/strict'
 import { readFileSync } from 'node:fs'
 import * as store from '../src/stores/receiving.js'
-import { normalizeReceivingSession } from '../src/api/receiving-adapter.js'
+import { normalizeReceivingSession, toReceivingError } from '../src/api/receiving-adapter.js'
 
 const source = readFileSync(new URL('../src/pages/operation/operation.vue', import.meta.url), 'utf8').match(/<script>([\s\S]*?)<\/script>/)[1]
 const defer = () => { let resolve, reject; const promise = new Promise((a, b) => { resolve = a; reject = b }); return { promise, resolve, reject } }
@@ -37,6 +37,60 @@ test('same current readback retains three signed previews; collapsed unversioned
   await vm.applyCurrentReceiving(sessionValue()); assert.equal(calls.length, 18)
 })
 
+test('editing and rejecting a pallet cannot submit using the previous successful validation', async t => {
+  store.resetReceivingSession(); store.setCurrentReceiving(sessionValue())
+  store.receiving.resolvedCarton = { inboundCode: 'IN-A', cartonMark: 'IN-A#22-1', destinationType: 'FBA' }
+  store.receiving.resolvedPallet = { palletCode: 'PALLET-OLD', compatible: true, version: 1 }
+  let writes = 0
+  const { vm } = page({ toReceivingError,
+    resolveCurrentPallet: async () => { throw Object.assign(new Error('Pallet code is not part of the current FBA destination group'), { code: 'A0404', requestId: 'scan-request', traceId: 'scan-trace' }) },
+    receiveCurrentBulk: async () => { writes++ },
+  })
+  t.after(() => vm.suspendReceiving())
+  vm.palletInput = 'PALLET-OLD'; vm.packageCount = 3
+  assert.equal(vm.canSubmitReceipt, true)
+  vm.palletInput = 'PALLET-WRONG'
+  assert.equal(vm.canSubmitReceipt, false)
+  const toasts = []; vm.showToast = (message, type) => toasts.push({ message, type })
+  await vm.resolvePallet(vm.palletInput)
+  assert.equal(vm.resolvedPallet, null)
+  assert.equal(vm.packageCount, '')
+  assert.equal(vm.activeTarget, 'pallet')
+  assert.equal(vm.error.message, '托盘不属于当前目的仓，请重扫')
+  assert.equal(vm.error.requestId, 'scan-request')
+  assert.equal(vm.error.traceId, 'scan-trace')
+  assert.deepEqual(toasts, [{ message: '托盘不属于当前目的仓，请重扫', type: 'error' }])
+  await vm.submitReceipt()
+  assert.equal(writes, 0)
+})
+
+test('an incompatible pallet never reports success and a corrected scan can be validated normally', async t => {
+  store.resetReceivingSession(); store.setCurrentReceiving(sessionValue())
+  store.receiving.resolvedCarton = { inboundCode: 'IN-A', cartonMark: 'IN-A#22-1', destinationType: 'FBA' }
+  const calls = []; let successes = 0
+  const { vm } = page({ toReceivingError, playSuccessSound: () => successes++,
+    resolveCurrentPallet: async (palletCode, inboundCode) => {
+      calls.push({ palletCode, inboundCode })
+      return { palletCode, compatible: palletCode === 'PALLET-VALID', version: 2, currentReceivedPackages: 3 }
+    },
+  })
+  t.after(() => vm.suspendReceiving())
+  const toasts = []; vm.showToast = (message, type) => toasts.push({ message, type })
+  await vm.resolvePallet('PALLET-WRONG')
+  assert.equal(vm.resolvedPallet, null)
+  assert.equal(vm.canSubmitReceipt, false)
+  assert.equal(successes, 0)
+  assert.deepEqual(toasts, [{ message: '托盘不匹配，请重扫', type: 'error' }])
+  await vm.resolvePallet('PALLET-VALID')
+  assert.deepEqual(calls, [{ palletCode: 'PALLET-WRONG', inboundCode: 'IN-A' }, { palletCode: 'PALLET-VALID', inboundCode: 'IN-A' }])
+  assert.equal(vm.resolvedPallet.palletCode, 'PALLET-VALID')
+  assert.equal(vm.error, null)
+  assert.equal(vm.packageCount, 3)
+  assert.equal(vm.canSubmitReceipt, true)
+  assert.equal(vm.activeTarget, 'quantity')
+  assert.equal(successes, 1)
+})
+
 test('signed photo changes, account/customer/cabinet changes and image failure cannot inherit stale previews', async () => {
   store.resetReceivingSession(); let calls = 0
   const { vm, deps } = page({ downloadCurrentUnloadPhoto: async () => `local:${++calls}`, downloadCurrentDomesticLoadingPhoto: async () => '' })