From 2a38288e205cca708e1f7b80ad913020fa2c9b65 Mon Sep 17 00:00:00 2001
From: liuyihe <2513762445@qq.com>
Date: Thu, 15 Oct 2026 15:45:32 +0800
Subject: [PATCH 1/8] =?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/warehouse-transfers.js                |   8 +
 src/components/CartonCountFields.vue          |  12 +
 src/pages/outbound/outbound.vue               |   2 +-
 src/pages/return-counting/return-counting.vue |   6 +-
 .../warehouse-transfer/warehouse-transfer.vue | 242 ++++++++++++++----
 tests/return-counting-page.test.mjs           |   2 +-
 tests/warehouse-transfer-api.test.mjs         |  10 +-
 tests/warehouse-transfer-counting.test.mjs    | 129 ++++++++++
 8 files changed, 358 insertions(+), 53 deletions(-)
 create mode 100644 src/components/CartonCountFields.vue
 create mode 100644 tests/warehouse-transfer-counting.test.mjs

diff --git a/src/api/warehouse-transfers.js b/src/api/warehouse-transfers.js
index 90e7479..764ccc9 100644
--- a/src/api/warehouse-transfers.js
+++ b/src/api/warehouse-transfers.js
@@ -49,3 +49,11 @@ export function downloadWarehouseTransferPalletLabel(labelDownloadPath) {
 	if (!path) return Promise.reject(new Error('服务端未返回托盘标签下载地址'))
 	return overseasDownload(path)
 }
+
+export function countWarehouseTransferCartons(transferNo, payload) {
+  return overseasRequest('POST', `${BASE}/${encoded(transferNo)}/cartons/count`, payload)
+}
+
+export function getWarehouseTransferCartonLabel(transferNo) {
+  return overseasRequest('GET', `${BASE}/${encoded(transferNo)}/carton-label`)
+}
diff --git a/src/components/CartonCountFields.vue b/src/components/CartonCountFields.vue
new file mode 100644
index 0000000..a5be130
--- /dev/null
+++ b/src/components/CartonCountFields.vue
@@ -0,0 +1,12 @@
+<template><view><view class="measure-grid"><label><text>长（cm）</text><input v-model="box.length" type="digit" class="measure-input" :disabled="disabled" placeholder="长度" /></label><label><text>宽（cm）</text><input v-model="box.width" type="digit" class="measure-input" :disabled="disabled" placeholder="宽度" /></label><label><text>高（cm）</text><input v-model="box.height" type="digit" class="measure-input" :disabled="disabled" placeholder="高度" /></label><label><text>重量（kg）</text><input v-model="box.weight" type="digit" class="measure-input" :disabled="disabled" placeholder="重量" /></label></view><view class="volume-chip"><text>体积</text><strong>{{ boxVolume(box) }} cm³</strong></view>
+          <view v-for="(line, lineIndex) in box.items" :key="lineIndex" class="count-line"><picker class="sku-picker" :disabled="disabled || !allowSkuChange" :range="skuCodes" :value="Math.max(0, skuCodes.indexOf(line.skuCode))" @change="line.skuCode = skuCodes[Number($event.detail.value)]"><text>{{ line.skuCode || '选择 SKU' }} ▾</text></picker><input v-model="line.quantity" type="number" class="number-input quantity" :disabled="disabled" placeholder="数量" /><button v-if="!disabled && allowSkuChange && box.items.length > 1" class="link-button" :disabled="disabled" @tap="box.items.splice(lineIndex, 1)">删除</button></view></view></template>
+<script>
+export default {
+  props: { box: { type: Object, required: true }, skuCodes: { type: Array, default: () => [] }, disabled: Boolean, allowSkuChange: { type: Boolean, default: true } },
+  methods: { boxVolume(box) { const value = Number(box.length) * Number(box.width) * Number(box.height); return Number.isFinite(value) && value > 0 ? value.toFixed(2) : '—' } }
+}
+</script>
+<style scoped>
+.count-line{display:flex;align-items:center;gap:8px;margin-top:8px}.sku-picker{flex:1;min-width:0;font-size:12px;word-break:break-all}.quantity{box-sizing:border-box;flex:none;width:90px;height:34px;text-align:center;font-size:13px;border:1px solid #cbd9e8;border-radius:8px;background:#fbfdff}.link-button{width:auto;font-size:12px;color:#135ee8}
+.measure-grid{display:grid;grid-template-columns:repeat(2,1fr);gap:7px;margin:10px 0 6px}.measure-grid label text{display:block;margin-bottom:4px;color:#65768b;font-size:10px}.measure-input{box-sizing:border-box;width:100%;height:34px;padding:0 8px;border:1px solid #cbd9e8;border-radius:8px;color:#203750;font-size:13px;text-align:center;background:#fbfdff}.volume-chip{display:flex;align-items:baseline;justify-content:flex-end;gap:4px;margin:4px 0 8px;color:#728197;font-size:10px}.volume-chip strong{color:#135ee8;font-size:14px}
+</style>
diff --git a/src/pages/outbound/outbound.vue b/src/pages/outbound/outbound.vue
index 65cdc72..26c728c 100644
--- a/src/pages/outbound/outbound.vue
+++ b/src/pages/outbound/outbound.vue
@@ -5,7 +5,7 @@
 			<view class="portal-content fulfillment-content">
 				<view class="fulfillment-heading"><text class="fulfillment-title">出库任务</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">
+				<view v-if="!discardCurrent" class="fulfillment-card">
 					<ScanTargetInput name="outbound" :model-value="scanCode" :label="scanLabel" :placeholder="scanPlaceholder" :active="true" @update:modelValue="updateScanCode" @submit="handleScan" />
 					<button class="secondary-button" :disabled="!scanCode || loading || busy || discardLoading || discardBusy" @tap="handleScan(scanCode)">{{ discardCurrent ? (discardTask?.scanMode === 'CARTON' ? '核对废弃箱唛' : '打开废弃托盘') : current ? '匹配出库货物' : '打开出库任务' }}</button>
 					<text class="scan-help">任务号直接恢复；退货整托出库扫托盘码，散箱出库扫箱唛。</text>
diff --git a/src/pages/return-counting/return-counting.vue b/src/pages/return-counting/return-counting.vue
index 335375f..4b6eb5c 100644
--- a/src/pages/return-counting/return-counting.vue
+++ b/src/pages/return-counting/return-counting.vue
@@ -13,8 +13,7 @@
       <template v-else>
         <view class="work-card"><text class="card-title">{{ task.palletCode }}</text><text class="hint">{{ task.status === 'COUNTING' ? '清点中' : '已完成' }}</text><text class="hint">{{ task.returnNo }} · {{ task.boxes.length }} 箱</text><view v-for="row in totals" :key="row.skuCode" class="total-row" :class="{ matched: row.actual === row.quantity }"><text>{{ row.skuCode }}</text><text>签收 {{ row.quantity }} / 已填 {{ row.actual }}</text></view></view>
         <view v-for="(box, index) in task.boxes" :id="`box-${index}`" :key="box.cartonMark" class="work-card box-card" :class="{ selected: box.cartonMark === selectedMark }">
-          <view class="row-head"><text class="card-title">第 {{ index + 1 }} 箱</text><button v-if="task.status === 'COUNTING'" class="link-button" :disabled="busy" @tap="addSku(box)">添加 SKU</button></view><text class="box-mark">{{ box.cartonMark }}</text><view class="measure-grid"><label><text>长（cm）</text><input v-model="box.length" type="digit" class="measure-input" :disabled="busy || task.status !== 'COUNTING'" placeholder="长度" /></label><label><text>宽（cm）</text><input v-model="box.width" type="digit" class="measure-input" :disabled="busy || task.status !== 'COUNTING'" placeholder="宽度" /></label><label><text>高（cm）</text><input v-model="box.height" type="digit" class="measure-input" :disabled="busy || task.status !== 'COUNTING'" placeholder="高度" /></label><label><text>重量（kg）</text><input v-model="box.weight" type="digit" class="measure-input" :disabled="busy || task.status !== 'COUNTING'" placeholder="重量" /></label></view><view class="volume-chip"><text>体积</text><strong>{{ boxVolume(box) }} cm³</strong></view>
-          <view v-for="(line, lineIndex) in box.items" :key="lineIndex" class="count-line"><picker class="sku-picker" :disabled="busy || task.status !== 'COUNTING'" :range="skuCodes" :value="Math.max(0, skuCodes.indexOf(line.skuCode))" @change="line.skuCode = skuCodes[Number($event.detail.value)]"><text>{{ line.skuCode || '选择 SKU' }} ▾</text></picker><input v-model="line.quantity" type="number" class="number-input quantity" :disabled="busy || task.status !== 'COUNTING'" placeholder="数量" /><button v-if="task.status === 'COUNTING' && box.items.length > 1" class="link-button" :disabled="busy" @tap="box.items.splice(lineIndex, 1)">删除</button></view>
+          <view class="row-head"><text class="card-title">第 {{ index + 1 }} 箱</text><button v-if="task.status === 'COUNTING'" class="link-button" :disabled="busy" @tap="addSku(box)">添加 SKU</button></view><text class="box-mark">{{ box.cartonMark }}</text><CartonCountFields :box="box" :sku-codes="skuCodes" :disabled="busy || task.status !== 'COUNTING'" />
         </view>
         <view class="work-card"><text class="hint">各箱 SKU 数量汇总必须与本托签收数量一致，确认后这些箱子才能换标、合箱或创建出库单。</text><button v-if="task.status === 'COUNTING'" class="primary" :disabled="busy || !ready" @tap="confirm">{{ busy ? '提交中…' : '确认全部箱内清点' }}</button><text v-else class="success">箱内清点已完成，可以继续换标或出库。</text></view>
       </template>
@@ -22,13 +21,14 @@
   </view>
 </template>
 <script>
+import CartonCountFields from '@/components/CartonCountFields.vue'
 import PortalHeader from '@/components/PortalHeader.vue'
 import ScanTargetInput from '@/components/ScanTargetInput.vue'
 import { session, requireSession } from '@/stores/session.js'
 import { startScanBroadcast } from '@/utils/scan-broadcast.js'
 import { listReturnCountTasks, scanReturnCountTasks, getCurrentReturnCountTask, beginReturnCountTask, confirmReturnCount } from '@/api/return-counting.js'
 export default {
-  components: { PortalHeader, ScanTargetInput },
+  components: { PortalHeader, ScanTargetInput, CartonCountFields },
   data() { return { user: session.currentUser, busy: false, error: null, scanCode: '', scanResult: '', page: 1, total: 0, tasks: [], task: null, activeTask: null, selectedMark: '', requestKey: '', signature: '', scannerStop: null } },
   computed: {
     skuCodes() { return this.task?.expectedItems.map(row => row.skuCode) || [] },
diff --git a/src/pages/warehouse-transfer/warehouse-transfer.vue b/src/pages/warehouse-transfer/warehouse-transfer.vue
index 188d5aa..2d9f283 100644
--- a/src/pages/warehouse-transfer/warehouse-transfer.vue
+++ b/src/pages/warehouse-transfer/warehouse-transfer.vue
@@ -1,9 +1,9 @@
 <template>
 	<view v-if="user" class="page-shell portal-page transfer-page">
 		<PortalHeader :title="entryMode === 'list' ? '仓储转运测量列表' : '转运测量作业'" :user="user" fallback-url="/pages/module/module?key=inbound" />
-		<scroll-view scroll-y class="transfer-scroll"><view class="portal-content transfer-content">
+		<scroll-view scroll-y :scroll-into-view="cartonScrollTarget" scroll-with-animation class="transfer-scroll"><view class="portal-content transfer-content">
 			<view class="transfer-heading">
-				<view><text class="transfer-title">{{ entryMode === 'list' ? '仓储转运测量列表' : '转运测量作业' }}</text><text class="transfer-subtitle">{{ entryMode === 'list' ? '选择待测转运单后进入作业详情' : '按实际托盘分别记录箱规、重量和箱数' }}</text></view>
+				<view><text class="transfer-title">{{ entryMode === 'list' ? '仓储转运测量列表' : '转运测量作业' }}</text><text class="transfer-subtitle">{{ entryMode === 'list' ? '选择待测转运单后进入作业详情' : '先创建托盘号，再逐箱测量清点并分配入托' }}</text></view>
 				<button class="refresh-button" :disabled="loading" aria-label="刷新待测转运单" @tap="loadCandidates"><uni-icons type="refresh" color="#135ee8" size="18" /><text>{{ loading ? '加载中' : '刷新' }}</text></button>
 			</view>
 
@@ -28,38 +28,73 @@
 				<template v-if="!isInventoryTransfer && !isMeasurementComplete">
 				<view class="order-summary">
 					<view><text class="summary-eyebrow">当前测量任务</text><text class="summary-no">{{ selected.transferNo }}</text></view>
-					<view class="summary-count"><strong>{{ totalCartons }}</strong><text>实收箱</text></view>
+					<view class="summary-count"><strong>{{ cartonsCounted ? actualReceivedCartons : receivedCartonBoxes.length }}</strong><text>{{ cartonsCounted ? '实收箱' : '待确认箱' }}</text></view>
 				</view>
-				<view class="receipt-comparison"><view><strong>{{ selected.packageCount || 0 }}</strong><text>客户预报</text></view><view><strong>{{ totalCartons }}</strong><text>当前实收</text></view><view :class="{ difference: cartonDifference !== 0 }"><strong>{{ cartonDifference > 0 ? `+${cartonDifference}` : cartonDifference }}</strong><text>{{ cartonDifference === 0 ? '无差异' : cartonDifference > 0 ? '超收差异' : '短收差异' }}</text></view></view>
-				<view class="summary-metrics"><view><strong>{{ pallets.length }}</strong><text>托盘</text></view><view><strong>{{ totalVolume }}</strong><text>总体积 m³</text></view><view><strong>{{ totalWeight }}</strong><text>总重量 kg</text></view></view>
+				<view class="receipt-comparison"><view><strong>{{ selected.packageCount || 0 }}</strong><text>客户预报</text></view><view><strong>{{ cartonsCounted ? actualReceivedCartons : '—' }}</strong><text>{{ cartonsCounted ? '当前实收' : '清点后确认' }}</text></view><view :class="{ difference: cartonsCounted && cartonDifference !== 0 }"><strong>{{ !cartonsCounted ? '—' : cartonDifference > 0 ? `+${cartonDifference}` : cartonDifference }}</strong><text>{{ !cartonsCounted ? '差异待确认' : cartonDifference === 0 ? '无差异' : cartonDifference > 0 ? '超收差异' : '短收差异' }}</text></view></view>
+				<view class="summary-metrics"><view><strong>{{ pallets.length }}</strong><text>托盘</text></view><view><strong>{{ totalVolume }}</strong><text>箱子总体积 m³</text></view><view><strong>{{ totalWeight }}</strong><text>箱子总重量 kg</text></view></view>
 
-				<view v-for="(pallet, index) in pallets" :key="pallet.key" class="pallet-card">
+				<view class="workflow-step"><text class="step-number">1</text><view><text class="step-title">创建签收托盘</text><text class="step-caption">支持多托盘，先生成标签，再分配箱子</text></view></view>
+				<view v-for="(pallet, index) in pallets" :key="pallet.key" class="pallet-card" :class="{ 'active-receiving-pallet': String(receivingPalletId) === String(pallet.draftId) }">
 					<view class="pallet-head">
 						<view class="pallet-index"><text>{{ String(index + 1).padStart(2, '0') }}</text></view>
-						<view class="pallet-heading-copy"><text>托盘 {{ index + 1 }} · {{ pallet.bound ? '已完成' : pallet.generated ? '待绑定' : '待测量' }}</text><text>{{ pallet.collapsed && pallet.palletNo ? pallet.palletNo : '本卡数据仅属于当前托盘' }}</text></view>
+						<view class="pallet-heading-copy"><text>托盘 {{ index + 1 }} · {{ pallet.bound ? '已绑定' : pallet.generated ? '待绑定' : '待创建' }}</text><text>{{ pallet.collapsed && pallet.palletNo ? pallet.palletNo : '先创建托盘号，再录入并分配签收箱子' }}</text></view>
 						<button v-if="pallets.length > 1 && !pallet.generated" class="remove-button" @tap.stop="removePallet(index)">移除</button>
 						<button v-if="pallet.generated" class="collapse-button" :aria-label="pallet.collapsed ? '展开托盘明细' : '折叠托盘明细'" @tap.stop="pallet.collapsed = !pallet.collapsed">{{ pallet.collapsed ? '⌄' : '⌃' }}</button>
 					</view>
+					<view v-if="pallet.generated" class="pallet-brief"><text>{{ palletSummary(pallet).cartonCount }} 箱</text><text>{{ palletVolume(pallet) }} m³</text><text>{{ palletSummary(pallet).weight.toFixed(2) }} kg</text><button :disabled="cartonsCounted || countingCartons" @tap="useReceivingPallet(pallet)">{{ String(receivingPalletId) === String(pallet.draftId) ? '当前签收托盘' : '在此托盘签收' }}</button></view>
 					<view v-show="!pallet.collapsed">
-					<view class="measure-section-head"><view><text class="measure-title">本托实测</text><text class="measure-hint">尺寸单位 cm，重量单位 kg</text></view><view class="volume-chip"><text>自动体积</text><strong>{{ palletVolume(pallet) }} m³</strong></view></view>
-					<view class="dimension-grid">
-						<label><text class="field-label">长</text><view class="input-with-unit"><input type="digit" v-model.number="pallet.lengthCm" :disabled="pallet.generated" placeholder="长度" /><text>cm</text></view></label>
-						<label><text class="field-label">宽</text><view class="input-with-unit"><input type="digit" v-model.number="pallet.widthCm" :disabled="pallet.generated" placeholder="宽度" /><text>cm</text></view></label>
-						<label><text class="field-label">高</text><view class="input-with-unit"><input type="digit" v-model.number="pallet.heightCm" :disabled="pallet.generated" placeholder="高度" /><text>cm</text></view></label>
-					</view>
-					<view class="measure-grid">
-						<label><text class="field-label">当前托重量</text><view class="input-with-unit important"><input type="digit" v-model.number="pallet.grossWeightKg" :disabled="pallet.generated" placeholder="毛重" /><text>kg</text></view></label>
-						<label><text class="field-label">当前托箱数</text><view class="input-with-unit important"><input type="number" v-model.number="pallet.cartonCount" :disabled="pallet.generated" placeholder="箱数" /><text>箱</text></view></label>
-					</view>
-					<button v-if="!pallet.generated" class="generate-button" :disabled="!palletReady(pallet) || pallet.busy" @tap="generatePallet(pallet)">{{ pallet.busy ? '生成中…' : '生成托盘号' }}</button>
+                    <view class="measure-section-head"><view><text class="measure-title">本托箱子汇总</text><text class="measure-hint">由分配到本托的实收箱自动汇总，无需填写托盘尺寸和重量</text></view></view>
+                    <view class="summary-metrics"><view><strong>{{ palletSummary(pallet).cartonCount }}</strong><text>实收箱数</text></view><view><strong>{{ palletVolume(pallet) }}</strong><text>箱子体积 m³</text></view><view><strong>{{ palletSummary(pallet).weight.toFixed(2) }}</strong><text>箱子重量 kg</text></view></view>
+					<button v-if="!pallet.generated" class="generate-button" :disabled="pallet.busy || cartonsCounted || countingCartons" @tap="generatePallet(pallet)">{{ pallet.busy ? '生成中…' : '生成托盘号' }}</button>
 					<view v-else class="generated-card"><view><text class="print-code">{{ pallet.palletNo }}</text><text>{{ destinationLabel(pallet, selected) }}</text></view><button :disabled="pallet.busy" @tap="printDraftPallet(pallet)">打印标签</button></view>
 					<view v-if="pallet.generated && !pallet.bound" class="bind-panel"><ScanTargetInput :name="`transfer-pallet-${index}`" v-model="pallet.bindCode" label="确认实物托盘码" placeholder="扫描或手输新托盘标签号" :active="activePalletKey === pallet.key" @activate="activePalletKey = pallet.key" @submit="bindPallet(pallet)" /><button :disabled="pallet.busy || !String(pallet.bindCode || '').trim()" @tap="bindPallet(pallet)">{{ pallet.busy ? '确认中…' : '确认绑定' }}</button></view>
 					<view v-if="pallet.bound" class="bound-state">已绑定实物托盘 {{ pallet.palletNo }}</view>
 					</view>
 				</view>
 
-				<button class="add-pallet-button" @tap="addPallet"><uni-icons type="plus" color="#135ee8" size="18" /><text>新增一个托盘</text></button>
+				<button class="add-pallet-button" :disabled="cartonsCounted || countingCartons" @tap="addPallet"><uni-icons type="plus" color="#135ee8" size="18" /><text>新增一个托盘</text></button>
+                <view v-if="!generatedPallets.length" class="transfer-validation"><view class="workflow-step"><text class="step-number">2</text><view><text class="step-title">填写签收箱子</text><text class="step-caption">请先生成托盘号，再填写签收箱子。</text></view></view></view>
+                <view v-if="generatedPallets.length" class="photo-card">
+                  <view id="transfer-boxes" class="workflow-step"><text class="step-number">2</text><view><text class="step-title">填写签收箱子</text><text class="step-caption">相同箱规批量填，差异箱单独改</text></view></view>
+                  <view class="carton-filter"><button :class="{active: !cartonPalletFilter}" @tap="cartonPalletFilter = ''">全部箱子</button><button v-for="(pallet, index) in generatedPallets" :key="pallet.draftId" :class="{active: String(cartonPalletFilter) === String(pallet.draftId)}" @tap="cartonPalletFilter = pallet.draftId">托盘 {{ index + 1 }} · {{ palletSummary(pallet).cartonCount }} 箱</button></view>
+                  <text class="measure-hint">扫描本单箱号定位；填写每箱尺寸、重量和箱内实点件数。申报未提供件数，按现场实点记录。</text>
+                  <ScanTargetInput name="transfer-carton" v-model="cartonScan" label="箱号" placeholder="扫描系统箱号或客户箱唛" :active="!cartonsCounted" @activate="activePalletKey = ''" @submit="locateCarton" />
+                  <text class="measure-title">{{ receivedCartonBoxes.length }} 箱 · {{ cartonVolume }} m³ · {{ cartonWeight }} kg · {{ cartonQuantity }} 件</text>
+                  <view v-if="!cartonsCounted" class="batch-count-panel">
+                    <button class="add-pallet-button" :disabled="countingCartons" @tap="toggleBatchPanel">{{ batchCountOpen ? '收起批量填写' : '相同箱规？批量填写' }}</button>
+                    <view v-if="batchCountOpen">
+                      <text class="measure-hint">选择同 SKU 的箱子，统一填写。应用后可逐箱修改；会覆盖所选箱的尺寸、重量和件数。</text>
+                      <picker :disabled="countingCartons" :range="batchSkuCodes" :value="Math.max(0, batchSkuCodes.indexOf(batchSku))" @change="changeBatchSku(Number($event.detail.value))"><view class="batch-sku">批量 SKU：{{ batchSku || '请选择' }} ▾</view></picker>
+                      <view class="batch-actions"><button :disabled="countingCartons" @tap="selectBatchCartons(true)">全选该 SKU</button><button :disabled="countingCartons" @tap="selectBatchCartons(false)">清空选择</button></view>
+                      <view class="batch-box-options"><template v-for="(box, index) in cartonBoxes" :key="box.localKey || box.cartonMark"><button v-if="box.received !== false && box.items[0].skuCode === batchSku" :disabled="countingCartons" :class="{chosen: batchSelectedIndexes.includes(index)}" :aria-label="`选择第${index + 1}箱批量填写`" @tap="toggleBatchCarton(index)">{{ batchSelectedIndexes.includes(index) ? '✓' : '+' }} 第 {{ index + 1 }} 箱</button></template></view>
+                      <picker :disabled="countingCartons" :range="generatedPallets.map(pallet => pallet.palletNo)" @change="batchPalletId = generatedPallets[Number($event.detail.value)]?.draftId || ''"><view class="batch-sku">批量所属托盘：{{ generatedPallets.find(pallet => String(pallet.draftId) === String(batchPalletId))?.palletNo || '请选择' }} ▾</view></picker>
+                      <CartonCountFields :box="batchBox" :sku-codes="[batchSku]" :allow-sku-change="false" :disabled="countingCartons" />
+                      <text class="batch-summary">已选 {{ batchTargetBoxes.length }} 箱 · 每箱 {{ Number(batchBox.items[0].quantity) || 0 }} 件 · 合计 {{ batchTotalQuantity }} 件</text>
+                      <button class="transfer-primary" :disabled="!batchCountReady || countingCartons" @tap="applyBatchCartons">应用到所选 {{ batchTargetBoxes.length }} 箱</button>
+                      <text v-if="batchCountMessage" class="batch-summary" role="status">{{ batchCountMessage }}</text>
+                    </view>
+                  </view>
+                  <view v-for="(box, index) in cartonBoxes" v-show="!cartonPalletFilter || String(box.transferPalletId) === String(cartonPalletFilter)" :id="`transfer-box-${index}`" :key="box.localKey || box.cartonMark" class="carton-count-card" :class="{ 'carton-selected': box.cartonMark === selectedCartonMark }">
+                    <text class="measure-title">第 {{ index + 1 }} 箱 · {{ box.cartonMark || '新增实收箱（确认后生成箱号）' }}</text>
+                    <view v-if="!cartonsCounted" class="batch-actions">
+
+                      <button v-if="previousMatchingCarton(index)" :disabled="countingCartons || box.received === false || !validCartonValues(previousMatchingCarton(index))" @tap="copyPreviousCarton(index)">复制上一同 SKU 箱</button>
+                    </view>
+                    <text v-if="box.customerCartonMark" class="measure-hint">客户箱唛：{{ box.customerCartonMark }}</text>
+                    <text class="measure-hint">SKU 与该箱申报一致，数量为箱内件数</text>
+                    <picker :disabled="cartonsCounted || countingCartons || box.received === false" :range="generatedPallets.map(pallet => pallet.palletNo)" :value="Math.max(0, generatedPallets.findIndex(pallet => String(pallet.draftId) === String(box.transferPalletId)))" @change="assignCartonPallet(box, Number($event.detail.value))"><view class="batch-sku">所属托盘：{{ cartonPalletLabel(box) }} ▾</view></picker>
+                    <button v-if="!cartonsCounted" class="refresh-button" :disabled="countingCartons" @tap="box.received = box.received === false">{{ box.received === false ? '标记为已收到' : '标记为未收到' }}</button>
+                    <text v-if="box.received === false" class="measure-hint">本箱未收到，不计入实收</text>
+                    <picker v-if="!box.cartonMark && !cartonsCounted" :range="selected.items.map(item => item.skuCode)" @change="selectExtraCartonSku(box, Number($event.detail.value))"><text>选择 SKU：{{ box.items[0].skuCode }} ▾</text></picker>
+                    <CartonCountFields :box="box" :sku-codes="box.items.map(line => line.skuCode)" :allow-sku-change="false" :disabled="cartonsCounted || countingCartons || box.received === false" />
+                  </view>
+                  <button v-if="cartonsCounted" class="add-pallet-button" @tap="printCartonLabels">打开箱标签打印</button>
+                  <button v-if="!cartonsCounted" class="add-pallet-button" :disabled="countingCartons" @tap="addExtraCarton">新增实收箱</button>
+                  <label v-if="receivedCartonBoxes.length !== Number(selected.packageCount)"><text class="measure-hint">差异原因（必填）</text><textarea v-model="countDiscrepancyReason" :disabled="cartonsCounted || countingCartons" maxlength="1000" placeholder="填写短收或超收原因" /></label>
+                  <button class="transfer-primary" :disabled="!cartonCountReady || countingCartons || cartonsCounted" @tap="confirmCartons">{{ cartonsCounted ? '全部箱子已清点' : countingCartons ? '保存中…' : '确认逐箱测量清点' }}</button>
+                </view>
 				<view class="photo-card">
+                    <view class="workflow-step"><text class="step-number">3</text><view><text class="step-title">拍照并确认入库</text><text class="step-caption">核对全部托盘与签收箱子</text></view></view>
 					<view class="photo-head"><view><text class="measure-title">测量现场照片</text><text class="measure-hint">完成测量并打托前至少拍摄 1 张</text></view><text class="photo-count">{{ photoFileIds.length }} / 20 张</text></view>
 					<view v-if="photoFileIds.length" class="photo-grid"><view v-for="(fileId, index) in photoFileIds" :key="fileId" class="photo-tile">
 						<image class="photo-image" :src="photoUrls[fileId]" mode="aspectFill" @tap="previewPhoto(fileId)" />
@@ -68,7 +103,7 @@
 					<button v-if="photoFileIds.length < 20" class="take-photo-button" :disabled="uploadingPhoto || submitting" @tap="takePhoto"><uni-icons type="camera-filled" color="#135ee8" size="20" /><text>{{ uploadingPhoto ? '照片上传中…' : '拍摄测量现场照片' }}</text></button>
 				</view>
 				<view v-if="validationMessage" class="transfer-validation" role="alert"><text class="validation-title">还不能提交</text><text>{{ validationMessage }}</text></view>
-				<view class="submit-panel"><view><text>整单测量汇总</text><strong>{{ pallets.length }} 托 · {{ totalCartons }} / {{ selected.packageCount || 0 }} 箱</strong></view><button class="transfer-primary" :disabled="submitting || !canSubmit" @tap="submit">{{ submitting ? '提交中…' : '完成测量并打托' }}</button></view>
+				<view class="submit-panel"><view><text>整单测量汇总</text><strong>{{ pallets.length }} 托 · 打托 {{ totalCartons }} / 已清点 {{ actualReceivedCartons }} 箱</strong></view><button class="transfer-primary" :disabled="submitting || !canSubmit" @tap="submit">{{ submitting ? '提交中…' : '完成测量并打托' }}</button></view>
 				</template>
 			</template>
 
@@ -83,15 +118,17 @@
 </template>
 
 <script>
+import CartonCountFields from '@/components/CartonCountFields.vue'
 import PortalHeader from '@/components/PortalHeader.vue'
 import ScanTargetInput from '@/components/ScanTargetInput.vue'
 import { session, requireSession } from '@/stores/session.js'
 import { restoreWarehouseWork, resetWarehouseDomain, updateWarehouseWork, warehouseWork } from '@/stores/warehouse-work.js'
 import { startScanBroadcast } from '@/utils/scan-broadcast.js'
-import { bindWarehouseTransferPallet, deleteWarehouseTransferPallet, downloadWarehouseTransferMeasurementPhoto, downloadWarehouseTransferPalletLabel, generateWarehouseTransferPallet, getWarehouseTransferDetail, listWarehouseTransferCandidates, listWarehouseTransferMeasurementPhotos, palletizeWarehouseTransfer, saveWarehouseTransferPalletDraft, uploadWarehouseTransferMeasurementPhoto } from '@/api/warehouse-transfers.js'
+import { getWarehouseTransferCartonLabel, countWarehouseTransferCartons, bindWarehouseTransferPallet, deleteWarehouseTransferPallet, downloadWarehouseTransferMeasurementPhoto, downloadWarehouseTransferPalletLabel, generateWarehouseTransferPallet, getWarehouseTransferDetail, listWarehouseTransferCandidates, listWarehouseTransferMeasurementPhotos, palletizeWarehouseTransfer, saveWarehouseTransferPalletDraft, uploadWarehouseTransferMeasurementPhoto } from '@/api/warehouse-transfers.js'
 
 const newPallet = () => ({ key: `${Date.now()}-${Math.random()}`, cartonCount: 0, lengthCm: null, widthCm: null, heightCm: null, grossWeightKg: null, generated: false, bound: false, collapsed: false, palletNo: '', fbaWarehouseCode: '', labelDownloadPath: '', bindCode: '', busy: false })
 const MAX_MEASUREMENT_PHOTOS = 20
+const newBatchBox = () => ({ length: '', width: '', height: '', weight: '', items: [{ skuCode: '', quantity: '' }] })
 
 const restoredPallet = (value, index) => ({
 	key: `server-${value.draftId || value.id || index}`,
@@ -102,24 +139,34 @@ const restoredPallet = (value, index) => ({
 })
 
 export default {
-	components: { PortalHeader, ScanTargetInput },
-	data() { return { user: session.currentUser, entryMode: 'work', pendingTaskNo: '', candidates: [], selected: null, pallets: [newPallet()], activePalletKey: '', photoFileIds: [], photoNames: [], photoUrls: {}, completedPallets: [], completedTransferNo: '', completedDestination: '', completedDestinationType: '', loading: false, detailLoading: false, submitting: false, uploadingPhoto: false, openingLabel: false, error: null, success: false, pendingKey: '' } },
+	components: { PortalHeader, ScanTargetInput, CartonCountFields },
+	data() { return { receivingPalletId: '', cartonPalletFilter: '', batchPalletId: '', batchCountOpen: false, batchSku: '', batchBox: newBatchBox(), batchSelectedIndexes: [], batchCountMessage: '', cartonScrollTarget: '', cartonBoxes: [], countDiscrepancyReason: '', cartonScan: '', selectedCartonMark: '', countingCartons: false, cartonRequestKey: '', cartonSignature: '', user: session.currentUser, entryMode: 'work', pendingTaskNo: '', candidates: [], selected: null, pallets: [newPallet()], activePalletKey: '', photoFileIds: [], photoNames: [], photoUrls: {}, completedPallets: [], completedTransferNo: '', completedDestination: '', completedDestinationType: '', loading: false, detailLoading: false, submitting: false, uploadingPhoto: false, openingLabel: false, error: null, success: false, pendingKey: '' } },
 	computed: {
+        generatedPallets() { return this.pallets.filter(pallet => pallet.generated && pallet.draftId) },
+        batchSkuCodes() { return [...new Set(this.receivedCartonBoxes.map(box => box.items[0]?.skuCode).filter(Boolean))] },
+        batchTargetBoxes() { return this.cartonBoxes.filter((box, index) => this.batchSelectedIndexes.includes(index) && box.received !== false && box.items[0]?.skuCode === this.batchSku) },
+        batchTotalQuantity() { const quantity = Number(this.batchBox.items[0].quantity); return Number.isSafeInteger(quantity) && quantity > 0 ? this.batchTargetBoxes.length * quantity : 0 },
+        batchCountReady() { return this.batchTargetBoxes.length > 0 && this.validCartonValues(this.batchBox) && this.generatedPallets.some(pallet => String(pallet.draftId) === String(this.batchPalletId)) },
+        actualReceivedCartons() { return this.cartonsCounted ? this.receivedCartonBoxes.length : 0 },
+        cartonsCounted() { return Boolean(this.selected?.cartons?.length) && this.selected.cartons.every(box => box.countedAt) },
+        cartonVolume() { return this.receivedCartonBoxes.reduce((sum, box) => sum + (Number(box.length) || 0) * (Number(box.width) || 0) * (Number(box.height) || 0) / 1000000, 0).toFixed(6) },
+        cartonWeight() { return this.receivedCartonBoxes.reduce((sum, box) => sum + (Number(box.weight) || 0), 0).toFixed(2) },
+        cartonQuantity() { return this.receivedCartonBoxes.reduce((sum, box) => sum + (Number(box.items[0]?.quantity) || 0), 0) },
+        receivedCartonBoxes() { return this.cartonBoxes.filter(box => box.received !== false) },
+        cartonCountReady() { return this.receivedCartonBoxes.length > 0 && this.pallets.every(pallet => pallet.generated && this.palletSummary(pallet).cartonCount > 0) && (this.receivedCartonBoxes.length === Number(this.selected?.packageCount) || Boolean(this.countDiscrepancyReason.trim())) && this.receivedCartonBoxes.every(box => this.generatedPallets.some(pallet => String(pallet.draftId) === String(box.transferPalletId)) && [box.length, box.width, box.height, box.weight].every(value => Number(value) >= 0.01) && box.items[0]?.skuCode && Number.isSafeInteger(Number(box.items[0].quantity)) && Number(box.items[0].quantity) > 0 && Number(box.items[0].quantity) <= 2147483647) },
 		completedDestinationLabel() { return this.destinationLabel({ fbaWarehouseCode: this.completedDestination, destinationType: this.completedDestinationType }) },
-		totalCartons() { return this.pallets.reduce((sum, pallet) => sum + Math.max(0, Number(pallet.cartonCount) || 0), 0) },
-		cartonDifference() { return this.totalCartons - Number(this.selected?.packageCount || 0) },
+		totalCartons() { return this.pallets.reduce((sum, pallet) => sum + this.palletSummary(pallet).cartonCount, 0) },
+		cartonDifference() { return this.actualReceivedCartons - Number(this.selected?.packageCount || 0) },
 		isInventoryTransfer() { return Boolean(this.selected && this.selected.status === 'WAIT_PDA_RECEIVING' && this.selected.inboundCode && this.selected.inboundCode !== this.selected.transferNo) },
 		isMeasurementComplete() { return Boolean(this.selected && !['WAIT_PDA_RECEIVING', 'PARTIALLY_RECEIVED'].includes(String(this.selected.status))) },
-		totalVolume() { return this.pallets.reduce((sum, pallet) => sum + this.rawPalletVolume(pallet), 0).toFixed(3) },
-		totalWeight() { return this.pallets.reduce((sum, pallet) => sum + Math.max(0, Number(pallet.grossWeightKg) || 0), 0).toFixed(2) },
+		totalVolume() { return this.pallets.reduce((sum, pallet) => sum + this.rawPalletVolume(pallet), 0).toFixed(6) },
+		totalWeight() { return this.pallets.reduce((sum, pallet) => sum + this.palletSummary(pallet).weight, 0).toFixed(2) },
 		validationMessage() {
 			if (this.isInventoryTransfer) return ''
+			if (!this.cartonsCounted) return '请先完成全部箱子的尺寸测量和箱内清点'
+			if (this.totalCartons !== this.receivedCartonBoxes.length) return '打托箱数必须与已清点实收箱数一致'
 			if (!this.selected || !this.pallets.length) return '转运单缺少可测量的托盘'
-			for (let index = 0; index < this.pallets.length; index += 1) {
-				const pallet = this.pallets[index]
-				if (![pallet.cartonCount, pallet.lengthCm, pallet.widthCm, pallet.heightCm, pallet.grossWeightKg].every((value) => Number(value) > 0)) return `托盘 ${index + 1} 的箱数、箱规和重量必须大于 0`
-				if (!Number.isInteger(Number(pallet.cartonCount))) return `托盘 ${index + 1} 的箱数必须是整数`
-			}
+            if (this.pallets.some(pallet => this.palletSummary(pallet).cartonCount === 0)) return '每个托盘必须至少分配一个实收箱'
 			if (this.pallets.some((pallet) => !pallet.bound)) return '请先生成并扫描确认绑定全部托盘'
 			if (this.photoFileIds.length > MAX_MEASUREMENT_PHOTOS) return `测量现场照片最多 ${MAX_MEASUREMENT_PHOTOS} 张，请移除多余照片`
 			if (!this.photoFileIds.length) return '请至少拍摄 1 张测量现场照片'
@@ -128,6 +175,8 @@ export default {
 		canSubmit() { return !this.validationMessage }
 	},
 	watch: {
+        countDiscrepancyReason() { this.saveCartonDraft() },
+		cartonBoxes: { deep: true, handler() { if (this.selected && !this.cartonsCounted) uni.setStorageSync(this.cartonDraftKey(), { boxes: this.cartonBoxes, discrepancyReason: this.countDiscrepancyReason, key: this.cartonRequestKey, signature: this.cartonSignature }) } },
 		pallets: { deep: true, handler() { if (!this.submitting) this.pendingKey = '' } }
 	},
 		 onShow() { if (requireSession()) { this.user = session.currentUser; restoreWarehouseWork(`${this.user.id}:${this.user.warehouseId}`); this.startScanner(); this.loadCandidates().then(() => { const activeNo = String(warehouseWork.warehouseTransfer.currentNo || ''); const taskNo = this.pendingTaskNo || activeNo; if (this.entryMode === 'work' && taskNo) { const active = this.candidates.find((item) => String(item.transferNo) === taskNo); if (active) { const fromExplicitTask = Boolean(this.pendingTaskNo); this.pendingTaskNo = ''; void this.select(active, fromExplicitTask) } } }) } },
@@ -135,28 +184,128 @@ export default {
 	onHide() { this.stopScanner() },
 	beforeUnmount() { this.stopScanner() },
 		methods: {
+        useReceivingPallet(pallet) {
+          if (this.cartonsCounted || this.countingCartons || !pallet.generated) return;
+          this.receivingPalletId = pallet.draftId; this.batchPalletId = pallet.draftId; this.cartonPalletFilter = pallet.draftId;
+          this.activePalletKey = ''; this.cartonScrollTarget = 'transfer-boxes';
+        },
+        toggleBatchPanel() {
+          if (this.countingCartons) return;
+          this.batchCountOpen = !this.batchCountOpen;
+          if (this.batchCountOpen && !this.batchSelectedIndexes.length) this.selectBatchCartons(true);
+        },
+        validCartonValues(box) { return Boolean(box && [box.length, box.width, box.height, box.weight].every(value => Number(value) >= 0.01 && Number.isFinite(Number(value))) && Number.isSafeInteger(Number(box.items[0]?.quantity)) && Number(box.items[0].quantity) > 0 && Number(box.items[0].quantity) <= 2147483647) },
+        changeBatchSku(index) {
+          if (this.countingCartons || this.cartonsCounted) return;
+          this.batchSku = this.batchSkuCodes[index] || ''; this.batchSelectedIndexes = []; this.batchCountMessage = ''; this.selectBatchCartons(true);
+          this.batchBox = newBatchBox(); this.batchBox.items[0].skuCode = this.batchSku;
+        },
+        selectBatchCartons(selected) {
+          if (this.countingCartons || this.cartonsCounted) return;
+          this.batchSelectedIndexes = selected ? this.cartonBoxes.flatMap((box, index) => box.received !== false && box.items[0]?.skuCode === this.batchSku ? [index] : []) : [];
+          this.batchCountMessage = '';
+        },
+        toggleBatchCarton(index) {
+          if (this.countingCartons || this.cartonsCounted) return;
+          const box = this.cartonBoxes[index];
+          if (!box || box.received === false || box.items[0]?.skuCode !== this.batchSku) return;
+          this.batchSelectedIndexes = this.batchSelectedIndexes.includes(index) ? this.batchSelectedIndexes.filter(value => value !== index) : [...this.batchSelectedIndexes, index]; this.batchCountMessage = '';
+        },
+        copyCartonValues(source, target) {
+          for (const key of ['length', 'width', 'height', 'weight']) target[key] = source[key];
+          target.items[0].quantity = source.items[0].quantity;
+        },
+        applyBatchCartons() {
+          if (this.cartonsCounted || this.countingCartons || !this.batchCountReady) return;
+          const targets = this.batchTargetBoxes;
+          targets.forEach(box => { this.copyCartonValues(this.batchBox, box); box.transferPalletId = this.batchPalletId });
+          this.cartonPalletFilter = ''; this.saveCartonDraft(); this.batchCountMessage = `已应用到 ${targets.length} 箱，共 ${this.batchTotalQuantity} 件，可继续逐箱调整`;
+        },
+        previousMatchingCarton(index) {
+          const sku = this.cartonBoxes[index]?.items[0]?.skuCode;
+          return this.cartonBoxes.slice(0, index).reverse().find(box => box.received !== false && box.items[0]?.skuCode === sku);
+        },
+        copyPreviousCarton(index) {
+          if (this.cartonsCounted || this.countingCartons) return;
+          const source = this.previousMatchingCarton(index), target = this.cartonBoxes[index];
+          if (!target || target.received === false || !this.validCartonValues(source)) return;
+          this.copyCartonValues(source, target); this.saveCartonDraft();
+        },
+        saveCartonDraft() { if (this.selected && !this.cartonsCounted) uni.setStorageSync(this.cartonDraftKey(), { boxes: this.cartonBoxes, discrepancyReason: this.countDiscrepancyReason, key: this.cartonRequestKey, signature: this.cartonSignature }) },
+        cartonDraftKey() { return `transfer-carton-count:${session.apiBase}:${this.user?.id}:${this.user?.warehouseId}:${this.selected?.transferNo}` },
+        restoreCartons() {
+          const rows = (this.selected?.cartons || []).map(box => ({ ...box, transferPalletId: box.transferPalletId || (this.generatedPallets.length === 1 ? this.generatedPallets[0].draftId : ''), received: box.status !== 'NOT_RECEIVED', items: [{ skuCode: this.selected.items.find(item => String(item.id) === String(box.transferItemId))?.skuCode || '', quantity: box.quantity ?? '' }] }));
+          const draft = uni.getStorageSync(this.cartonDraftKey());
+          this.countDiscrepancyReason = this.selected?.cartons?.find(box => box.discrepancyReason)?.discrepancyReason || ''; this.cartonRequestKey = ''; this.cartonSignature = ''; this.selectedCartonMark = ''; this.cartonScan = '';
+          if (!this.cartonsCounted && draft?.boxes?.length >= rows.length && draft.boxes.every(box => box.cartonMark || this.selected.items.some(item => String(item.id) === String(box.transferItemId))) && rows.every(box => draft.boxes.some(row => row.cartonMark === box.cartonMark && row.items?.[0]?.skuCode === box.items[0].skuCode))) {
+            this.cartonBoxes = draft.boxes; this.countDiscrepancyReason = draft.discrepancyReason || ''; this.cartonRequestKey = draft.key || ''; this.cartonSignature = draft.signature || '';
+          } else this.cartonBoxes = rows;
+          this.receivingPalletId = this.generatedPallets[0]?.draftId || ''; this.cartonPalletFilter = ''; this.batchPalletId = this.receivingPalletId; this.batchCountOpen = false; this.batchSelectedIndexes = []; this.batchCountMessage = ''; this.batchSku = this.batchSkuCodes[0] || ''; this.batchBox = newBatchBox(); this.batchBox.items[0].skuCode = this.batchSku;
+        },
+        async printCartonLabels() {
+          // #ifdef H5
+          const view = window.open('', '_blank');
+          if (!view) { this.error = new Error('请允许打开标签打印窗口'); return }
+          try { const label = await getWarehouseTransferCartonLabel(this.selected.transferNo); view.document.write(label.printableHtml); view.document.close(); view.focus(); view.print() }
+          catch (error) { view.close(); this.error = error }
+          // #endif
+          // #ifndef H5
+          this.error = new Error('当前设备未配置箱标签打印服务');
+          // #endif
+        },
+        addExtraCarton() {
+          if (this.cartonsCounted || this.countingCartons || !this.selected?.items?.length) return;
+          const item = this.selected.items[0];
+          this.cartonBoxes.push({ localKey: `extra-${Date.now()}-${Math.random()}`, cartonMark: '', transferItemId: item.id, transferPalletId: this.receivingPalletId || this.generatedPallets[0]?.draftId || '', received: true, length: '', width: '', height: '', weight: '', items: [{ skuCode: item.skuCode, quantity: '' }] });
+        },
+        selectExtraCartonSku(box, index) { const item = this.selected.items[index]; if (item) { box.transferItemId = item.id; box.items[0].skuCode = item.skuCode } },
+        locateCarton(value) {
+          const code = String(typeof value === 'string' ? value : this.cartonScan).trim();
+          const matches = this.cartonBoxes.filter(box => box.cartonMark === code || box.customerCartonMark === code);
+          if (matches.length !== 1) { this.error = new Error(matches.length ? '客户箱唛对应多箱，请扫描系统箱号' : '该箱不属于当前转运单'); return }
+          this.error = null; this.cartonPalletFilter = ''; this.selectedCartonMark = matches[0].cartonMark; this.cartonScan = '';
+          this.cartonScrollTarget = `transfer-box-${this.cartonBoxes.indexOf(matches[0])}`;
+        },
+        async confirmCartons() {
+          if (!this.cartonCountReady || this.countingCartons || this.cartonsCounted) return;
+          this.countingCartons = true; this.error = null;
+          try {
+            const boxes = this.receivedCartonBoxes.map(box => ({ cartonMark: box.cartonMark || null, transferItemId: box.transferItemId, transferPalletId: box.transferPalletId, length: Number(box.length), width: Number(box.width), height: Number(box.height), weight: Number(box.weight), skuCode: box.items[0].skuCode, quantity: Number(box.items[0].quantity) }));
+            const signature = JSON.stringify({ boxes, discrepancyReason: this.countDiscrepancyReason });
+            if (!this.cartonRequestKey || signature !== this.cartonSignature) { this.cartonRequestKey = `transfer-count-${Date.now()}-${Math.random().toString(36).slice(2)}`; this.cartonSignature = signature }
+            uni.setStorageSync(this.cartonDraftKey(), { boxes: this.cartonBoxes, discrepancyReason: this.countDiscrepancyReason, key: this.cartonRequestKey, signature });
+            const detail = await countWarehouseTransferCartons(this.selected.transferNo, { idempotencyKey: this.cartonRequestKey, boxes, discrepancyReason: this.countDiscrepancyReason });
+            if (!detail.cartons?.length || !detail.cartons.every(box => box.countedAt)) throw new Error('清点结果未确认，请刷新核实');
+            uni.removeStorageSync(this.cartonDraftKey()); this.selected = detail; this.pallets = detail.pallets.map(restoredPallet); this.restoreCartons();
+          } catch (error) { this.error = error } finally { this.countingCartons = false }
+        },
 			openPalletOperations() { uni.navigateTo({ url: '/pages/pallet/pallet' }) },
 		destinationLabel(value, fallback = {}) { const code = String(value?.fbaWarehouseCode || fallback?.fbaWarehouseCode || '').trim(); if (code) return code; const type = value?.destinationType || fallback?.destinationType; return type === 'PRIVATE' ? '私人仓' : '目的仓待定' },
 		startScanner() { this.stopScanner(); this._stopScanner = startScanBroadcast({ onScan: (value) => this.handlePalletScan(value), onError: (error) => { this.error = error } }) },
 		stopScanner() { if (this._stopScanner) this._stopScanner(); this._stopScanner = null },
-		handlePalletScan(value) { const pallet = this.pallets.find((item) => item.key === this.activePalletKey && item.generated && !item.bound); if (!pallet) return; pallet.bindCode = String(value || '').trim(); this.bindPallet(pallet) },
+		handlePalletScan(value) { if (!this.activePalletKey && this.selected && !this.cartonsCounted) { this.locateCarton(value); return }; const pallet = this.pallets.find((item) => item.key === this.activePalletKey && item.generated && !item.bound); if (!pallet) return; pallet.bindCode = String(value || '').trim(); this.bindPallet(pallet) },
 		statusLabel(status, transferNo = '') { if (String(status) === 'WAIT_PDA_RECEIVING' && String(warehouseWork.warehouseTransfer.currentNo) === String(transferNo)) return '测量中'; return ({ WAIT_PDA_RECEIVING: '待测量', APPROVED: '待测量', PARTIALLY_RECEIVED: '测量中' })[status] || '待测量' },
-		rawPalletVolume(pallet) { const values = [pallet.lengthCm, pallet.widthCm, pallet.heightCm].map(Number); return values.every((value) => value > 0) ? values[0] * values[1] * values[2] / 1000000 : 0 },
-		palletVolume(pallet) { return this.rawPalletVolume(pallet).toFixed(3) },
-		palletReady(pallet) { return Number.isInteger(Number(pallet.cartonCount)) && [pallet.cartonCount, pallet.lengthCm, pallet.widthCm, pallet.heightCm, pallet.grossWeightKg].every((value) => Number(value) > 0) },
+        palletSummary(pallet) {
+          const boxes = this.receivedCartonBoxes.filter(box => pallet.draftId && String(box.transferPalletId) === String(pallet.draftId));
+          return { cartonCount: boxes.length, volume: boxes.reduce((sum,box) => sum + (Number(box.length)||0)*(Number(box.width)||0)*(Number(box.height)||0)/1000000,0), weight: boxes.reduce((sum,box) => sum + (Number(box.weight)||0),0) };
+        },
+        rawPalletVolume(pallet) { return this.palletSummary(pallet).volume },
+        palletVolume(pallet) { return this.rawPalletVolume(pallet).toFixed(6) },
+        cartonPalletLabel(box) { return this.generatedPallets.find(pallet => String(pallet.draftId) === String(box.transferPalletId))?.palletNo || '请选择托盘' },
+        assignCartonPallet(box, index) { if (!this.cartonsCounted && !this.countingCartons && box.received !== false) box.transferPalletId = this.generatedPallets[index]?.draftId || '' },
 		applyPallet(target, value) { Object.assign(target, restoredPallet(value, this.pallets.indexOf(target)), { key: target.key, busy: false, collapsed: false }) },
 		async generatePallet(pallet) {
-			if (!this.selected || pallet.busy || pallet.generated || !this.palletReady(pallet)) return
+			if (!this.selected || pallet.busy || pallet.generated || this.cartonsCounted || this.countingCartons) return
 			pallet.busy = true; this.error = null
 			try {
-				const measured = { palletId: pallet.draftId || null, idempotencyKey: `pda-transfer-draft-${this.selected.transferNo}-${pallet.key}`, cartonCount: Number(pallet.cartonCount), lengthCm: Number(pallet.lengthCm), widthCm: Number(pallet.widthCm), heightCm: Number(pallet.heightCm), volumeCbm: Number(this.rawPalletVolume(pallet).toFixed(6)), grossWeightKg: Number(pallet.grossWeightKg) }
+                const measured = { palletId: pallet.draftId || null, idempotencyKey: `pda-transfer-draft-${this.selected.transferNo}-${pallet.key}` }
 				const draftDetail = await saveWarehouseTransferPalletDraft(this.selected.transferNo, measured)
 				const draft = pallet.draftId ? (draftDetail.pallets || []).find((item) => String(item.id) === String(pallet.draftId)) : [...(draftDetail.pallets || [])].sort((a, b) => Number(b.sequenceNo || 0) - Number(a.sequenceNo || 0))[0]
 				if (!draft?.id) throw new Error('服务端未返回已保存的托盘草稿')
 				const generatedDetail = await generateWarehouseTransferPallet(this.selected.transferNo, draft.id, { idempotencyKey: `pda-transfer-generate-${this.selected.transferNo}-${draft.id}` })
 				const generated = (generatedDetail.pallets || []).find((item) => String(item.id) === String(draft.id))
 				if (!generated?.palletNo) throw new Error('服务端未返回新托盘号')
-				this.applyPallet(pallet, generated); this.pendingKey = ''
+				this.applyPallet(pallet, generated); this.pendingKey = ''; this.receivingPalletId = pallet.draftId; this.batchPalletId = pallet.draftId; if (this.generatedPallets.length === 1) this.receivedCartonBoxes.forEach(box => { if (!box.transferPalletId) box.transferPalletId = pallet.draftId }); this.saveCartonDraft()
 			} catch (error) { this.error = error; pallet.busy = false }
 		},
 		async bindPallet(pallet) {
@@ -185,7 +334,7 @@ export default {
 			} catch (e) { this.error = e } finally { this.loading = false }
 		},
 		async select(item, fromExplicitTask = false) {
-			if (this.detailLoading || this.submitting) return
+			if (this.detailLoading || this.submitting || this.countingCartons || this.pallets.some(pallet => pallet.busy)) return
 			const requestedNo = String(item?.transferNo || '')
 			const activeNo = String(warehouseWork.warehouseTransfer.currentNo || '')
 			if (!activeNo && !fromExplicitTask) {
@@ -201,12 +350,12 @@ export default {
 			this.candidates = this.candidates.map((candidate) => String(candidate.transferNo) === String(item.transferNo) ? { ...candidate, status: 'PARTIALLY_RECEIVED' } : candidate)
 			if (this.entryMode === 'list') { uni.navigateTo({ url: `/pages/warehouse-transfer/warehouse-transfer?mode=work&task=${encodeURIComponent(String(item.transferNo))}` }); return }
 			this.detailLoading = true; this.error = null; this.success = false; this.completedPallets = []; this.completedTransferNo = ''; this.completedDestination = ''; this.completedDestinationType = ''
-			try { this.selected = await getWarehouseTransferDetail(item.transferNo); this.pendingKey = ''; this.pallets = this.selected.pallets?.length ? this.selected.pallets.map(restoredPallet) : [newPallet()]; await this.restorePhotos(item.transferNo, this.selected.measurementPhotos) }
+			try { this.selected = await getWarehouseTransferDetail(item.transferNo); this.pendingKey = ''; this.pallets = this.selected.pallets?.length ? this.selected.pallets.map(restoredPallet) : [newPallet()]; this.restoreCartons(); await this.restorePhotos(item.transferNo, this.selected.measurementPhotos) }
 			catch (e) { this.selected = null; this.error = e }
 			finally { this.detailLoading = false }
 		},
-		backToCandidates() { if (this.submitting || this.detailLoading) return; this.entryMode = 'list'; this.selected = null; this.error = null; this.pallets = [newPallet()]; this.photoFileIds = []; this.photoUrls = {}; this.photoNames = [] },
-		addPallet() { this.pendingKey = ''; this.pallets.push(newPallet()) },
+		backToCandidates() { if (this.submitting || this.detailLoading || this.countingCartons || this.pallets.some(pallet => pallet.busy)) return; this.entryMode = 'list'; this.selected = null; this.error = null; this.pallets = [newPallet()]; this.photoFileIds = []; this.photoUrls = {}; this.photoNames = [] },
+		addPallet() { if (this.cartonsCounted || this.countingCartons) return; this.pendingKey = ''; this.pallets.push(newPallet()) },
 		async removePallet(index) { const pallet = this.pallets[index]; if (!pallet || pallet.generated || pallet.busy) return; pallet.busy = true; try { if (pallet.draftId) await deleteWarehouseTransferPallet(this.selected.transferNo, pallet.draftId); this.pallets.splice(index, 1); this.pendingKey = '' } catch (error) { pallet.busy = false; this.error = error } },
 		async restorePhotos(transferNo, knownPhotos) {
 			let photos
@@ -293,6 +442,12 @@ export default {
 </script>
 
 <style scoped>
+.workflow-step{display:flex;align-items:center;gap:10px;margin:18px 0 12px}.step-number{display:flex;align-items:center;justify-content:center;flex:none;width:28px;height:28px;border-radius:9px;background:#e5efff;color:#135ee8;font-weight:800;font-size:14px}.step-title,.step-caption{display:block}.step-title{font-size:16px;font-weight:800;color:#17314f}.step-caption{margin-top:3px;font-size:11px;color:#7a899c;line-height:17px}.active-receiving-pallet{border-color:#79a7ec!important}.pallet-brief{display:flex;align-items:center;flex-wrap:wrap;gap:10px;margin:-3px 0 12px;color:#3f5671;font-size:12px}.pallet-brief button{margin:0 0 0 auto;padding:0 10px;height:36px;line-height:36px;border-radius:8px;background:#eaf2ff;color:#135ee8;font-size:11px}.carton-filter,.batch-box-options{display:flex;flex-wrap:wrap;gap:7px;margin:12px 0}.carton-filter button,.batch-box-options button{width:auto;margin:0;padding:0 11px;height:36px;line-height:36px;border:1px solid #d4dfed;border-radius:9px;background:#fff;color:#5b6e84;font-size:12px}.carton-filter .active,.batch-box-options .chosen{border-color:#135ee8;background:#eaf2ff;color:#135ee8}.batch-count-panel .add-pallet-button{margin:0}.carton-count-card>.measure-title{overflow-wrap:anywhere;font-size:12px;line-height:19px}.batch-sku{padding:10px;border:1px solid #cbdcf2;border-radius:8px;background:#fff}.summary-no{overflow-wrap:anywhere}.photo-card>.workflow-step{margin-top:0}
+
+.batch-count-panel{margin:12px 0;padding:10px;border:1px solid #b9d3f4;border-radius:10px;background:#f4f8ff}.batch-sku{margin:10px 0;color:#17314f;font-size:12px;word-break:break-all}.batch-actions{display:flex;flex-wrap:wrap;gap:8px;margin:8px 0}.batch-actions button{width:auto;margin:0;padding:0 10px;min-height:34px;line-height:34px;font-size:11px;color:#135ee8;border:1px solid #b9d3f4;border-radius:7px;background:#fff}.batch-actions button[disabled]{opacity:.45}.batch-summary{display:block;margin:10px 0;color:#245981;font-size:11px;line-height:18px}
+
+.carton-count-card{padding:14px 10px;margin:10px 0;border:1px solid #d8e3f1;border-radius:12px}.carton-selected{border-color:#135ee8;background:#f0f6ff}
+
 .transfer-page{height:100vh;overflow:hidden;background:#f2f5f9}.transfer-scroll{height:calc(100vh - 48px - var(--status-bar-height,0px))}.transfer-content{padding-bottom:52px}.transfer-heading{display:flex;align-items:flex-start;justify-content:space-between;gap:12px;margin:4px 2px 17px}.transfer-title,.transfer-subtitle,.transfer-no,.transfer-meta,.summary-eyebrow,.summary-no,.pallet-heading-copy text,.measure-title,.measure-hint,.sku-copy text,.validation-title,.transfer-validation>text,.feedback-title,.transfer-error>text,.transfer-success>text,.empty-title,.transfer-empty>text{display:block}.transfer-title{color:#14263d;font-size:22px;font-weight:850;letter-spacing:.2px}.transfer-subtitle{margin-top:4px;color:#718095;font-size:11px;line-height:17px}.refresh-button{display:flex;align-items:center;justify-content:center;gap:4px;width:auto;height:34px;margin:0;padding:0 11px;border:1px solid #b8d1f5;border-radius:17px;color:#135ee8;font-size:10px;line-height:34px;background:#f8fbff}.refresh-button[disabled]{opacity:.55}.section-heading{display:flex;align-items:center;justify-content:space-between;margin:0 2px 8px;color:#243951;font-size:12px;font-weight:800}.section-heading text:last-child{color:#8290a2;font-size:10px;font-weight:600}.candidate-list{display:flex;flex-direction:column;gap:9px;margin-bottom:16px}.transfer-card{box-sizing:border-box;width:100%;margin:0;padding:13px;border:1px solid #dce5f0;border-radius:13px;text-align:left;background:#fff;box-shadow:0 4px 15px rgba(32,67,111,.055)}.transfer-card.selected{border-color:#6da3f1;background:#f7faff;box-shadow:0 5px 18px rgba(19,94,232,.11)}.transfer-card-head{display:flex;align-items:center;justify-content:space-between;gap:10px}.transfer-no{overflow:hidden;color:#18324f;font-size:14px;font-weight:850;text-overflow:ellipsis;white-space:nowrap}.status-pill{flex-shrink:0;padding:4px 7px;border-radius:6px;color:#135ee8;font-size:9px;font-weight:750;background:#eaf2ff}.task-metrics{display:grid;grid-template-columns:.75fr 1.25fr .75fr;gap:6px;margin-top:11px}.task-metrics view{min-width:0;padding:7px 8px;border-radius:8px;background:#f4f7fa}.task-metrics text{display:block;color:#8492a4;font-size:8px}.task-metrics strong{display:block;overflow:hidden;margin-top:2px;color:#2c4058;font-size:11px;text-overflow:ellipsis;white-space:nowrap}.transfer-meta{margin-top:8px;color:#7b899b;font-size:9px}.transfer-empty{margin-bottom:12px;padding:26px 14px;border:1px dashed #ccd7e4;border-radius:13px;color:#8996a6;font-size:10px;line-height:18px;text-align:center;background:rgba(255,255,255,.65)}.empty-title{color:#56677b;font-size:12px;font-weight:800}.order-summary{display:flex;align-items:center;justify-content:space-between;gap:12px;padding:14px 15px;border-radius:14px 14px 0 0;color:#fff;background:linear-gradient(135deg,#123d73,#135ee8)}.summary-eyebrow{font-size:9px;opacity:.72}.summary-no{margin-top:3px;font-size:15px;font-weight:850}.summary-count{display:flex;align-items:baseline;gap:3px;flex-shrink:0}.summary-count strong{font-size:24px}.summary-count text{font-size:10px;opacity:.8}.summary-metrics{display:grid;grid-template-columns:repeat(3,1fr);margin-bottom:12px;padding:11px 8px;border-radius:0 0 14px 14px;background:#fff;box-shadow:0 5px 17px rgba(32,67,111,.07)}.summary-metrics view{position:relative;text-align:center}.summary-metrics view+view:before{position:absolute;top:3px;bottom:3px;left:0;width:1px;background:#e7edf4;content:''}.summary-metrics strong{display:block;color:#17314f;font-size:14px}.summary-metrics text{display:block;margin-top:2px;color:#8390a1;font-size:8px}.pallet-card{box-sizing:border-box;margin-bottom:12px;padding:14px;border:1px solid #d9e3ee;border-radius:15px;background:#fff;box-shadow:0 5px 18px rgba(32,67,111,.065)}.pallet-head{display:flex;align-items:center;gap:9px;margin:-2px -2px 14px;padding-bottom:11px;border-bottom:1px solid #edf1f5}.pallet-index{display:flex;align-items:center;justify-content:center;width:34px;height:34px;border-radius:10px;color:#fff;font-size:13px;font-weight:850;background:#135ee8;box-shadow:0 4px 10px rgba(19,94,232,.2)}.pallet-heading-copy{min-width:0;flex:1}.pallet-heading-copy text:first-child{color:#17314f;font-size:13px;font-weight:850}.pallet-heading-copy text:last-child{margin-top:2px;color:#8995a5;font-size:8px}.remove-button{width:auto;height:28px;margin:0;padding:0 9px;border-radius:7px;color:#b33030;font-size:9px;line-height:28px;background:#fff0f0}.field-label{display:block;margin-bottom:5px;color:#65768b;font-size:9px;font-weight:700}.field-label small{margin-left:3px;color:#9aa5b3;font-size:8px;font-weight:500}.measure-input,.input-with-unit{box-sizing:border-box;width:100%;height:42px;border:1px solid #cad7e5;border-radius:9px;color:#203750;background:#fafcfe}.measure-input{padding:0 11px;font-size:12px}.pallet-code-field{display:block;margin-bottom:14px}.measure-section-head,.sku-section-head{display:flex;align-items:center;justify-content:space-between;gap:10px;margin-bottom:9px}.measure-title{color:#243a53;font-size:11px;font-weight:850}.measure-hint{margin-top:2px;color:#8a96a5;font-size:8px}.volume-chip{flex-shrink:0;padding:5px 8px;border-radius:8px;text-align:right;background:#edf5ff}.volume-chip text{display:block;color:#7189a7;font-size:7px}.volume-chip strong{display:block;margin-top:1px;color:#135ee8;font-size:10px}.dimension-grid{display:grid;grid-template-columns:repeat(3,1fr);gap:7px}.measure-grid{display:grid;grid-template-columns:repeat(2,1fr);gap:9px;margin-top:10px}.input-with-unit{display:flex;align-items:center;overflow:hidden}.input-with-unit input{box-sizing:border-box;min-width:0;height:40px;padding:0 4px 0 10px;flex:1;color:#203750;font-size:16px;font-weight:800}.input-with-unit>text{padding-right:8px;color:#8491a1;font-size:8px}.input-with-unit.important{border-color:#9ebff0;background:#f8fbff}.sku-section{margin:15px -2px -2px;padding:12px;border-radius:11px;background:#f5f8fb}.sku-total{flex-shrink:0;padding:5px 7px;border-radius:7px;color:#9a5c13;font-size:9px;font-weight:800;background:#fff1dd}.sku-total.matched{color:#08705f;background:#dff5ed}.sku-row{display:flex;align-items:center;gap:9px;min-height:48px;border-top:1px solid #e3eaf2}.sku-copy{min-width:0;flex:1}.sku-code{overflow:hidden;color:#233b56;font-size:11px;font-weight:800;text-overflow:ellipsis;white-space:nowrap}.sku-copy text:last-child{margin-top:2px;color:#8693a3;font-size:8px}.sku-input{display:flex;align-items:center;gap:4px;color:#718095;font-size:9px}.sku-input input{box-sizing:border-box;width:64px;height:34px;padding:0 7px;border:1px solid #abc4e8;border-radius:8px;color:#17314f;font-size:14px;font-weight:800;text-align:center;background:#fff}.add-pallet-button{display:flex;align-items:center;justify-content:center;gap:5px;box-sizing:border-box;width:100%;height:44px;margin:2px 0 11px;border:1px dashed #78a8ed;border-radius:11px;color:#135ee8;font-size:11px;font-weight:800;background:#f7faff}.transfer-validation,.transfer-error,.transfer-success{box-sizing:border-box;margin-bottom:11px;padding:11px 12px;border-radius:10px;font-size:9px;line-height:16px}.transfer-validation,.transfer-error{color:#9d3030;background:#fff0f0}.validation-title,.feedback-title{font-size:11px;font-weight:850}.transfer-success{color:#176b42;background:#eaf8f1}.submit-panel{box-sizing:border-box;padding:12px;border:1px solid #dce5f0;border-radius:13px;background:#fff;box-shadow:0 5px 18px rgba(32,67,111,.07)}.submit-panel>view{display:flex;align-items:center;justify-content:space-between;margin-bottom:9px;color:#778598;font-size:9px}.submit-panel strong{color:#243951;font-size:11px}.transfer-primary{box-sizing:border-box;width:100%;height:44px;margin:0;border-radius:9px;color:#fff;font-size:12px;font-weight:850;line-height:44px;background:#135ee8}.transfer-primary[disabled]{color:#9aa7b5;background:#e7ecf2;opacity:1}
 .photo-card{box-sizing:border-box;margin-bottom:11px;padding:14px;border:1px solid #d9e3ee;border-radius:13px;background:#fff;box-shadow:0 5px 18px rgba(32,67,111,.06)}
 .photo-head{display:flex;align-items:center;justify-content:space-between;gap:10px;margin-bottom:9px}
@@ -309,4 +464,5 @@ export default {
 .operation-detail-heading{display:flex;align-items:flex-start;gap:10px;margin:0 2px 12px;padding:2px 0}.back-to-list{width:auto;height:30px;margin:0;padding:0 9px;border:1px solid #c8d8ec;border-radius:8px;color:#135ee8;font-size:10px;line-height:30px;background:#f8fbff}.operation-detail-heading>view{min-width:0}.operation-detail-title{display:block;color:#243951;font-size:15px;font-weight:850}.operation-detail-subtitle{display:block;margin-top:3px;color:#8794a4;font-size:9px;line-height:14px}
 .collapse-button{width:30px;height:28px;margin:0;padding:0;color:#135ee8;font-size:16px;line-height:28px;background:#edf5ff}
 .receipt-comparison{display:grid;grid-template-columns:repeat(3,1fr);gap:7px;margin-bottom:9px}.receipt-comparison view{padding:9px;border-radius:9px;text-align:center;background:#fff}.receipt-comparison strong,.receipt-comparison text{display:block}.receipt-comparison strong{color:#17314f;font-size:15px}.receipt-comparison text{margin-top:2px;color:#8390a1;font-size:8px}.receipt-comparison .difference{border:1px solid #e3a044;background:#fff4df}.receipt-comparison .difference strong,.receipt-comparison .difference text{color:#a35b0c;font-weight:800}
+.transfer-content .measure-hint{font-size:11px;line-height:17px}.transfer-content .measure-title{font-size:13px}.transfer-content .summary-metrics text{font-size:10px}.transfer-content .transfer-primary{height:46px;line-height:46px;font-size:14px}.transfer-content .photo-card{padding:14px}.transfer-content .pallet-heading-copy text:last-child{font-size:10px;line-height:16px}.transfer-content .summary-no{font-size:13px}.transfer-content .batch-summary{font-size:12px}
 </style>
diff --git a/tests/return-counting-page.test.mjs b/tests/return-counting-page.test.mjs
index 577c226..f50cc7d 100644
--- a/tests/return-counting-page.test.mjs
+++ b/tests/return-counting-page.test.mjs
@@ -5,7 +5,7 @@ import { runInNewContext } from 'node:vm'
 
 const source = readFileSync(new URL('../src/pages/return-counting/return-counting.vue', import.meta.url), 'utf8')
 const script = source.match(/<script>([\s\S]*?)<\/script>/)[1].replace(/^import .+$/gm, '').replace('export default', 'page =')
-const scope = { PortalHeader: {}, ScanTargetInput: {} }
+const scope = { PortalHeader: {}, ScanTargetInput: {}, CartonCountFields: {} }
 runInNewContext(script, scope)
 
 function state(a = '2', b = '2', c = '2') {
diff --git a/tests/warehouse-transfer-api.test.mjs b/tests/warehouse-transfer-api.test.mjs
index 3bfddad..bb9704d 100644
--- a/tests/warehouse-transfer-api.test.mjs
+++ b/tests/warehouse-transfer-api.test.mjs
@@ -54,12 +54,12 @@ test('warehouse transfer removes completed work from the pending list', async ()
 	assert.match(page, /this\.selected = null; this\.pendingKey = '';[\s\S]*await this\.loadCandidates\(\)/)
 })
 
-test('warehouse transfer shows forecast and actual variance without blocking short or over receipt', async () => {
+test('warehouse transfer shows forecast and actual variance and requires counted box reconciliation', async () => {
 	const page = await readFile(new URL('../src/pages/warehouse-transfer/warehouse-transfer.vue', import.meta.url), 'utf8')
 	for (const label of ['客户预报', '当前实收', '短收差异', '超收差异']) assert.match(page, new RegExp(label))
 	assert.match(page, /cartonDifference/)
 	assert.doesNotMatch(page, /全部托盘箱数必须等于订单计划箱数/)
-	assert.doesNotMatch(page, /本托 SKU 箱数|itemCounts|transferItemId/)
+	assert.doesNotMatch(page, /本托 SKU 箱数|itemCounts/)
 })
 
 test('warehouse transfer retries reuse the pending idempotency key', async () => {
@@ -71,13 +71,13 @@ test('warehouse transfer retries reuse the pending idempotency key', async () =>
 
 test('warehouse transfer measurement inputs retain explicit placeholders', async () => {
 	const page = await readFile(new URL('../src/pages/warehouse-transfer/warehouse-transfer.vue', import.meta.url), 'utf8')
-	for (const placeholder of ['长度', '宽度', '高度', '毛重']) assert.match(page, new RegExp(`placeholder="${placeholder}"`))
+	assert.doesNotMatch(page, /v-model.number="pallet\.(lengthCm|widthCm|heightCm|grossWeightKg)"/)
 })
 
 test('warehouse transfer measurements are grouped and summarized per pallet', async () => {
 	const page = await readFile(new URL('../src/pages/warehouse-transfer/warehouse-transfer.vue', import.meta.url), 'utf8')
 	assert.match(page, /v-for="\(pallet, index\) in pallets"/)
-	for (const label of ['本托实测', '当前托重量', '当前托箱数', '自动体积']) assert.match(page, new RegExp(label))
+	for (const label of ['本托箱子汇总', '实收箱数', '箱子重量 kg', '箱子体积 m³']) assert.match(page, new RegExp(label))
 	assert.match(page, /palletVolume\(pallet\)/)
 	assert.match(page, /rawPalletVolume\(pallet\)/)
 })
@@ -138,7 +138,7 @@ test('warehouse transfer pallet cards prepare generated and server-bound states'
 	assert.match(page, /扫描或手输新托盘标签号/)
 	assert.match(page, /已绑定实物托盘/)
 	assert.match(page, /!pallet\.generated.*removePallet/)
-	assert.match(page, /:disabled="pallet\.generated"/)
+	assert.match(page, /请先生成托盘号，再填写签收箱子/)
 	assert.match(page, /collapsed: false/)
 	assert.match(page, /pallet\.collapsed = !pallet\.collapsed/)
 	assert.match(page, /v-show="!pallet\.collapsed"/)
diff --git a/tests/warehouse-transfer-counting.test.mjs b/tests/warehouse-transfer-counting.test.mjs
new file mode 100644
index 0000000..1bda1bf
--- /dev/null
+++ b/tests/warehouse-transfer-counting.test.mjs
@@ -0,0 +1,129 @@
+import test from 'node:test'
+import assert from 'node:assert/strict'
+import { readFileSync } from 'node:fs'
+import { runInNewContext } from 'node:vm'
+const source = readFileSync(new URL('../src/pages/warehouse-transfer/warehouse-transfer.vue',import.meta.url),'utf8')
+const script = source.match(/<script>([\s\S]*?)<\/script>/)[1].replace(/^import .+$/gm,'').replace('export default','page =')
+function setup() {
+  const storage = new Map()
+  const scope = { CartonCountFields:{},PortalHeader:{},ScanTargetInput:{},session:{apiBase:'LOCAL',currentUser:{id:'OP',warehouseId:'WH'}},uni:{getStorageSync:key=>storage.get(key),setStorageSync:(key,value)=>storage.set(key,JSON.parse(JSON.stringify(value))),removeStorageSync:key=>storage.delete(key)} }
+  runInNewContext(script,scope)
+  const value = scope.page.data()
+  for(const [key,method] of Object.entries(scope.page.methods)) value[key]=method.bind(value)
+  for(const [key,get] of Object.entries(scope.page.computed)) Object.defineProperty(value,key,{get:()=>get.call(value)})
+  value.selected={transferNo:'WT1',packageCount:1,status:'WAIT_PDA_RECEIVING',items:[{id:'I1',skuCode:'A'}],cartons:[{cartonMark:'BOX1',transferItemId:'I1',status:'EXPECTED'}]}
+  value.pallets=[{key:'P1',draftId:'P1',palletNo:'PALLET1',generated:true,bound:false}];value.restoreCartons();Object.assign(value.cartonBoxes[0],{length:10,width:20,height:30,weight:2});value.cartonBoxes[0].items[0].quantity=4
+  return {scope,value,storage}
+}
+test('transfer counts require valid pieces and measurements and record variance reason',()=>{
+  const {value}=setup();assert.equal(value.cartonCountReady,true)
+  value.cartonBoxes[0].items[0].quantity=0;assert.equal(value.cartonCountReady,false)
+  value.cartonBoxes[0].items[0].quantity=1.5;assert.equal(value.cartonCountReady,false)
+  value.cartonBoxes[0].items[0].quantity=4;value.cartonBoxes[0].height=0;assert.equal(value.cartonCountReady,false)
+  value.cartonBoxes[0].height=30;value.addExtraCarton();Object.assign(value.cartonBoxes[1],{length:10,width:20,height:30,weight:2});value.cartonBoxes[1].items[0].quantity=5
+  assert.equal(value.cartonCountReady,false);value.countDiscrepancyReason='多一箱';assert.equal(value.cartonCountReady,true)
+  assert.equal(value.cartonQuantity,9);assert.equal(value.cartonVolume,'0.012000')
+})
+test('network retry preserves request key and changed content uses a new request',async()=>{
+  const {value,scope}=setup();const requests=[]
+  scope.countWarehouseTransferCartons=async(no,request)=>{requests.push(request);throw new Error('offline')}
+  await value.confirmCartons();await value.confirmCartons()
+  assert.equal(requests.length,2);assert.equal(requests[0].idempotencyKey,requests[1].idempotencyKey)
+  value.cartonBoxes[0].items[0].quantity=8;await value.confirmCartons();assert.notEqual(requests[1].idempotencyKey,requests[2].idempotencyKey)
+  assert.equal(value.countingCartons,false);assert.equal(value.error.message,'offline')
+})
+test('draft restores additional cartons and discrepancy reason and scanning rejects foreign box',()=>{
+  const {value}=setup();value.addExtraCarton();value.countDiscrepancyReason='超收';value.saveCartonDraft();value.restoreCartons()
+  assert.equal(value.cartonBoxes.length,2);assert.equal(value.countDiscrepancyReason,'超收')
+  value.locateCarton('FOREIGN');assert.match(value.error.message,/不属于/)
+  value.locateCarton('BOX1');assert.equal(value.selectedCartonMark,'BOX1');assert.equal(value.cartonScrollTarget,'transfer-box-0')
+  value.selected={...value.selected,transferNo:'WT2'};value.restoreCartons();assert.equal(value.cartonBoxes.length,1)
+})
+test('received count gates pallet completion and saving cannot switch active order',()=>{
+  const {value}=setup();assert.match(value.validationMessage,/先完成全部箱子/)
+  value.selected.cartons[0].countedAt='2026-10-15';value.cartonBoxes[0].transferPalletId='FOREIGN';assert.match(value.validationMessage,/已清点实收箱数/)
+  value.countingCartons=true;value.backToCandidates();assert.equal(value.selected.transferNo,'WT1')
+})
+
+test('batch applies only selected received boxes of one SKU and preserves independent drafts',()=>{
+  const {value}=setup()
+  value.addExtraCarton();value.addExtraCarton();value.addExtraCarton()
+  value.cartonBoxes[2].items[0].skuCode='B'
+  value.cartonBoxes[3].received=false
+  value.selectBatchCartons(true)
+  assert.equal(value.batchTargetBoxes.length,2)
+  value.toggleBatchCarton(0)
+  Object.assign(value.batchBox,{length:32,width:24,height:18,weight:3.2})
+  value.batchBox.items[0].quantity=6
+  assert.equal(value.batchTotalQuantity,6)
+  value.applyBatchCartons()
+  assert.equal(value.cartonBoxes[0].items[0].quantity,4)
+  assert.equal(value.cartonBoxes[1].items[0].quantity,6)
+  assert.equal(value.cartonBoxes[2].items[0].quantity,'')
+  assert.equal(value.cartonBoxes[3].items[0].quantity,'')
+  value.batchBox.items[0].quantity=8
+  assert.equal(value.cartonBoxes[1].items[0].quantity,6)
+  value.restoreCartons()
+  assert.equal(value.cartonBoxes[1].items[0].quantity,6)
+  assert.equal(value.batchTargetBoxes.length,0)
+  value.changeBatchSku(1)
+  assert.equal(value.batchSku,'B')
+  assert.equal(value.batchBox.items[0].quantity,'')
+})
+
+test('batch guards invalid quantities, busy state, submitted facts and stale mixed SKU selections',()=>{
+  const {value}=setup();value.selectBatchCartons(true)
+  Object.assign(value.batchBox,{length:32,width:24,height:18,weight:3.2})
+  for(const quantity of [0,1.5,2147483648]){
+    value.batchBox.items[0].quantity=quantity;value.applyBatchCartons()
+    assert.equal(value.cartonBoxes[0].items[0].quantity,4)
+  }
+  value.batchBox.items[0].quantity=6;value.countingCartons=true;value.applyBatchCartons()
+  assert.equal(value.cartonBoxes[0].items[0].quantity,4)
+  value.countingCartons=false;value.cartonBoxes[0].items[0].skuCode='B'
+  assert.equal(value.batchTargetBoxes.length,0);value.applyBatchCartons()
+  assert.equal(value.cartonBoxes[0].items[0].quantity,4)
+  value.cartonBoxes[0].items[0].skuCode='A';value.selected.cartons[0].countedAt='now';value.applyBatchCartons()
+  assert.equal(value.cartonBoxes[0].items[0].quantity,4)
+})
+
+test('copy uses preceding received same SKU without sharing quantity objects or changing box identity',()=>{
+  const {value}=setup();value.addExtraCarton();value.addExtraCarton()
+  value.cartonBoxes[1].items[0].skuCode='B'
+  value.copyPreviousCarton(1);assert.equal(value.cartonBoxes[1].items[0].quantity,'')
+  const identity=value.cartonBoxes[2].localKey
+  value.copyPreviousCarton(2)
+  assert.equal(value.cartonBoxes[2].length,10)
+  assert.equal(value.cartonBoxes[2].items[0].quantity,4)
+  assert.equal(value.cartonBoxes[2].localKey,identity)
+  value.cartonBoxes[2].items[0].quantity=9
+  assert.equal(value.cartonBoxes[0].items[0].quantity,4)
+  value.cartonBoxes[0].received=false;assert.equal(value.previousMatchingCarton(2),undefined)
+})
+
+
+test('pallet totals follow actual box assignments and exclude missing boxes',()=>{
+ const {value}=setup();value.pallets.push({key:'P2',draftId:'P2',palletNo:'PALLET2',generated:true})
+ value.addExtraCarton();Object.assign(value.cartonBoxes[1],{length:40,width:20,height:10,weight:3,transferPalletId:'P2'});value.cartonBoxes[1].items[0].quantity=6
+ assert.equal(value.palletSummary(value.pallets[0]).cartonCount,1)
+ assert.equal(value.palletSummary(value.pallets[1]).volume,0.008)
+ assert.equal(value.totalWeight,'5.00')
+ value.assignCartonPallet(value.cartonBoxes[1],0)
+ assert.equal(value.palletSummary(value.pallets[0]).cartonCount,2)
+ assert.equal(value.palletSummary(value.pallets[1]).cartonCount,0)
+ value.cartonBoxes[1].received=false
+ assert.equal(value.totalWeight,'2.00')
+ value.cartonBoxes[0].transferPalletId='FOREIGN';assert.equal(value.cartonCountReady,false)
+})
+
+test('pallet number can be created before measurements and new boxes receive that identity',async()=>{
+ const {value,scope}=setup();const requests=[]
+ value.pallets=[{key:'NEW',generated:false,busy:false}];value.cartonBoxes[0].transferPalletId=''
+ const pallet={id:'CREATED',sequenceNo:1,status:'GENERATED',palletNo:'NEWPALLET'}
+ scope.saveWarehouseTransferPalletDraft=async(no,request)=>{requests.push(request);return {pallets:[{...pallet,status:'DRAFT'}]}}
+ scope.generateWarehouseTransferPallet=async()=>({pallets:[pallet]})
+ await value.generatePallet(value.pallets[0])
+ assert.equal(requests.length,1);assert.equal('lengthCm' in requests[0],false);assert.equal('grossWeightKg' in requests[0],false)
+ assert.equal(value.cartonBoxes[0].transferPalletId,'CREATED')
+ assert.equal(value.pallets[0].palletNo,'NEWPALLET')
+})

From 55b41709f2d042c88edc2b47860610f409ae59ae Mon Sep 17 00:00:00 2001
From: liuyihe <2513762445@qq.com>
Date: Thu, 15 Oct 2026 18:25:46 +0800
Subject: [PATCH 2/8] =?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/components/CartonCountFields.vue          |   6 +-
 .../warehouse-transfer/warehouse-transfer.vue |  97 ++++++++-------
 tests/warehouse-transfer-api.test.mjs         |   2 +-
 .../warehouse-transfer-mixed-cartons.test.mjs | 117 ++++++++++++++++++
 4 files changed, 174 insertions(+), 48 deletions(-)
 create mode 100644 tests/warehouse-transfer-mixed-cartons.test.mjs

diff --git a/src/components/CartonCountFields.vue b/src/components/CartonCountFields.vue
index a5be130..f3796da 100644
--- a/src/components/CartonCountFields.vue
+++ b/src/components/CartonCountFields.vue
@@ -1,9 +1,9 @@
 <template><view><view class="measure-grid"><label><text>长（cm）</text><input v-model="box.length" type="digit" class="measure-input" :disabled="disabled" placeholder="长度" /></label><label><text>宽（cm）</text><input v-model="box.width" type="digit" class="measure-input" :disabled="disabled" placeholder="宽度" /></label><label><text>高（cm）</text><input v-model="box.height" type="digit" class="measure-input" :disabled="disabled" placeholder="高度" /></label><label><text>重量（kg）</text><input v-model="box.weight" type="digit" class="measure-input" :disabled="disabled" placeholder="重量" /></label></view><view class="volume-chip"><text>体积</text><strong>{{ boxVolume(box) }} cm³</strong></view>
-          <view v-for="(line, lineIndex) in box.items" :key="lineIndex" class="count-line"><picker class="sku-picker" :disabled="disabled || !allowSkuChange" :range="skuCodes" :value="Math.max(0, skuCodes.indexOf(line.skuCode))" @change="line.skuCode = skuCodes[Number($event.detail.value)]"><text>{{ line.skuCode || '选择 SKU' }} ▾</text></picker><input v-model="line.quantity" type="number" class="number-input quantity" :disabled="disabled" placeholder="数量" /><button v-if="!disabled && allowSkuChange && box.items.length > 1" class="link-button" :disabled="disabled" @tap="box.items.splice(lineIndex, 1)">删除</button></view></view></template>
+          <view v-for="(line, lineIndex) in box.items" :key="lineIndex" class="count-line"><picker class="sku-picker" :disabled="disabled || !allowSkuChange || (lockFirstSku && lineIndex === 0)" :range="lineSkuCodes(lineIndex)" :value="Math.max(0, lineSkuCodes(lineIndex).indexOf(line.skuCode))" @change="line.skuCode = lineSkuCodes(lineIndex)[Number($event.detail.value)]"><text>{{ line.skuCode || '选择 SKU' }} ▾</text></picker><input v-model="line.quantity" type="number" class="number-input quantity" :disabled="disabled" placeholder="数量" /><button v-if="!disabled && allowSkuChange && box.items.length > 1 && (!lockFirstSku || lineIndex > 0)" class="link-button" :disabled="disabled" @tap="box.items.splice(lineIndex, 1)">删除</button></view></view></template>
 <script>
 export default {
-  props: { box: { type: Object, required: true }, skuCodes: { type: Array, default: () => [] }, disabled: Boolean, allowSkuChange: { type: Boolean, default: true } },
-  methods: { boxVolume(box) { const value = Number(box.length) * Number(box.width) * Number(box.height); return Number.isFinite(value) && value > 0 ? value.toFixed(2) : '—' } }
+  props: { box: { type: Object, required: true }, skuCodes: { type: Array, default: () => [] }, disabled: Boolean, uniqueSkus: Boolean, lockFirstSku: Boolean, allowSkuChange: { type: Boolean, default: true } },
+  methods: { lineSkuCodes(index) { return this.uniqueSkus ? this.skuCodes.filter(sku => !this.box.items.some((line, other) => other !== index && line.skuCode === sku)) : this.skuCodes }, boxVolume(box) { const value = Number(box.length) * Number(box.width) * Number(box.height); return Number.isFinite(value) && value > 0 ? value.toFixed(2) : '—' } }
 }
 </script>
 <style scoped>
diff --git a/src/pages/warehouse-transfer/warehouse-transfer.vue b/src/pages/warehouse-transfer/warehouse-transfer.vue
index 2d9f283..ead8f28 100644
--- a/src/pages/warehouse-transfer/warehouse-transfer.vue
+++ b/src/pages/warehouse-transfer/warehouse-transfer.vue
@@ -1,9 +1,13 @@
 <template>
 	<view v-if="user" class="page-shell portal-page transfer-page">
 		<PortalHeader :title="entryMode === 'list' ? '仓储转运测量列表' : '转运测量作业'" :user="user" fallback-url="/pages/module/module?key=inbound" />
+		<view v-if="entryMode === 'work'" class="transfer-work-toolbar">
+			<button class="back-to-list" @tap="backToCandidates"><uni-icons type="back" color="#135ee8" size="18" /><text>返回列表</text></button>
+			<button class="refresh-button" :disabled="loading" aria-label="刷新当前转运单" @tap="loadCandidates"><uni-icons type="refresh" color="#135ee8" size="18" /><text>{{ loading ? '加载中' : '刷新' }}</text></button>
+		</view>
 		<scroll-view scroll-y :scroll-into-view="cartonScrollTarget" scroll-with-animation class="transfer-scroll"><view class="portal-content transfer-content">
-			<view class="transfer-heading">
-				<view><text class="transfer-title">{{ entryMode === 'list' ? '仓储转运测量列表' : '转运测量作业' }}</text><text class="transfer-subtitle">{{ entryMode === 'list' ? '选择待测转运单后进入作业详情' : '先创建托盘号，再逐箱测量清点并分配入托' }}</text></view>
+			<view v-if="entryMode === 'list'" class="transfer-heading">
+				<view><text class="transfer-title">仓储转运测量列表</text><text class="transfer-subtitle">选择待测转运单</text></view>
 				<button class="refresh-button" :disabled="loading" aria-label="刷新待测转运单" @tap="loadCandidates"><uni-icons type="refresh" color="#135ee8" size="18" /><text>{{ loading ? '加载中' : '刷新' }}</text></button>
 			</view>
 
@@ -22,7 +26,6 @@
 
 			<view v-if="detailLoading" class="transfer-empty"><text class="empty-title">正在读取转运明细</text><text>请稍候，不要重复选择</text></view>
 			<template v-if="selected && !detailLoading">
-				<view class="operation-detail-heading"><button class="back-to-list" @tap="backToCandidates">‹ 返回待测列表</button><view><text class="operation-detail-title">作业详情</text><text class="operation-detail-subtitle">进入后完成当前转运单的测量、打托和拍照</text></view></view>
 				<view v-if="isMeasurementComplete" class="transfer-success"><text class="feedback-title">测量已完成</text><text>该转运单已完成 PDA 测量，不再重复进入测量或托盘作业。</text></view>
 				<view v-else-if="isInventoryTransfer" class="transfer-success inventory-transfer-panel"><text class="feedback-title">库存转运 · 无需测量</text><text>该单来源于仓库现有库存，不需要重复测量或上传现场照片。请进入托盘作业，按来源托盘执行整托转运、拆托重打，或与相同目的仓合托。</text><button class="transfer-primary" @tap="openPalletOperations">进入托盘作业</button></view>
 				<template v-if="!isInventoryTransfer && !isMeasurementComplete">
@@ -33,7 +36,6 @@
 				<view class="receipt-comparison"><view><strong>{{ selected.packageCount || 0 }}</strong><text>客户预报</text></view><view><strong>{{ cartonsCounted ? actualReceivedCartons : '—' }}</strong><text>{{ cartonsCounted ? '当前实收' : '清点后确认' }}</text></view><view :class="{ difference: cartonsCounted && cartonDifference !== 0 }"><strong>{{ !cartonsCounted ? '—' : cartonDifference > 0 ? `+${cartonDifference}` : cartonDifference }}</strong><text>{{ !cartonsCounted ? '差异待确认' : cartonDifference === 0 ? '无差异' : cartonDifference > 0 ? '超收差异' : '短收差异' }}</text></view></view>
 				<view class="summary-metrics"><view><strong>{{ pallets.length }}</strong><text>托盘</text></view><view><strong>{{ totalVolume }}</strong><text>箱子总体积 m³</text></view><view><strong>{{ totalWeight }}</strong><text>箱子总重量 kg</text></view></view>
 
-				<view class="workflow-step"><text class="step-number">1</text><view><text class="step-title">创建签收托盘</text><text class="step-caption">支持多托盘，先生成标签，再分配箱子</text></view></view>
 				<view v-for="(pallet, index) in pallets" :key="pallet.key" class="pallet-card" :class="{ 'active-receiving-pallet': String(receivingPalletId) === String(pallet.draftId) }">
 					<view class="pallet-head">
 						<view class="pallet-index"><text>{{ String(index + 1).padStart(2, '0') }}</text></view>
@@ -53,20 +55,17 @@
 				</view>
 
 				<button class="add-pallet-button" :disabled="cartonsCounted || countingCartons" @tap="addPallet"><uni-icons type="plus" color="#135ee8" size="18" /><text>新增一个托盘</text></button>
-                <view v-if="!generatedPallets.length" class="transfer-validation"><view class="workflow-step"><text class="step-number">2</text><view><text class="step-title">填写签收箱子</text><text class="step-caption">请先生成托盘号，再填写签收箱子。</text></view></view></view>
+                <text v-if="!generatedPallets.length" class="carton-prerequisite">请先生成托盘号，再填写签收箱子。</text>
                 <view v-if="generatedPallets.length" class="photo-card">
-                  <view id="transfer-boxes" class="workflow-step"><text class="step-number">2</text><view><text class="step-title">填写签收箱子</text><text class="step-caption">相同箱规批量填，差异箱单独改</text></view></view>
+                  <text id="transfer-boxes" class="measure-title">签收箱子</text>
                   <view class="carton-filter"><button :class="{active: !cartonPalletFilter}" @tap="cartonPalletFilter = ''">全部箱子</button><button v-for="(pallet, index) in generatedPallets" :key="pallet.draftId" :class="{active: String(cartonPalletFilter) === String(pallet.draftId)}" @tap="cartonPalletFilter = pallet.draftId">托盘 {{ index + 1 }} · {{ palletSummary(pallet).cartonCount }} 箱</button></view>
-                  <text class="measure-hint">扫描本单箱号定位；填写每箱尺寸、重量和箱内实点件数。申报未提供件数，按现场实点记录。</text>
-                  <ScanTargetInput name="transfer-carton" v-model="cartonScan" label="箱号" placeholder="扫描系统箱号或客户箱唛" :active="!cartonsCounted" @activate="activePalletKey = ''" @submit="locateCarton" />
-                  <text class="measure-title">{{ receivedCartonBoxes.length }} 箱 · {{ cartonVolume }} m³ · {{ cartonWeight }} kg · {{ cartonQuantity }} 件</text>
                   <view v-if="!cartonsCounted" class="batch-count-panel">
                     <button class="add-pallet-button" :disabled="countingCartons" @tap="toggleBatchPanel">{{ batchCountOpen ? '收起批量填写' : '相同箱规？批量填写' }}</button>
                     <view v-if="batchCountOpen">
                       <text class="measure-hint">选择同 SKU 的箱子，统一填写。应用后可逐箱修改；会覆盖所选箱的尺寸、重量和件数。</text>
                       <picker :disabled="countingCartons" :range="batchSkuCodes" :value="Math.max(0, batchSkuCodes.indexOf(batchSku))" @change="changeBatchSku(Number($event.detail.value))"><view class="batch-sku">批量 SKU：{{ batchSku || '请选择' }} ▾</view></picker>
                       <view class="batch-actions"><button :disabled="countingCartons" @tap="selectBatchCartons(true)">全选该 SKU</button><button :disabled="countingCartons" @tap="selectBatchCartons(false)">清空选择</button></view>
-                      <view class="batch-box-options"><template v-for="(box, index) in cartonBoxes" :key="box.localKey || box.cartonMark"><button v-if="box.received !== false && box.items[0].skuCode === batchSku" :disabled="countingCartons" :class="{chosen: batchSelectedIndexes.includes(index)}" :aria-label="`选择第${index + 1}箱批量填写`" @tap="toggleBatchCarton(index)">{{ batchSelectedIndexes.includes(index) ? '✓' : '+' }} 第 {{ index + 1 }} 箱</button></template></view>
+                      <view class="batch-box-options"><template v-for="(box, index) in cartonBoxes" :key="box.localKey || box.cartonMark"><button v-if="box.received !== false && box.items.length === 1 && box.items[0].skuCode === batchSku" :disabled="countingCartons" :class="{chosen: batchSelectedIndexes.includes(index)}" :aria-label="`选择第${index + 1}箱批量填写`" @tap="toggleBatchCarton(index)">{{ batchSelectedIndexes.includes(index) ? '✓' : '+' }} 第 {{ index + 1 }} 箱</button></template></view>
                       <picker :disabled="countingCartons" :range="generatedPallets.map(pallet => pallet.palletNo)" @change="batchPalletId = generatedPallets[Number($event.detail.value)]?.draftId || ''"><view class="batch-sku">批量所属托盘：{{ generatedPallets.find(pallet => String(pallet.draftId) === String(batchPalletId))?.palletNo || '请选择' }} ▾</view></picker>
                       <CartonCountFields :box="batchBox" :sku-codes="[batchSku]" :allow-sku-change="false" :disabled="countingCartons" />
                       <text class="batch-summary">已选 {{ batchTargetBoxes.length }} 箱 · 每箱 {{ Number(batchBox.items[0].quantity) || 0 }} 件 · 合计 {{ batchTotalQuantity }} 件</text>
@@ -74,19 +73,16 @@
                       <text v-if="batchCountMessage" class="batch-summary" role="status">{{ batchCountMessage }}</text>
                     </view>
                   </view>
-                  <view v-for="(box, index) in cartonBoxes" v-show="!cartonPalletFilter || String(box.transferPalletId) === String(cartonPalletFilter)" :id="`transfer-box-${index}`" :key="box.localKey || box.cartonMark" class="carton-count-card" :class="{ 'carton-selected': box.cartonMark === selectedCartonMark }">
-                    <text class="measure-title">第 {{ index + 1 }} 箱 · {{ box.cartonMark || '新增实收箱（确认后生成箱号）' }}</text>
+                  <view v-for="(box, index) in cartonBoxes" v-show="!cartonPalletFilter || String(box.transferPalletId) === String(cartonPalletFilter)" :id="`transfer-box-${index}`" :key="box.localKey || box.cartonMark" class="carton-count-card">
+                    <view class="carton-title-row"><text class="measure-title">第 {{ index + 1 }} 箱 · {{ box.cartonMark || '新增实收箱（确认后生成箱号）' }}</text><button v-if="!cartonsCounted" class="add-sku-button" :disabled="countingCartons || box.received === false || box.items.length >= Math.min(200, declaredSkuCodes.length)" @tap="addCartonSku(box)">添加 SKU</button><button v-if="!cartonsCounted" class="delete-carton-button" :disabled="countingCartons" @tap="removeCarton(index)">删除箱子</button></view>
                     <view v-if="!cartonsCounted" class="batch-actions">
 
                       <button v-if="previousMatchingCarton(index)" :disabled="countingCartons || box.received === false || !validCartonValues(previousMatchingCarton(index))" @tap="copyPreviousCarton(index)">复制上一同 SKU 箱</button>
                     </view>
                     <text v-if="box.customerCartonMark" class="measure-hint">客户箱唛：{{ box.customerCartonMark }}</text>
-                    <text class="measure-hint">SKU 与该箱申报一致，数量为箱内件数</text>
+                    <text class="measure-hint">可添加本单预报 SKU，数量按箱内实际件数填写</text>
                     <picker :disabled="cartonsCounted || countingCartons || box.received === false" :range="generatedPallets.map(pallet => pallet.palletNo)" :value="Math.max(0, generatedPallets.findIndex(pallet => String(pallet.draftId) === String(box.transferPalletId)))" @change="assignCartonPallet(box, Number($event.detail.value))"><view class="batch-sku">所属托盘：{{ cartonPalletLabel(box) }} ▾</view></picker>
-                    <button v-if="!cartonsCounted" class="refresh-button" :disabled="countingCartons" @tap="box.received = box.received === false">{{ box.received === false ? '标记为已收到' : '标记为未收到' }}</button>
-                    <text v-if="box.received === false" class="measure-hint">本箱未收到，不计入实收</text>
-                    <picker v-if="!box.cartonMark && !cartonsCounted" :range="selected.items.map(item => item.skuCode)" @change="selectExtraCartonSku(box, Number($event.detail.value))"><text>选择 SKU：{{ box.items[0].skuCode }} ▾</text></picker>
-                    <CartonCountFields :box="box" :sku-codes="box.items.map(line => line.skuCode)" :allow-sku-change="false" :disabled="cartonsCounted || countingCartons || box.received === false" />
+                    <CartonCountFields :box="box" :sku-codes="declaredSkuCodes" :unique-skus="true" :lock-first-sku="Boolean(box.cartonMark)" :disabled="cartonsCounted || countingCartons || box.received === false" />
                   </view>
                   <button v-if="cartonsCounted" class="add-pallet-button" @tap="printCartonLabels">打开箱标签打印</button>
                   <button v-if="!cartonsCounted" class="add-pallet-button" :disabled="countingCartons" @tap="addExtraCarton">新增实收箱</button>
@@ -94,7 +90,6 @@
                   <button class="transfer-primary" :disabled="!cartonCountReady || countingCartons || cartonsCounted" @tap="confirmCartons">{{ cartonsCounted ? '全部箱子已清点' : countingCartons ? '保存中…' : '确认逐箱测量清点' }}</button>
                 </view>
 				<view class="photo-card">
-                    <view class="workflow-step"><text class="step-number">3</text><view><text class="step-title">拍照并确认入库</text><text class="step-caption">核对全部托盘与签收箱子</text></view></view>
 					<view class="photo-head"><view><text class="measure-title">测量现场照片</text><text class="measure-hint">完成测量并打托前至少拍摄 1 张</text></view><text class="photo-count">{{ photoFileIds.length }} / 20 张</text></view>
 					<view v-if="photoFileIds.length" class="photo-grid"><view v-for="(fileId, index) in photoFileIds" :key="fileId" class="photo-tile">
 						<image class="photo-image" :src="photoUrls[fileId]" mode="aspectFill" @tap="previewPhoto(fileId)" />
@@ -140,20 +135,21 @@ const restoredPallet = (value, index) => ({
 
 export default {
 	components: { PortalHeader, ScanTargetInput, CartonCountFields },
-	data() { return { receivingPalletId: '', cartonPalletFilter: '', batchPalletId: '', batchCountOpen: false, batchSku: '', batchBox: newBatchBox(), batchSelectedIndexes: [], batchCountMessage: '', cartonScrollTarget: '', cartonBoxes: [], countDiscrepancyReason: '', cartonScan: '', selectedCartonMark: '', countingCartons: false, cartonRequestKey: '', cartonSignature: '', user: session.currentUser, entryMode: 'work', pendingTaskNo: '', candidates: [], selected: null, pallets: [newPallet()], activePalletKey: '', photoFileIds: [], photoNames: [], photoUrls: {}, completedPallets: [], completedTransferNo: '', completedDestination: '', completedDestinationType: '', loading: false, detailLoading: false, submitting: false, uploadingPhoto: false, openingLabel: false, error: null, success: false, pendingKey: '' } },
+	data() { return { receivingPalletId: '', cartonPalletFilter: '', batchPalletId: '', batchCountOpen: false, batchSku: '', batchBox: newBatchBox(), batchSelectedIndexes: [], batchCountMessage: '', cartonScrollTarget: '', cartonBoxes: [], countDiscrepancyReason: '', countingCartons: false, cartonRequestKey: '', cartonSignature: '', user: session.currentUser, entryMode: 'work', pendingTaskNo: '', candidates: [], selected: null, pallets: [newPallet()], activePalletKey: '', photoFileIds: [], photoNames: [], photoUrls: {}, completedPallets: [], completedTransferNo: '', completedDestination: '', completedDestinationType: '', loading: false, detailLoading: false, submitting: false, uploadingPhoto: false, openingLabel: false, error: null, success: false, pendingKey: '' } },
 	computed: {
         generatedPallets() { return this.pallets.filter(pallet => pallet.generated && pallet.draftId) },
+        declaredSkuCodes() { return [...new Set((this.selected?.items || []).map(item => item.skuCode))] },
         batchSkuCodes() { return [...new Set(this.receivedCartonBoxes.map(box => box.items[0]?.skuCode).filter(Boolean))] },
-        batchTargetBoxes() { return this.cartonBoxes.filter((box, index) => this.batchSelectedIndexes.includes(index) && box.received !== false && box.items[0]?.skuCode === this.batchSku) },
+        batchTargetBoxes() { return this.cartonBoxes.filter((box, index) => this.batchSelectedIndexes.includes(index) && box.received !== false && box.items.length === 1 && box.items[0]?.skuCode === this.batchSku) },
         batchTotalQuantity() { const quantity = Number(this.batchBox.items[0].quantity); return Number.isSafeInteger(quantity) && quantity > 0 ? this.batchTargetBoxes.length * quantity : 0 },
         batchCountReady() { return this.batchTargetBoxes.length > 0 && this.validCartonValues(this.batchBox) && this.generatedPallets.some(pallet => String(pallet.draftId) === String(this.batchPalletId)) },
         actualReceivedCartons() { return this.cartonsCounted ? this.receivedCartonBoxes.length : 0 },
         cartonsCounted() { return Boolean(this.selected?.cartons?.length) && this.selected.cartons.every(box => box.countedAt) },
         cartonVolume() { return this.receivedCartonBoxes.reduce((sum, box) => sum + (Number(box.length) || 0) * (Number(box.width) || 0) * (Number(box.height) || 0) / 1000000, 0).toFixed(6) },
         cartonWeight() { return this.receivedCartonBoxes.reduce((sum, box) => sum + (Number(box.weight) || 0), 0).toFixed(2) },
-        cartonQuantity() { return this.receivedCartonBoxes.reduce((sum, box) => sum + (Number(box.items[0]?.quantity) || 0), 0) },
+        cartonQuantity() { return this.receivedCartonBoxes.reduce((sum, box) => sum + box.items.reduce((total, line) => total + (Number(line.quantity) || 0), 0), 0) },
         receivedCartonBoxes() { return this.cartonBoxes.filter(box => box.received !== false) },
-        cartonCountReady() { return this.receivedCartonBoxes.length > 0 && this.pallets.every(pallet => pallet.generated && this.palletSummary(pallet).cartonCount > 0) && (this.receivedCartonBoxes.length === Number(this.selected?.packageCount) || Boolean(this.countDiscrepancyReason.trim())) && this.receivedCartonBoxes.every(box => this.generatedPallets.some(pallet => String(pallet.draftId) === String(box.transferPalletId)) && [box.length, box.width, box.height, box.weight].every(value => Number(value) >= 0.01) && box.items[0]?.skuCode && Number.isSafeInteger(Number(box.items[0].quantity)) && Number(box.items[0].quantity) > 0 && Number(box.items[0].quantity) <= 2147483647) },
+        cartonCountReady() { return this.receivedCartonBoxes.length > 0 && this.pallets.every(pallet => pallet.generated && this.palletSummary(pallet).cartonCount > 0) && (this.receivedCartonBoxes.length === Number(this.selected?.packageCount) || Boolean(this.countDiscrepancyReason.trim())) && this.receivedCartonBoxes.every(box => this.generatedPallets.some(pallet => String(pallet.draftId) === String(box.transferPalletId)) && [box.length, box.width, box.height, box.weight].every(value => Number(value) >= 0.01) && this.validCartonSkuLines(box)) },
 		completedDestinationLabel() { return this.destinationLabel({ fbaWarehouseCode: this.completedDestination, destinationType: this.completedDestinationType }) },
 		totalCartons() { return this.pallets.reduce((sum, pallet) => sum + this.palletSummary(pallet).cartonCount, 0) },
 		cartonDifference() { return this.actualReceivedCartons - Number(this.selected?.packageCount || 0) },
@@ -194,7 +190,7 @@ export default {
           this.batchCountOpen = !this.batchCountOpen;
           if (this.batchCountOpen && !this.batchSelectedIndexes.length) this.selectBatchCartons(true);
         },
-        validCartonValues(box) { return Boolean(box && [box.length, box.width, box.height, box.weight].every(value => Number(value) >= 0.01 && Number.isFinite(Number(value))) && Number.isSafeInteger(Number(box.items[0]?.quantity)) && Number(box.items[0].quantity) > 0 && Number(box.items[0].quantity) <= 2147483647) },
+        validCartonValues(box) { return Boolean(box && [box.length, box.width, box.height, box.weight].every(value => Number(value) >= 0.01 && Number.isFinite(Number(value))) && this.validCartonSkuLines(box)) },
         changeBatchSku(index) {
           if (this.countingCartons || this.cartonsCounted) return;
           this.batchSku = this.batchSkuCodes[index] || ''; this.batchSelectedIndexes = []; this.batchCountMessage = ''; this.selectBatchCartons(true);
@@ -202,18 +198,18 @@ export default {
         },
         selectBatchCartons(selected) {
           if (this.countingCartons || this.cartonsCounted) return;
-          this.batchSelectedIndexes = selected ? this.cartonBoxes.flatMap((box, index) => box.received !== false && box.items[0]?.skuCode === this.batchSku ? [index] : []) : [];
+          this.batchSelectedIndexes = selected ? this.cartonBoxes.flatMap((box, index) => box.received !== false && box.items.length === 1 && box.items[0]?.skuCode === this.batchSku ? [index] : []) : [];
           this.batchCountMessage = '';
         },
         toggleBatchCarton(index) {
           if (this.countingCartons || this.cartonsCounted) return;
           const box = this.cartonBoxes[index];
-          if (!box || box.received === false || box.items[0]?.skuCode !== this.batchSku) return;
+          if (!box || box.received === false || box.items.length !== 1 || box.items[0]?.skuCode !== this.batchSku) return;
           this.batchSelectedIndexes = this.batchSelectedIndexes.includes(index) ? this.batchSelectedIndexes.filter(value => value !== index) : [...this.batchSelectedIndexes, index]; this.batchCountMessage = '';
         },
         copyCartonValues(source, target) {
           for (const key of ['length', 'width', 'height', 'weight']) target[key] = source[key];
-          target.items[0].quantity = source.items[0].quantity;
+          target.items = source.items.map(line => ({ ...line }));
         },
         applyBatchCartons() {
           if (this.cartonsCounted || this.countingCartons || !this.batchCountReady) return;
@@ -222,8 +218,9 @@ export default {
           this.cartonPalletFilter = ''; this.saveCartonDraft(); this.batchCountMessage = `已应用到 ${targets.length} 箱，共 ${this.batchTotalQuantity} 件，可继续逐箱调整`;
         },
         previousMatchingCarton(index) {
+          if (this.cartonBoxes[index]?.items.length !== 1) return null;
           const sku = this.cartonBoxes[index]?.items[0]?.skuCode;
-          return this.cartonBoxes.slice(0, index).reverse().find(box => box.received !== false && box.items[0]?.skuCode === sku);
+          return this.cartonBoxes.slice(0, index).reverse().find(box => box.received !== false && box.items.length === 1 && box.items[0]?.skuCode === sku);
         },
         copyPreviousCarton(index) {
           if (this.cartonsCounted || this.countingCartons) return;
@@ -234,10 +231,10 @@ export default {
         saveCartonDraft() { if (this.selected && !this.cartonsCounted) uni.setStorageSync(this.cartonDraftKey(), { boxes: this.cartonBoxes, discrepancyReason: this.countDiscrepancyReason, key: this.cartonRequestKey, signature: this.cartonSignature }) },
         cartonDraftKey() { return `transfer-carton-count:${session.apiBase}:${this.user?.id}:${this.user?.warehouseId}:${this.selected?.transferNo}` },
         restoreCartons() {
-          const rows = (this.selected?.cartons || []).map(box => ({ ...box, transferPalletId: box.transferPalletId || (this.generatedPallets.length === 1 ? this.generatedPallets[0].draftId : ''), received: box.status !== 'NOT_RECEIVED', items: [{ skuCode: this.selected.items.find(item => String(item.id) === String(box.transferItemId))?.skuCode || '', quantity: box.quantity ?? '' }] }));
+          const rows = (this.selected?.cartons || []).filter(box => box.status !== 'NOT_RECEIVED').map(box => ({ ...box, transferPalletId: box.transferPalletId || (this.generatedPallets.length === 1 ? this.generatedPallets[0].draftId : ''), received: box.status !== 'NOT_RECEIVED', items: box.items?.length ? box.items.map(line => ({ skuCode: line.skuCode, quantity: line.quantity })) : [{ skuCode: this.selected.items.find(item => String(item.id) === String(box.transferItemId))?.skuCode || '', quantity: box.quantity ?? '' }] }));
           const draft = uni.getStorageSync(this.cartonDraftKey());
-          this.countDiscrepancyReason = this.selected?.cartons?.find(box => box.discrepancyReason)?.discrepancyReason || ''; this.cartonRequestKey = ''; this.cartonSignature = ''; this.selectedCartonMark = ''; this.cartonScan = '';
-          if (!this.cartonsCounted && draft?.boxes?.length >= rows.length && draft.boxes.every(box => box.cartonMark || this.selected.items.some(item => String(item.id) === String(box.transferItemId))) && rows.every(box => draft.boxes.some(row => row.cartonMark === box.cartonMark && row.items?.[0]?.skuCode === box.items[0].skuCode))) {
+          this.countDiscrepancyReason = this.selected?.cartons?.find(box => box.discrepancyReason)?.discrepancyReason || ''; this.cartonRequestKey = ''; this.cartonSignature = '';
+          if (!this.cartonsCounted && Array.isArray(draft?.boxes) && draft.boxes.every(box => box.items?.length && box.items.every(line => this.declaredSkuCodes.includes(line.skuCode)) && (box.cartonMark || this.selected.items.some(item => String(item.id) === String(box.transferItemId)))) && draft.boxes.every(box => !box.cartonMark || rows.some(row => row.cartonMark === box.cartonMark))) {
             this.cartonBoxes = draft.boxes; this.countDiscrepancyReason = draft.discrepancyReason || ''; this.cartonRequestKey = draft.key || ''; this.cartonSignature = draft.signature || '';
           } else this.cartonBoxes = rows;
           this.receivingPalletId = this.generatedPallets[0]?.draftId || ''; this.cartonPalletFilter = ''; this.batchPalletId = this.receivingPalletId; this.batchCountOpen = false; this.batchSelectedIndexes = []; this.batchCountMessage = ''; this.batchSku = this.batchSkuCodes[0] || ''; this.batchBox = newBatchBox(); this.batchBox.items[0].skuCode = this.batchSku;
@@ -253,24 +250,29 @@ export default {
           this.error = new Error('当前设备未配置箱标签打印服务');
           // #endif
         },
+        removeCarton(index) {
+          if (this.cartonsCounted || this.countingCartons) return;
+          this.cartonBoxes.splice(index, 1); this.batchSelectedIndexes = []; this.batchCountMessage = ''; this.saveCartonDraft();
+        },
         addExtraCarton() {
           if (this.cartonsCounted || this.countingCartons || !this.selected?.items?.length) return;
           const item = this.selected.items[0];
           this.cartonBoxes.push({ localKey: `extra-${Date.now()}-${Math.random()}`, cartonMark: '', transferItemId: item.id, transferPalletId: this.receivingPalletId || this.generatedPallets[0]?.draftId || '', received: true, length: '', width: '', height: '', weight: '', items: [{ skuCode: item.skuCode, quantity: '' }] });
         },
-        selectExtraCartonSku(box, index) { const item = this.selected.items[index]; if (item) { box.transferItemId = item.id; box.items[0].skuCode = item.skuCode } },
-        locateCarton(value) {
-          const code = String(typeof value === 'string' ? value : this.cartonScan).trim();
-          const matches = this.cartonBoxes.filter(box => box.cartonMark === code || box.customerCartonMark === code);
-          if (matches.length !== 1) { this.error = new Error(matches.length ? '客户箱唛对应多箱，请扫描系统箱号' : '该箱不属于当前转运单'); return }
-          this.error = null; this.cartonPalletFilter = ''; this.selectedCartonMark = matches[0].cartonMark; this.cartonScan = '';
-          this.cartonScrollTarget = `transfer-box-${this.cartonBoxes.indexOf(matches[0])}`;
+        addCartonSku(box) {
+          if (this.cartonsCounted || this.countingCartons || box.received === false) return;
+          const skuCode = this.declaredSkuCodes.find(sku => !box.items.some(line => line.skuCode === sku));
+          if (skuCode) box.items.push({ skuCode, quantity: '' });
+        },
+        validCartonSkuLines(box) {
+          return box.items.length > 0 && box.items.length <= 200 && (!box.cartonMark || box.items.some(line => line.skuCode === this.selected.items.find(item => String(item.id) === String(box.transferItemId))?.skuCode)) && new Set(box.items.map(line => line.skuCode)).size === box.items.length
+            && box.items.every(line => this.declaredSkuCodes.includes(line.skuCode) && Number.isSafeInteger(Number(line.quantity)) && Number(line.quantity) > 0 && Number(line.quantity) <= 2147483647);
         },
         async confirmCartons() {
           if (!this.cartonCountReady || this.countingCartons || this.cartonsCounted) return;
           this.countingCartons = true; this.error = null;
           try {
-            const boxes = this.receivedCartonBoxes.map(box => ({ cartonMark: box.cartonMark || null, transferItemId: box.transferItemId, transferPalletId: box.transferPalletId, length: Number(box.length), width: Number(box.width), height: Number(box.height), weight: Number(box.weight), skuCode: box.items[0].skuCode, quantity: Number(box.items[0].quantity) }));
+            const boxes = this.receivedCartonBoxes.map(box => ({ cartonMark: box.cartonMark || null, transferItemId: box.cartonMark ? box.transferItemId : this.selected.items.find(item => item.skuCode === box.items[0]?.skuCode)?.id, transferPalletId: box.transferPalletId, length: Number(box.length), width: Number(box.width), height: Number(box.height), weight: Number(box.weight), items: box.items.map(line => ({ skuCode: line.skuCode, quantity: Number(line.quantity) })) }));
             const signature = JSON.stringify({ boxes, discrepancyReason: this.countDiscrepancyReason });
             if (!this.cartonRequestKey || signature !== this.cartonSignature) { this.cartonRequestKey = `transfer-count-${Date.now()}-${Math.random().toString(36).slice(2)}`; this.cartonSignature = signature }
             uni.setStorageSync(this.cartonDraftKey(), { boxes: this.cartonBoxes, discrepancyReason: this.countDiscrepancyReason, key: this.cartonRequestKey, signature });
@@ -283,7 +285,7 @@ export default {
 		destinationLabel(value, fallback = {}) { const code = String(value?.fbaWarehouseCode || fallback?.fbaWarehouseCode || '').trim(); if (code) return code; const type = value?.destinationType || fallback?.destinationType; return type === 'PRIVATE' ? '私人仓' : '目的仓待定' },
 		startScanner() { this.stopScanner(); this._stopScanner = startScanBroadcast({ onScan: (value) => this.handlePalletScan(value), onError: (error) => { this.error = error } }) },
 		stopScanner() { if (this._stopScanner) this._stopScanner(); this._stopScanner = null },
-		handlePalletScan(value) { if (!this.activePalletKey && this.selected && !this.cartonsCounted) { this.locateCarton(value); return }; const pallet = this.pallets.find((item) => item.key === this.activePalletKey && item.generated && !item.bound); if (!pallet) return; pallet.bindCode = String(value || '').trim(); this.bindPallet(pallet) },
+		handlePalletScan(value) { const pallet = this.pallets.find((item) => item.key === this.activePalletKey && item.generated && !item.bound); if (!pallet) return; pallet.bindCode = String(value || '').trim(); this.bindPallet(pallet) },
 		statusLabel(status, transferNo = '') { if (String(status) === 'WAIT_PDA_RECEIVING' && String(warehouseWork.warehouseTransfer.currentNo) === String(transferNo)) return '测量中'; return ({ WAIT_PDA_RECEIVING: '待测量', APPROVED: '待测量', PARTIALLY_RECEIVED: '测量中' })[status] || '待测量' },
         palletSummary(pallet) {
           const boxes = this.receivedCartonBoxes.filter(box => pallet.draftId && String(box.transferPalletId) === String(pallet.draftId));
@@ -442,13 +444,20 @@ export default {
 </script>
 
 <style scoped>
-.workflow-step{display:flex;align-items:center;gap:10px;margin:18px 0 12px}.step-number{display:flex;align-items:center;justify-content:center;flex:none;width:28px;height:28px;border-radius:9px;background:#e5efff;color:#135ee8;font-weight:800;font-size:14px}.step-title,.step-caption{display:block}.step-title{font-size:16px;font-weight:800;color:#17314f}.step-caption{margin-top:3px;font-size:11px;color:#7a899c;line-height:17px}.active-receiving-pallet{border-color:#79a7ec!important}.pallet-brief{display:flex;align-items:center;flex-wrap:wrap;gap:10px;margin:-3px 0 12px;color:#3f5671;font-size:12px}.pallet-brief button{margin:0 0 0 auto;padding:0 10px;height:36px;line-height:36px;border-radius:8px;background:#eaf2ff;color:#135ee8;font-size:11px}.carton-filter,.batch-box-options{display:flex;flex-wrap:wrap;gap:7px;margin:12px 0}.carton-filter button,.batch-box-options button{width:auto;margin:0;padding:0 11px;height:36px;line-height:36px;border:1px solid #d4dfed;border-radius:9px;background:#fff;color:#5b6e84;font-size:12px}.carton-filter .active,.batch-box-options .chosen{border-color:#135ee8;background:#eaf2ff;color:#135ee8}.batch-count-panel .add-pallet-button{margin:0}.carton-count-card>.measure-title{overflow-wrap:anywhere;font-size:12px;line-height:19px}.batch-sku{padding:10px;border:1px solid #cbdcf2;border-radius:8px;background:#fff}.summary-no{overflow-wrap:anywhere}.photo-card>.workflow-step{margin-top:0}
+.carton-title-row{display:flex;align-items:flex-start;gap:8px}.carton-title-row{flex-wrap:wrap}.carton-title-row>.measure-title{flex:1;min-width:150px}.delete-carton-button{flex:none;width:auto;margin:0;padding:0 8px;border:1px solid #f0caca;border-radius:7px;color:#b74545;background:#fff7f7;font-size:12px;line-height:30px}.add-sku-button{flex:none;width:auto;margin:0;padding:0 9px;border:1px solid #cbdcff;border-radius:7px;color:#135ee8;background:#f0f6ff;font-size:12px;line-height:30px}.add-sku-button[disabled]{color:#a0adbe;background:#f5f7fa}
+
+.pallet-index{display:flex;align-items:center;justify-content:center;width:34px;height:34px;border-radius:10px;color:#fff;font-size:13px;font-weight:850;background:#135ee8;box-shadow:0 4px 10px rgba(19,94,232,.2)}
+.transfer-page{display:flex;flex-direction:column}.transfer-page .transfer-scroll{flex:1;min-height:0;height:0}
+.transfer-work-toolbar{display:flex;flex-shrink:0;align-items:center;justify-content:space-between;gap:12px;padding:8px 14px;border-bottom:1px solid #e1e7ef;background:#fff}
+.transfer-work-toolbar .back-to-list,.transfer-work-toolbar .refresh-button{display:flex;align-items:center;justify-content:center;gap:4px;width:auto;min-height:40px;margin:0;padding:0 12px;border:1px solid #d6e2f1;border-radius:8px;color:#135ee8;font-size:13px;line-height:40px;background:#f8fbff}
+.carton-prerequisite{display:block;margin:0 0 12px;color:#718095;font-size:12px;line-height:18px}
+.active-receiving-pallet{border-color:#79a7ec!important}.pallet-brief{display:flex;align-items:center;flex-wrap:wrap;gap:10px;margin:-3px 0 12px;color:#3f5671;font-size:12px}.pallet-brief button{margin:0 0 0 auto;padding:0 10px;height:36px;line-height:36px;border-radius:8px;background:#eaf2ff;color:#135ee8;font-size:11px}.carton-filter,.batch-box-options{display:flex;flex-wrap:wrap;gap:7px;margin:12px 0}.carton-filter button,.batch-box-options button{width:auto;margin:0;padding:0 11px;height:36px;line-height:36px;border:1px solid #d4dfed;border-radius:9px;background:#fff;color:#5b6e84;font-size:12px}.carton-filter .active,.batch-box-options .chosen{border-color:#135ee8;background:#eaf2ff;color:#135ee8}.batch-count-panel .add-pallet-button{margin:0}.carton-count-card>.measure-title{overflow-wrap:anywhere;font-size:12px;line-height:19px}.batch-sku{padding:10px;border:1px solid #cbdcf2;border-radius:8px;background:#fff}.summary-no{overflow-wrap:anywhere}
 
 .batch-count-panel{margin:12px 0;padding:10px;border:1px solid #b9d3f4;border-radius:10px;background:#f4f8ff}.batch-sku{margin:10px 0;color:#17314f;font-size:12px;word-break:break-all}.batch-actions{display:flex;flex-wrap:wrap;gap:8px;margin:8px 0}.batch-actions button{width:auto;margin:0;padding:0 10px;min-height:34px;line-height:34px;font-size:11px;color:#135ee8;border:1px solid #b9d3f4;border-radius:7px;background:#fff}.batch-actions button[disabled]{opacity:.45}.batch-summary{display:block;margin:10px 0;color:#245981;font-size:11px;line-height:18px}
 
-.carton-count-card{padding:14px 10px;margin:10px 0;border:1px solid #d8e3f1;border-radius:12px}.carton-selected{border-color:#135ee8;background:#f0f6ff}
+.carton-count-card{padding:14px 10px;margin:10px 0;border:1px solid #d8e3f1;border-radius:12px}
 
-.transfer-page{height:100vh;overflow:hidden;background:#f2f5f9}.transfer-scroll{height:calc(100vh - 48px - var(--status-bar-height,0px))}.transfer-content{padding-bottom:52px}.transfer-heading{display:flex;align-items:flex-start;justify-content:space-between;gap:12px;margin:4px 2px 17px}.transfer-title,.transfer-subtitle,.transfer-no,.transfer-meta,.summary-eyebrow,.summary-no,.pallet-heading-copy text,.measure-title,.measure-hint,.sku-copy text,.validation-title,.transfer-validation>text,.feedback-title,.transfer-error>text,.transfer-success>text,.empty-title,.transfer-empty>text{display:block}.transfer-title{color:#14263d;font-size:22px;font-weight:850;letter-spacing:.2px}.transfer-subtitle{margin-top:4px;color:#718095;font-size:11px;line-height:17px}.refresh-button{display:flex;align-items:center;justify-content:center;gap:4px;width:auto;height:34px;margin:0;padding:0 11px;border:1px solid #b8d1f5;border-radius:17px;color:#135ee8;font-size:10px;line-height:34px;background:#f8fbff}.refresh-button[disabled]{opacity:.55}.section-heading{display:flex;align-items:center;justify-content:space-between;margin:0 2px 8px;color:#243951;font-size:12px;font-weight:800}.section-heading text:last-child{color:#8290a2;font-size:10px;font-weight:600}.candidate-list{display:flex;flex-direction:column;gap:9px;margin-bottom:16px}.transfer-card{box-sizing:border-box;width:100%;margin:0;padding:13px;border:1px solid #dce5f0;border-radius:13px;text-align:left;background:#fff;box-shadow:0 4px 15px rgba(32,67,111,.055)}.transfer-card.selected{border-color:#6da3f1;background:#f7faff;box-shadow:0 5px 18px rgba(19,94,232,.11)}.transfer-card-head{display:flex;align-items:center;justify-content:space-between;gap:10px}.transfer-no{overflow:hidden;color:#18324f;font-size:14px;font-weight:850;text-overflow:ellipsis;white-space:nowrap}.status-pill{flex-shrink:0;padding:4px 7px;border-radius:6px;color:#135ee8;font-size:9px;font-weight:750;background:#eaf2ff}.task-metrics{display:grid;grid-template-columns:.75fr 1.25fr .75fr;gap:6px;margin-top:11px}.task-metrics view{min-width:0;padding:7px 8px;border-radius:8px;background:#f4f7fa}.task-metrics text{display:block;color:#8492a4;font-size:8px}.task-metrics strong{display:block;overflow:hidden;margin-top:2px;color:#2c4058;font-size:11px;text-overflow:ellipsis;white-space:nowrap}.transfer-meta{margin-top:8px;color:#7b899b;font-size:9px}.transfer-empty{margin-bottom:12px;padding:26px 14px;border:1px dashed #ccd7e4;border-radius:13px;color:#8996a6;font-size:10px;line-height:18px;text-align:center;background:rgba(255,255,255,.65)}.empty-title{color:#56677b;font-size:12px;font-weight:800}.order-summary{display:flex;align-items:center;justify-content:space-between;gap:12px;padding:14px 15px;border-radius:14px 14px 0 0;color:#fff;background:linear-gradient(135deg,#123d73,#135ee8)}.summary-eyebrow{font-size:9px;opacity:.72}.summary-no{margin-top:3px;font-size:15px;font-weight:850}.summary-count{display:flex;align-items:baseline;gap:3px;flex-shrink:0}.summary-count strong{font-size:24px}.summary-count text{font-size:10px;opacity:.8}.summary-metrics{display:grid;grid-template-columns:repeat(3,1fr);margin-bottom:12px;padding:11px 8px;border-radius:0 0 14px 14px;background:#fff;box-shadow:0 5px 17px rgba(32,67,111,.07)}.summary-metrics view{position:relative;text-align:center}.summary-metrics view+view:before{position:absolute;top:3px;bottom:3px;left:0;width:1px;background:#e7edf4;content:''}.summary-metrics strong{display:block;color:#17314f;font-size:14px}.summary-metrics text{display:block;margin-top:2px;color:#8390a1;font-size:8px}.pallet-card{box-sizing:border-box;margin-bottom:12px;padding:14px;border:1px solid #d9e3ee;border-radius:15px;background:#fff;box-shadow:0 5px 18px rgba(32,67,111,.065)}.pallet-head{display:flex;align-items:center;gap:9px;margin:-2px -2px 14px;padding-bottom:11px;border-bottom:1px solid #edf1f5}.pallet-index{display:flex;align-items:center;justify-content:center;width:34px;height:34px;border-radius:10px;color:#fff;font-size:13px;font-weight:850;background:#135ee8;box-shadow:0 4px 10px rgba(19,94,232,.2)}.pallet-heading-copy{min-width:0;flex:1}.pallet-heading-copy text:first-child{color:#17314f;font-size:13px;font-weight:850}.pallet-heading-copy text:last-child{margin-top:2px;color:#8995a5;font-size:8px}.remove-button{width:auto;height:28px;margin:0;padding:0 9px;border-radius:7px;color:#b33030;font-size:9px;line-height:28px;background:#fff0f0}.field-label{display:block;margin-bottom:5px;color:#65768b;font-size:9px;font-weight:700}.field-label small{margin-left:3px;color:#9aa5b3;font-size:8px;font-weight:500}.measure-input,.input-with-unit{box-sizing:border-box;width:100%;height:42px;border:1px solid #cad7e5;border-radius:9px;color:#203750;background:#fafcfe}.measure-input{padding:0 11px;font-size:12px}.pallet-code-field{display:block;margin-bottom:14px}.measure-section-head,.sku-section-head{display:flex;align-items:center;justify-content:space-between;gap:10px;margin-bottom:9px}.measure-title{color:#243a53;font-size:11px;font-weight:850}.measure-hint{margin-top:2px;color:#8a96a5;font-size:8px}.volume-chip{flex-shrink:0;padding:5px 8px;border-radius:8px;text-align:right;background:#edf5ff}.volume-chip text{display:block;color:#7189a7;font-size:7px}.volume-chip strong{display:block;margin-top:1px;color:#135ee8;font-size:10px}.dimension-grid{display:grid;grid-template-columns:repeat(3,1fr);gap:7px}.measure-grid{display:grid;grid-template-columns:repeat(2,1fr);gap:9px;margin-top:10px}.input-with-unit{display:flex;align-items:center;overflow:hidden}.input-with-unit input{box-sizing:border-box;min-width:0;height:40px;padding:0 4px 0 10px;flex:1;color:#203750;font-size:16px;font-weight:800}.input-with-unit>text{padding-right:8px;color:#8491a1;font-size:8px}.input-with-unit.important{border-color:#9ebff0;background:#f8fbff}.sku-section{margin:15px -2px -2px;padding:12px;border-radius:11px;background:#f5f8fb}.sku-total{flex-shrink:0;padding:5px 7px;border-radius:7px;color:#9a5c13;font-size:9px;font-weight:800;background:#fff1dd}.sku-total.matched{color:#08705f;background:#dff5ed}.sku-row{display:flex;align-items:center;gap:9px;min-height:48px;border-top:1px solid #e3eaf2}.sku-copy{min-width:0;flex:1}.sku-code{overflow:hidden;color:#233b56;font-size:11px;font-weight:800;text-overflow:ellipsis;white-space:nowrap}.sku-copy text:last-child{margin-top:2px;color:#8693a3;font-size:8px}.sku-input{display:flex;align-items:center;gap:4px;color:#718095;font-size:9px}.sku-input input{box-sizing:border-box;width:64px;height:34px;padding:0 7px;border:1px solid #abc4e8;border-radius:8px;color:#17314f;font-size:14px;font-weight:800;text-align:center;background:#fff}.add-pallet-button{display:flex;align-items:center;justify-content:center;gap:5px;box-sizing:border-box;width:100%;height:44px;margin:2px 0 11px;border:1px dashed #78a8ed;border-radius:11px;color:#135ee8;font-size:11px;font-weight:800;background:#f7faff}.transfer-validation,.transfer-error,.transfer-success{box-sizing:border-box;margin-bottom:11px;padding:11px 12px;border-radius:10px;font-size:9px;line-height:16px}.transfer-validation,.transfer-error{color:#9d3030;background:#fff0f0}.validation-title,.feedback-title{font-size:11px;font-weight:850}.transfer-success{color:#176b42;background:#eaf8f1}.submit-panel{box-sizing:border-box;padding:12px;border:1px solid #dce5f0;border-radius:13px;background:#fff;box-shadow:0 5px 18px rgba(32,67,111,.07)}.submit-panel>view{display:flex;align-items:center;justify-content:space-between;margin-bottom:9px;color:#778598;font-size:9px}.submit-panel strong{color:#243951;font-size:11px}.transfer-primary{box-sizing:border-box;width:100%;height:44px;margin:0;border-radius:9px;color:#fff;font-size:12px;font-weight:850;line-height:44px;background:#135ee8}.transfer-primary[disabled]{color:#9aa7b5;background:#e7ecf2;opacity:1}
+.transfer-page{height:100vh;overflow:hidden;background:#f2f5f9}.transfer-scroll{height:calc(100vh - 48px - var(--status-bar-height,0px))}.transfer-content{padding-bottom:52px}.transfer-heading{display:flex;align-items:flex-start;justify-content:space-between;gap:12px;margin:4px 2px 17px}.transfer-title,.transfer-subtitle,.transfer-no,.transfer-meta,.summary-eyebrow,.summary-no,.pallet-heading-copy text,.measure-title,.measure-hint,.sku-copy text,.validation-title,.transfer-validation>text,.feedback-title,.transfer-error>text,.transfer-success>text,.empty-title,.transfer-empty>text{display:block}.transfer-title{color:#14263d;font-size:22px;font-weight:850;letter-spacing:.2px}.transfer-subtitle{margin-top:4px;color:#718095;font-size:11px;line-height:17px}.refresh-button{display:flex;align-items:center;justify-content:center;gap:4px;width:auto;height:34px;margin:0;padding:0 11px;border:1px solid #b8d1f5;border-radius:17px;color:#135ee8;font-size:10px;line-height:34px;background:#f8fbff}.refresh-button[disabled]{opacity:.55}.section-heading{display:flex;align-items:center;justify-content:space-between;margin:0 2px 8px;color:#243951;font-size:12px;font-weight:800}.section-heading text:last-child{color:#8290a2;font-size:10px;font-weight:600}.candidate-list{display:flex;flex-direction:column;gap:9px;margin-bottom:16px}.transfer-card{box-sizing:border-box;width:100%;margin:0;padding:13px;border:1px solid #dce5f0;border-radius:13px;text-align:left;background:#fff;box-shadow:0 4px 15px rgba(32,67,111,.055)}.transfer-card.selected{border-color:#6da3f1;background:#f7faff;box-shadow:0 5px 18px rgba(19,94,232,.11)}.transfer-card-head{display:flex;align-items:center;justify-content:space-between;gap:10px}.transfer-no{overflow:hidden;color:#18324f;font-size:14px;font-weight:850;text-overflow:ellipsis;white-space:nowrap}.status-pill{flex-shrink:0;padding:4px 7px;border-radius:6px;color:#135ee8;font-size:9px;font-weight:750;background:#eaf2ff}.task-metrics{display:grid;grid-template-columns:.75fr 1.25fr .75fr;gap:6px;margin-top:11px}.task-metrics view{min-width:0;padding:7px 8px;border-radius:8px;background:#f4f7fa}.task-metrics text{display:block;color:#8492a4;font-size:8px}.task-metrics strong{display:block;overflow:hidden;margin-top:2px;color:#2c4058;font-size:11px;text-overflow:ellipsis;white-space:nowrap}.transfer-meta{margin-top:8px;color:#7b899b;font-size:9px}.transfer-empty{margin-bottom:12px;padding:26px 14px;border:1px dashed #ccd7e4;border-radius:13px;color:#8996a6;font-size:10px;line-height:18px;text-align:center;background:rgba(255,255,255,.65)}.empty-title{color:#56677b;font-size:12px;font-weight:800}.order-summary{display:flex;align-items:center;justify-content:space-between;gap:12px;padding:14px 15px;border-radius:14px 14px 0 0;color:#fff;background:linear-gradient(135deg,#123d73,#135ee8)}.summary-eyebrow{font-size:9px;opacity:.72}.summary-no{margin-top:3px;font-size:15px;font-weight:850}.summary-count{display:flex;align-items:baseline;gap:3px;flex-shrink:0}.summary-count strong{font-size:24px}.summary-count text{font-size:10px;opacity:.8}.summary-metrics{display:grid;grid-template-columns:repeat(3,1fr);margin-bottom:12px;padding:11px 8px;border-radius:0 0 14px 14px;background:#fff;box-shadow:0 5px 17px rgba(32,67,111,.07)}.summary-metrics view{position:relative;text-align:center}.summary-metrics view+view:before{position:absolute;top:3px;bottom:3px;left:0;width:1px;background:#e7edf4;content:''}.summary-metrics strong{display:block;color:#17314f;font-size:14px}.summary-metrics text{display:block;margin-top:2px;color:#8390a1;font-size:8px}.pallet-card{box-sizing:border-box;margin-bottom:12px;padding:14px;border:1px solid #d9e3ee;border-radius:15px;background:#fff;box-shadow:0 5px 18px rgba(32,67,111,.065)}.pallet-head{display:flex;align-items:center;gap:9px;margin:-2px -2px 14px;padding-bottom:11px;border-bottom:1px solid #edf1f5}.pallet-heading-copy{min-width:0;flex:1}.pallet-heading-copy text:first-child{color:#17314f;font-size:13px;font-weight:850}.pallet-heading-copy text:last-child{margin-top:2px;color:#8995a5;font-size:8px}.remove-button{width:auto;height:28px;margin:0;padding:0 9px;border-radius:7px;color:#b33030;font-size:9px;line-height:28px;background:#fff0f0}.field-label{display:block;margin-bottom:5px;color:#65768b;font-size:9px;font-weight:700}.field-label small{margin-left:3px;color:#9aa5b3;font-size:8px;font-weight:500}.measure-input,.input-with-unit{box-sizing:border-box;width:100%;height:42px;border:1px solid #cad7e5;border-radius:9px;color:#203750;background:#fafcfe}.measure-input{padding:0 11px;font-size:12px}.pallet-code-field{display:block;margin-bottom:14px}.measure-section-head,.sku-section-head{display:flex;align-items:center;justify-content:space-between;gap:10px;margin-bottom:9px}.measure-title{color:#243a53;font-size:11px;font-weight:850}.measure-hint{margin-top:2px;color:#8a96a5;font-size:8px}.volume-chip{flex-shrink:0;padding:5px 8px;border-radius:8px;text-align:right;background:#edf5ff}.volume-chip text{display:block;color:#7189a7;font-size:7px}.volume-chip strong{display:block;margin-top:1px;color:#135ee8;font-size:10px}.dimension-grid{display:grid;grid-template-columns:repeat(3,1fr);gap:7px}.measure-grid{display:grid;grid-template-columns:repeat(2,1fr);gap:9px;margin-top:10px}.input-with-unit{display:flex;align-items:center;overflow:hidden}.input-with-unit input{box-sizing:border-box;min-width:0;height:40px;padding:0 4px 0 10px;flex:1;color:#203750;font-size:16px;font-weight:800}.input-with-unit>text{padding-right:8px;color:#8491a1;font-size:8px}.input-with-unit.important{border-color:#9ebff0;background:#f8fbff}.sku-section{margin:15px -2px -2px;padding:12px;border-radius:11px;background:#f5f8fb}.sku-total{flex-shrink:0;padding:5px 7px;border-radius:7px;color:#9a5c13;font-size:9px;font-weight:800;background:#fff1dd}.sku-total.matched{color:#08705f;background:#dff5ed}.sku-row{display:flex;align-items:center;gap:9px;min-height:48px;border-top:1px solid #e3eaf2}.sku-copy{min-width:0;flex:1}.sku-code{overflow:hidden;color:#233b56;font-size:11px;font-weight:800;text-overflow:ellipsis;white-space:nowrap}.sku-copy text:last-child{margin-top:2px;color:#8693a3;font-size:8px}.sku-input{display:flex;align-items:center;gap:4px;color:#718095;font-size:9px}.sku-input input{box-sizing:border-box;width:64px;height:34px;padding:0 7px;border:1px solid #abc4e8;border-radius:8px;color:#17314f;font-size:14px;font-weight:800;text-align:center;background:#fff}.add-pallet-button{display:flex;align-items:center;justify-content:center;gap:5px;box-sizing:border-box;width:100%;height:44px;margin:2px 0 11px;border:1px dashed #78a8ed;border-radius:11px;color:#135ee8;font-size:11px;font-weight:800;background:#f7faff}.transfer-validation,.transfer-error,.transfer-success{box-sizing:border-box;margin-bottom:11px;padding:11px 12px;border-radius:10px;font-size:9px;line-height:16px}.transfer-validation,.transfer-error{color:#9d3030;background:#fff0f0}.validation-title,.feedback-title{font-size:11px;font-weight:850}.transfer-success{color:#176b42;background:#eaf8f1}.submit-panel{box-sizing:border-box;padding:12px;border:1px solid #dce5f0;border-radius:13px;background:#fff;box-shadow:0 5px 18px rgba(32,67,111,.07)}.submit-panel>view{display:flex;align-items:center;justify-content:space-between;margin-bottom:9px;color:#778598;font-size:9px}.submit-panel strong{color:#243951;font-size:11px}.transfer-primary{box-sizing:border-box;width:100%;height:44px;margin:0;border-radius:9px;color:#fff;font-size:12px;font-weight:850;line-height:44px;background:#135ee8}.transfer-primary[disabled]{color:#9aa7b5;background:#e7ecf2;opacity:1}
 .photo-card{box-sizing:border-box;margin-bottom:11px;padding:14px;border:1px solid #d9e3ee;border-radius:13px;background:#fff;box-shadow:0 5px 18px rgba(32,67,111,.06)}
 .photo-head{display:flex;align-items:center;justify-content:space-between;gap:10px;margin-bottom:9px}
 .photo-count{flex-shrink:0;padding:5px 8px;border-radius:7px;color:#135ee8;font-size:9px;font-weight:800;background:#eaf2ff}
@@ -461,8 +470,8 @@ export default {
 .print-card{box-sizing:border-box;margin-bottom:11px;padding:14px;border:1px solid #b9d3f4;border-radius:13px;background:#f8fbff}.print-row button{width:auto;margin:0;padding:0 10px;color:#135ee8;border:1px solid #9fc0ef;border-radius:8px;background:#fff}.print-row{display:flex;align-items:center;justify-content:space-between;padding:10px 0;border-top:1px solid #dce8f5;color:#728196;font-size:9px}.print-code{display:block;color:#17314f;font-size:13px;font-weight:850}
 .generate-button{width:100%;margin-top:12px;color:#fff;background:#135ee8}.generated-card{display:flex;align-items:center;justify-content:space-between;margin-top:12px;padding:10px;border-radius:9px;background:#edf5ff}.generated-card button,.bind-panel>button{width:auto;margin:0;color:#135ee8;background:#fff}.bind-panel{margin-top:10px}.bound-state{margin-top:10px;padding:9px;border-radius:8px;color:#08705f;font-weight:800;background:#dff5ed}
 .generated-card,.print-row{gap:10px}.generated-card>view,.print-row>view{flex:1;min-width:0;overflow-wrap:anywhere}.generated-card button,.print-row button{flex-shrink:0;white-space:nowrap;padding:0 10px}
-.operation-detail-heading{display:flex;align-items:flex-start;gap:10px;margin:0 2px 12px;padding:2px 0}.back-to-list{width:auto;height:30px;margin:0;padding:0 9px;border:1px solid #c8d8ec;border-radius:8px;color:#135ee8;font-size:10px;line-height:30px;background:#f8fbff}.operation-detail-heading>view{min-width:0}.operation-detail-title{display:block;color:#243951;font-size:15px;font-weight:850}.operation-detail-subtitle{display:block;margin-top:3px;color:#8794a4;font-size:9px;line-height:14px}
+.back-to-list{width:auto;height:30px;margin:0;padding:0 9px;border:1px solid #c8d8ec;border-radius:8px;color:#135ee8;font-size:10px;line-height:30px;background:#f8fbff}
 .collapse-button{width:30px;height:28px;margin:0;padding:0;color:#135ee8;font-size:16px;line-height:28px;background:#edf5ff}
 .receipt-comparison{display:grid;grid-template-columns:repeat(3,1fr);gap:7px;margin-bottom:9px}.receipt-comparison view{padding:9px;border-radius:9px;text-align:center;background:#fff}.receipt-comparison strong,.receipt-comparison text{display:block}.receipt-comparison strong{color:#17314f;font-size:15px}.receipt-comparison text{margin-top:2px;color:#8390a1;font-size:8px}.receipt-comparison .difference{border:1px solid #e3a044;background:#fff4df}.receipt-comparison .difference strong,.receipt-comparison .difference text{color:#a35b0c;font-weight:800}
-.transfer-content .measure-hint{font-size:11px;line-height:17px}.transfer-content .measure-title{font-size:13px}.transfer-content .summary-metrics text{font-size:10px}.transfer-content .transfer-primary{height:46px;line-height:46px;font-size:14px}.transfer-content .photo-card{padding:14px}.transfer-content .pallet-heading-copy text:last-child{font-size:10px;line-height:16px}.transfer-content .summary-no{font-size:13px}.transfer-content .batch-summary{font-size:12px}
+.transfer-content .measure-hint{font-size:11px;line-height:17px}.transfer-content .measure-title{font-size:13px}.transfer-content .summary-metrics text{font-size:10px}.transfer-content .transfer-primary{height:46px;line-height:46px;font-size:14px}.transfer-content .photo-card{padding:14px}.transfer-content .pallet-heading-copy text:last-child{margin-top:2px;color:#8995a5;font-size:8px}.transfer-content .summary-no{font-size:13px}.transfer-content .batch-summary{font-size:12px}
 </style>
diff --git a/tests/warehouse-transfer-api.test.mjs b/tests/warehouse-transfer-api.test.mjs
index bb9704d..1b062a9 100644
--- a/tests/warehouse-transfer-api.test.mjs
+++ b/tests/warehouse-transfer-api.test.mjs
@@ -36,7 +36,7 @@ test('warehouse transfer page loads detail without exposing internal identifiers
 	assert.match(page, /entryMode === 'work' && taskNo/)
 	assert.match(page, /mode=work&task=\$\{encodeURIComponent\(String\(item\.transferNo\)\)\}/)
 	assert.match(page, /v-if="!selected && entryMode === 'list'"/)
-	assert.match(page, /作业详情/)
+	assert.match(page, /返回列表/)
 	assert.match(page, /backToCandidates\(\)/)
 	assert.match(page, /backToCandidates\(\) \{ if \(this\.submitting.*this\.entryMode = 'list'/)
 	assert.match(page, /存在未完结的测量单/)
diff --git a/tests/warehouse-transfer-mixed-cartons.test.mjs b/tests/warehouse-transfer-mixed-cartons.test.mjs
new file mode 100644
index 0000000..e625e00
--- /dev/null
+++ b/tests/warehouse-transfer-mixed-cartons.test.mjs
@@ -0,0 +1,117 @@
+import test from 'node:test'
+import assert from 'node:assert/strict'
+import { readFile } from 'node:fs/promises'
+
+const source = await readFile(new URL('../src/pages/warehouse-transfer/warehouse-transfer.vue', import.meta.url), 'utf8')
+const script = source.match(/<script>([\s\S]*?)<\/script>/)[1].replace(/^import .+$/gm, '').replace('export default', 'return')
+const page = new Function('CartonCountFields', 'PortalHeader', 'ScanTargetInput', 'session', script)({}, {}, {}, { currentUser: null })
+function context() {
+  const ctx = { ...page.data(), selected: { transferNo: 'WT1', packageCount: 2, items: [{ id: '1', skuCode: 'A' }, { id: '2', skuCode: 'B' }], cartons: [] }, saveCartonDraft() {} }
+  for (const [name, method] of Object.entries(page.methods)) ctx[name] = method.bind(ctx)
+  for (const [name, getter] of Object.entries(page.computed)) Object.defineProperty(ctx, name, { get: getter.bind(ctx), configurable: true })
+  ctx.saveCartonDraft = () => {}
+  return ctx
+}
+const box = (sku = 'A', quantity = 3) => ({ received: true, length: 10, width: 20, height: 30, weight: 2, items: [{ skuCode: sku, quantity }] })
+
+test('one carton can add distinct forecast SKUs and validates every quantity', () => {
+  const ctx = context(), current = box()
+  ctx.addCartonSku(current)
+  assert.deepEqual(current.items, [{ skuCode: 'A', quantity: 3 }, { skuCode: 'B', quantity: '' }])
+  assert.equal(ctx.validCartonSkuLines(current), false)
+  current.items[1].quantity = 7
+  assert.equal(ctx.validCartonSkuLines(current), true)
+  ctx.addCartonSku(current)
+  assert.equal(current.items.length, 2)
+  current.items[1].skuCode = 'A'
+  assert.equal(ctx.validCartonSkuLines(current), false)
+  current.items[1].skuCode = 'FOREIGN'
+  assert.equal(ctx.validCartonSkuLines(current), false)
+})
+
+test('single SKU batch changes never overwrite mixed carton contents', () => {
+  const ctx = context(), single = box(), mixed = box()
+  mixed.items.push({ skuCode: 'B', quantity: 7 })
+  ctx.cartonBoxes = [single, mixed]; ctx.batchSku = 'A'
+  ctx.selectBatchCartons(true)
+  assert.deepEqual(ctx.batchSelectedIndexes, [0])
+  ctx.toggleBatchCarton(1)
+  assert.deepEqual(ctx.batchSelectedIndexes, [0])
+  assert.equal(ctx.previousMatchingCarton(1), null)
+  assert.equal(ctx.cartonQuantity, 13)
+})
+
+test('delete only changes actual draft and preserves forecast; additions keep their own SKU rows', () => {
+  const ctx = context()
+  ctx.cartonBoxes = [box(), box('B')]; ctx.batchSelectedIndexes = [1]
+  ctx.removeCarton(0)
+  assert.equal(ctx.cartonBoxes.length, 1)
+  assert.equal(ctx.selected.packageCount, 2)
+  assert.deepEqual(ctx.batchSelectedIndexes, [])
+  ctx.addExtraCarton()
+  assert.equal(ctx.cartonBoxes.length, 2)
+  assert.equal(ctx.cartonBoxes[1].items[0].skuCode, 'A')
+  ctx.cartonBoxes[1].items[0].quantity = 8
+  assert.equal(ctx.cartonBoxes[0].items[0].quantity, 3)
+})
+
+test('draft reload preserves deletions, including an empty actual list', () => {
+  const ctx = context()
+  ctx.selected.cartons = [{ cartonMark: 'BOX1', transferItemId: '1', status: 'EXPECTED' }, { cartonMark: 'BOX2', transferItemId: '2', status: 'EXPECTED' }]
+  let saved = { boxes: [{ ...box('B'), cartonMark: 'BOX2', transferItemId: '2' }], discrepancyReason: '少到一箱' }
+  globalThis.uni = { getStorageSync: () => saved }
+  try {
+    ctx.restoreCartons()
+    assert.equal(ctx.cartonBoxes.length, 1)
+    assert.equal(ctx.cartonBoxes[0].cartonMark, 'BOX2')
+    assert.equal(ctx.countDiscrepancyReason, '少到一箱')
+    saved = { boxes: [], discrepancyReason: '重新录入' }
+    ctx.restoreCartons()
+    assert.equal(ctx.cartonBoxes.length, 0)
+    assert.equal(ctx.selected.cartons.length, 2)
+  } finally { delete globalThis.uni }
+})
+
+test('100 same SKU cartons accept two distinct specification groups and independent exceptions', () => {
+  const ctx = context()
+  ctx.selected.packageCount = 100
+  ctx.pallets = [{ generated: true, draftId: 'P1' }, { generated: true, draftId: 'P2' }]
+  ctx.cartonBoxes = Array.from({ length: 100 }, (_, index) => ({ ...box('A', ''), localKey: `BOX-${index}`, transferItemId: '1', length: '', width: '', height: '', weight: '' }))
+  ctx.batchSku = 'A'; ctx.batchPalletId = 'P1'; ctx.batchBox = { ...box('A', 12), length: 40, width: 30, height: 20, weight: 5 }
+  ctx.selectBatchCartons(true)
+  for (let index = 60; index < 100; index++) ctx.toggleBatchCarton(index)
+  assert.equal(ctx.batchTargetBoxes.length, 60)
+  assert.equal(ctx.batchTotalQuantity, 720)
+  ctx.applyBatchCartons()
+  assert.equal(ctx.cartonBoxes[59].items[0].quantity, 12)
+  assert.equal(ctx.cartonBoxes[60].items[0].quantity, '')
+  ctx.selectBatchCartons(true)
+  for (let index = 0; index < 60; index++) ctx.toggleBatchCarton(index)
+  ctx.batchPalletId = 'P2'; ctx.batchBox = { ...box('A', 8), length: 50, width: 40, height: 30, weight: 7 }
+  ctx.applyBatchCartons()
+  assert.equal(ctx.palletSummary(ctx.pallets[0]).cartonCount, 60)
+  assert.equal(ctx.palletSummary(ctx.pallets[1]).cartonCount, 40)
+  assert.equal(ctx.cartonQuantity, 1040)
+  assert.equal(ctx.totalWeight, '580.00')
+  assert.equal(ctx.totalVolume, '3.840000')
+  assert.equal(ctx.cartonCountReady, true)
+  ctx.cartonBoxes[0].items[0].quantity = 11
+  ctx.cartonBoxes[0].weight = 6
+  assert.equal(ctx.cartonBoxes[1].items[0].quantity, 12)
+  assert.equal(ctx.cartonBoxes[1].weight, 5)
+  assert.equal(ctx.batchBox.items[0].quantity, 8)
+  assert.equal(ctx.cartonQuantity, 1039)
+  assert.equal(ctx.totalWeight, '581.00')
+})
+
+test('copy previous matching SKU skips other SKUs and preserves the target pallet', () => {
+  const ctx = context()
+  ctx.cartonBoxes = [{ ...box('A', 12), length: 40, width: 30, height: 20, weight: 5, transferPalletId: 'P1' }, box('B', 99), { ...box('A', ''), transferPalletId: 'P2' }]
+  ctx.copyPreviousCarton(2)
+  assert.equal(ctx.cartonBoxes[2].length, 40)
+  assert.equal(ctx.cartonBoxes[2].weight, 5)
+  assert.equal(ctx.cartonBoxes[2].items[0].quantity, 12)
+  assert.equal(ctx.cartonBoxes[2].transferPalletId, 'P2')
+  ctx.cartonBoxes[2].items[0].quantity = 9
+  assert.equal(ctx.cartonBoxes[0].items[0].quantity, 12)
+})

From 2410a5dce32a72e4b3f1a98ba3340d09f08ad4be Mon Sep 17 00:00:00 2001
From: liuyihe <2513762445@qq.com>
Date: Fri, 16 Oct 2026 11:43:15 +0800
Subject: [PATCH 3/8] =?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/components/RelabelPalletWork.vue      | 46 +++++++++++---
 tests/relabel-pallet-measurement.test.mjs | 77 ++++++++++++++++++++++-
 2 files changed, 114 insertions(+), 9 deletions(-)

diff --git a/src/components/RelabelPalletWork.vue b/src/components/RelabelPalletWork.vue
index 9661914..033c253 100644
--- a/src/components/RelabelPalletWork.vue
+++ b/src/components/RelabelPalletWork.vue
@@ -11,12 +11,20 @@
     <view v-for="pallet in boundPalletTotals" :key="pallet.palletCode" class="hint"><text>{{ pallet.palletCode }} · {{ pallet.totalPackages }} 箱 · 体积 {{ pallet.volumeCbm == null ? '待补测' : pallet.volumeCbm + ' m³' }} · 重量 {{ pallet.grossWeightKg == null ? '待补测' : pallet.grossWeightKg + ' kg' }}</text></view>
     <view v-for="pallet in measurements" :key="pallet.palletCode" class="measurement-card">
       <text class="heading">{{ pallet.palletCode }} · {{ pallet.packages }} 箱</text>
-      <text class="hint">{{ pallet.inherited ? '原托盘货物未变，沿用原测量；包装变化请重新测量。' : '拆托、合托后请确认本托最终尺寸和毛重，原托盘剩余货物也需补测。' }}</text>
-      <text v-if="pallet.volumeCbm != null" class="hint">已确认：{{ pallet.volumeCbm }} m³ · {{ pallet.grossWeightKg }} kg</text>
-      <view class="measurement-inputs">
+      <text class="hint">{{ pallet.cartonAggregated ? '按当前托盘内实测箱自动汇总，移出扣减、移入增加。' : pallet.inherited ? '原托盘货物未变，沿用来源测量。' : '请核对托盘测量数据。' }}</text>
+      <text v-if="pallet.volumeCbm != null" class="hint">{{ pallet.inherited ? '来源汇总' : '已确认' }}：{{ pallet.volumeCbm }} m³ · {{ pallet.grossWeightKg }} kg</text>
+      <view v-if="pallet.inherited && pallet.sourceCartonSpecs?.length" class="source-carton-specs">
+        <text class="source-caption">来源箱规（长 × 宽 × 高）</text>
+        <text v-for="(spec, index) in pallet.sourceCartonSpecs" :key="index" class="hint">{{ spec.lengthCm }} × {{ spec.widthCm }} × {{ spec.heightCm }} cm · {{ spec.grossWeightKg }} kg/箱 · {{ spec.cartons }} 箱</text>
+      </view>
+      <text v-if="pallet.inherited && pallet.lengthCm > 0 && pallet.widthCm > 0 && pallet.heightCm > 0" class="hint">原整托尺寸：{{ pallet.lengthCm }} × {{ pallet.widthCm }} × {{ pallet.heightCm }} cm</text>
+      <text v-else-if="pallet.inherited && !pallet.cartonAggregated" class="hint">来源按箱测量，未测整托长宽高。</text>
+      <button v-if="!pallet.cartonAggregated && pallet.inherited && !pallet.remeasuring" :disabled="busy" @tap="pallet.remeasuring = true">包装变化，重新测量</button>
+      <view v-if="!pallet.cartonAggregated && (!pallet.inherited || pallet.remeasuring)" class="measurement-inputs">
         <label v-for="field in measurementFields" :key="field.key"><text>{{ field.label }}</text><input v-model="pallet[field.key]" type="digit" :disabled="busy" :placeholder="field.label" /></label>
       </view>
-      <button :disabled="busy" @tap="saveMeasurement(pallet)">确认本托实测</button>
+      <button v-if="!pallet.cartonAggregated && (!pallet.inherited || pallet.remeasuring)" :disabled="busy" @tap="saveMeasurement(pallet)">确认本托实测</button>
+      <button v-if="!pallet.cartonAggregated && pallet.inherited && pallet.remeasuring" :disabled="busy" @tap="pallet.remeasuring = false">取消重新测量</button>
     </view>
     <view v-if="rebindSelection"><text class="hint">正在改绑：{{ rebindSelection.mark }}，当前托盘：{{ rebindSelection.pallet }}</text><button :disabled="busy" @tap="rebindSelection = null; targetCode = ''; target = null">取消改绑</button></view>
     <template v-if="!allBindingsComplete && !rebindSelection">
@@ -37,7 +45,13 @@
         <text v-else class="hint">退货换标按整托绑定，不支持拆箱；托盘仍会展示用于核对。</text>
         <text class="hint">退货换标无需扫描箱唛。</text>
       </template>
-      <template v-else><view class="split-quantity-row"><text>本次拆出箱数</text><input v-model="quantity" type="number" :disabled="busy" placeholder="箱数" @input="marks = []" /><text>箱</text></view></template>
+      <template v-else><view class="split-quantity-row"><text>本次拆出箱数</text><input v-model="quantity" type="number" :disabled="busy" placeholder="箱数" @input="prepareMeasuredBatch" /><text>箱</text></view></template>
+    </view>
+    <view v-if="requiresMeasuredBoxChoice && marks.length" class="source-carton-specs">
+      <text class="hint">来源有多种箱规，请选择本次移出的实测箱，系统自动扣减体积和重量。</text>
+      <picker v-for="mark in marks" :key="mark" :range="measuredBoxOptions(mark)" range-key="label" :disabled="busy" @change="chooseMeasuredBox(mark, $event)">
+        <view class="hint">{{ mark }}：{{ measuredBoxLabel(mark) }}</view>
+      </picker>
     </view>
     <view class="split-progress"><template v-if="!isReturnBulk"><text>本次需换标拆 <strong>{{ requiredSplitPackages }}</strong> 箱</text><text>已拆 <strong>{{ splitPackages }}</strong> 箱</text></template><button class="create-pallet-button" :disabled="busy || !!newPallet" @tap="createPallet">新增托盘号</button></view>
     </template>
@@ -60,9 +74,11 @@ export default {
   components: { ScanTargetInput },
   props: { task: { type: Object, required: true }, allowDisassemble: { type: Boolean, default: true } },
   emits: ['activate', 'busy', 'saved'],
-  data() { return { measurements: [], measurementFields: [{ key: 'lengthCm', label: '长 cm' }, { key: 'widthCm', label: '宽 cm' }, { key: 'heightCm', label: '高 cm' }, { key: 'grossWeightKg', label: '毛重 kg' }], palletTotals: {}, rebindSelection: null, active: 'source', sourceCode: '', targetCode: '', source: null, target: null, marks: [], busy: false, error: '', message: '', newPallet: null, sourceRows: [], selectedSource: null, quantity: '', selectedDestination: '' } },
+  data() { return { measurements: [], measuredSelections: {}, measurementFields: [{ key: 'lengthCm', label: '长 cm' }, { key: 'widthCm', label: '宽 cm' }, { key: 'heightCm', label: '高 cm' }, { key: 'grossWeightKg', label: '毛重 kg' }], palletTotals: {}, rebindSelection: null, active: 'source', sourceCode: '', targetCode: '', source: null, target: null, marks: [], busy: false, error: '', message: '', newPallet: null, sourceRows: [], selectedSource: null, quantity: '', selectedDestination: '' } },
   mounted() { this.loadSources() },
   computed: {
+    measuredBoxChoices() { return this.measurements.find(p => p.palletCode === this.selectedSource?.palletCode)?.cartons || [] },
+    requiresMeasuredBoxChoice() { return new Set(this.measuredBoxChoices.map(box => [box.lengthCm,box.widthCm,box.heightCm,box.grossWeightKg].join(':'))).size > 1 },
     canRetainOriginal() { return !this.isReturnBulk && !this.unboundSourceMode && this.source && this.selectedSource && this.plannedPackages === Number(this.source.totalPackages) },
     boundPalletTotals() { const codes = new Set(this.currentBindings.map(binding => binding.pallet)); return Object.values(this.palletTotals).filter(pallet => codes.has(pallet.palletCode) && !this.measurements.some(measured => measured.palletCode === pallet.palletCode)) },
     allBindingsComplete() {
@@ -103,6 +119,18 @@ export default {
     readyToBind() { return this.target && this.selectedSource && (this.unboundSourceMode || (this.source && this.samePallet(this.source, this.selectedSource) && (!this.samePallet(this.source, this.target) || this.canRetainOriginal))) && Number.isSafeInteger(Number(this.quantity)) && Number(this.quantity) > 0 && Number(this.quantity) <= this.selectedSource.movablePackages && this.bindingSelectionValid() }
   },
   methods: {
+    prepareMeasuredBatch(event) {
+      this.quantity = String(event.detail.value)
+      this.marks = []; this.measuredSelections = {}
+      const count = Number(this.quantity)
+      if (this.measuredBoxChoices.length && Number.isSafeInteger(count) && count > 0 && count <= this.selectedSource.movablePackages && count <= this.eligibleItems.length) this.fillBatch()
+    },
+    measuredBoxOptions(mark) {
+      const used = Object.entries(this.measuredSelections || {}).filter(([key]) => key !== mark && this.marks.includes(key)).map(([,value]) => value)
+      return this.measuredBoxChoices.filter(box => !used.includes(box.cartonMark)).map(box => ({ ...box, label: `${box.cartonMark} · ${box.lengthCm}×${box.widthCm}×${box.heightCm} cm · ${box.grossWeightKg} kg` }))
+    },
+    chooseMeasuredBox(mark, event) { const box = this.measuredBoxOptions(mark)[Number(event.detail.value)]; if (box) this.measuredSelections = { ...this.measuredSelections, [mark]: box.cartonMark } },
+    measuredBoxLabel(mark) { return this.measuredBoxOptions(mark).find(box => box.cartonMark === this.measuredSelections?.[mark])?.label || '点击选择实测箱' },
     async saveMeasurement(pallet) {
       const dimensions = Object.fromEntries(this.measurementFields.map(field => [field.key, Number(pallet[field.key])]))
       if (!Object.values(dimensions).every(value => Number.isFinite(value) && value > 0)) { this.error = '请填写有效的长、宽、高和毛重'; return }
@@ -166,7 +194,7 @@ export default {
     async loadSources() { await this.run(async () => { try { this.sourceRows = await findRelabelSources(this.task.relabelNo) } catch (error) { if (!this.isReturnBulk && this.returnCartonItems.length) this.sourceRows = []; else throw error } if (!this.isReturnBulk && this.returnCartonItems.length && !this.sourceRows.some(row => Number(row.movablePackages) > 0)) this.sourceRows = [{ positionId: this.returnCartonItems[0].returnCartonId, positionVersion: 0, palletCode: 'UNBOUND', stockPackages: this.returnCartonItems.length, movablePackages: this.returnCartonItems.length, cartonMarks: this.returnCartonItems.map(item => item.cartonMark).filter(Boolean) }]; for (const code of new Set(this.currentBindings.map(binding => binding.pallet))) { const pallet = await resolvePallet(code); this.savePalletTotals({ pallets: [pallet] }) } this.measurements = await listRelabelPalletMeasurements(this.task.relabelNo); this.selectedSource = null; this.source = null; this.marks = []; this.quantity = ''; if (this.unboundSourceMode && this.operableSourceRows.length === 1) { this.selectedSource = this.operableSourceRows[0]; this.selectedDestination = this.returnCartonItems[0]?.destinationFbaWarehouseCode || ''; this.marks = this.completedItems().map(item => item.cartonMark); this.quantity = String(this.marks.length); this.activate('target') } }) },
     async selectSource(row) {
       if (this.busy) return
-      this.rebindSelection = null; this.selectedSource = row; this.source = null; this.sourceCode = ''; this.quantity = ''; this.marks = []
+      this.measuredSelections = {}; this.rebindSelection = null; this.selectedSource = row; this.source = null; this.sourceCode = ''; this.quantity = ''; this.marks = []
       this.selectedDestination = (this.isReturnBulk ? this.sourceItems() : this.completedItems())[0]?.destinationFbaWarehouseCode || ''
       if (this.unboundSourceMode) {
         this.marks = this.completedItems().map(item => item.cartonMark)
@@ -241,6 +269,7 @@ export default {
       else if (this.isReturnBulk && this.completedItems().length !== this.eligibleItems.length) reason = '请先完成本托盘的 SKU 贴标登记，再绑定新托盘；整托无需填写拆箱数量。'
       else if (!Number.isSafeInteger(Number(this.quantity)) || Number(this.quantity) <= 0 || Number(this.quantity) > this.selectedSource.movablePackages) reason = this.isReturnBulk ? '本托盘可操作件数不足，请刷新来源托盘。' : '请填写有效的拆出箱数，不能超过来源托盘可拆数量。'
       else if (!this.selectedDestination || !this.bindingSelectionValid()) reason = this.isReturnBulk ? `本托盘拆箱数量必须等于贴标预报分配数量 ${this.plannedPackages} 件。` : '本次拆出箱数必须对应已完成换标且尚未拆出的同目的仓箱唛。'
+      else if (this.requiresMeasuredBoxChoice && this.marks.some(mark => !this.measuredSelections?.[mark])) reason = '请选择本次移出的实测箱，系统将按所选箱扣减体积和重量。'
       else if (!this.targetCode.trim()) reason = '请扫描或输入目标托盘号。'
       if (reason) { this.error = reason; this.showBindingMessage('尚未绑定', reason); return }
       await this.resolve('target')
@@ -280,8 +309,11 @@ export default {
     async createPallet() { const payload = { relabelNo: this.task.relabelNo }; const key = warehouseIdempotencyKey('relabel', 'new-pallet', payload); await this.run(async () => { this.newPallet = await createRelabelPallet({ ...payload, idempotencyKey: key.value }); this.target = null; this.targetCode = this.newPallet.palletCode || ''; this.activate('target') }) },
     async bind() {
       if (!this.readyToBind) { this.error = '请核对来源托盘、拆出箱数、本批箱唛和目标托盘'; return }
+      const measuredCartons = this.requiresMeasuredBoxChoice ? this.marks.map(mark => ({ cartonMark: mark, sourceCartonMark: this.measuredSelections?.[mark] })) : []
+      if (measuredCartons.some(row => !row.sourceCartonMark)) { this.error = '请选择本次移出的实测箱'; return }
       const expectation = value => ({ palletCode: value.palletCode, expectedVersion: value.palletVersion })
       const payload = { relabelNo: this.task.relabelNo, ...(this.unboundSourceMode ? {} : { source: expectation(this.source), actualSource: { positionId: this.selectedSource.positionId, expectedPositionVersion: this.selectedSource.positionVersion, packages: Number(this.quantity) } }), target: expectation(this.target), cartonMarks: [...this.marks], reason: this.unboundSourceMode ? 'PDA 扫描无来源托盘退货箱并绑定目的托盘' : 'PDA 按原入仓单箱数拆托并按新目的仓合托' }
+      if (measuredCartons.length) payload.measuredCartons = measuredCartons
       const key = warehouseIdempotencyKey('relabel', 'bind-pallet', payload)
       let saved = false
       await this.run(async () => { await bindRelabelPallet({ ...payload, idempotencyKey: key.value }); saved = true; releaseWarehouseKey('relabel', key.signature); const createdKey = warehouseIdempotencyKey('relabel', 'new-pallet', { relabelNo: this.task.relabelNo }); releaseWarehouseKey('relabel', createdKey.signature); this.message = `托盘 ${this.target.palletCode} 已绑定`; this.marks = []; this.source = null; this.target = null; this.newPallet = null; this.sourceCode = ''; this.targetCode = ''; this.$emit('saved'); this.activate('source') })
diff --git a/tests/relabel-pallet-measurement.test.mjs b/tests/relabel-pallet-measurement.test.mjs
index 943c891..2e3e6ec 100644
--- a/tests/relabel-pallet-measurement.test.mjs
+++ b/tests/relabel-pallet-measurement.test.mjs
@@ -1,14 +1,16 @@
 import test from 'node:test'
 import assert from 'node:assert/strict'
 import { readFile } from 'node:fs/promises'
+import { createSSRApp } from 'vue'
+import { renderToString } from 'vue/server-renderer'
 
 const source = await readFile(new URL('../src/components/RelabelPalletWork.vue', import.meta.url), 'utf8')
 const script = source.split('<script>')[1].split('</script>')[0].replace(/^import .*$/gm, '').replace('export default', 'return')
 function setup() {
   const calls = []
-  const component = new Function('ScanTargetInput', 'measureRelabelPallet', 'warehouseIdempotencyKey', 'releaseWarehouseKey', script)(
+  const component = new Function('ScanTargetInput', 'measureRelabelPallet', 'warehouseIdempotencyKey', 'releaseWarehouseKey', 'bindRelabelPallet', script)(
     {}, async payload => { calls.push(payload); return [{ palletCode: payload.palletCode, volumeCbm: 0.25, grossWeightKg: payload.grossWeightKg }] },
-    () => ({ value: 'stable-key', signature: 'signature' }), () => {})
+    () => ({ value: 'stable-key', signature: 'signature' }), () => {}, async payload => calls.push(payload))
   const value = { ...component.data(), task: { relabelNo: 'RL-1' }, $emit() {} }
   for (const [key, method] of Object.entries(component.methods)) value[key] = method.bind(value)
   return { component, value, calls }
@@ -33,3 +35,74 @@ test('only whole physical pallet quantities offer original pallet reuse', () =>
   ctx.plannedPackages = 10;ctx.isReturnBulk = true
   assert.equal(canRetain.call(ctx), false)
 })
+
+async function renderMeasurements(measurements) {
+  const { component } = setup()
+  const template = source.slice(source.indexOf('<template>') + 10, source.indexOf('<script>')).trim().replace(/<\/template>$/, '')
+  return renderToString(createSSRApp({ ...component, template,
+    components: { ScanTargetInput: { template: '<view />' } },
+    props: undefined,
+    data() { return { ...component.data(), task: { relabelNo: 'RL-1', items: [], history: [] }, measurements } }
+  }))
+}
+test('unchanged source renders real grouped box specs and totals without zero pallet dimension inputs', async () => {
+  const html = await renderMeasurements([
+    { palletCode: 'FIRST', packages: 2, inherited: true, lengthCm: null, widthCm: null, heightCm: null,
+      grossWeightKg: 5, volumeCbm: 0.3, sourceCartonSpecs: [{ lengthCm: 60, widthCm: 50, heightCm: 50, grossWeightKg: 2.5, cartons: 2 }] },
+    { palletCode: 'SECOND', packages: 3, inherited: true, lengthCm: null, widthCm: null, heightCm: null,
+      grossWeightKg: 9.7, volumeCbm: 0.31, sourceCartonSpecs: [
+        { lengthCm: 60, widthCm: 50, heightCm: 50, grossWeightKg: 2.5, cartons: 1 },
+        { lengthCm: 50, widthCm: 40, heightCm: 40, grossWeightKg: 3.6, cartons: 2 }] }
+  ])
+  assert.match(html, /60 × 50 × 50 cm · 2.5 kg\/箱 · 2 箱/)
+  assert.match(html, /50 × 40 × 40 cm · 3.6 kg\/箱 · 2 箱/)
+  assert.match(html, /来源汇总：0.31 m³ · 9.7 kg/)
+  assert.match(html, /未测整托长宽高/)
+  assert.equal((html.match(/class="measurement-inputs"/g) || []).length, 0)
+  assert.doesNotMatch(html, /确认本托实测/)
+})
+test('changed pallets and explicit packaging changes still render final pallet measurement inputs', async () => {
+  for (const pallet of [{ inherited: false }, { inherited: true, remeasuring: true }]) {
+    const html = await renderMeasurements([{ ...pallet, palletCode: 'P', packages: 1 }])
+    assert.match(html, /class="measurement-inputs"/)
+    assert.match(html, /确认本托实测/)
+    assert.match(html, /长 cm/)
+  }
+})
+test('box aggregated pallets render current totals and no manual pallet measurement even after moving', async () => {
+  const html = await renderMeasurements([{ palletCode: 'NEW', packages: 1, inherited: true, cartonAggregated: true,
+    grossWeightKg: 3.6, volumeCbm: 0.08, sourceCartonSpecs: [{lengthCm:50,widthCm:40,heightCm:40,grossWeightKg:3.6,cartons:1}] }])
+  assert.match(html, /移出扣减、移入增加/)
+  assert.match(html, /0.08 m³ · 3.6 kg/)
+  assert.doesNotMatch(html, /确认本托实测|重新测量|measurement-inputs/)
+})
+test('mixed box selection is required and submits exact measured source box with binding', async () => {
+  const { value, calls } = setup()
+  Object.assign(value, { readyToBind:true, requiresMeasuredBoxChoice:true, marks:['CUSTOMER'],
+    source:{palletCode:'OLD',palletVersion:1}, target:{palletCode:'NEW',palletVersion:1},
+    selectedSource:{positionId:'1',positionVersion:1},quantity:'1', loadSources:async()=>{}, showBindingMessage(){} })
+  await value.bind()
+  assert.equal(calls.length,0)
+  assert.match(value.error,/请选择/)
+  value.measuredSelections={CUSTOMER:'SMALL1'}
+  await value.bind()
+  assert.deepEqual(calls[0].measuredCartons,[{cartonMark:'CUSTOMER',sourceCartonMark:'SMALL1'}])
+})
+test('measured box picker excludes a box selected for another item', () => {
+  const { value } = setup()
+  Object.assign(value,{marks:['X','Y'],measuredSelections:{X:'A'},measuredBoxChoices:[
+    {cartonMark:'A',lengthCm:60,widthCm:50,heightCm:50,grossWeightKg:2.5},
+    {cartonMark:'B',lengthCm:50,widthCm:40,heightCm:40,grossWeightKg:3.6}]})
+  assert.deepEqual(value.measuredBoxOptions('Y').map(box=>box.cartonMark),['B'])
+  assert.equal(value.measuredBoxOptions('X').length,2)
+})
+test('entering split quantity prepares measured box choices before target binding', () => {
+  const { value } = setup()
+  Object.assign(value,{measuredBoxChoices:[{cartonMark:'A'}],eligibleItems:[{cartonMark:'X'}],
+    selectedSource:{movablePackages:1},measuredSelections:{OLD:'A'},fillBatch(){this.marks=['X']}})
+  value.prepareMeasuredBatch({detail:{value:'1'}})
+  assert.deepEqual(value.marks,['X'])
+  assert.deepEqual(value.measuredSelections,{})
+  value.prepareMeasuredBatch({detail:{value:'0'}})
+  assert.deepEqual(value.marks,[])
+})

From 5c43a820aa78f640cb5a802dd466b1b0f78b62b5 Mon Sep 17 00:00:00 2001
From: liuyihe <2513762445@qq.com>
Date: Fri, 16 Oct 2026 16:19:41 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AGENTS.md                                     |   2 +-
 src/api/warehouse-transfers.js                |   4 +
 src/components/CartonCountFields.vue          |  15 +-
 .../warehouse-transfer/warehouse-transfer.vue | 197 ++++++++++++++----
 tests/warehouse-transfer-api.test.mjs         |   8 +-
 tests/warehouse-transfer-counting.test.mjs    | 136 +++++++++++-
 .../warehouse-transfer-mixed-cartons.test.mjs |   6 +-
 7 files changed, 312 insertions(+), 56 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index ea0a386..f3207ef 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -61,7 +61,7 @@
 
 ## 海外业务接口边界
 
-- 仓储转运按托盘分别保存箱数、长宽高（cm）和毛重（kg），体积按本托尺寸计算；短收/超收仅展示差异，不以预报箱数强制核平。生成托盘号后锁定该卡测量数据，必须取得服务端绑定确认且至少有一张现场照片才能完成打托；完成请求只提交稳定幂等键和照片文件 ID，不重复提交整份托盘测量。重新进入从详情恢复托盘和鉴权照片；标签使用服务端 `labelDownloadPath` 下载 PDF，打开文档不等于真机打印完成。
+- 仓储转运按托盘分别保存箱数、长宽高（cm）和毛重（kg），体积按本托尺寸计算；SKU件数逐种核对差异，不以预报箱数强制核平。箱唛沿用客户预报编号，PDA不得另造新箱号；测量完成前客户可增加预报箱数，PDA刷新时合并新箱并保留本机草稿，清点提交携带forecastPackageCount拦截旧快照。生成托盘号后锁定该卡测量数据，必须取得服务端绑定确认且至少有一张现场照片才能完成打托；完成请求提交稳定幂等键、照片文件 ID，SKU实收件数有差异时在完成入口弹窗必填差异原因，不重复提交整份托盘测量。重新进入从详情恢复托盘和鉴权照片；标签使用服务端 `labelDownloadPath` 下载 PDF，打开文档不等于真机打印完成。
 
 - 换标目标确认即提交拆托合托，不再二次点击底部提交。`RelabelPalletWork.vue` 按当前轮次 `PALLET_BIND` 最新记录提供逐箱改绑，扫描新目标后弹窗确认，使用既有 `relabel-disassemble` 精确来源路径（不传 `actualSource`）；同目标不发写请求。服务器持有库存、托盘版本与幂等约束，已排车或出库禁止直接改绑。离线回归 `tests/relabel-pallet-work.test.mjs`，不等同真机验收。
 
diff --git a/src/api/warehouse-transfers.js b/src/api/warehouse-transfers.js
index 764ccc9..156b48d 100644
--- a/src/api/warehouse-transfers.js
+++ b/src/api/warehouse-transfers.js
@@ -54,6 +54,10 @@ export function countWarehouseTransferCartons(transferNo, payload) {
   return overseasRequest('POST', `${BASE}/${encoded(transferNo)}/cartons/count`, payload)
 }
 
+export function reopenWarehouseTransferMeasurement(transferNo) {
+  return overseasRequest('POST', `${BASE}/${encoded(transferNo)}/cartons/reopen`)
+}
+
 export function getWarehouseTransferCartonLabel(transferNo) {
   return overseasRequest('GET', `${BASE}/${encoded(transferNo)}/carton-label`)
 }
diff --git a/src/components/CartonCountFields.vue b/src/components/CartonCountFields.vue
index f3796da..481b29b 100644
--- a/src/components/CartonCountFields.vue
+++ b/src/components/CartonCountFields.vue
@@ -1,12 +1,17 @@
-<template><view><view class="measure-grid"><label><text>长（cm）</text><input v-model="box.length" type="digit" class="measure-input" :disabled="disabled" placeholder="长度" /></label><label><text>宽（cm）</text><input v-model="box.width" type="digit" class="measure-input" :disabled="disabled" placeholder="宽度" /></label><label><text>高（cm）</text><input v-model="box.height" type="digit" class="measure-input" :disabled="disabled" placeholder="高度" /></label><label><text>重量（kg）</text><input v-model="box.weight" type="digit" class="measure-input" :disabled="disabled" placeholder="重量" /></label></view><view class="volume-chip"><text>体积</text><strong>{{ boxVolume(box) }} cm³</strong></view>
-          <view v-for="(line, lineIndex) in box.items" :key="lineIndex" class="count-line"><picker class="sku-picker" :disabled="disabled || !allowSkuChange || (lockFirstSku && lineIndex === 0)" :range="lineSkuCodes(lineIndex)" :value="Math.max(0, lineSkuCodes(lineIndex).indexOf(line.skuCode))" @change="line.skuCode = lineSkuCodes(lineIndex)[Number($event.detail.value)]"><text>{{ line.skuCode || '选择 SKU' }} ▾</text></picker><input v-model="line.quantity" type="number" class="number-input quantity" :disabled="disabled" placeholder="数量" /><button v-if="!disabled && allowSkuChange && box.items.length > 1 && (!lockFirstSku || lineIndex > 0)" class="link-button" :disabled="disabled" @tap="box.items.splice(lineIndex, 1)">删除</button></view></view></template>
+<template><view :class="{ 'compact-measure': volumeUnit === 'm3' }"><view class="measure-grid"><label><text>长（cm）</text><input v-model="box.length" type="digit" class="measure-input" :disabled="disabled" placeholder="长度" /></label><label><text>宽（cm）</text><input v-model="box.width" type="digit" class="measure-input" :disabled="disabled" placeholder="宽度" /></label><label><text>高（cm）</text><input v-model="box.height" type="digit" class="measure-input" :disabled="disabled" placeholder="高度" /></label><label><text>重量（kg）</text><input v-model="box.weight" type="digit" class="measure-input" :disabled="disabled" placeholder="重量" /></label></view><view class="volume-chip"><text>体积</text><strong>{{ boxVolume(box) }} {{ volumeUnit === 'm3' ? 'm³' : 'cm³' }}</strong></view>
+          <view v-for="(line, lineIndex) in box.items" :key="lineIndex" class="count-line"><picker class="sku-picker" :disabled="disabled || !allowSkuChange || (lockFirstSku && lineIndex === 0)" :range="lineSkuCodes(lineIndex)" :value="Math.max(0, lineSkuCodes(lineIndex).indexOf(line.skuCode))" @change="line.skuCode = lineSkuCodes(lineIndex)[Number($event.detail.value)]"><text>{{ line.skuCode || '选择 SKU' }} ▾</text></picker><slot v-if="lineIndex === 0" name="sku-action" /><input v-model="line.quantity" type="number" class="number-input quantity" :disabled="disabled" placeholder="数量" /><button v-if="!disabled && allowSkuChange && box.items.length > 1 && (!lockFirstSku || lineIndex > 0)" class="link-button" :disabled="disabled" @tap="box.items.splice(lineIndex, 1)">删除</button></view></view></template>
 <script>
 export default {
-  props: { box: { type: Object, required: true }, skuCodes: { type: Array, default: () => [] }, disabled: Boolean, uniqueSkus: Boolean, lockFirstSku: Boolean, allowSkuChange: { type: Boolean, default: true } },
-  methods: { lineSkuCodes(index) { return this.uniqueSkus ? this.skuCodes.filter(sku => !this.box.items.some((line, other) => other !== index && line.skuCode === sku)) : this.skuCodes }, boxVolume(box) { const value = Number(box.length) * Number(box.width) * Number(box.height); return Number.isFinite(value) && value > 0 ? value.toFixed(2) : '—' } }
+  props: { box: { type: Object, required: true }, skuCodes: { type: Array, default: () => [] }, volumeUnit: { type: String, default: 'cm3' }, disabled: Boolean, uniqueSkus: Boolean, lockFirstSku: Boolean, allowSkuChange: { type: Boolean, default: true } },
+  methods: {
+    // 混箱中同一 SKU 只出现一次，保留当前行已选择的 SKU。
+    lineSkuCodes(index) { return this.uniqueSkus ? this.skuCodes.filter(sku => !this.box.items.some((line, other) => other !== index && line.skuCode === sku)) : this.skuCodes },
+    // 转运按立方米显示三位；其他作业保留原来的立方厘米显示。
+    boxVolume(box) { const value = Number(box.length) * Number(box.width) * Number(box.height); return Number.isFinite(value) && value > 0 ? (this.volumeUnit === 'm3' ? (value / 1000000).toFixed(3) : value.toFixed(2)) : '—' }
+  }
 }
 </script>
 <style scoped>
 .count-line{display:flex;align-items:center;gap:8px;margin-top:8px}.sku-picker{flex:1;min-width:0;font-size:12px;word-break:break-all}.quantity{box-sizing:border-box;flex:none;width:90px;height:34px;text-align:center;font-size:13px;border:1px solid #cbd9e8;border-radius:8px;background:#fbfdff}.link-button{width:auto;font-size:12px;color:#135ee8}
 .measure-grid{display:grid;grid-template-columns:repeat(2,1fr);gap:7px;margin:10px 0 6px}.measure-grid label text{display:block;margin-bottom:4px;color:#65768b;font-size:10px}.measure-input{box-sizing:border-box;width:100%;height:34px;padding:0 8px;border:1px solid #cbd9e8;border-radius:8px;color:#203750;font-size:13px;text-align:center;background:#fbfdff}.volume-chip{display:flex;align-items:baseline;justify-content:flex-end;gap:4px;margin:4px 0 8px;color:#728197;font-size:10px}.volume-chip strong{color:#135ee8;font-size:14px}
-</style>
+.compact-measure .count-line{padding-top:8px;border-top:1px solid #edf1f6}.compact-measure .sku-picker{line-height:18px}.compact-measure .quantity{width:76px;font-weight:600;background:#fff}.compact-measure .measure-grid{gap:10px}.compact-measure .measure-input{height:38px;background:#f8fafd}.compact-measure .volume-chip{margin:8px 0;padding:6px 10px;border-radius:7px;background:#f4f8ff}.compact-measure .volume-chip strong{font-size:13px}</style>
diff --git a/src/pages/warehouse-transfer/warehouse-transfer.vue b/src/pages/warehouse-transfer/warehouse-transfer.vue
index ead8f28..64deff4 100644
--- a/src/pages/warehouse-transfer/warehouse-transfer.vue
+++ b/src/pages/warehouse-transfer/warehouse-transfer.vue
@@ -3,7 +3,7 @@
 		<PortalHeader :title="entryMode === 'list' ? '仓储转运测量列表' : '转运测量作业'" :user="user" fallback-url="/pages/module/module?key=inbound" />
 		<view v-if="entryMode === 'work'" class="transfer-work-toolbar">
 			<button class="back-to-list" @tap="backToCandidates"><uni-icons type="back" color="#135ee8" size="18" /><text>返回列表</text></button>
-			<button class="refresh-button" :disabled="loading" aria-label="刷新当前转运单" @tap="loadCandidates"><uni-icons type="refresh" color="#135ee8" size="18" /><text>{{ loading ? '加载中' : '刷新' }}</text></button>
+			<button class="refresh-button" :disabled="loading" aria-label="刷新当前转运单" @tap="refreshCurrentTransfer"><uni-icons type="refresh" color="#135ee8" size="18" /><text>{{ loading ? '加载中' : '刷新' }}</text></button>
 		</view>
 		<scroll-view scroll-y :scroll-into-view="cartonScrollTarget" scroll-with-animation class="transfer-scroll"><view class="portal-content transfer-content">
 			<view v-if="entryMode === 'list'" class="transfer-heading">
@@ -29,21 +29,23 @@
 				<view v-if="isMeasurementComplete" class="transfer-success"><text class="feedback-title">测量已完成</text><text>该转运单已完成 PDA 测量，不再重复进入测量或托盘作业。</text></view>
 				<view v-else-if="isInventoryTransfer" class="transfer-success inventory-transfer-panel"><text class="feedback-title">库存转运 · 无需测量</text><text>该单来源于仓库现有库存，不需要重复测量或上传现场照片。请进入托盘作业，按来源托盘执行整托转运、拆托重打，或与相同目的仓合托。</text><button class="transfer-primary" @tap="openPalletOperations">进入托盘作业</button></view>
 				<template v-if="!isInventoryTransfer && !isMeasurementComplete">
-				<view class="order-summary">
+				<view class="order-summary" @tap="summaryCollapsed = !summaryCollapsed" role="button" :aria-expanded="!summaryCollapsed" aria-label="展开或收起任务汇总">
 					<view><text class="summary-eyebrow">当前测量任务</text><text class="summary-no">{{ selected.transferNo }}</text></view>
 					<view class="summary-count"><strong>{{ cartonsCounted ? actualReceivedCartons : receivedCartonBoxes.length }}</strong><text>{{ cartonsCounted ? '实收箱' : '待确认箱' }}</text></view>
+					<text class="summary-toggle">{{ summaryCollapsed ? '展开 ⌄' : '收起 ⌃' }}</text>
 				</view>
-				<view class="receipt-comparison"><view><strong>{{ selected.packageCount || 0 }}</strong><text>客户预报</text></view><view><strong>{{ cartonsCounted ? actualReceivedCartons : '—' }}</strong><text>{{ cartonsCounted ? '当前实收' : '清点后确认' }}</text></view><view :class="{ difference: cartonsCounted && cartonDifference !== 0 }"><strong>{{ !cartonsCounted ? '—' : cartonDifference > 0 ? `+${cartonDifference}` : cartonDifference }}</strong><text>{{ !cartonsCounted ? '差异待确认' : cartonDifference === 0 ? '无差异' : cartonDifference > 0 ? '超收差异' : '短收差异' }}</text></view></view>
-				<view class="summary-metrics"><view><strong>{{ pallets.length }}</strong><text>托盘</text></view><view><strong>{{ totalVolume }}</strong><text>箱子总体积 m³</text></view><view><strong>{{ totalWeight }}</strong><text>箱子总重量 kg</text></view></view>
+				<view v-show="!summaryCollapsed" class="receipt-comparison"><view><strong>{{ forecastSkuQuantity }}</strong><text>客户预报（件）</text></view><view><strong>{{ cartonsCounted ? cartonQuantity : '—' }}</strong><text>SKU实收（件）</text></view><view :class="{ difference: cartonsCounted && hasSkuReceiptDifference }"><strong>{{ !cartonsCounted ? '—' : hasSkuReceiptDifference ? skuReceiptDifferences.length + ' 种' : '无差异' }}</strong><text>{{ !cartonsCounted ? '差异待确认' : 'SKU签收差异' }}</text></view></view>
+				<view v-show="!summaryCollapsed" class="summary-metrics"><view><strong>{{ pallets.length }}</strong><text>托盘</text></view><view><strong>{{ totalVolume }}</strong><text>箱子总体积 m³</text></view><view><strong>{{ totalWeight }}</strong><text>箱子总重量 kg</text></view></view>
 
 				<view v-for="(pallet, index) in pallets" :key="pallet.key" class="pallet-card" :class="{ 'active-receiving-pallet': String(receivingPalletId) === String(pallet.draftId) }">
 					<view class="pallet-head">
 						<view class="pallet-index"><text>{{ String(index + 1).padStart(2, '0') }}</text></view>
-						<view class="pallet-heading-copy"><text>托盘 {{ index + 1 }} · {{ pallet.bound ? '已绑定' : pallet.generated ? '待绑定' : '待创建' }}</text><text>{{ pallet.collapsed && pallet.palletNo ? pallet.palletNo : '先创建托盘号，再录入并分配签收箱子' }}</text></view>
-						<button v-if="pallets.length > 1 && !pallet.generated" class="remove-button" @tap.stop="removePallet(index)">移除</button>
+						<view class="pallet-heading-copy"><view class="pallet-title-line"><text class="pallet-name">托盘 {{ index + 1 }}</text><text class="pallet-status" :class="{ 'is-bound': pallet.bound }">{{ pallet.bound ? '已绑定' : pallet.generated ? '待绑定' : '待创建' }}</text></view></view>
+						<button class="remove-button" aria-label="删除托盘" :disabled="countingCartons || submitting || pallets.some(item => item.busy)" @tap.stop="removePallet(index)">×</button>
 						<button v-if="pallet.generated" class="collapse-button" :aria-label="pallet.collapsed ? '展开托盘明细' : '折叠托盘明细'" @tap.stop="pallet.collapsed = !pallet.collapsed">{{ pallet.collapsed ? '⌄' : '⌃' }}</button>
 					</view>
-					<view v-if="pallet.generated" class="pallet-brief"><text>{{ palletSummary(pallet).cartonCount }} 箱</text><text>{{ palletVolume(pallet) }} m³</text><text>{{ palletSummary(pallet).weight.toFixed(2) }} kg</text><button :disabled="cartonsCounted || countingCartons" @tap="useReceivingPallet(pallet)">{{ String(receivingPalletId) === String(pallet.draftId) ? '当前签收托盘' : '在此托盘签收' }}</button></view>
+					<view v-if="pallet.generated" class="pallet-stats"><view><strong>{{ palletSummary(pallet).cartonCount }}<text> 箱</text></strong><text>实收箱数</text></view><view><strong>{{ palletVolume(pallet) }}<text> m³</text></strong><text>体积</text></view><view><strong>{{ palletSummary(pallet).weight.toFixed(2) }}<text> kg</text></strong><text>重量</text></view></view>
+					<view v-if="pallet.generated" class="pallet-brief"><text class="pallet-business-code" selectable>{{ pallet.palletNo }}</text><text v-if="String(receivingPalletId) === String(pallet.draftId)" class="receiving-badge">当前签收</text><button v-else :disabled="cartonsCounted || countingCartons" @tap="useReceivingPallet(pallet)">设为签收托盘</button></view>
 					<view v-show="!pallet.collapsed">
                     <view class="measure-section-head"><view><text class="measure-title">本托箱子汇总</text><text class="measure-hint">由分配到本托的实收箱自动汇总，无需填写托盘尺寸和重量</text></view></view>
                     <view class="summary-metrics"><view><strong>{{ palletSummary(pallet).cartonCount }}</strong><text>实收箱数</text></view><view><strong>{{ palletVolume(pallet) }}</strong><text>箱子体积 m³</text></view><view><strong>{{ palletSummary(pallet).weight.toFixed(2) }}</strong><text>箱子重量 kg</text></view></view>
@@ -57,7 +59,7 @@
 				<button class="add-pallet-button" :disabled="cartonsCounted || countingCartons" @tap="addPallet"><uni-icons type="plus" color="#135ee8" size="18" /><text>新增一个托盘</text></button>
                 <text v-if="!generatedPallets.length" class="carton-prerequisite">请先生成托盘号，再填写签收箱子。</text>
                 <view v-if="generatedPallets.length" class="photo-card">
-                  <text id="transfer-boxes" class="measure-title">签收箱子</text>
+                  <view class="photo-head"><text id="transfer-boxes" class="measure-title">签收箱子</text><button v-if="cartonsCounted" class="remeasure-button" :disabled="countingCartons || submitting || pallets.some(item => item.busy)" @tap="remeasure">重新测量</button></view>
                   <view class="carton-filter"><button :class="{active: !cartonPalletFilter}" @tap="cartonPalletFilter = ''">全部箱子</button><button v-for="(pallet, index) in generatedPallets" :key="pallet.draftId" :class="{active: String(cartonPalletFilter) === String(pallet.draftId)}" @tap="cartonPalletFilter = pallet.draftId">托盘 {{ index + 1 }} · {{ palletSummary(pallet).cartonCount }} 箱</button></view>
                   <view v-if="!cartonsCounted" class="batch-count-panel">
                     <button class="add-pallet-button" :disabled="countingCartons" @tap="toggleBatchPanel">{{ batchCountOpen ? '收起批量填写' : '相同箱规？批量填写' }}</button>
@@ -67,27 +69,28 @@
                       <view class="batch-actions"><button :disabled="countingCartons" @tap="selectBatchCartons(true)">全选该 SKU</button><button :disabled="countingCartons" @tap="selectBatchCartons(false)">清空选择</button></view>
                       <view class="batch-box-options"><template v-for="(box, index) in cartonBoxes" :key="box.localKey || box.cartonMark"><button v-if="box.received !== false && box.items.length === 1 && box.items[0].skuCode === batchSku" :disabled="countingCartons" :class="{chosen: batchSelectedIndexes.includes(index)}" :aria-label="`选择第${index + 1}箱批量填写`" @tap="toggleBatchCarton(index)">{{ batchSelectedIndexes.includes(index) ? '✓' : '+' }} 第 {{ index + 1 }} 箱</button></template></view>
                       <picker :disabled="countingCartons" :range="generatedPallets.map(pallet => pallet.palletNo)" @change="batchPalletId = generatedPallets[Number($event.detail.value)]?.draftId || ''"><view class="batch-sku">批量所属托盘：{{ generatedPallets.find(pallet => String(pallet.draftId) === String(batchPalletId))?.palletNo || '请选择' }} ▾</view></picker>
-                      <CartonCountFields :box="batchBox" :sku-codes="[batchSku]" :allow-sku-change="false" :disabled="countingCartons" />
+                      <CartonCountFields :box="batchBox" volume-unit="m3" :sku-codes="[batchSku]" :allow-sku-change="false" :disabled="countingCartons" />
                       <text class="batch-summary">已选 {{ batchTargetBoxes.length }} 箱 · 每箱 {{ Number(batchBox.items[0].quantity) || 0 }} 件 · 合计 {{ batchTotalQuantity }} 件</text>
                       <button class="transfer-primary" :disabled="!batchCountReady || countingCartons" @tap="applyBatchCartons">应用到所选 {{ batchTargetBoxes.length }} 箱</button>
                       <text v-if="batchCountMessage" class="batch-summary" role="status">{{ batchCountMessage }}</text>
                     </view>
                   </view>
-                  <view v-for="(box, index) in cartonBoxes" v-show="!cartonPalletFilter || String(box.transferPalletId) === String(cartonPalletFilter)" :id="`transfer-box-${index}`" :key="box.localKey || box.cartonMark" class="carton-count-card">
-                    <view class="carton-title-row"><text class="measure-title">第 {{ index + 1 }} 箱 · {{ box.cartonMark || '新增实收箱（确认后生成箱号）' }}</text><button v-if="!cartonsCounted" class="add-sku-button" :disabled="countingCartons || box.received === false || box.items.length >= Math.min(200, declaredSkuCodes.length)" @tap="addCartonSku(box)">添加 SKU</button><button v-if="!cartonsCounted" class="delete-carton-button" :disabled="countingCartons" @tap="removeCarton(index)">删除箱子</button></view>
+                  <view v-for="(box, index) in cartonBoxes" v-show="!cartonPalletFilter || String(box.transferPalletId) === String(cartonPalletFilter)" :id="`transfer-box-${index}`" :key="box.localKey || box.cartonMark" class="carton-count-card" :class="{ 'carton-collapsed': cartonConfirmed(box) }">
+                    <view v-if="cartonConfirmed(box)" class="collapsed-carton-row"><scroll-view class="collapsed-carton-mark" scroll-x><text @tap="editCarton(box)">{{ box.cartonMark || '新增实收箱' }}</text></scroll-view><button class="collapsed-carton-expand" aria-label="展开修改箱子" :disabled="countingCartons || submitting" @tap="editCarton(box)"><uni-icons type="down" color="#7185a0" size="16" /></button></view>
+                    <template v-else>
+                    <view class="carton-title-row"><text class="measure-title">第 {{ index + 1 }} 箱</text><view class="carton-icon-actions"><button v-if="!cartonsCounted" class="delete-carton-button" aria-label="删除箱子" :disabled="countingCartons" @tap="removeCarton(index)">×</button></view></view>
+                    <text class="carton-business-code" selectable>{{ box.cartonMark || '新增实收箱' }}</text>
                     <view v-if="!cartonsCounted" class="batch-actions">
 
                       <button v-if="previousMatchingCarton(index)" :disabled="countingCartons || box.received === false || !validCartonValues(previousMatchingCarton(index))" @tap="copyPreviousCarton(index)">复制上一同 SKU 箱</button>
                     </view>
-                    <text v-if="box.customerCartonMark" class="measure-hint">客户箱唛：{{ box.customerCartonMark }}</text>
-                    <text class="measure-hint">可添加本单预报 SKU，数量按箱内实际件数填写</text>
                     <picker :disabled="cartonsCounted || countingCartons || box.received === false" :range="generatedPallets.map(pallet => pallet.palletNo)" :value="Math.max(0, generatedPallets.findIndex(pallet => String(pallet.draftId) === String(box.transferPalletId)))" @change="assignCartonPallet(box, Number($event.detail.value))"><view class="batch-sku">所属托盘：{{ cartonPalletLabel(box) }} ▾</view></picker>
-                    <CartonCountFields :box="box" :sku-codes="declaredSkuCodes" :unique-skus="true" :lock-first-sku="Boolean(box.cartonMark)" :disabled="cartonsCounted || countingCartons || box.received === false" />
+                    <CartonCountFields :box="box" :sku-codes="declaredSkuCodes" :unique-skus="true" :lock-first-sku="Boolean(box.cartonMark)" volume-unit="m3" :disabled="cartonsCounted || countingCartons || box.received === false"><template #sku-action><button v-if="!cartonsCounted && declaredSkuCodes.length > 1" class="add-sku-button" aria-label="添加 SKU" :disabled="countingCartons || box.received === false || box.items.length >= Math.min(200, declaredSkuCodes.length)" @tap="addCartonSku(box)">＋</button></template></CartonCountFields>
+                    <button class="confirm-carton-button" :disabled="countingCartons || submitting || !validCartonValues(box) || !generatedPallets.some(pallet => String(pallet.draftId) === String(box.transferPalletId))" @tap="confirmSingleCarton(box)">确认本箱</button>
+                    </template>
                   </view>
                   <button v-if="cartonsCounted" class="add-pallet-button" @tap="printCartonLabels">打开箱标签打印</button>
-                  <button v-if="!cartonsCounted" class="add-pallet-button" :disabled="countingCartons" @tap="addExtraCarton">新增实收箱</button>
-                  <label v-if="receivedCartonBoxes.length !== Number(selected.packageCount)"><text class="measure-hint">差异原因（必填）</text><textarea v-model="countDiscrepancyReason" :disabled="cartonsCounted || countingCartons" maxlength="1000" placeholder="填写短收或超收原因" /></label>
-                  <button class="transfer-primary" :disabled="!cartonCountReady || countingCartons || cartonsCounted" @tap="confirmCartons">{{ cartonsCounted ? '全部箱子已清点' : countingCartons ? '保存中…' : '确认逐箱测量清点' }}</button>
+                  <button class="transfer-primary" :disabled="!allCartonsConfirmed || !cartonCountReady || countingCartons || cartonsCounted" @tap="confirmCartons">{{ cartonsCounted ? '全部箱子已清点' : countingCartons ? '保存中…' : '保存全部清点结果' }}</button>
                 </view>
 				<view class="photo-card">
 					<view class="photo-head"><view><text class="measure-title">测量现场照片</text><text class="measure-hint">完成测量并打托前至少拍摄 1 张</text></view><text class="photo-count">{{ photoFileIds.length }} / 20 张</text></view>
@@ -119,7 +122,7 @@ import ScanTargetInput from '@/components/ScanTargetInput.vue'
 import { session, requireSession } from '@/stores/session.js'
 import { restoreWarehouseWork, resetWarehouseDomain, updateWarehouseWork, warehouseWork } from '@/stores/warehouse-work.js'
 import { startScanBroadcast } from '@/utils/scan-broadcast.js'
-import { getWarehouseTransferCartonLabel, countWarehouseTransferCartons, bindWarehouseTransferPallet, deleteWarehouseTransferPallet, downloadWarehouseTransferMeasurementPhoto, downloadWarehouseTransferPalletLabel, generateWarehouseTransferPallet, getWarehouseTransferDetail, listWarehouseTransferCandidates, listWarehouseTransferMeasurementPhotos, palletizeWarehouseTransfer, saveWarehouseTransferPalletDraft, uploadWarehouseTransferMeasurementPhoto } from '@/api/warehouse-transfers.js'
+import { getWarehouseTransferCartonLabel, countWarehouseTransferCartons, reopenWarehouseTransferMeasurement, bindWarehouseTransferPallet, deleteWarehouseTransferPallet, downloadWarehouseTransferMeasurementPhoto, downloadWarehouseTransferPalletLabel, generateWarehouseTransferPallet, getWarehouseTransferDetail, listWarehouseTransferCandidates, listWarehouseTransferMeasurementPhotos, palletizeWarehouseTransfer, saveWarehouseTransferPalletDraft, uploadWarehouseTransferMeasurementPhoto } from '@/api/warehouse-transfers.js'
 
 const newPallet = () => ({ key: `${Date.now()}-${Math.random()}`, cartonCount: 0, lengthCm: null, widthCm: null, heightCm: null, grossWeightKg: null, generated: false, bound: false, collapsed: false, palletNo: '', fbaWarehouseCode: '', labelDownloadPath: '', bindCode: '', busy: false })
 const MAX_MEASUREMENT_PHOTOS = 20
@@ -135,7 +138,7 @@ const restoredPallet = (value, index) => ({
 
 export default {
 	components: { PortalHeader, ScanTargetInput, CartonCountFields },
-	data() { return { receivingPalletId: '', cartonPalletFilter: '', batchPalletId: '', batchCountOpen: false, batchSku: '', batchBox: newBatchBox(), batchSelectedIndexes: [], batchCountMessage: '', cartonScrollTarget: '', cartonBoxes: [], countDiscrepancyReason: '', countingCartons: false, cartonRequestKey: '', cartonSignature: '', user: session.currentUser, entryMode: 'work', pendingTaskNo: '', candidates: [], selected: null, pallets: [newPallet()], activePalletKey: '', photoFileIds: [], photoNames: [], photoUrls: {}, completedPallets: [], completedTransferNo: '', completedDestination: '', completedDestinationType: '', loading: false, detailLoading: false, submitting: false, uploadingPhoto: false, openingLabel: false, error: null, success: false, pendingKey: '' } },
+	data() { return { summaryCollapsed: false, receivingPalletId: '', cartonPalletFilter: '', batchPalletId: '', batchCountOpen: false, batchSku: '', batchBox: newBatchBox(), batchSelectedIndexes: [], batchCountMessage: '', cartonScrollTarget: '', cartonBoxes: [], countDiscrepancyReason: '', countingCartons: false, cartonRequestKey: '', cartonSignature: '', user: session.currentUser, entryMode: 'work', pendingTaskNo: '', candidates: [], selected: null, pallets: [newPallet()], activePalletKey: '', photoFileIds: [], photoNames: [], photoUrls: {}, completedPallets: [], completedTransferNo: '', completedDestination: '', completedDestinationType: '', loading: false, detailLoading: false, submitting: false, uploadingPhoto: false, openingLabel: false, error: null, success: false, pendingKey: '' } },
 	computed: {
         generatedPallets() { return this.pallets.filter(pallet => pallet.generated && pallet.draftId) },
         declaredSkuCodes() { return [...new Set((this.selected?.items || []).map(item => item.skuCode))] },
@@ -143,19 +146,30 @@ export default {
         batchTargetBoxes() { return this.cartonBoxes.filter((box, index) => this.batchSelectedIndexes.includes(index) && box.received !== false && box.items.length === 1 && box.items[0]?.skuCode === this.batchSku) },
         batchTotalQuantity() { const quantity = Number(this.batchBox.items[0].quantity); return Number.isSafeInteger(quantity) && quantity > 0 ? this.batchTargetBoxes.length * quantity : 0 },
         batchCountReady() { return this.batchTargetBoxes.length > 0 && this.validCartonValues(this.batchBox) && this.generatedPallets.some(pallet => String(pallet.draftId) === String(this.batchPalletId)) },
+        // 确认快照与当前内容一致，才允许保存整单清点结果。
+        // 按 SKU 分别核对件数，不能让不同 SKU 的短收与超收相互抵消。
+        forecastSkuQuantity() { return (this.selected?.items || []).reduce((sum, item) => sum + Number(item.quantity || 0), 0) },
+        skuReceiptDifferences() {
+          const expected = new Map(), received = new Map()
+          for (const item of this.selected?.items || []) expected.set(item.skuCode, (expected.get(item.skuCode) || 0) + Number(item.quantity || 0))
+          for (const box of this.receivedCartonBoxes) for (const line of box.items) received.set(line.skuCode, (received.get(line.skuCode) || 0) + Number(line.quantity || 0))
+          return [...new Set([...expected.keys(), ...received.keys()])].filter(sku => (received.get(sku) || 0) !== (expected.get(sku) || 0))
+        },
+        hasSkuReceiptDifference() { return this.skuReceiptDifferences.length > 0 },
+        allCartonsConfirmed() { return this.receivedCartonBoxes.length > 0 && this.receivedCartonBoxes.every(box => this.cartonConfirmed(box)) },
         actualReceivedCartons() { return this.cartonsCounted ? this.receivedCartonBoxes.length : 0 },
         cartonsCounted() { return Boolean(this.selected?.cartons?.length) && this.selected.cartons.every(box => box.countedAt) },
-        cartonVolume() { return this.receivedCartonBoxes.reduce((sum, box) => sum + (Number(box.length) || 0) * (Number(box.width) || 0) * (Number(box.height) || 0) / 1000000, 0).toFixed(6) },
+        cartonVolume() { return this.receivedCartonBoxes.reduce((sum, box) => sum + (Number(box.length) || 0) * (Number(box.width) || 0) * (Number(box.height) || 0) / 1000000, 0).toFixed(3) },
         cartonWeight() { return this.receivedCartonBoxes.reduce((sum, box) => sum + (Number(box.weight) || 0), 0).toFixed(2) },
         cartonQuantity() { return this.receivedCartonBoxes.reduce((sum, box) => sum + box.items.reduce((total, line) => total + (Number(line.quantity) || 0), 0), 0) },
         receivedCartonBoxes() { return this.cartonBoxes.filter(box => box.received !== false) },
-        cartonCountReady() { return this.receivedCartonBoxes.length > 0 && this.pallets.every(pallet => pallet.generated && this.palletSummary(pallet).cartonCount > 0) && (this.receivedCartonBoxes.length === Number(this.selected?.packageCount) || Boolean(this.countDiscrepancyReason.trim())) && this.receivedCartonBoxes.every(box => this.generatedPallets.some(pallet => String(pallet.draftId) === String(box.transferPalletId)) && [box.length, box.width, box.height, box.weight].every(value => Number(value) >= 0.01) && this.validCartonSkuLines(box)) },
+        cartonCountReady() { return this.receivedCartonBoxes.length > 0 && this.pallets.every(pallet => pallet.generated && this.palletSummary(pallet).cartonCount > 0) && this.receivedCartonBoxes.every(box => this.generatedPallets.some(pallet => String(pallet.draftId) === String(box.transferPalletId)) && [box.length, box.width, box.height, box.weight].every(value => Number(value) >= 0.01) && this.validCartonSkuLines(box)) },
 		completedDestinationLabel() { return this.destinationLabel({ fbaWarehouseCode: this.completedDestination, destinationType: this.completedDestinationType }) },
 		totalCartons() { return this.pallets.reduce((sum, pallet) => sum + this.palletSummary(pallet).cartonCount, 0) },
 		cartonDifference() { return this.actualReceivedCartons - Number(this.selected?.packageCount || 0) },
 		isInventoryTransfer() { return Boolean(this.selected && this.selected.status === 'WAIT_PDA_RECEIVING' && this.selected.inboundCode && this.selected.inboundCode !== this.selected.transferNo) },
 		isMeasurementComplete() { return Boolean(this.selected && !['WAIT_PDA_RECEIVING', 'PARTIALLY_RECEIVED'].includes(String(this.selected.status))) },
-		totalVolume() { return this.pallets.reduce((sum, pallet) => sum + this.rawPalletVolume(pallet), 0).toFixed(6) },
+		totalVolume() { return this.pallets.reduce((sum, pallet) => sum + this.rawPalletVolume(pallet), 0).toFixed(3) },
 		totalWeight() { return this.pallets.reduce((sum, pallet) => sum + this.palletSummary(pallet).weight, 0).toFixed(2) },
 		validationMessage() {
 			if (this.isInventoryTransfer) return ''
@@ -172,7 +186,7 @@ export default {
 	},
 	watch: {
         countDiscrepancyReason() { this.saveCartonDraft() },
-		cartonBoxes: { deep: true, handler() { if (this.selected && !this.cartonsCounted) uni.setStorageSync(this.cartonDraftKey(), { boxes: this.cartonBoxes, discrepancyReason: this.countDiscrepancyReason, key: this.cartonRequestKey, signature: this.cartonSignature }) } },
+		cartonBoxes: { deep: true, handler() { if (this.selected && !this.cartonsCounted) uni.setStorageSync(this.cartonDraftKey(), { boxes: this.cartonBoxes, forecastMarks: (this.selected.cartons || []).map(box => box.cartonMark), discrepancyReason: this.countDiscrepancyReason, key: this.cartonRequestKey, signature: this.cartonSignature }) } },
 		pallets: { deep: true, handler() { if (!this.submitting) this.pendingKey = '' } }
 	},
 		 onShow() { if (requireSession()) { this.user = session.currentUser; restoreWarehouseWork(`${this.user.id}:${this.user.warehouseId}`); this.startScanner(); this.loadCandidates().then(() => { const activeNo = String(warehouseWork.warehouseTransfer.currentNo || ''); const taskNo = this.pendingTaskNo || activeNo; if (this.entryMode === 'work' && taskNo) { const active = this.candidates.find((item) => String(item.transferNo) === taskNo); if (active) { const fromExplicitTask = Boolean(this.pendingTaskNo); this.pendingTaskNo = ''; void this.select(active, fromExplicitTask) } } }) } },
@@ -180,6 +194,31 @@ export default {
 	onHide() { this.stopScanner() },
 	beforeUnmount() { this.stopScanner() },
 		methods: {
+        // 快照只包含业务数据；复制、批量修改或改托后会自动失效并重新展开。
+        cartonConfirmationSignature(box) {
+          return JSON.stringify({ pallet: String(box.transferPalletId || ''), dimensions: [box.length, box.width, box.height, box.weight].map(Number), items: box.items.map(line => [line.skuCode, Number(line.quantity)]) })
+        },
+        cartonConfirmed(box) { return Boolean(box.confirmedSignature && box.confirmedSignature === this.cartonConfirmationSignature(box)) },
+        // 单箱先保存设备草稿，最后一箱确认后统一提交后端已有的整单清点事务。
+        async confirmSingleCarton(box) {
+          if (this.countingCartons || this.submitting || this.cartonsCounted || !this.validCartonValues(box) || !this.generatedPallets.some(pallet => String(pallet.draftId) === String(box.transferPalletId))) return
+          box.confirmedSignature = this.cartonConfirmationSignature(box)
+          this.error = null; this.saveCartonDraft()
+          if (this.allCartonsConfirmed && this.cartonCountReady) await this.confirmCartons()
+        },
+        // 已保存清点时先请求服务端重开；成功后只展开当前箱，其他箱继续保留确认状态。
+        async editCarton(box) {
+          if (this.countingCartons || this.submitting || this.pallets.some(pallet => pallet.busy)) return
+          if (!this.cartonsCounted) { box.confirmedSignature = ''; this.saveCartonDraft(); return }
+          const mark = box.cartonMark
+          this.countingCartons = true; this.error = null
+          try {
+            const detail = await reopenWarehouseTransferMeasurement(this.selected.transferNo)
+            uni.removeStorageSync(this.cartonDraftKey()); this.selected = detail; this.restoreCartons()
+            this.cartonBoxes.forEach(current => { current.confirmedSignature = current.cartonMark === mark ? '' : this.cartonConfirmationSignature(current) })
+            this.pendingKey = ''; this.saveCartonDraft()
+          } catch (error) { this.error = error } finally { this.countingCartons = false }
+        },
         useReceivingPallet(pallet) {
           if (this.cartonsCounted || this.countingCartons || !pallet.generated) return;
           this.receivingPalletId = pallet.draftId; this.batchPalletId = pallet.draftId; this.cartonPalletFilter = pallet.draftId;
@@ -228,15 +267,17 @@ export default {
           if (!target || target.received === false || !this.validCartonValues(source)) return;
           this.copyCartonValues(source, target); this.saveCartonDraft();
         },
-        saveCartonDraft() { if (this.selected && !this.cartonsCounted) uni.setStorageSync(this.cartonDraftKey(), { boxes: this.cartonBoxes, discrepancyReason: this.countDiscrepancyReason, key: this.cartonRequestKey, signature: this.cartonSignature }) },
+        saveCartonDraft() { if (this.selected && !this.cartonsCounted) uni.setStorageSync(this.cartonDraftKey(), { boxes: this.cartonBoxes, forecastMarks: (this.selected.cartons || []).map(box => box.cartonMark), discrepancyReason: this.countDiscrepancyReason, key: this.cartonRequestKey, signature: this.cartonSignature }) },
         cartonDraftKey() { return `transfer-carton-count:${session.apiBase}:${this.user?.id}:${this.user?.warehouseId}:${this.selected?.transferNo}` },
         restoreCartons() {
           const rows = (this.selected?.cartons || []).filter(box => box.status !== 'NOT_RECEIVED').map(box => ({ ...box, transferPalletId: box.transferPalletId || (this.generatedPallets.length === 1 ? this.generatedPallets[0].draftId : ''), received: box.status !== 'NOT_RECEIVED', items: box.items?.length ? box.items.map(line => ({ skuCode: line.skuCode, quantity: line.quantity })) : [{ skuCode: this.selected.items.find(item => String(item.id) === String(box.transferItemId))?.skuCode || '', quantity: box.quantity ?? '' }] }));
           const draft = uni.getStorageSync(this.cartonDraftKey());
           this.countDiscrepancyReason = this.selected?.cartons?.find(box => box.discrepancyReason)?.discrepancyReason || ''; this.cartonRequestKey = ''; this.cartonSignature = '';
           if (!this.cartonsCounted && Array.isArray(draft?.boxes) && draft.boxes.every(box => box.items?.length && box.items.every(line => this.declaredSkuCodes.includes(line.skuCode)) && (box.cartonMark || this.selected.items.some(item => String(item.id) === String(box.transferItemId)))) && draft.boxes.every(box => !box.cartonMark || rows.some(row => row.cartonMark === box.cartonMark))) {
-            this.cartonBoxes = draft.boxes; this.countDiscrepancyReason = draft.discrepancyReason || ''; this.cartonRequestKey = draft.key || ''; this.cartonSignature = draft.signature || '';
+            const knownMarks = new Set(draft.forecastMarks || draft.boxes.map(box => box.cartonMark));
+            this.cartonBoxes = [...draft.boxes, ...rows.filter(box => !knownMarks.has(box.cartonMark))]; this.countDiscrepancyReason = draft.discrepancyReason || ''; this.cartonRequestKey = draft.key || ''; this.cartonSignature = draft.signature || '';
           } else this.cartonBoxes = rows;
+          this.cartonBoxes.forEach(box => { if (this.cartonsCounted || (box.status === 'COUNTED' && this.validCartonValues(box))) box.confirmedSignature = this.cartonConfirmationSignature(box) });
           this.receivingPalletId = this.generatedPallets[0]?.draftId || ''; this.cartonPalletFilter = ''; this.batchPalletId = this.receivingPalletId; this.batchCountOpen = false; this.batchSelectedIndexes = []; this.batchCountMessage = ''; this.batchSku = this.batchSkuCodes[0] || ''; this.batchBox = newBatchBox(); this.batchBox.items[0].skuCode = this.batchSku;
         },
         async printCartonLabels() {
@@ -273,10 +314,10 @@ export default {
           this.countingCartons = true; this.error = null;
           try {
             const boxes = this.receivedCartonBoxes.map(box => ({ cartonMark: box.cartonMark || null, transferItemId: box.cartonMark ? box.transferItemId : this.selected.items.find(item => item.skuCode === box.items[0]?.skuCode)?.id, transferPalletId: box.transferPalletId, length: Number(box.length), width: Number(box.width), height: Number(box.height), weight: Number(box.weight), items: box.items.map(line => ({ skuCode: line.skuCode, quantity: Number(line.quantity) })) }));
-            const signature = JSON.stringify({ boxes, discrepancyReason: this.countDiscrepancyReason });
+            const signature = JSON.stringify({ boxes, discrepancyReason: this.countDiscrepancyReason, forecastPackageCount: Number(this.selected.packageCount) });
             if (!this.cartonRequestKey || signature !== this.cartonSignature) { this.cartonRequestKey = `transfer-count-${Date.now()}-${Math.random().toString(36).slice(2)}`; this.cartonSignature = signature }
-            uni.setStorageSync(this.cartonDraftKey(), { boxes: this.cartonBoxes, discrepancyReason: this.countDiscrepancyReason, key: this.cartonRequestKey, signature });
-            const detail = await countWarehouseTransferCartons(this.selected.transferNo, { idempotencyKey: this.cartonRequestKey, boxes, discrepancyReason: this.countDiscrepancyReason });
+            uni.setStorageSync(this.cartonDraftKey(), { boxes: this.cartonBoxes, forecastMarks: (this.selected.cartons || []).map(box => box.cartonMark), discrepancyReason: this.countDiscrepancyReason, key: this.cartonRequestKey, signature });
+            const detail = await countWarehouseTransferCartons(this.selected.transferNo, { idempotencyKey: this.cartonRequestKey, boxes, discrepancyReason: this.countDiscrepancyReason, forecastPackageCount: Number(this.selected.packageCount) });
             if (!detail.cartons?.length || !detail.cartons.every(box => box.countedAt)) throw new Error('清点结果未确认，请刷新核实');
             uni.removeStorageSync(this.cartonDraftKey()); this.selected = detail; this.pallets = detail.pallets.map(restoredPallet); this.restoreCartons();
           } catch (error) { this.error = error } finally { this.countingCartons = false }
@@ -291,8 +332,9 @@ export default {
           const boxes = this.receivedCartonBoxes.filter(box => pallet.draftId && String(box.transferPalletId) === String(pallet.draftId));
           return { cartonCount: boxes.length, volume: boxes.reduce((sum,box) => sum + (Number(box.length)||0)*(Number(box.width)||0)*(Number(box.height)||0)/1000000,0), weight: boxes.reduce((sum,box) => sum + (Number(box.weight)||0),0) };
         },
-        rawPalletVolume(pallet) { return this.palletSummary(pallet).volume },
-        palletVolume(pallet) { return this.rawPalletVolume(pallet).toFixed(6) },
+        // 逐托汇总后取三位，与服务端落库精度一致。
+        rawPalletVolume(pallet) { return Number(this.palletSummary(pallet).volume.toFixed(3)) },
+        palletVolume(pallet) { return this.rawPalletVolume(pallet).toFixed(3) },
         cartonPalletLabel(box) { return this.generatedPallets.find(pallet => String(pallet.draftId) === String(box.transferPalletId))?.palletNo || '请选择托盘' },
         assignCartonPallet(box, index) { if (!this.cartonsCounted && !this.countingCartons && box.received !== false) box.transferPalletId = this.generatedPallets[index]?.draftId || '' },
 		applyPallet(target, value) { Object.assign(target, restoredPallet(value, this.pallets.indexOf(target)), { key: target.key, busy: false, collapsed: false }) },
@@ -318,6 +360,16 @@ export default {
 			catch (error) { this.error = error; pallet.busy = false }
 		},
 		async printDraftPallet(pallet) { if (!pallet.labelDownloadPath) { this.error = new Error('服务端未返回托盘标签下载地址'); return }; await this.openLabelPdf(() => downloadWarehouseTransferPalletLabel(pallet.labelDownloadPath)) },
+        // 刷新本单时合并预报新增箱号，保留本机已填写的测量草稿。
+        async refreshCurrentTransfer() {
+          if (!this.selected || this.loading || this.submitting || this.countingCartons || this.pallets.some(pallet => pallet.busy)) return
+          this.saveCartonDraft(); this.loading = true; this.error = null
+          try {
+            const detail = await getWarehouseTransferDetail(this.selected.transferNo)
+            this.selected = detail; this.pallets = detail.pallets?.length ? detail.pallets.map(restoredPallet) : [newPallet()]
+            this.restoreCartons(); this.pendingKey = ''; await this.restorePhotos(detail.transferNo, detail.measurementPhotos)
+          } catch (error) { this.error = error } finally { this.loading = false }
+        },
 		async loadCandidates() {
 			this.loading = true; this.error = null
 			try {
@@ -352,13 +404,36 @@ export default {
 			this.candidates = this.candidates.map((candidate) => String(candidate.transferNo) === String(item.transferNo) ? { ...candidate, status: 'PARTIALLY_RECEIVED' } : candidate)
 			if (this.entryMode === 'list') { uni.navigateTo({ url: `/pages/warehouse-transfer/warehouse-transfer?mode=work&task=${encodeURIComponent(String(item.transferNo))}` }); return }
 			this.detailLoading = true; this.error = null; this.success = false; this.completedPallets = []; this.completedTransferNo = ''; this.completedDestination = ''; this.completedDestinationType = ''
-			try { this.selected = await getWarehouseTransferDetail(item.transferNo); this.pendingKey = ''; this.pallets = this.selected.pallets?.length ? this.selected.pallets.map(restoredPallet) : [newPallet()]; this.restoreCartons(); await this.restorePhotos(item.transferNo, this.selected.measurementPhotos) }
+			try { this.selected = await getWarehouseTransferDetail(item.transferNo); this.summaryCollapsed = false; this.pendingKey = ''; this.pallets = this.selected.pallets?.length ? this.selected.pallets.map(restoredPallet) : [newPallet()]; this.restoreCartons(); await this.restorePhotos(item.transferNo, this.selected.measurementPhotos) }
 			catch (e) { this.selected = null; this.error = e }
 			finally { this.detailLoading = false }
 		},
 		backToCandidates() { if (this.submitting || this.detailLoading || this.countingCartons || this.pallets.some(pallet => pallet.busy)) return; this.entryMode = 'list'; this.selected = null; this.error = null; this.pallets = [newPallet()]; this.photoFileIds = []; this.photoUrls = {}; this.photoNames = [] },
 		addPallet() { if (this.cartonsCounted || this.countingCartons) return; this.pendingKey = ''; this.pallets.push(newPallet()) },
-		async removePallet(index) { const pallet = this.pallets[index]; if (!pallet || pallet.generated || pallet.busy) return; pallet.busy = true; try { if (pallet.draftId) await deleteWarehouseTransferPallet(this.selected.transferNo, pallet.draftId); this.pallets.splice(index, 1); this.pendingKey = '' } catch (error) { pallet.busy = false; this.error = error } },
+        async remeasure() {
+          if (!this.selected || this.countingCartons || this.submitting || this.pallets.some(pallet => pallet.busy)) return;
+          this.countingCartons = true; this.error = null;
+          try {
+            const detail = await reopenWarehouseTransferMeasurement(this.selected.transferNo);
+            uni.removeStorageSync(this.cartonDraftKey()); this.selected = detail; this.restoreCartons(); this.pendingKey = '';
+            this.cartonScrollTarget = 'transfer-boxes';
+          } catch (error) { this.error = error } finally { this.countingCartons = false }
+        },
+        async removePallet(index) {
+          const pallet = this.pallets[index];
+          if (!pallet || this.countingCartons || this.submitting || this.pallets.some(item => item.busy)) return;
+          pallet.busy = true;
+          try {
+            const answer = await new Promise((resolve, reject) => uni.showModal({ title: '删除托盘', content: '删除后保留箱子和测量数据，本托箱子需重新选择托盘并确认清点。是否继续？', success: resolve, fail: reject }));
+            if (!answer.confirm) return;
+            this.error = null;
+            if (pallet.draftId) this.selected = await deleteWarehouseTransferPallet(this.selected.transferNo, pallet.draftId);
+            this.cartonBoxes.forEach(box => { if (pallet.draftId && String(box.transferPalletId) === String(pallet.draftId)) box.transferPalletId = '' });
+            this.pallets.splice(index, 1); if (!this.pallets.length) this.pallets = [newPallet()];
+            this.receivingPalletId = this.generatedPallets[0]?.draftId || ''; this.batchPalletId = this.receivingPalletId; this.cartonPalletFilter = ''; this.activePalletKey = '';
+            this.cartonRequestKey = ''; this.cartonSignature = ''; this.pendingKey = ''; this.batchSelectedIndexes = []; this.saveCartonDraft();
+          } catch (error) { this.error = error } finally { pallet.busy = false }
+        },
 		async restorePhotos(transferNo, knownPhotos) {
 			let photos
 			try {
@@ -416,8 +491,23 @@ export default {
 			if (this.validationMessage) { this.error = new Error(this.validationMessage); return }
 			this.submitting = true; this.error = null
 			try {
-				if (!this.pendingKey) this.pendingKey = `pda-transfer-${this.selected.transferNo}-${Date.now()}-${Math.random().toString(36).slice(2, 10)}`
-				const payload = { idempotencyKey: this.pendingKey, photoFileIds: [...this.photoFileIds] }
+				// 清点、绑托和拍照完成后，仅 SKU 件数差异要求填写原因。
+                if (this.hasSkuReceiptDifference) {
+                    const answer = await new Promise((resolve, reject) => uni.showModal({
+                        title: 'SKU签收数量存在差异', content: this.countDiscrepancyReason || '', editable: true,
+                        placeholderText: '请填写SKU签收差异原因（必填）', confirmText: '确认完成',
+                        success: resolve, fail: reject
+                    }))
+                    if (!answer.confirm) return
+                    const reason = String(answer.content || '').trim()
+                    if (!reason) { this.error = new Error('请填写差异原因后再完成测量'); return }
+                    if (reason.length > 1000) { this.error = new Error('差异原因不能超过1000字'); return }
+                    if (reason !== this.countDiscrepancyReason) this.pendingKey = ''
+                    this.countDiscrepancyReason = reason
+                    this.saveCartonDraft()
+                }
+                if (!this.pendingKey) this.pendingKey = `pda-transfer-${this.selected.transferNo}-${Date.now()}-${Math.random().toString(36).slice(2, 10)}`
+				const payload = { idempotencyKey: this.pendingKey, photoFileIds: [...this.photoFileIds], discrepancyReason: this.hasSkuReceiptDifference ? this.countDiscrepancyReason : null }
 				const transferNo = this.selected.transferNo; const result = await palletizeWarehouseTransfer(transferNo, payload); this.completedTransferNo = transferNo; this.completedDestination = result?.fbaWarehouseCode || this.selected.fbaWarehouseCode || ''; this.completedDestinationType = result?.destinationType || this.selected.destinationType || ''; this.completedPallets = (result?.pallets || []).filter((pallet) => pallet?.palletNo); this.success = true; resetWarehouseDomain('warehouseTransfer'); this.selected = null; this.pendingKey = ''; this.pallets = [newPallet()]; this.photoFileIds = []; this.photoUrls = {}; this.photoNames = []; await this.loadCandidates()
 			} catch (e) { this.error = e } finally { this.submitting = false }
 		},
@@ -444,7 +534,11 @@ export default {
 </script>
 
 <style scoped>
-.carton-title-row{display:flex;align-items:flex-start;gap:8px}.carton-title-row{flex-wrap:wrap}.carton-title-row>.measure-title{flex:1;min-width:150px}.delete-carton-button{flex:none;width:auto;margin:0;padding:0 8px;border:1px solid #f0caca;border-radius:7px;color:#b74545;background:#fff7f7;font-size:12px;line-height:30px}.add-sku-button{flex:none;width:auto;margin:0;padding:0 9px;border:1px solid #cbdcff;border-radius:7px;color:#135ee8;background:#f0f6ff;font-size:12px;line-height:30px}.add-sku-button[disabled]{color:#a0adbe;background:#f5f7fa}
+.collapsed-carton-row{position:relative;min-height:40px;padding:0 36px 0 0;color:#415a78;font-size:12px;line-height:40px}.collapsed-carton-mark{width:100%;white-space:nowrap}.collapsed-carton-mark text{display:inline-block;white-space:nowrap;word-break:normal;overflow-wrap:normal}.collapsed-carton-expand{position:absolute;top:0;right:0;display:flex;align-items:center;justify-content:center;width:32px;height:32px;margin:0;padding:0;border:0;border-radius:6px;background:transparent;line-height:32px}.collapsed-carton-expand::after{border:0}.transfer-content .carton-count-card.carton-collapsed{padding:6px 12px}
+.confirm-carton-button{margin:12px 0 0;border:1px solid #cbdcff;border-radius:8px;color:#135ee8;background:#eff5ff;font-size:13px;line-height:38px}
+
+.pallet-title-line{display:flex;align-items:center;flex-wrap:wrap;gap:5px 10px}.pallet-inline-metrics{display:flex;flex-wrap:wrap;gap:4px 8px}.transfer-content .pallet-inline-metrics text{margin:0;color:#3f5671;font-size:10px;font-weight:500;white-space:nowrap}.pallet-index{flex-shrink:0}.remeasure-button{width:auto;margin:0;padding:0 12px;border:1px solid #b9d3f4;border-radius:8px;color:#135ee8;font-size:12px;line-height:36px;background:#f0f6ff}
+.carton-title-row{display:flex;align-items:flex-start;gap:8px}.carton-title-row{flex-wrap:wrap}.carton-title-row>.measure-title{flex:1;min-width:150px}.delete-carton-button{flex:none;width:auto;margin:0;padding:0 8px;border:1px solid #f0caca;border-radius:7px;color:#b74545;background:#fff7f7;font-size:12px;line-height:30px}.add-sku-button{display:flex;align-items:center;justify-content:center;flex:none;box-sizing:border-box;width:24px;height:24px;margin:0;padding:0;border:1px solid #cbdcff;border-radius:7px;color:#135ee8;background:#f0f6ff;font-size:12px;line-height:30px}.add-sku-button[disabled]{color:#a0adbe;background:#f5f7fa}
 
 .pallet-index{display:flex;align-items:center;justify-content:center;width:34px;height:34px;border-radius:10px;color:#fff;font-size:13px;font-weight:850;background:#135ee8;box-shadow:0 4px 10px rgba(19,94,232,.2)}
 .transfer-page{display:flex;flex-direction:column}.transfer-page .transfer-scroll{flex:1;min-height:0;height:0}
@@ -457,7 +551,7 @@ export default {
 
 .carton-count-card{padding:14px 10px;margin:10px 0;border:1px solid #d8e3f1;border-radius:12px}
 
-.transfer-page{height:100vh;overflow:hidden;background:#f2f5f9}.transfer-scroll{height:calc(100vh - 48px - var(--status-bar-height,0px))}.transfer-content{padding-bottom:52px}.transfer-heading{display:flex;align-items:flex-start;justify-content:space-between;gap:12px;margin:4px 2px 17px}.transfer-title,.transfer-subtitle,.transfer-no,.transfer-meta,.summary-eyebrow,.summary-no,.pallet-heading-copy text,.measure-title,.measure-hint,.sku-copy text,.validation-title,.transfer-validation>text,.feedback-title,.transfer-error>text,.transfer-success>text,.empty-title,.transfer-empty>text{display:block}.transfer-title{color:#14263d;font-size:22px;font-weight:850;letter-spacing:.2px}.transfer-subtitle{margin-top:4px;color:#718095;font-size:11px;line-height:17px}.refresh-button{display:flex;align-items:center;justify-content:center;gap:4px;width:auto;height:34px;margin:0;padding:0 11px;border:1px solid #b8d1f5;border-radius:17px;color:#135ee8;font-size:10px;line-height:34px;background:#f8fbff}.refresh-button[disabled]{opacity:.55}.section-heading{display:flex;align-items:center;justify-content:space-between;margin:0 2px 8px;color:#243951;font-size:12px;font-weight:800}.section-heading text:last-child{color:#8290a2;font-size:10px;font-weight:600}.candidate-list{display:flex;flex-direction:column;gap:9px;margin-bottom:16px}.transfer-card{box-sizing:border-box;width:100%;margin:0;padding:13px;border:1px solid #dce5f0;border-radius:13px;text-align:left;background:#fff;box-shadow:0 4px 15px rgba(32,67,111,.055)}.transfer-card.selected{border-color:#6da3f1;background:#f7faff;box-shadow:0 5px 18px rgba(19,94,232,.11)}.transfer-card-head{display:flex;align-items:center;justify-content:space-between;gap:10px}.transfer-no{overflow:hidden;color:#18324f;font-size:14px;font-weight:850;text-overflow:ellipsis;white-space:nowrap}.status-pill{flex-shrink:0;padding:4px 7px;border-radius:6px;color:#135ee8;font-size:9px;font-weight:750;background:#eaf2ff}.task-metrics{display:grid;grid-template-columns:.75fr 1.25fr .75fr;gap:6px;margin-top:11px}.task-metrics view{min-width:0;padding:7px 8px;border-radius:8px;background:#f4f7fa}.task-metrics text{display:block;color:#8492a4;font-size:8px}.task-metrics strong{display:block;overflow:hidden;margin-top:2px;color:#2c4058;font-size:11px;text-overflow:ellipsis;white-space:nowrap}.transfer-meta{margin-top:8px;color:#7b899b;font-size:9px}.transfer-empty{margin-bottom:12px;padding:26px 14px;border:1px dashed #ccd7e4;border-radius:13px;color:#8996a6;font-size:10px;line-height:18px;text-align:center;background:rgba(255,255,255,.65)}.empty-title{color:#56677b;font-size:12px;font-weight:800}.order-summary{display:flex;align-items:center;justify-content:space-between;gap:12px;padding:14px 15px;border-radius:14px 14px 0 0;color:#fff;background:linear-gradient(135deg,#123d73,#135ee8)}.summary-eyebrow{font-size:9px;opacity:.72}.summary-no{margin-top:3px;font-size:15px;font-weight:850}.summary-count{display:flex;align-items:baseline;gap:3px;flex-shrink:0}.summary-count strong{font-size:24px}.summary-count text{font-size:10px;opacity:.8}.summary-metrics{display:grid;grid-template-columns:repeat(3,1fr);margin-bottom:12px;padding:11px 8px;border-radius:0 0 14px 14px;background:#fff;box-shadow:0 5px 17px rgba(32,67,111,.07)}.summary-metrics view{position:relative;text-align:center}.summary-metrics view+view:before{position:absolute;top:3px;bottom:3px;left:0;width:1px;background:#e7edf4;content:''}.summary-metrics strong{display:block;color:#17314f;font-size:14px}.summary-metrics text{display:block;margin-top:2px;color:#8390a1;font-size:8px}.pallet-card{box-sizing:border-box;margin-bottom:12px;padding:14px;border:1px solid #d9e3ee;border-radius:15px;background:#fff;box-shadow:0 5px 18px rgba(32,67,111,.065)}.pallet-head{display:flex;align-items:center;gap:9px;margin:-2px -2px 14px;padding-bottom:11px;border-bottom:1px solid #edf1f5}.pallet-heading-copy{min-width:0;flex:1}.pallet-heading-copy text:first-child{color:#17314f;font-size:13px;font-weight:850}.pallet-heading-copy text:last-child{margin-top:2px;color:#8995a5;font-size:8px}.remove-button{width:auto;height:28px;margin:0;padding:0 9px;border-radius:7px;color:#b33030;font-size:9px;line-height:28px;background:#fff0f0}.field-label{display:block;margin-bottom:5px;color:#65768b;font-size:9px;font-weight:700}.field-label small{margin-left:3px;color:#9aa5b3;font-size:8px;font-weight:500}.measure-input,.input-with-unit{box-sizing:border-box;width:100%;height:42px;border:1px solid #cad7e5;border-radius:9px;color:#203750;background:#fafcfe}.measure-input{padding:0 11px;font-size:12px}.pallet-code-field{display:block;margin-bottom:14px}.measure-section-head,.sku-section-head{display:flex;align-items:center;justify-content:space-between;gap:10px;margin-bottom:9px}.measure-title{color:#243a53;font-size:11px;font-weight:850}.measure-hint{margin-top:2px;color:#8a96a5;font-size:8px}.volume-chip{flex-shrink:0;padding:5px 8px;border-radius:8px;text-align:right;background:#edf5ff}.volume-chip text{display:block;color:#7189a7;font-size:7px}.volume-chip strong{display:block;margin-top:1px;color:#135ee8;font-size:10px}.dimension-grid{display:grid;grid-template-columns:repeat(3,1fr);gap:7px}.measure-grid{display:grid;grid-template-columns:repeat(2,1fr);gap:9px;margin-top:10px}.input-with-unit{display:flex;align-items:center;overflow:hidden}.input-with-unit input{box-sizing:border-box;min-width:0;height:40px;padding:0 4px 0 10px;flex:1;color:#203750;font-size:16px;font-weight:800}.input-with-unit>text{padding-right:8px;color:#8491a1;font-size:8px}.input-with-unit.important{border-color:#9ebff0;background:#f8fbff}.sku-section{margin:15px -2px -2px;padding:12px;border-radius:11px;background:#f5f8fb}.sku-total{flex-shrink:0;padding:5px 7px;border-radius:7px;color:#9a5c13;font-size:9px;font-weight:800;background:#fff1dd}.sku-total.matched{color:#08705f;background:#dff5ed}.sku-row{display:flex;align-items:center;gap:9px;min-height:48px;border-top:1px solid #e3eaf2}.sku-copy{min-width:0;flex:1}.sku-code{overflow:hidden;color:#233b56;font-size:11px;font-weight:800;text-overflow:ellipsis;white-space:nowrap}.sku-copy text:last-child{margin-top:2px;color:#8693a3;font-size:8px}.sku-input{display:flex;align-items:center;gap:4px;color:#718095;font-size:9px}.sku-input input{box-sizing:border-box;width:64px;height:34px;padding:0 7px;border:1px solid #abc4e8;border-radius:8px;color:#17314f;font-size:14px;font-weight:800;text-align:center;background:#fff}.add-pallet-button{display:flex;align-items:center;justify-content:center;gap:5px;box-sizing:border-box;width:100%;height:44px;margin:2px 0 11px;border:1px dashed #78a8ed;border-radius:11px;color:#135ee8;font-size:11px;font-weight:800;background:#f7faff}.transfer-validation,.transfer-error,.transfer-success{box-sizing:border-box;margin-bottom:11px;padding:11px 12px;border-radius:10px;font-size:9px;line-height:16px}.transfer-validation,.transfer-error{color:#9d3030;background:#fff0f0}.validation-title,.feedback-title{font-size:11px;font-weight:850}.transfer-success{color:#176b42;background:#eaf8f1}.submit-panel{box-sizing:border-box;padding:12px;border:1px solid #dce5f0;border-radius:13px;background:#fff;box-shadow:0 5px 18px rgba(32,67,111,.07)}.submit-panel>view{display:flex;align-items:center;justify-content:space-between;margin-bottom:9px;color:#778598;font-size:9px}.submit-panel strong{color:#243951;font-size:11px}.transfer-primary{box-sizing:border-box;width:100%;height:44px;margin:0;border-radius:9px;color:#fff;font-size:12px;font-weight:850;line-height:44px;background:#135ee8}.transfer-primary[disabled]{color:#9aa7b5;background:#e7ecf2;opacity:1}
+.transfer-page{height:100vh;overflow:hidden;background:#f2f5f9}.transfer-scroll{height:calc(100vh - 48px - var(--status-bar-height,0px))}.transfer-content{padding-bottom:52px}.transfer-heading{display:flex;align-items:flex-start;justify-content:space-between;gap:12px;margin:4px 2px 17px}.transfer-title,.transfer-subtitle,.transfer-no,.transfer-meta,.summary-eyebrow,.summary-no,.pallet-heading-copy text,.measure-title,.measure-hint,.sku-copy text,.validation-title,.transfer-validation>text,.feedback-title,.transfer-error>text,.transfer-success>text,.empty-title,.transfer-empty>text{display:block}.transfer-title{color:#14263d;font-size:22px;font-weight:850;letter-spacing:.2px}.transfer-subtitle{margin-top:4px;color:#718095;font-size:11px;line-height:17px}.refresh-button{display:flex;align-items:center;justify-content:center;gap:4px;width:auto;height:34px;margin:0;padding:0 11px;border:1px solid #b8d1f5;border-radius:17px;color:#135ee8;font-size:10px;line-height:34px;background:#f8fbff}.refresh-button[disabled]{opacity:.55}.section-heading{display:flex;align-items:center;justify-content:space-between;margin:0 2px 8px;color:#243951;font-size:12px;font-weight:800}.section-heading text:last-child{color:#8290a2;font-size:10px;font-weight:600}.candidate-list{display:flex;flex-direction:column;gap:9px;margin-bottom:16px}.transfer-card{box-sizing:border-box;width:100%;margin:0;padding:13px;border:1px solid #dce5f0;border-radius:13px;text-align:left;background:#fff;box-shadow:0 4px 15px rgba(32,67,111,.055)}.transfer-card.selected{border-color:#6da3f1;background:#f7faff;box-shadow:0 5px 18px rgba(19,94,232,.11)}.transfer-card-head{display:flex;align-items:center;justify-content:space-between;gap:10px}.transfer-no{overflow:hidden;color:#18324f;font-size:14px;font-weight:850;text-overflow:ellipsis;white-space:nowrap}.status-pill{flex-shrink:0;padding:4px 7px;border-radius:6px;color:#135ee8;font-size:9px;font-weight:750;background:#eaf2ff}.task-metrics{display:grid;grid-template-columns:.75fr 1.25fr .75fr;gap:6px;margin-top:11px}.task-metrics view{min-width:0;padding:7px 8px;border-radius:8px;background:#f4f7fa}.task-metrics text{display:block;color:#8492a4;font-size:8px}.task-metrics strong{display:block;overflow:hidden;margin-top:2px;color:#2c4058;font-size:11px;text-overflow:ellipsis;white-space:nowrap}.transfer-meta{margin-top:8px;color:#7b899b;font-size:9px}.transfer-empty{margin-bottom:12px;padding:26px 14px;border:1px dashed #ccd7e4;border-radius:13px;color:#8996a6;font-size:10px;line-height:18px;text-align:center;background:rgba(255,255,255,.65)}.empty-title{color:#56677b;font-size:12px;font-weight:800}.order-summary{display:flex;align-items:center;justify-content:space-between;gap:12px;padding:14px 15px;border-radius:14px 14px 0 0;color:#fff;background:linear-gradient(135deg,#123d73,#135ee8)}.summary-eyebrow{font-size:9px;opacity:.72}.summary-no{margin-top:3px;font-size:15px;font-weight:850}.summary-count{display:flex;align-items:baseline;gap:3px;flex-shrink:0}.summary-count strong{font-size:24px}.summary-count text{font-size:10px;opacity:.8}.summary-metrics{display:grid;grid-template-columns:repeat(3,1fr);margin-bottom:12px;padding:11px 8px;border-radius:0 0 14px 14px;background:#fff;box-shadow:0 5px 17px rgba(32,67,111,.07)}.summary-metrics view{position:relative;text-align:center}.summary-metrics view+view:before{position:absolute;top:3px;bottom:3px;left:0;width:1px;background:#e7edf4;content:''}.summary-metrics strong{display:block;color:#17314f;font-size:14px}.summary-metrics text{display:block;margin-top:2px;color:#8390a1;font-size:8px}.pallet-card{box-sizing:border-box;margin-bottom:12px;padding:14px;border:1px solid #d9e3ee;border-radius:15px;background:#fff;box-shadow:0 5px 18px rgba(32,67,111,.065)}.pallet-head{display:flex;align-items:center;gap:9px;margin:-2px -2px 14px;padding-bottom:11px;border-bottom:1px solid #edf1f5}.pallet-heading-copy{min-width:0;flex:1}.pallet-heading-copy text:first-child{color:#17314f;font-size:13px;font-weight:850}.pallet-heading-copy>text:last-child{margin-top:2px;color:#8995a5;font-size:8px}.remove-button{width:auto;height:28px;margin:0;padding:0 9px;border-radius:7px;color:#b33030;font-size:9px;line-height:28px;background:#fff0f0}.field-label{display:block;margin-bottom:5px;color:#65768b;font-size:9px;font-weight:700}.field-label small{margin-left:3px;color:#9aa5b3;font-size:8px;font-weight:500}.measure-input,.input-with-unit{box-sizing:border-box;width:100%;height:42px;border:1px solid #cad7e5;border-radius:9px;color:#203750;background:#fafcfe}.measure-input{padding:0 11px;font-size:12px}.pallet-code-field{display:block;margin-bottom:14px}.measure-section-head,.sku-section-head{display:flex;align-items:center;justify-content:space-between;gap:10px;margin-bottom:9px}.measure-title{color:#243a53;font-size:11px;font-weight:850}.measure-hint{margin-top:2px;color:#8a96a5;font-size:8px}.volume-chip{flex-shrink:0;padding:5px 8px;border-radius:8px;text-align:right;background:#edf5ff}.volume-chip text{display:block;color:#7189a7;font-size:7px}.volume-chip strong{display:block;margin-top:1px;color:#135ee8;font-size:10px}.dimension-grid{display:grid;grid-template-columns:repeat(3,1fr);gap:7px}.measure-grid{display:grid;grid-template-columns:repeat(2,1fr);gap:9px;margin-top:10px}.input-with-unit{display:flex;align-items:center;overflow:hidden}.input-with-unit input{box-sizing:border-box;min-width:0;height:40px;padding:0 4px 0 10px;flex:1;color:#203750;font-size:16px;font-weight:800}.input-with-unit>text{padding-right:8px;color:#8491a1;font-size:8px}.input-with-unit.important{border-color:#9ebff0;background:#f8fbff}.sku-section{margin:15px -2px -2px;padding:12px;border-radius:11px;background:#f5f8fb}.sku-total{flex-shrink:0;padding:5px 7px;border-radius:7px;color:#9a5c13;font-size:9px;font-weight:800;background:#fff1dd}.sku-total.matched{color:#08705f;background:#dff5ed}.sku-row{display:flex;align-items:center;gap:9px;min-height:48px;border-top:1px solid #e3eaf2}.sku-copy{min-width:0;flex:1}.sku-code{overflow:hidden;color:#233b56;font-size:11px;font-weight:800;text-overflow:ellipsis;white-space:nowrap}.sku-copy text:last-child{margin-top:2px;color:#8693a3;font-size:8px}.sku-input{display:flex;align-items:center;gap:4px;color:#718095;font-size:9px}.sku-input input{box-sizing:border-box;width:64px;height:34px;padding:0 7px;border:1px solid #abc4e8;border-radius:8px;color:#17314f;font-size:14px;font-weight:800;text-align:center;background:#fff}.add-pallet-button{display:flex;align-items:center;justify-content:center;gap:5px;box-sizing:border-box;width:100%;height:44px;margin:2px 0 11px;border:1px dashed #78a8ed;border-radius:11px;color:#135ee8;font-size:11px;font-weight:800;background:#f7faff}.transfer-validation,.transfer-error,.transfer-success{box-sizing:border-box;margin-bottom:11px;padding:11px 12px;border-radius:10px;font-size:9px;line-height:16px}.transfer-validation,.transfer-error{color:#9d3030;background:#fff0f0}.validation-title,.feedback-title{font-size:11px;font-weight:850}.transfer-success{color:#176b42;background:#eaf8f1}.submit-panel{box-sizing:border-box;padding:12px;border:1px solid #dce5f0;border-radius:13px;background:#fff;box-shadow:0 5px 18px rgba(32,67,111,.07)}.submit-panel>view{display:flex;align-items:center;justify-content:space-between;margin-bottom:9px;color:#778598;font-size:9px}.submit-panel strong{color:#243951;font-size:11px}.transfer-primary{box-sizing:border-box;width:100%;height:44px;margin:0;border-radius:9px;color:#fff;font-size:12px;font-weight:850;line-height:44px;background:#135ee8}.transfer-primary[disabled]{color:#9aa7b5;background:#e7ecf2;opacity:1}
 .photo-card{box-sizing:border-box;margin-bottom:11px;padding:14px;border:1px solid #d9e3ee;border-radius:13px;background:#fff;box-shadow:0 5px 18px rgba(32,67,111,.06)}
 .photo-head{display:flex;align-items:center;justify-content:space-between;gap:10px;margin-bottom:9px}
 .photo-count{flex-shrink:0;padding:5px 8px;border-radius:7px;color:#135ee8;font-size:9px;font-weight:800;background:#eaf2ff}
@@ -473,5 +567,34 @@ export default {
 .back-to-list{width:auto;height:30px;margin:0;padding:0 9px;border:1px solid #c8d8ec;border-radius:8px;color:#135ee8;font-size:10px;line-height:30px;background:#f8fbff}
 .collapse-button{width:30px;height:28px;margin:0;padding:0;color:#135ee8;font-size:16px;line-height:28px;background:#edf5ff}
 .receipt-comparison{display:grid;grid-template-columns:repeat(3,1fr);gap:7px;margin-bottom:9px}.receipt-comparison view{padding:9px;border-radius:9px;text-align:center;background:#fff}.receipt-comparison strong,.receipt-comparison text{display:block}.receipt-comparison strong{color:#17314f;font-size:15px}.receipt-comparison text{margin-top:2px;color:#8390a1;font-size:8px}.receipt-comparison .difference{border:1px solid #e3a044;background:#fff4df}.receipt-comparison .difference strong,.receipt-comparison .difference text{color:#a35b0c;font-weight:800}
-.transfer-content .measure-hint{font-size:11px;line-height:17px}.transfer-content .measure-title{font-size:13px}.transfer-content .summary-metrics text{font-size:10px}.transfer-content .transfer-primary{height:46px;line-height:46px;font-size:14px}.transfer-content .photo-card{padding:14px}.transfer-content .pallet-heading-copy text:last-child{margin-top:2px;color:#8995a5;font-size:8px}.transfer-content .summary-no{font-size:13px}.transfer-content .batch-summary{font-size:12px}
+.transfer-content .measure-hint{font-size:11px;line-height:17px}.transfer-content .measure-title{font-size:13px}.transfer-content .summary-metrics text{font-size:10px}.transfer-content .transfer-primary{height:46px;line-height:46px;font-size:14px}.transfer-content .photo-card{padding:14px}.transfer-content .pallet-heading-copy>text:last-child{margin-top:2px;color:#8995a5;font-size:8px}.transfer-content .summary-no{font-size:13px}.transfer-content .batch-summary{font-size:12px}
+/* 测量任务默认展开，收起后仍保留单号和实收箱数，方便现场核对。 */
+.order-summary{position:relative;margin-bottom:10px;border-radius:12px;cursor:pointer;padding:12px;gap:8px}
+.order-summary>view:first-child{flex:1;min-width:0}.summary-toggle{flex:none;font-size:11px;white-space:nowrap;opacity:.9}.transfer-content .summary-no{font-size:12px;line-height:18px;word-break:break-all}.summary-count strong{font-size:20px}
+.receipt-comparison{margin-top:0}.summary-metrics{box-shadow:none}
+/* 托盘卡片按身份、实测指标、业务码分层，所有信息沿左侧基线排列。 */
+.transfer-content .pallet-card{padding:12px;border-radius:12px;border-color:#dce5f0;box-shadow:0 2px 8px rgba(32,67,111,.04);text-align:left}
+.transfer-content .pallet-card.active-receiving-pallet{border-color:#91b7ef!important}
+.pallet-card .pallet-head{display:flex;align-items:center;gap:9px;margin:0;padding:0 0 10px;border-bottom:0;text-align:left}
+.pallet-card .pallet-index{width:30px;height:30px;min-width:30px;border-radius:8px;font-size:12px;box-shadow:none}
+.pallet-card .pallet-heading-copy{flex:1;min-width:0;text-align:left}
+.pallet-card .pallet-title-line{display:flex;flex-direction:row;align-items:center;justify-content:flex-start;gap:8px;flex-wrap:wrap}
+.pallet-card .pallet-title-line .pallet-name{margin:0;font-size:14px;font-weight:750;color:#18324f}
+.pallet-card .pallet-title-line .pallet-status{margin:0;padding:3px 6px;border-radius:5px;color:#a47320;background:#fff6e5;font-size:10px;font-weight:500;line-height:15px}
+.pallet-card .pallet-title-line .pallet-status.is-bound{color:#278365;background:#edf8f2}
+.pallet-card .remove-button,.pallet-card .collapse-button{flex:none;box-sizing:border-box;width:28px;height:28px;margin:0;padding:0;line-height:26px;border-radius:7px;font-size:18px}
+.pallet-card .remove-button{color:#c46868;background:#fff5f5}.pallet-card .collapse-button{color:#6180a6;background:#f2f6fc}
+.pallet-stats{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:8px;padding:10px;border-radius:8px;background:#f5f8fc}
+.pallet-stats>view{min-width:0;text-align:left}.pallet-stats strong{display:block;color:#213b58;font-size:15px;font-weight:750;line-height:21px}.pallet-stats strong text{font-size:10px;font-weight:400;color:#73859b}.pallet-stats>view>text{display:block;margin-top:3px;color:#8090a3;font-size:10px}
+.pallet-card .pallet-brief{display:flex;align-items:center;justify-content:space-between;gap:10px;margin:10px 0 0;padding:0;flex-wrap:nowrap}
+.pallet-business-code{flex:1;min-width:0;color:#7c8ca0;font-size:9px;line-height:15px;overflow-wrap:anywhere;word-break:break-all;text-align:left}
+.receiving-badge{flex:none;display:flex;align-items:center;gap:5px;color:#3273c7;font-size:10px;white-space:nowrap}.receiving-badge:before{content:'';width:5px;height:5px;border-radius:50%;background:#4184e1}
+.pallet-card .pallet-brief button{flex:none;width:auto;height:28px;line-height:28px;margin:0;padding:0 8px;font-size:10px;border-radius:6px;background:#edf4ff;color:#246ac6}
+.pallet-card .measure-section-head{margin-top:12px}.pallet-card .generated-card{margin-top:10px}
+/* 箱号独占一行，操作按钮固定在标题右侧，长业务编号不会挤压按钮。 */
+.transfer-content .carton-count-card{padding:12px;margin:12px 0;border-color:#dce5f0;border-radius:12px;background:#fff}
+.carton-title-row{flex-wrap:nowrap;align-items:center;justify-content:space-between;gap:8px}.carton-title-row>.measure-title{min-width:0;font-size:14px!important}.carton-icon-actions{display:flex;flex:none;gap:6px}
+.carton-icon-actions button{box-sizing:border-box;width:30px;height:30px;padding:0;margin:0;line-height:28px;font-size:20px;border-radius:8px}
+.carton-business-code{display:block;margin:5px 0 10px;color:#7c8da2;font-size:10px;line-height:15px;overflow-wrap:anywhere;word-break:break-all}
+.carton-count-card .batch-sku{padding:9px 10px;margin:8px 0;font-size:11px;background:#f7faff;border-color:#dce5f0}.carton-count-card .batch-actions:empty{display:none}
 </style>
diff --git a/tests/warehouse-transfer-api.test.mjs b/tests/warehouse-transfer-api.test.mjs
index 1b062a9..a4bf222 100644
--- a/tests/warehouse-transfer-api.test.mjs
+++ b/tests/warehouse-transfer-api.test.mjs
@@ -56,8 +56,8 @@ test('warehouse transfer removes completed work from the pending list', async ()
 
 test('warehouse transfer shows forecast and actual variance and requires counted box reconciliation', async () => {
 	const page = await readFile(new URL('../src/pages/warehouse-transfer/warehouse-transfer.vue', import.meta.url), 'utf8')
-	for (const label of ['客户预报', '当前实收', '短收差异', '超收差异']) assert.match(page, new RegExp(label))
-	assert.match(page, /cartonDifference/)
+	for (const label of ['客户预报', 'SKU实收', 'SKU签收差异']) assert.match(page, new RegExp(label))
+	assert.match(page, /hasSkuReceiptDifference/)
 	assert.doesNotMatch(page, /全部托盘箱数必须等于订单计划箱数/)
 	assert.doesNotMatch(page, /本托 SKU 箱数|itemCounts/)
 })
@@ -137,7 +137,7 @@ test('warehouse transfer pallet cards prepare generated and server-bound states'
 	assert.match(page, /handlePalletScan/)
 	assert.match(page, /扫描或手输新托盘标签号/)
 	assert.match(page, /已绑定实物托盘/)
-	assert.match(page, /!pallet\.generated.*removePallet/)
+	assert.match(page, /@tap\.stop="removePallet\(index\)">×/)
 	assert.match(page, /请先生成托盘号，再填写签收箱子/)
 	assert.match(page, /collapsed: false/)
 	assert.match(page, /pallet\.collapsed = !pallet\.collapsed/)
@@ -149,5 +149,5 @@ test('warehouse transfer pallet cards prepare generated and server-bound states'
 	assert.match(page, /bindWarehouseTransferPallet/)
 	assert.match(page, /deleteWarehouseTransferPallet/)
 	assert.match(page, /请先生成并扫描确认绑定全部托盘/)
-	assert.match(page, /const payload = \{ idempotencyKey: this\.pendingKey, photoFileIds: \[\.\.\.this\.photoFileIds\] \}/)
+	assert.match(page, /const payload = \{ idempotencyKey: this\.pendingKey, photoFileIds: \[\.\.\.this\.photoFileIds\], discrepancyReason:/)
 })
diff --git a/tests/warehouse-transfer-counting.test.mjs b/tests/warehouse-transfer-counting.test.mjs
index 1bda1bf..21fb8f3 100644
--- a/tests/warehouse-transfer-counting.test.mjs
+++ b/tests/warehouse-transfer-counting.test.mjs
@@ -11,18 +11,63 @@ function setup() {
   const value = scope.page.data()
   for(const [key,method] of Object.entries(scope.page.methods)) value[key]=method.bind(value)
   for(const [key,get] of Object.entries(scope.page.computed)) Object.defineProperty(value,key,{get:()=>get.call(value)})
-  value.selected={transferNo:'WT1',packageCount:1,status:'WAIT_PDA_RECEIVING',items:[{id:'I1',skuCode:'A'}],cartons:[{cartonMark:'BOX1',transferItemId:'I1',status:'EXPECTED'}]}
+  value.selected={transferNo:'WT1',packageCount:1,status:'WAIT_PDA_RECEIVING',items:[{id:'I1',skuCode:'A',quantity:4}],cartons:[{cartonMark:'BOX1',transferItemId:'I1',status:'EXPECTED'}]}
   value.pallets=[{key:'P1',draftId:'P1',palletNo:'PALLET1',generated:true,bound:false}];value.restoreCartons();Object.assign(value.cartonBoxes[0],{length:10,width:20,height:30,weight:2});value.cartonBoxes[0].items[0].quantity=4
   return {scope,value,storage}
 }
+test('summary toggle preserves measurements and volume uses three decimals',()=>{
+  const {value}=setup()
+  assert.equal(value.summaryCollapsed,false)
+  value.summaryCollapsed=true
+  assert.equal(value.cartonBoxes[0].weight,2)
+  Object.assign(value.cartonBoxes[0],{length:10,width:10,height:6})
+  value.addExtraCarton()
+  Object.assign(value.cartonBoxes[1],{length:10,width:10,height:6,weight:2})
+  assert.equal(value.palletVolume(value.pallets[0]),'0.001')
+  assert.equal(value.totalVolume,'0.001')
+  assert.match(source,/aria-label="添加 SKU"/)
+  assert.match(source,/aria-label="删除箱子"/)
+})
+
+test('remeasure preserves saved measurements and unlocks carton editing',async()=>{
+  const {value,scope}=setup();
+  const box={...value.cartonBoxes[0],countedAt:'2026-10-16',status:'COUNTED'};
+  value.selected.cartons=[box]; value.cartonRequestKey='old-key';
+  scope.reopenWarehouseTransferMeasurement=async()=>({...value.selected,cartons:[{...box,countedAt:null}]});
+  await value.remeasure();
+  assert.equal(value.cartonsCounted,false); assert.equal(value.cartonBoxes[0].weight,2);
+  assert.equal(value.cartonBoxes[0].transferPalletId,'P1'); assert.equal(value.cartonRequestKey,'');
+  assert.equal(value.cartonCountReady,true);
+})
+
+test('bound pallet deletion retains box values and requires reassignment',async()=>{
+  const {value,scope}=setup();
+  scope.uni.showModal=options=>options.success({confirm:true});
+  value.pallets[0].bound=true;
+  scope.deleteWarehouseTransferPallet=async()=>({...value.selected,pallets:[]});
+  await value.removePallet(0);
+  assert.equal(value.cartonBoxes[0].transferPalletId,''); assert.equal(value.cartonBoxes[0].weight,2);
+  assert.equal(value.generatedPallets.length,0); assert.equal(value.pallets.length,1);
+  assert.equal(value.cartonCountReady,false); assert.equal(value.cartonPalletFilter,'');
+})
+
+test('failed pallet deletion retains binding and measurements',async()=>{
+  const {value,scope}=setup();
+  scope.uni.showModal=options=>options.success({confirm:true});
+  scope.deleteWarehouseTransferPallet=async()=>{throw new Error('offline')};
+  await value.removePallet(0);
+  assert.equal(value.cartonBoxes[0].transferPalletId,'P1'); assert.equal(value.pallets[0].busy,false);
+  assert.equal(value.error.message,'offline');
+})
+
 test('transfer counts require valid pieces and measurements and record variance reason',()=>{
   const {value}=setup();assert.equal(value.cartonCountReady,true)
   value.cartonBoxes[0].items[0].quantity=0;assert.equal(value.cartonCountReady,false)
   value.cartonBoxes[0].items[0].quantity=1.5;assert.equal(value.cartonCountReady,false)
   value.cartonBoxes[0].items[0].quantity=4;value.cartonBoxes[0].height=0;assert.equal(value.cartonCountReady,false)
   value.cartonBoxes[0].height=30;value.addExtraCarton();Object.assign(value.cartonBoxes[1],{length:10,width:20,height:30,weight:2});value.cartonBoxes[1].items[0].quantity=5
-  assert.equal(value.cartonCountReady,false);value.countDiscrepancyReason='多一箱';assert.equal(value.cartonCountReady,true)
-  assert.equal(value.cartonQuantity,9);assert.equal(value.cartonVolume,'0.012000')
+  assert.equal(value.cartonCountReady,true);value.countDiscrepancyReason='多一箱';assert.equal(value.cartonCountReady,true)
+  assert.equal(value.cartonQuantity,9);assert.equal(value.cartonVolume,'0.012')
 })
 test('network retry preserves request key and changed content uses a new request',async()=>{
   const {value,scope}=setup();const requests=[]
@@ -32,11 +77,9 @@ test('network retry preserves request key and changed content uses a new request
   value.cartonBoxes[0].items[0].quantity=8;await value.confirmCartons();assert.notEqual(requests[1].idempotencyKey,requests[2].idempotencyKey)
   assert.equal(value.countingCartons,false);assert.equal(value.error.message,'offline')
 })
-test('draft restores additional cartons and discrepancy reason and scanning rejects foreign box',()=>{
+test('draft restores additional cartons and discrepancy reason without crossing tasks',()=>{
   const {value}=setup();value.addExtraCarton();value.countDiscrepancyReason='超收';value.saveCartonDraft();value.restoreCartons()
   assert.equal(value.cartonBoxes.length,2);assert.equal(value.countDiscrepancyReason,'超收')
-  value.locateCarton('FOREIGN');assert.match(value.error.message,/不属于/)
-  value.locateCarton('BOX1');assert.equal(value.selectedCartonMark,'BOX1');assert.equal(value.cartonScrollTarget,'transfer-box-0')
   value.selected={...value.selected,transferNo:'WT2'};value.restoreCartons();assert.equal(value.cartonBoxes.length,1)
 })
 test('received count gates pallet completion and saving cannot switch active order',()=>{
@@ -47,6 +90,7 @@ test('received count gates pallet completion and saving cannot switch active ord
 
 test('batch applies only selected received boxes of one SKU and preserves independent drafts',()=>{
   const {value}=setup()
+  value.selected.items.push({id:'I2',skuCode:'B'})
   value.addExtraCarton();value.addExtraCarton();value.addExtraCarton()
   value.cartonBoxes[2].items[0].skuCode='B'
   value.cartonBoxes[3].received=false
@@ -127,3 +171,83 @@ test('pallet number can be created before measurements and new boxes receive tha
  assert.equal(value.cartonBoxes[0].transferPalletId,'CREATED')
  assert.equal(value.pallets[0].palletNo,'NEWPALLET')
 })
+
+// 最终完成入口需要区分无差异、取消、空白原因和网络重试。
+for (const answer of [{confirm:false}, {confirm:true,content:'  '}, {confirm:true,content:'少到一箱'}]) {
+  test('completion handles discrepancy answer '+JSON.stringify(answer),async()=>{
+    const {value,scope}=setup();let requests=[];let prompts=0
+    value.selected.items[0].quantity=5;value.selected.cartons[0].countedAt='2026-10-16'
+    value.pallets[0].bound=true;value.photoFileIds=[91]
+    scope.uni.showModal=options=>{prompts++;options.success(answer)}
+    scope.palletizeWarehouseTransfer=async(no,payload)=>{requests.push(payload);throw new Error('offline')}
+    await value.submit()
+    assert.equal(prompts,1);assert.equal(value.submitting,false)
+    assert.equal(requests.length,answer.confirm && answer.content?.trim()?1:0)
+    if(requests.length){assert.equal(requests[0].discrepancyReason,'少到一箱');await value.submit();assert.equal(requests[0].idempotencyKey,requests[1].idempotencyKey)}
+  })
+}
+test('matching SKU counts with different carton count submit without prompting, and missing photos block before prompting',async()=>{
+  const {value,scope}=setup();let prompts=0;let requests=[]
+  value.selected.packageCount=9;value.selected.cartons[0].countedAt='2026-10-16';value.pallets[0].bound=true
+  scope.uni.showModal=()=>{prompts++}
+  scope.palletizeWarehouseTransfer=async(no,payload)=>{requests.push(payload);throw new Error('offline')}
+  await value.submit();assert.equal(requests.length,0);assert.equal(prompts,0)
+  value.photoFileIds=[91];await value.submit();assert.equal(prompts,0);assert.equal(requests.length,1);assert.equal(requests[0].discrepancyReason,null)
+})
+
+// 逐箱确认收起、再次编辑及草稿恢复必须保留其他箱的确认状态。
+test('individual confirmation collapses only that box and resumes from draft',async()=>{
+  const {value,scope}=setup();value.addExtraCarton()
+  Object.assign(value.cartonBoxes[1],{length:10,width:20,height:30,weight:2});value.cartonBoxes[1].items[0].quantity=5
+  let saves=0;scope.countWarehouseTransferCartons=async()=>{saves++;throw new Error('offline')}
+  await value.confirmSingleCarton(value.cartonBoxes[0])
+  assert.equal(value.cartonConfirmed(value.cartonBoxes[0]),true);assert.equal(value.allCartonsConfirmed,false);assert.equal(saves,0)
+  value.restoreCartons();assert.equal(value.cartonConfirmed(value.cartonBoxes[0]),true)
+  await value.editCarton(value.cartonBoxes[0]);assert.equal(value.cartonConfirmed(value.cartonBoxes[0]),false)
+  await value.confirmSingleCarton(value.cartonBoxes[0]);await value.confirmSingleCarton(value.cartonBoxes[1])
+  assert.equal(value.allCartonsConfirmed,true);assert.equal(saves,1);assert.equal(value.error.message,'offline')
+  value.cartonBoxes[0].weight=3;assert.equal(value.cartonConfirmed(value.cartonBoxes[0]),false);assert.equal(value.allCartonsConfirmed,false)
+})
+test('saved boxes restore collapsed and editing reopens only selected box',async()=>{
+  const {value,scope}=setup()
+  const first={...value.cartonBoxes[0],quantity:4,countedAt:'2026-10-16',status:'COUNTED'}
+  const second={...first,cartonMark:'BOX2'}
+  value.selected.cartons=[first,second];value.restoreCartons()
+  assert.equal(value.cartonBoxes.every(box=>value.cartonConfirmed(box)),true)
+  scope.reopenWarehouseTransferMeasurement=async()=>({...value.selected,cartons:value.selected.cartons.map(box=>({...box,countedAt:null}))})
+  await value.editCarton(value.cartonBoxes[0])
+  assert.equal(value.cartonsCounted,false);assert.equal(value.cartonConfirmed(value.cartonBoxes[0]),false);assert.equal(value.cartonConfirmed(value.cartonBoxes[1]),true)
+  value.restoreCartons();assert.equal(value.cartonConfirmed(value.cartonBoxes[1]),true)
+})
+test('failed reopening preserves confirmed data and invalid box cannot confirm',async()=>{
+  const {value,scope}=setup();value.cartonBoxes[0].weight=0
+  await value.confirmSingleCarton(value.cartonBoxes[0]);assert.equal(value.cartonConfirmed(value.cartonBoxes[0]),false)
+  value.cartonBoxes[0].weight=2;value.selected.cartons=[{...value.cartonBoxes[0],countedAt:'2026-10-16',status:'COUNTED'}];value.restoreCartons()
+  scope.reopenWarehouseTransferMeasurement=async()=>{throw new Error('offline')}
+  await value.editCarton(value.cartonBoxes[0]);assert.equal(value.cartonsCounted,true);assert.equal(value.cartonConfirmed(value.cartonBoxes[0]),true)
+})
+
+// 箱数变化不影响 SKU 门禁，异 SKU 正负差异不能按总件数抵消。
+test('SKU differences compare each SKU and ignore carton count',()=>{
+  const {value}=setup();value.selected.packageCount=9
+  assert.equal(value.hasSkuReceiptDifference,false)
+  value.selected.items.push({id:'I2',skuCode:'B',quantity:3})
+  value.cartonBoxes[0].items=[{skuCode:'A',quantity:3},{skuCode:'B',quantity:4}]
+  assert.equal(value.cartonQuantity,value.forecastSkuQuantity)
+  assert.equal(value.skuReceiptDifferences.length,2)
+  value.cartonBoxes[0].items=[{skuCode:'A',quantity:4},{skuCode:'B',quantity:3}]
+  assert.equal(value.hasSkuReceiptDifference,false)
+})
+
+// 客户补箱后，新增预报箱进入PDA，原本机草稿和删除标记不丢失。
+test('forecast additions merge into existing draft without losing edited boxes',()=>{
+  const {value}=setup();value.cartonBoxes[0].weight=7;value.saveCartonDraft()
+  value.selected.packageCount=2;value.selected.cartons.push({cartonMark:'BOX2',transferItemId:'I1',status:'EXPECTED'})
+  value.restoreCartons();assert.equal(value.cartonBoxes.length,2);assert.equal(value.cartonBoxes[0].weight,7);assert.equal(value.cartonBoxes[1].cartonMark,'BOX2')
+  value.removeCarton(0);value.restoreCartons();assert.equal(value.cartonBoxes.length,1);assert.equal(value.cartonBoxes[0].cartonMark,'BOX2')
+})
+test('count payload carries forecast version for stale snapshot rejection',async()=>{
+  const {value,scope}=setup();let payload
+  scope.countWarehouseTransferCartons=async(no,request)=>{payload=request;throw new Error('offline')}
+  await value.confirmCartons();assert.equal(payload.forecastPackageCount,1);assert.equal(payload.boxes[0].cartonMark,'BOX1')
+})
diff --git a/tests/warehouse-transfer-mixed-cartons.test.mjs b/tests/warehouse-transfer-mixed-cartons.test.mjs
index e625e00..bdf13d4 100644
--- a/tests/warehouse-transfer-mixed-cartons.test.mjs
+++ b/tests/warehouse-transfer-mixed-cartons.test.mjs
@@ -58,14 +58,14 @@ test('delete only changes actual draft and preserves forecast; additions keep th
 test('draft reload preserves deletions, including an empty actual list', () => {
   const ctx = context()
   ctx.selected.cartons = [{ cartonMark: 'BOX1', transferItemId: '1', status: 'EXPECTED' }, { cartonMark: 'BOX2', transferItemId: '2', status: 'EXPECTED' }]
-  let saved = { boxes: [{ ...box('B'), cartonMark: 'BOX2', transferItemId: '2' }], discrepancyReason: '少到一箱' }
+  let saved = { forecastMarks: ['BOX1','BOX2'], boxes: [{ ...box('B'), cartonMark: 'BOX2', transferItemId: '2' }], discrepancyReason: '少到一箱' }
   globalThis.uni = { getStorageSync: () => saved }
   try {
     ctx.restoreCartons()
     assert.equal(ctx.cartonBoxes.length, 1)
     assert.equal(ctx.cartonBoxes[0].cartonMark, 'BOX2')
     assert.equal(ctx.countDiscrepancyReason, '少到一箱')
-    saved = { boxes: [], discrepancyReason: '重新录入' }
+    saved = { forecastMarks: ['BOX1','BOX2'], boxes: [], discrepancyReason: '重新录入' }
     ctx.restoreCartons()
     assert.equal(ctx.cartonBoxes.length, 0)
     assert.equal(ctx.selected.cartons.length, 2)
@@ -93,7 +93,7 @@ test('100 same SKU cartons accept two distinct specification groups and independ
   assert.equal(ctx.palletSummary(ctx.pallets[1]).cartonCount, 40)
   assert.equal(ctx.cartonQuantity, 1040)
   assert.equal(ctx.totalWeight, '580.00')
-  assert.equal(ctx.totalVolume, '3.840000')
+  assert.equal(ctx.totalVolume, '3.840')
   assert.equal(ctx.cartonCountReady, true)
   ctx.cartonBoxes[0].items[0].quantity = 11
   ctx.cartonBoxes[0].weight = 6

From d4225ff5a1c98bb5394143be2fa934099268e1fd Mon Sep 17 00:00:00 2001
From: liuyihe <2513762445@qq.com>
Date: Fri, 16 Oct 2026 16:53:09 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AGENTS.md                                           |  2 +-
 src/pages/warehouse-transfer/warehouse-transfer.vue |  6 +++---
 tests/warehouse-transfer-counting.test.mjs          | 10 ++++++++++
 tests/warehouse-transfer-mixed-cartons.test.mjs     | 10 ++++++++++
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index f3207ef..57a8218 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -61,7 +61,7 @@
 
 ## 海外业务接口边界
 
-- 仓储转运按托盘分别保存箱数、长宽高（cm）和毛重（kg），体积按本托尺寸计算；SKU件数逐种核对差异，不以预报箱数强制核平。箱唛沿用客户预报编号，PDA不得另造新箱号；测量完成前客户可增加预报箱数，PDA刷新时合并新箱并保留本机草稿，清点提交携带forecastPackageCount拦截旧快照。生成托盘号后锁定该卡测量数据，必须取得服务端绑定确认且至少有一张现场照片才能完成打托；完成请求提交稳定幂等键、照片文件 ID，SKU实收件数有差异时在完成入口弹窗必填差异原因，不重复提交整份托盘测量。重新进入从详情恢复托盘和鉴权照片；标签使用服务端 `labelDownloadPath` 下载 PDF，打开文档不等于真机打印完成。
+- 仓储转运按托盘分别保存箱数、长宽高（cm）和毛重（kg），体积按本托尺寸计算；SKU件数逐种核对差异，不以预报箱数强制核平。箱唛沿用客户预报编号，PDA不得另造新箱号；测量完成前客户与平台可增加整单预报箱数，不选SKU，箱内SKU以PDA实点为准，PDA刷新时合并新箱并保留本机草稿，清点提交携带forecastPackageCount拦截旧快照。生成托盘号后锁定该卡测量数据，必须取得服务端绑定确认且至少有一张现场照片才能完成打托；完成请求提交稳定幂等键、照片文件 ID，SKU实收件数有差异时在完成入口弹窗必填差异原因，不重复提交整份托盘测量。重新进入从详情恢复托盘和鉴权照片；标签使用服务端 `labelDownloadPath` 下载 PDF，打开文档不等于真机打印完成。
 
 - 换标目标确认即提交拆托合托，不再二次点击底部提交。`RelabelPalletWork.vue` 按当前轮次 `PALLET_BIND` 最新记录提供逐箱改绑，扫描新目标后弹窗确认，使用既有 `relabel-disassemble` 精确来源路径（不传 `actualSource`）；同目标不发写请求。服务器持有库存、托盘版本与幂等约束，已排车或出库禁止直接改绑。离线回归 `tests/relabel-pallet-work.test.mjs`，不等同真机验收。
 
diff --git a/src/pages/warehouse-transfer/warehouse-transfer.vue b/src/pages/warehouse-transfer/warehouse-transfer.vue
index 64deff4..522f225 100644
--- a/src/pages/warehouse-transfer/warehouse-transfer.vue
+++ b/src/pages/warehouse-transfer/warehouse-transfer.vue
@@ -85,7 +85,7 @@
                       <button v-if="previousMatchingCarton(index)" :disabled="countingCartons || box.received === false || !validCartonValues(previousMatchingCarton(index))" @tap="copyPreviousCarton(index)">复制上一同 SKU 箱</button>
                     </view>
                     <picker :disabled="cartonsCounted || countingCartons || box.received === false" :range="generatedPallets.map(pallet => pallet.palletNo)" :value="Math.max(0, generatedPallets.findIndex(pallet => String(pallet.draftId) === String(box.transferPalletId)))" @change="assignCartonPallet(box, Number($event.detail.value))"><view class="batch-sku">所属托盘：{{ cartonPalletLabel(box) }} ▾</view></picker>
-                    <CartonCountFields :box="box" :sku-codes="declaredSkuCodes" :unique-skus="true" :lock-first-sku="Boolean(box.cartonMark)" volume-unit="m3" :disabled="cartonsCounted || countingCartons || box.received === false"><template #sku-action><button v-if="!cartonsCounted && declaredSkuCodes.length > 1" class="add-sku-button" aria-label="添加 SKU" :disabled="countingCartons || box.received === false || box.items.length >= Math.min(200, declaredSkuCodes.length)" @tap="addCartonSku(box)">＋</button></template></CartonCountFields>
+                    <CartonCountFields :box="box" :sku-codes="declaredSkuCodes" :unique-skus="true" volume-unit="m3" :disabled="cartonsCounted || countingCartons || box.received === false"><template #sku-action><button v-if="!cartonsCounted && declaredSkuCodes.length > 1" class="add-sku-button" aria-label="添加 SKU" :disabled="countingCartons || box.received === false || box.items.length >= Math.min(200, declaredSkuCodes.length)" @tap="addCartonSku(box)">＋</button></template></CartonCountFields>
                     <button class="confirm-carton-button" :disabled="countingCartons || submitting || !validCartonValues(box) || !generatedPallets.some(pallet => String(pallet.draftId) === String(box.transferPalletId))" @tap="confirmSingleCarton(box)">确认本箱</button>
                     </template>
                   </view>
@@ -270,7 +270,7 @@ export default {
         saveCartonDraft() { if (this.selected && !this.cartonsCounted) uni.setStorageSync(this.cartonDraftKey(), { boxes: this.cartonBoxes, forecastMarks: (this.selected.cartons || []).map(box => box.cartonMark), discrepancyReason: this.countDiscrepancyReason, key: this.cartonRequestKey, signature: this.cartonSignature }) },
         cartonDraftKey() { return `transfer-carton-count:${session.apiBase}:${this.user?.id}:${this.user?.warehouseId}:${this.selected?.transferNo}` },
         restoreCartons() {
-          const rows = (this.selected?.cartons || []).filter(box => box.status !== 'NOT_RECEIVED').map(box => ({ ...box, transferPalletId: box.transferPalletId || (this.generatedPallets.length === 1 ? this.generatedPallets[0].draftId : ''), received: box.status !== 'NOT_RECEIVED', items: box.items?.length ? box.items.map(line => ({ skuCode: line.skuCode, quantity: line.quantity })) : [{ skuCode: this.selected.items.find(item => String(item.id) === String(box.transferItemId))?.skuCode || '', quantity: box.quantity ?? '' }] }));
+          const rows = (this.selected?.cartons || []).filter(box => box.status !== 'NOT_RECEIVED').map(box => ({ ...box, transferPalletId: box.transferPalletId || (this.generatedPallets.length === 1 ? this.generatedPallets[0].draftId : ''), received: box.status !== 'NOT_RECEIVED', items: box.items?.length ? box.items.map(line => ({ skuCode: line.skuCode, quantity: line.quantity })) : [{ skuCode: this.selected.items.find(item => String(item.id) === String(box.transferItemId))?.skuCode || this.declaredSkuCodes[0] || '', quantity: box.quantity ?? '' }] }));
           const draft = uni.getStorageSync(this.cartonDraftKey());
           this.countDiscrepancyReason = this.selected?.cartons?.find(box => box.discrepancyReason)?.discrepancyReason || ''; this.cartonRequestKey = ''; this.cartonSignature = '';
           if (!this.cartonsCounted && Array.isArray(draft?.boxes) && draft.boxes.every(box => box.items?.length && box.items.every(line => this.declaredSkuCodes.includes(line.skuCode)) && (box.cartonMark || this.selected.items.some(item => String(item.id) === String(box.transferItemId)))) && draft.boxes.every(box => !box.cartonMark || rows.some(row => row.cartonMark === box.cartonMark))) {
@@ -306,7 +306,7 @@ export default {
           if (skuCode) box.items.push({ skuCode, quantity: '' });
         },
         validCartonSkuLines(box) {
-          return box.items.length > 0 && box.items.length <= 200 && (!box.cartonMark || box.items.some(line => line.skuCode === this.selected.items.find(item => String(item.id) === String(box.transferItemId))?.skuCode)) && new Set(box.items.map(line => line.skuCode)).size === box.items.length
+          return box.items.length > 0 && box.items.length <= 200 && new Set(box.items.map(line => line.skuCode)).size === box.items.length
             && box.items.every(line => this.declaredSkuCodes.includes(line.skuCode) && Number.isSafeInteger(Number(line.quantity)) && Number(line.quantity) > 0 && Number(line.quantity) <= 2147483647);
         },
         async confirmCartons() {
diff --git a/tests/warehouse-transfer-counting.test.mjs b/tests/warehouse-transfer-counting.test.mjs
index 21fb8f3..d69202d 100644
--- a/tests/warehouse-transfer-counting.test.mjs
+++ b/tests/warehouse-transfer-counting.test.mjs
@@ -251,3 +251,13 @@ test('count payload carries forecast version for stale snapshot rejection',async
   scope.countWarehouseTransferCartons=async(no,request)=>{payload=request;throw new Error('offline')}
   await value.confirmCartons();assert.equal(payload.forecastPackageCount,1);assert.equal(payload.boxes[0].cartonMark,'BOX1')
 })
+
+test('新增预报箱无SKU绑定时恢复为可编辑箱，保留已有草稿', () => {
+  const { value } = setup()
+  value.selected.cartons.push({ cartonMark: 'NEW-UNBOUND', cartonIndex: 2, status: 'EXPECTED', transferItemId: null })
+  value.selected.packageCount = 2
+  value.restoreCartons()
+  const added = value.cartonBoxes.find(box => box.cartonMark === 'NEW-UNBOUND')
+  assert.ok(added)
+  assert.ok(value.declaredSkuCodes.includes(added.items[0].skuCode))
+})
diff --git a/tests/warehouse-transfer-mixed-cartons.test.mjs b/tests/warehouse-transfer-mixed-cartons.test.mjs
index bdf13d4..ccae108 100644
--- a/tests/warehouse-transfer-mixed-cartons.test.mjs
+++ b/tests/warehouse-transfer-mixed-cartons.test.mjs
@@ -115,3 +115,13 @@ test('copy previous matching SKU skips other SKUs and preserves the target palle
   ctx.cartonBoxes[2].items[0].quantity = 9
   assert.equal(ctx.cartonBoxes[0].items[0].quantity, 12)
 })
+
+test('预报箱可调整原SKU，新增无绑定箱也可清点', () => {
+  const ctx = context(); const current = { ...box('B', 4), cartonMark: 'FORECAST-1', transferItemId: '1' }
+  assert.equal(ctx.validCartonSkuLines(current), true)
+  current.transferItemId = null
+  assert.equal(ctx.validCartonSkuLines(current), true)
+  current.items[0].skuCode = 'OTHER'
+  assert.equal(ctx.validCartonSkuLines(current), false)
+  assert.doesNotMatch(source, /:lock-first-sku="Boolean\(box.cartonMark\)"/)
+})

From f8533772b754e882dbf9148aeb122ac24e245eca Mon Sep 17 00:00:00 2001
From: liuyihe <2513762445@qq.com>
Date: Fri, 16 Oct 2026 17:43:48 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouse-transfer/warehouse-transfer.vue | 60 +++++++++++++++----
 tests/warehouse-transfer-counting.test.mjs    | 44 +++++++++++++-
 .../warehouse-transfer-mixed-cartons.test.mjs |  6 +-
 3 files changed, 93 insertions(+), 17 deletions(-)

diff --git a/src/pages/warehouse-transfer/warehouse-transfer.vue b/src/pages/warehouse-transfer/warehouse-transfer.vue
index 522f225..f76f5bd 100644
--- a/src/pages/warehouse-transfer/warehouse-transfer.vue
+++ b/src/pages/warehouse-transfer/warehouse-transfer.vue
@@ -90,6 +90,7 @@
                     </template>
                   </view>
                   <button v-if="cartonsCounted" class="add-pallet-button" @tap="printCartonLabels">打开箱标签打印</button>
+                  <button v-if="restorableCartons.length" class="add-pallet-button" :disabled="countingCartons || submitting || deletingCarton" @tap="restoreDeletedCarton">恢复已删除箱子（{{ restorableCartons.length }}）</button>
                   <button class="transfer-primary" :disabled="!allCartonsConfirmed || !cartonCountReady || countingCartons || cartonsCounted" @tap="confirmCartons">{{ cartonsCounted ? '全部箱子已清点' : countingCartons ? '保存中…' : '保存全部清点结果' }}</button>
                 </view>
 				<view class="photo-card">
@@ -138,8 +139,17 @@ const restoredPallet = (value, index) => ({
 
 export default {
 	components: { PortalHeader, ScanTargetInput, CartonCountFields },
-	data() { return { summaryCollapsed: false, receivingPalletId: '', cartonPalletFilter: '', batchPalletId: '', batchCountOpen: false, batchSku: '', batchBox: newBatchBox(), batchSelectedIndexes: [], batchCountMessage: '', cartonScrollTarget: '', cartonBoxes: [], countDiscrepancyReason: '', countingCartons: false, cartonRequestKey: '', cartonSignature: '', user: session.currentUser, entryMode: 'work', pendingTaskNo: '', candidates: [], selected: null, pallets: [newPallet()], activePalletKey: '', photoFileIds: [], photoNames: [], photoUrls: {}, completedPallets: [], completedTransferNo: '', completedDestination: '', completedDestinationType: '', loading: false, detailLoading: false, submitting: false, uploadingPhoto: false, openingLabel: false, error: null, success: false, pendingKey: '' } },
+	data() { return { deletedCartonBoxes: [], deletingCarton: false, summaryCollapsed: false, receivingPalletId: '', cartonPalletFilter: '', batchPalletId: '', batchCountOpen: false, batchSku: '', batchBox: newBatchBox(), batchSelectedIndexes: [], batchCountMessage: '', cartonScrollTarget: '', cartonBoxes: [], countDiscrepancyReason: '', countingCartons: false, cartonRequestKey: '', cartonSignature: '', user: session.currentUser, entryMode: 'work', pendingTaskNo: '', candidates: [], selected: null, pallets: [newPallet()], activePalletKey: '', photoFileIds: [], photoNames: [], photoUrls: {}, completedPallets: [], completedTransferNo: '', completedDestination: '', completedDestinationType: '', loading: false, detailLoading: false, submitting: false, uploadingPhoto: false, openingLabel: false, error: null, success: false, pendingKey: '' } },
 	computed: {
+        restorableCartons() {
+          const current = new Set(this.cartonBoxes.map(box => box.cartonMark || box.localKey));
+          const removed = new Map();
+          for (const box of [...(this.selected?.cartons || []), ...this.deletedCartonBoxes]) {
+            const key = box.cartonMark || box.localKey;
+            if (key && !current.has(key)) removed.set(key, box);
+          }
+          return [...removed.values()];
+        },
         generatedPallets() { return this.pallets.filter(pallet => pallet.generated && pallet.draftId) },
         declaredSkuCodes() { return [...new Set((this.selected?.items || []).map(item => item.skuCode))] },
         batchSkuCodes() { return [...new Set(this.receivedCartonBoxes.map(box => box.items[0]?.skuCode).filter(Boolean))] },
@@ -186,7 +196,7 @@ export default {
 	},
 	watch: {
         countDiscrepancyReason() { this.saveCartonDraft() },
-		cartonBoxes: { deep: true, handler() { if (this.selected && !this.cartonsCounted) uni.setStorageSync(this.cartonDraftKey(), { boxes: this.cartonBoxes, forecastMarks: (this.selected.cartons || []).map(box => box.cartonMark), discrepancyReason: this.countDiscrepancyReason, key: this.cartonRequestKey, signature: this.cartonSignature }) } },
+		cartonBoxes: { deep: true, handler() { if (this.selected && !this.cartonsCounted) uni.setStorageSync(this.cartonDraftKey(), { boxes: this.cartonBoxes, deletedBoxes: this.deletedCartonBoxes, forecastMarks: (this.selected.cartons || []).map(box => box.cartonMark), discrepancyReason: this.countDiscrepancyReason, key: this.cartonRequestKey, signature: this.cartonSignature }) } },
 		pallets: { deep: true, handler() { if (!this.submitting) this.pendingKey = '' } }
 	},
 		 onShow() { if (requireSession()) { this.user = session.currentUser; restoreWarehouseWork(`${this.user.id}:${this.user.warehouseId}`); this.startScanner(); this.loadCandidates().then(() => { const activeNo = String(warehouseWork.warehouseTransfer.currentNo || ''); const taskNo = this.pendingTaskNo || activeNo; if (this.entryMode === 'work' && taskNo) { const active = this.candidates.find((item) => String(item.transferNo) === taskNo); if (active) { const fromExplicitTask = Boolean(this.pendingTaskNo); this.pendingTaskNo = ''; void this.select(active, fromExplicitTask) } } }) } },
@@ -214,7 +224,7 @@ export default {
           this.countingCartons = true; this.error = null
           try {
             const detail = await reopenWarehouseTransferMeasurement(this.selected.transferNo)
-            uni.removeStorageSync(this.cartonDraftKey()); this.selected = detail; this.restoreCartons()
+            uni.setStorageSync(this.cartonDraftKey(), { deletedBoxes: this.deletedCartonBoxes }); this.selected = detail; this.restoreCartons()
             this.cartonBoxes.forEach(current => { current.confirmedSignature = current.cartonMark === mark ? '' : this.cartonConfirmationSignature(current) })
             this.pendingKey = ''; this.saveCartonDraft()
           } catch (error) { this.error = error } finally { this.countingCartons = false }
@@ -267,13 +277,14 @@ export default {
           if (!target || target.received === false || !this.validCartonValues(source)) return;
           this.copyCartonValues(source, target); this.saveCartonDraft();
         },
-        saveCartonDraft() { if (this.selected && !this.cartonsCounted) uni.setStorageSync(this.cartonDraftKey(), { boxes: this.cartonBoxes, forecastMarks: (this.selected.cartons || []).map(box => box.cartonMark), discrepancyReason: this.countDiscrepancyReason, key: this.cartonRequestKey, signature: this.cartonSignature }) },
+        saveCartonDraft() { if (this.selected && !this.cartonsCounted) uni.setStorageSync(this.cartonDraftKey(), { boxes: this.cartonBoxes, deletedBoxes: this.deletedCartonBoxes, forecastMarks: (this.selected.cartons || []).map(box => box.cartonMark), discrepancyReason: this.countDiscrepancyReason, key: this.cartonRequestKey, signature: this.cartonSignature }) },
         cartonDraftKey() { return `transfer-carton-count:${session.apiBase}:${this.user?.id}:${this.user?.warehouseId}:${this.selected?.transferNo}` },
         restoreCartons() {
           const rows = (this.selected?.cartons || []).filter(box => box.status !== 'NOT_RECEIVED').map(box => ({ ...box, transferPalletId: box.transferPalletId || (this.generatedPallets.length === 1 ? this.generatedPallets[0].draftId : ''), received: box.status !== 'NOT_RECEIVED', items: box.items?.length ? box.items.map(line => ({ skuCode: line.skuCode, quantity: line.quantity })) : [{ skuCode: this.selected.items.find(item => String(item.id) === String(box.transferItemId))?.skuCode || this.declaredSkuCodes[0] || '', quantity: box.quantity ?? '' }] }));
           const draft = uni.getStorageSync(this.cartonDraftKey());
+          this.deletedCartonBoxes = Array.isArray(draft?.deletedBoxes) ? draft.deletedBoxes.filter(box => !box.cartonMark || (this.selected?.cartons || []).some(row => row.cartonMark === box.cartonMark)) : [];
           this.countDiscrepancyReason = this.selected?.cartons?.find(box => box.discrepancyReason)?.discrepancyReason || ''; this.cartonRequestKey = ''; this.cartonSignature = '';
-          if (!this.cartonsCounted && Array.isArray(draft?.boxes) && draft.boxes.every(box => box.items?.length && box.items.every(line => this.declaredSkuCodes.includes(line.skuCode)) && (box.cartonMark || this.selected.items.some(item => String(item.id) === String(box.transferItemId)))) && draft.boxes.every(box => !box.cartonMark || rows.some(row => row.cartonMark === box.cartonMark))) {
+          if (!this.cartonsCounted && Array.isArray(draft?.boxes) && draft.boxes.every(box => box.items?.length && box.items.every(line => this.declaredSkuCodes.includes(line.skuCode)) && (box.cartonMark || this.selected.items.some(item => String(item.id) === String(box.transferItemId)))) && draft.boxes.every(box => !box.cartonMark || (this.selected?.cartons || []).some(row => row.cartonMark === box.cartonMark))) {
             const knownMarks = new Set(draft.forecastMarks || draft.boxes.map(box => box.cartonMark));
             this.cartonBoxes = [...draft.boxes, ...rows.filter(box => !knownMarks.has(box.cartonMark))]; this.countDiscrepancyReason = draft.discrepancyReason || ''; this.cartonRequestKey = draft.key || ''; this.cartonSignature = draft.signature || '';
           } else this.cartonBoxes = rows;
@@ -291,9 +302,36 @@ export default {
           this.error = new Error('当前设备未配置箱标签打印服务');
           // #endif
         },
-        removeCarton(index) {
-          if (this.cartonsCounted || this.countingCartons) return;
-          this.cartonBoxes.splice(index, 1); this.batchSelectedIndexes = []; this.batchCountMessage = ''; this.saveCartonDraft();
+        async removeCarton(index) {
+          if (this.cartonsCounted || this.countingCartons || this.submitting || this.deletingCarton) return;
+          const box = this.cartonBoxes[index], transferNo = this.selected?.transferNo;
+          if (!box) return;
+          this.deletingCarton = true;
+          try {
+            const answer = await new Promise((resolve, reject) => uni.showModal({ title: '确认删除箱子', content: `确定删除${box.cartonMark || `第 ${index + 1} 箱`}吗？删除后本箱不计入本次实收，保存清点时会记为未收到。误删可通过“恢复已删除箱子”找回。`, confirmText: '确认删除', confirmColor: '#b74545', cancelText: '取消', success: resolve, fail: reject }));
+            if (!answer.confirm || transferNo !== this.selected?.transferNo || this.cartonsCounted || this.countingCartons || this.submitting) return;
+            const position = this.cartonBoxes.indexOf(box);
+            if (position < 0) return;
+            if (!box.cartonMark && !box.localKey) box.localKey = `removed-${Date.now()}-${Math.random()}`;
+            this.deletedCartonBoxes.push(box); this.cartonBoxes.splice(position, 1);
+            this.batchSelectedIndexes = []; this.batchCountMessage = ''; this.saveCartonDraft();
+          } catch (error) { this.error = error } finally { this.deletingCarton = false }
+        },
+        async restoreDeletedCarton() {
+          if (this.countingCartons || this.submitting || this.deletingCarton || !this.restorableCartons.length) return;
+          const candidates = this.restorableCartons, transferNo = this.selected?.transferNo;
+          try {
+            const choice = candidates.length === 1 ? 0 : await new Promise((resolve, reject) => uni.showActionSheet({ itemList: candidates.map((box, index) => box.cartonMark || `已删除实收箱 ${index + 1}`), success: result => resolve(result.tapIndex), fail: () => resolve(-1) }));
+            if (choice < 0 || transferNo !== this.selected?.transferNo) return;
+            const removed = candidates[choice], key = removed.cartonMark || removed.localKey;
+            if (this.cartonsCounted) { await this.remeasure(); if (this.cartonsCounted || transferNo !== this.selected?.transferNo) return }
+            if (this.cartonBoxes.some(box => (box.cartonMark || box.localKey) === key)) return;
+            const box = { ...removed, received: true, status: 'EXPECTED', countedAt: null, confirmedSignature: '',
+              items: removed.items?.length ? removed.items.map(line => ({ ...line })) : [{ skuCode: this.selected.items.find(item => String(item.id) === String(removed.transferItemId))?.skuCode || this.declaredSkuCodes[0] || '', quantity: removed.quantity ?? '' }] };
+            if (!this.generatedPallets.some(pallet => String(pallet.draftId) === String(box.transferPalletId))) box.transferPalletId = this.receivingPalletId || this.generatedPallets[0]?.draftId || '';
+            this.deletedCartonBoxes = this.deletedCartonBoxes.filter(item => (item.cartonMark || item.localKey) !== key);
+            this.cartonBoxes.push(box); this.cartonPalletFilter = ''; this.cartonRequestKey = ''; this.cartonSignature = ''; this.saveCartonDraft();
+          } catch (error) { this.error = error }
         },
         addExtraCarton() {
           if (this.cartonsCounted || this.countingCartons || !this.selected?.items?.length) return;
@@ -316,10 +354,10 @@ export default {
             const boxes = this.receivedCartonBoxes.map(box => ({ cartonMark: box.cartonMark || null, transferItemId: box.cartonMark ? box.transferItemId : this.selected.items.find(item => item.skuCode === box.items[0]?.skuCode)?.id, transferPalletId: box.transferPalletId, length: Number(box.length), width: Number(box.width), height: Number(box.height), weight: Number(box.weight), items: box.items.map(line => ({ skuCode: line.skuCode, quantity: Number(line.quantity) })) }));
             const signature = JSON.stringify({ boxes, discrepancyReason: this.countDiscrepancyReason, forecastPackageCount: Number(this.selected.packageCount) });
             if (!this.cartonRequestKey || signature !== this.cartonSignature) { this.cartonRequestKey = `transfer-count-${Date.now()}-${Math.random().toString(36).slice(2)}`; this.cartonSignature = signature }
-            uni.setStorageSync(this.cartonDraftKey(), { boxes: this.cartonBoxes, forecastMarks: (this.selected.cartons || []).map(box => box.cartonMark), discrepancyReason: this.countDiscrepancyReason, key: this.cartonRequestKey, signature });
+            uni.setStorageSync(this.cartonDraftKey(), { boxes: this.cartonBoxes, deletedBoxes: this.deletedCartonBoxes, forecastMarks: (this.selected.cartons || []).map(box => box.cartonMark), discrepancyReason: this.countDiscrepancyReason, key: this.cartonRequestKey, signature });
             const detail = await countWarehouseTransferCartons(this.selected.transferNo, { idempotencyKey: this.cartonRequestKey, boxes, discrepancyReason: this.countDiscrepancyReason, forecastPackageCount: Number(this.selected.packageCount) });
             if (!detail.cartons?.length || !detail.cartons.every(box => box.countedAt)) throw new Error('清点结果未确认，请刷新核实');
-            uni.removeStorageSync(this.cartonDraftKey()); this.selected = detail; this.pallets = detail.pallets.map(restoredPallet); this.restoreCartons();
+            uni.setStorageSync(this.cartonDraftKey(), { deletedBoxes: this.deletedCartonBoxes }); this.selected = detail; this.pallets = detail.pallets.map(restoredPallet); this.restoreCartons();
           } catch (error) { this.error = error } finally { this.countingCartons = false }
         },
 			openPalletOperations() { uni.navigateTo({ url: '/pages/pallet/pallet' }) },
@@ -415,7 +453,7 @@ export default {
           this.countingCartons = true; this.error = null;
           try {
             const detail = await reopenWarehouseTransferMeasurement(this.selected.transferNo);
-            uni.removeStorageSync(this.cartonDraftKey()); this.selected = detail; this.restoreCartons(); this.pendingKey = '';
+            uni.setStorageSync(this.cartonDraftKey(), { deletedBoxes: this.deletedCartonBoxes }); this.selected = detail; this.restoreCartons(); this.pendingKey = '';
             this.cartonScrollTarget = 'transfer-boxes';
           } catch (error) { this.error = error } finally { this.countingCartons = false }
         },
diff --git a/tests/warehouse-transfer-counting.test.mjs b/tests/warehouse-transfer-counting.test.mjs
index d69202d..8046f3d 100644
--- a/tests/warehouse-transfer-counting.test.mjs
+++ b/tests/warehouse-transfer-counting.test.mjs
@@ -6,7 +6,7 @@ const source = readFileSync(new URL('../src/pages/warehouse-transfer/warehouse-t
 const script = source.match(/<script>([\s\S]*?)<\/script>/)[1].replace(/^import .+$/gm,'').replace('export default','page =')
 function setup() {
   const storage = new Map()
-  const scope = { CartonCountFields:{},PortalHeader:{},ScanTargetInput:{},session:{apiBase:'LOCAL',currentUser:{id:'OP',warehouseId:'WH'}},uni:{getStorageSync:key=>storage.get(key),setStorageSync:(key,value)=>storage.set(key,JSON.parse(JSON.stringify(value))),removeStorageSync:key=>storage.delete(key)} }
+  const scope = { CartonCountFields:{},PortalHeader:{},ScanTargetInput:{},session:{apiBase:'LOCAL',currentUser:{id:'OP',warehouseId:'WH'}},uni:{showModal: options=>options.success({confirm:true}),getStorageSync:key=>storage.get(key),setStorageSync:(key,value)=>storage.set(key,JSON.parse(JSON.stringify(value))),removeStorageSync:key=>storage.delete(key)} }
   runInNewContext(script,scope)
   const value = scope.page.data()
   for(const [key,method] of Object.entries(scope.page.methods)) value[key]=method.bind(value)
@@ -15,6 +15,44 @@ function setup() {
   value.pallets=[{key:'P1',draftId:'P1',palletNo:'PALLET1',generated:true,bound:false}];value.restoreCartons();Object.assign(value.cartonBoxes[0],{length:10,width:20,height:30,weight:2});value.cartonBoxes[0].items[0].quantity=4
   return {scope,value,storage}
 }
+test('deletion needs confirmation and cancel preserves box and measurements',async()=>{
+  const {value,scope}=setup(); let warning;
+  scope.uni.showModal=options=>{warning=options;options.success({confirm:false})};
+  await value.removeCarton(0);
+  assert.equal(value.cartonBoxes.length,1);assert.equal(value.cartonBoxes[0].weight,2);
+  assert.match(warning.content,/不计入本次实收/);assert.equal(warning.confirmText,'确认删除');
+  assert.equal(value.restorableCartons.length,0);assert.equal(value.deletingCarton,false);
+})
+
+test('deleted box survives reload and restores original identity, SKU, measurements and pallet',async()=>{
+  const {value}=setup(); await value.removeCarton(0);
+  assert.equal(value.cartonBoxes.length,0);assert.equal(value.restorableCartons.length,1);
+  value.restoreCartons();await value.restoreDeletedCarton();
+  const box=value.cartonBoxes[0];
+  assert.equal(box.cartonMark,'BOX1');assert.equal(box.weight,2);assert.equal(box.items[0].quantity,4);
+  assert.equal(box.transferPalletId,'P1');assert.equal(value.restorableCartons.length,0);
+  assert.equal(value.selected.packageCount,1);assert.equal(value.cartonConfirmed(box),false);
+})
+
+test('saved missing box can be restored after reopening count without increasing forecast',async()=>{
+  const {value,scope}=setup();
+  value.selected.cartons[0].status='NOT_RECEIVED';value.selected.cartons[0].countedAt='2026-10-16';
+  value.restoreCartons();assert.equal(value.cartonBoxes.length,0);
+  scope.reopenWarehouseTransferMeasurement=async()=>({...value.selected,cartons:value.selected.cartons.map(box=>({...box,countedAt:null}))});
+  await value.restoreDeletedCarton();
+  assert.equal(value.cartonsCounted,false);assert.equal(value.cartonBoxes[0].cartonMark,'BOX1');
+  assert.equal(value.selected.packageCount,1);assert.equal(value.restorableCartons.length,0);
+  value.cartonBoxes[0].weight=9;value.saveCartonDraft();value.restoreCartons();
+  assert.equal(value.cartonBoxes[0].cartonMark,'BOX1');assert.equal(value.cartonBoxes[0].weight,9);
+})
+
+test('previously deleted forecast box without an archive can still be restored',async()=>{
+  const {value}=setup();value.cartonBoxes=[];value.saveCartonDraft();value.restoreCartons();
+  assert.equal(value.restorableCartons.length,1);
+  await value.restoreDeletedCarton();
+  assert.equal(value.cartonBoxes[0].cartonMark,'BOX1');assert.equal(value.selected.packageCount,1);
+})
+
 test('summary toggle preserves measurements and volume uses three decimals',()=>{
   const {value}=setup()
   assert.equal(value.summaryCollapsed,false)
@@ -240,11 +278,11 @@ test('SKU differences compare each SKU and ignore carton count',()=>{
 })
 
 // 客户补箱后，新增预报箱进入PDA，原本机草稿和删除标记不丢失。
-test('forecast additions merge into existing draft without losing edited boxes',()=>{
+test('forecast additions merge into existing draft without losing edited boxes',async()=>{
   const {value}=setup();value.cartonBoxes[0].weight=7;value.saveCartonDraft()
   value.selected.packageCount=2;value.selected.cartons.push({cartonMark:'BOX2',transferItemId:'I1',status:'EXPECTED'})
   value.restoreCartons();assert.equal(value.cartonBoxes.length,2);assert.equal(value.cartonBoxes[0].weight,7);assert.equal(value.cartonBoxes[1].cartonMark,'BOX2')
-  value.removeCarton(0);value.restoreCartons();assert.equal(value.cartonBoxes.length,1);assert.equal(value.cartonBoxes[0].cartonMark,'BOX2')
+  await value.removeCarton(0);value.restoreCartons();assert.equal(value.cartonBoxes.length,1);assert.equal(value.cartonBoxes[0].cartonMark,'BOX2')
 })
 test('count payload carries forecast version for stale snapshot rejection',async()=>{
   const {value,scope}=setup();let payload
diff --git a/tests/warehouse-transfer-mixed-cartons.test.mjs b/tests/warehouse-transfer-mixed-cartons.test.mjs
index ccae108..31159be 100644
--- a/tests/warehouse-transfer-mixed-cartons.test.mjs
+++ b/tests/warehouse-transfer-mixed-cartons.test.mjs
@@ -4,7 +4,7 @@ import { readFile } from 'node:fs/promises'
 
 const source = await readFile(new URL('../src/pages/warehouse-transfer/warehouse-transfer.vue', import.meta.url), 'utf8')
 const script = source.match(/<script>([\s\S]*?)<\/script>/)[1].replace(/^import .+$/gm, '').replace('export default', 'return')
-const page = new Function('CartonCountFields', 'PortalHeader', 'ScanTargetInput', 'session', script)({}, {}, {}, { currentUser: null })
+const page = new Function('CartonCountFields', 'PortalHeader', 'ScanTargetInput', 'session', 'uni', script)({}, {}, {}, { currentUser: null }, { showModal: options => options.success({confirm:true}), getStorageSync: key => globalThis.uni?.getStorageSync(key) })
 function context() {
   const ctx = { ...page.data(), selected: { transferNo: 'WT1', packageCount: 2, items: [{ id: '1', skuCode: 'A' }, { id: '2', skuCode: 'B' }], cartons: [] }, saveCartonDraft() {} }
   for (const [name, method] of Object.entries(page.methods)) ctx[name] = method.bind(ctx)
@@ -41,10 +41,10 @@ test('single SKU batch changes never overwrite mixed carton contents', () => {
   assert.equal(ctx.cartonQuantity, 13)
 })
 
-test('delete only changes actual draft and preserves forecast; additions keep their own SKU rows', () => {
+test('delete only changes actual draft and preserves forecast; additions keep their own SKU rows', async () => {
   const ctx = context()
   ctx.cartonBoxes = [box(), box('B')]; ctx.batchSelectedIndexes = [1]
-  ctx.removeCarton(0)
+  await ctx.removeCarton(0)
   assert.equal(ctx.cartonBoxes.length, 1)
   assert.equal(ctx.selected.packageCount, 2)
   assert.deepEqual(ctx.batchSelectedIndexes, [])

From b8c9fddf8e166c8ed38acaec528a0af8b12291b1 Mon Sep 17 00:00:00 2001
From: liuyihe <2513762445@qq.com>
Date: Fri, 16 Oct 2026 18:26:06 +0800
Subject: [PATCH 7/8] =?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/components/RelabelPalletWork.vue      | 62 +++++++++------------
 tests/relabel-pallet-measurement.test.mjs | 67 ++++++++++++++---------
 tests/relabel-pallet-work.test.mjs        |  6 +-
 3 files changed, 71 insertions(+), 64 deletions(-)

diff --git a/src/components/RelabelPalletWork.vue b/src/components/RelabelPalletWork.vue
index 033c253..9b1a5df 100644
--- a/src/components/RelabelPalletWork.vue
+++ b/src/components/RelabelPalletWork.vue
@@ -5,20 +5,17 @@
       <button class="refresh-button" :disabled="busy" @tap="loadSources">刷新</button>
     </view>
     <view v-if="currentBindings.length">
-      <text class="hint">已绑定箱唛：选择后扫描新目标托盘可改绑（已排车或出库不可直接改绑）。</text>
       <button v-for="binding in currentBindings" :key="binding.mark" class="binding-row" :disabled="busy" @tap="selectRebind(binding)"><text class="binding-mark">{{ binding.mark }}</text><text class="binding-arrow">→</text><text class="binding-pallet">{{ binding.pallet }}</text><text class="binding-action">重新绑定</text></button>
     </view>
     <view v-for="pallet in boundPalletTotals" :key="pallet.palletCode" class="hint"><text>{{ pallet.palletCode }} · {{ pallet.totalPackages }} 箱 · 体积 {{ pallet.volumeCbm == null ? '待补测' : pallet.volumeCbm + ' m³' }} · 重量 {{ pallet.grossWeightKg == null ? '待补测' : pallet.grossWeightKg + ' kg' }}</text></view>
     <view v-for="pallet in measurements" :key="pallet.palletCode" class="measurement-card">
       <text class="heading">{{ pallet.palletCode }} · {{ pallet.packages }} 箱</text>
-      <text class="hint">{{ pallet.cartonAggregated ? '按当前托盘内实测箱自动汇总，移出扣减、移入增加。' : pallet.inherited ? '原托盘货物未变，沿用来源测量。' : '请核对托盘测量数据。' }}</text>
       <text v-if="pallet.volumeCbm != null" class="hint">{{ pallet.inherited ? '来源汇总' : '已确认' }}：{{ pallet.volumeCbm }} m³ · {{ pallet.grossWeightKg }} kg</text>
       <view v-if="pallet.inherited && pallet.sourceCartonSpecs?.length" class="source-carton-specs">
         <text class="source-caption">来源箱规（长 × 宽 × 高）</text>
         <text v-for="(spec, index) in pallet.sourceCartonSpecs" :key="index" class="hint">{{ spec.lengthCm }} × {{ spec.widthCm }} × {{ spec.heightCm }} cm · {{ spec.grossWeightKg }} kg/箱 · {{ spec.cartons }} 箱</text>
       </view>
       <text v-if="pallet.inherited && pallet.lengthCm > 0 && pallet.widthCm > 0 && pallet.heightCm > 0" class="hint">原整托尺寸：{{ pallet.lengthCm }} × {{ pallet.widthCm }} × {{ pallet.heightCm }} cm</text>
-      <text v-else-if="pallet.inherited && !pallet.cartonAggregated" class="hint">来源按箱测量，未测整托长宽高。</text>
       <button v-if="!pallet.cartonAggregated && pallet.inherited && !pallet.remeasuring" :disabled="busy" @tap="pallet.remeasuring = true">包装变化，重新测量</button>
       <view v-if="!pallet.cartonAggregated && (!pallet.inherited || pallet.remeasuring)" class="measurement-inputs">
         <label v-for="field in measurementFields" :key="field.key"><text>{{ field.label }}</text><input v-model="pallet[field.key]" type="digit" :disabled="busy" :placeholder="field.label" /></label>
@@ -35,32 +32,20 @@
     <text v-if="!busy && !operableSourceRows.length" class="hint">当前没有可操作的来源托盘或来源箱</text>
     <ScanTargetInput v-if="!isReturnBulk && !unboundSourceMode" v-model="sourceCode" name="relabel-source" label="实际来源托盘" placeholder="扫描实际来源托盘" :active="active === 'source'" @activate="activate('source')" @submit="confirmSourceScan" />
     <ScanTargetInput v-if="unboundSourceMode" v-model="sourceCode" name="relabel-source-carton" label="来源箱唛" placeholder="扫描来源箱唛确认" :active="active === 'source'" @activate="activate('source')" @submit="confirmSourceScan" />
-    <text v-if="source" class="hint">来源已确认：{{ source.palletCode }}；尚未拆出，请完成贴标登记、核对拆出数量并扫描目标托盘，绑定成功后才保存拆托明细。</text>
+    <text v-if="source" class="hint">来源已确认：{{ source.palletCode }}</text>
     <view v-if="selectedSource">
-      <text v-if="isReturnBulk" class="hint">本次{{ wholeSource ? '整托换标数量' : '拆出件数' }}（可分多个来源托盘，逐批提交）</text>
       <template v-if="isReturnBulk">
         <text class="return-pallet-summary">{{ selectedSource.palletCode }}：{{ wholeSource ? '整托换标' : '部分拆箱' }} {{ quantity || 0 }} 件 → {{ selectedDestination || '目的仓待维护' }}</text>
-        <text v-if="wholeSource" class="hint">贴标数量等于本托盘全部 {{ selectedSource.stockPackages }} 件，无需填写拆箱数量；直接新增带目的仓的托盘标签并绑定。</text>
-        <template v-else-if="allowDisassemble"><input v-model="quantity" type="number" :disabled="busy" :placeholder="`请输入拆箱数量（应为 ${plannedPackages} 件）`" /><text class="hint">贴标数量少于本托盘库存，请按现场实际选择来源托盘并填写拆箱数量；本托盘应拆 {{ plannedPackages }} 件。</text></template>
-        <text v-else class="hint">退货换标按整托绑定，不支持拆箱；托盘仍会展示用于核对。</text>
-        <text class="hint">退货换标无需扫描箱唛。</text>
+        <input v-if="!wholeSource && allowDisassemble" v-model="quantity" type="number" :disabled="busy" :placeholder="`拆出件数（${plannedPackages} 件）`" />
       </template>
       <template v-else><view class="split-quantity-row"><text>本次拆出箱数</text><input v-model="quantity" type="number" :disabled="busy" placeholder="箱数" @input="prepareMeasuredBatch" /><text>箱</text></view></template>
     </view>
-    <view v-if="requiresMeasuredBoxChoice && marks.length" class="source-carton-specs">
-      <text class="hint">来源有多种箱规，请选择本次移出的实测箱，系统自动扣减体积和重量。</text>
-      <picker v-for="mark in marks" :key="mark" :range="measuredBoxOptions(mark)" range-key="label" :disabled="busy" @change="chooseMeasuredBox(mark, $event)">
-        <view class="hint">{{ mark }}：{{ measuredBoxLabel(mark) }}</view>
-      </picker>
-    </view>
     <view class="split-progress"><template v-if="!isReturnBulk"><text>本次需换标拆 <strong>{{ requiredSplitPackages }}</strong> 箱</text><text>已拆 <strong>{{ splitPackages }}</strong> 箱</text></template><button class="create-pallet-button" :disabled="busy || !!newPallet" @tap="createPallet">新增托盘号</button></view>
     </template>
     <template v-if="!allBindingsComplete || rebindSelection">
     <ScanTargetInput v-model="targetCode" name="relabel-target" label="目标托盘" placeholder="扫描同目的仓目标托盘或新托盘号" :active="active === 'target'" @activate="activate('target')" @submit="confirmTargetAndBind" />
     <button v-if="canRetainOriginal" :disabled="busy" @tap="quantity = String(source.totalPackages); targetCode = source.palletCode; confirmTargetAndBind()">整托全部贴标，保留原托盘</button>
     <button :disabled="busy || !targetCode.trim()" @tap="confirmTargetAndBind">{{ rebindSelection ? '确认改绑目标托盘' : '确认绑定目标托盘' }}</button>
-    <text v-if="labelBlockReason" class="hint">{{ labelBlockReason }}</text>
-    <text v-if="target" class="hint">已识别目标：{{ target.palletCode }}，尚未绑定成功</text>
     <view v-if="newPallet" class="hint"><text>托盘 {{ newPallet.palletCode }} 待绑定</text><button @tap="printPallet">查看 / 打印托盘标签</button></view>
     </template>
     <text v-if="message" class="hint">{{ message }}</text><text v-if="error" class="error">{{ error }}</text>
@@ -74,11 +59,11 @@ export default {
   components: { ScanTargetInput },
   props: { task: { type: Object, required: true }, allowDisassemble: { type: Boolean, default: true } },
   emits: ['activate', 'busy', 'saved'],
-  data() { return { measurements: [], measuredSelections: {}, measurementFields: [{ key: 'lengthCm', label: '长 cm' }, { key: 'widthCm', label: '宽 cm' }, { key: 'heightCm', label: '高 cm' }, { key: 'grossWeightKg', label: '毛重 kg' }], palletTotals: {}, rebindSelection: null, active: 'source', sourceCode: '', targetCode: '', source: null, target: null, marks: [], busy: false, error: '', message: '', newPallet: null, sourceRows: [], selectedSource: null, quantity: '', selectedDestination: '' } },
+  data() { return { measurements: [], measurementFields: [{ key: 'lengthCm', label: '长 cm' }, { key: 'widthCm', label: '宽 cm' }, { key: 'heightCm', label: '高 cm' }, { key: 'grossWeightKg', label: '毛重 kg' }], palletTotals: {}, rebindSelection: null, active: 'source', sourceCode: '', targetCode: '', source: null, target: null, marks: [], busy: false, error: '', message: '', newPallet: null, sourceRows: [], selectedSource: null, quantity: '', selectedDestination: '' } },
   mounted() { this.loadSources() },
   computed: {
     measuredBoxChoices() { return this.measurements.find(p => p.palletCode === this.selectedSource?.palletCode)?.cartons || [] },
-    requiresMeasuredBoxChoice() { return new Set(this.measuredBoxChoices.map(box => [box.lengthCm,box.widthCm,box.heightCm,box.grossWeightKg].join(':'))).size > 1 },
+    requiresMeasuredBoxMapping() { return new Set(this.measuredBoxChoices.map(box => [box.lengthCm,box.widthCm,box.heightCm,box.grossWeightKg].join(':'))).size > 1 },
     canRetainOriginal() { return !this.isReturnBulk && !this.unboundSourceMode && this.source && this.selectedSource && this.plannedPackages === Number(this.source.totalPackages) },
     boundPalletTotals() { const codes = new Set(this.currentBindings.map(binding => binding.pallet)); return Object.values(this.palletTotals).filter(pallet => codes.has(pallet.palletCode) && !this.measurements.some(measured => measured.palletCode === pallet.palletCode)) },
     allBindingsComplete() {
@@ -111,8 +96,8 @@ export default {
       const pending = this.sourceItems().filter(item => Number(item.relabelledPackages || 0) < Number(item.expectedPackages || 1))
       if (!pending.length) return ''
       const missingSku = pending.some(item => item.operationType === 'CARTON_AND_SKU' && Number(item.skuProcessedPackages || 0) < Number(item.expectedPackages || 1))
-      if (missingSku) return '本托盘还有未完成的 SKU 贴标登记。混合换标须完成箱唛和 SKU 两项，请返回 SKU 页签处理后再确认绑定。'
-      return '本托盘还有未完成的换标明细，请先完成贴标登记，再确认目标托盘绑定。'
+      if (missingSku) return '请先完成 SKU 贴标登记'
+      return '请先完成贴标登记'
     },
     wholeSource() { return this.isReturnBulk && this.selectedSource && (!this.allowDisassemble || this.plannedPackages === Number(this.selectedSource.stockPackages || 0)) },
     unboundSourceMode() { return !this.isReturnBulk && this.returnCartonItems.length > 0 && (this.selectedSource ? (!this.selectedSource.palletCode || this.selectedSource.palletCode === 'UNBOUND') : !this.operableSourceRows.some(row => row.palletCode && row.palletCode !== 'UNBOUND')) },
@@ -121,16 +106,21 @@ export default {
   methods: {
     prepareMeasuredBatch(event) {
       this.quantity = String(event.detail.value)
-      this.marks = []; this.measuredSelections = {}
+      this.marks = []
       const count = Number(this.quantity)
       if (this.measuredBoxChoices.length && Number.isSafeInteger(count) && count > 0 && count <= this.selectedSource.movablePackages && count <= this.eligibleItems.length) this.fillBatch()
     },
-    measuredBoxOptions(mark) {
-      const used = Object.entries(this.measuredSelections || {}).filter(([key]) => key !== mark && this.marks.includes(key)).map(([,value]) => value)
-      return this.measuredBoxChoices.filter(box => !used.includes(box.cartonMark)).map(box => ({ ...box, label: `${box.cartonMark} · ${box.lengthCm}×${box.widthCm}×${box.heightCm} cm · ${box.grossWeightKg} kg` }))
+    // 按申请时的仓库箱唛或客户箱唛对应原实测箱，禁止重新选择其他箱。
+    measuredCartonBindings() {
+      if (!this.requiresMeasuredBoxMapping) return []
+      const used = new Set()
+      return this.marks.map(mark => {
+        const matches = this.measuredBoxChoices.filter(box => box.cartonMark === mark || box.customerCartonMark === mark)
+        const box = matches.length === 1 && !used.has(matches[0].cartonMark) ? matches[0] : null
+        if (box) used.add(box.cartonMark)
+        return { cartonMark: mark, sourceCartonMark: box?.cartonMark }
+      })
     },
-    chooseMeasuredBox(mark, event) { const box = this.measuredBoxOptions(mark)[Number(event.detail.value)]; if (box) this.measuredSelections = { ...this.measuredSelections, [mark]: box.cartonMark } },
-    measuredBoxLabel(mark) { return this.measuredBoxOptions(mark).find(box => box.cartonMark === this.measuredSelections?.[mark])?.label || '点击选择实测箱' },
     async saveMeasurement(pallet) {
       const dimensions = Object.fromEntries(this.measurementFields.map(field => [field.key, Number(pallet[field.key])]))
       if (!Object.values(dimensions).every(value => Number.isFinite(value) && value > 0)) { this.error = '请填写有效的长、宽、高和毛重'; return }
@@ -171,9 +161,9 @@ export default {
       const binding = this.rebindSelection
       const targetCode = this.targetCode.trim().toUpperCase()
       if (!binding || !targetCode || this.busy) return
-      if (targetCode === binding.pallet.toUpperCase()) { this.showBindingMessage('无需改绑', '该箱唛已经绑定此托盘，不会重复扣库存。'); return }
+      if (targetCode === binding.pallet.toUpperCase()) { this.showBindingMessage('无需改绑', '该箱唛已绑定此托盘'); return }
       this.busy = true; this.$emit('busy', true)
-      const confirmed = await new Promise(resolve => uni.showModal({ title: '确认改绑', content: `将 ${binding.mark} 从 ${binding.pallet} 移至 ${targetCode}？旧托盘扣箱，新托盘加箱。`, confirmText: '是', cancelText: '否', success: result => resolve(result.confirm), fail: () => resolve(false) }))
+      const confirmed = await new Promise(resolve => uni.showModal({ title: '确认改绑', content: `将 ${binding.mark} 从 ${binding.pallet} 移至 ${targetCode}？`, confirmText: '是', cancelText: '否', success: result => resolve(result.confirm), fail: () => resolve(false) }))
       this.busy = false; this.$emit('busy', false)
       if (!confirmed) return
       await this.run(async () => {
@@ -194,7 +184,7 @@ export default {
     async loadSources() { await this.run(async () => { try { this.sourceRows = await findRelabelSources(this.task.relabelNo) } catch (error) { if (!this.isReturnBulk && this.returnCartonItems.length) this.sourceRows = []; else throw error } if (!this.isReturnBulk && this.returnCartonItems.length && !this.sourceRows.some(row => Number(row.movablePackages) > 0)) this.sourceRows = [{ positionId: this.returnCartonItems[0].returnCartonId, positionVersion: 0, palletCode: 'UNBOUND', stockPackages: this.returnCartonItems.length, movablePackages: this.returnCartonItems.length, cartonMarks: this.returnCartonItems.map(item => item.cartonMark).filter(Boolean) }]; for (const code of new Set(this.currentBindings.map(binding => binding.pallet))) { const pallet = await resolvePallet(code); this.savePalletTotals({ pallets: [pallet] }) } this.measurements = await listRelabelPalletMeasurements(this.task.relabelNo); this.selectedSource = null; this.source = null; this.marks = []; this.quantity = ''; if (this.unboundSourceMode && this.operableSourceRows.length === 1) { this.selectedSource = this.operableSourceRows[0]; this.selectedDestination = this.returnCartonItems[0]?.destinationFbaWarehouseCode || ''; this.marks = this.completedItems().map(item => item.cartonMark); this.quantity = String(this.marks.length); this.activate('target') } }) },
     async selectSource(row) {
       if (this.busy) return
-      this.measuredSelections = {}; this.rebindSelection = null; this.selectedSource = row; this.source = null; this.sourceCode = ''; this.quantity = ''; this.marks = []
+      this.rebindSelection = null; this.selectedSource = row; this.source = null; this.sourceCode = ''; this.quantity = ''; this.marks = []
       this.selectedDestination = (this.isReturnBulk ? this.sourceItems() : this.completedItems())[0]?.destinationFbaWarehouseCode || ''
       if (this.unboundSourceMode) {
         this.marks = this.completedItems().map(item => item.cartonMark)
@@ -265,17 +255,17 @@ export default {
       let reason = ''
       if (!this.selectedSource) reason = '请先选择实际拆出货物的来源托盘或来源箱。'
       else if (this.unboundSourceMode && !this.bindingSelectionValid()) reason = '请先完成来源箱换标，再绑定目标托盘。'
-      else if (!this.unboundSourceMode && !this.samePallet(this.source, this.selectedSource)) reason = this.isReturnBulk ? '来源托盘识别失败，请重新选择。' : '请先扫描并确认实际来源托盘；选择来源列表不等于扫描确认。'
-      else if (this.isReturnBulk && this.completedItems().length !== this.eligibleItems.length) reason = '请先完成本托盘的 SKU 贴标登记，再绑定新托盘；整托无需填写拆箱数量。'
+      else if (!this.unboundSourceMode && !this.samePallet(this.source, this.selectedSource)) reason = this.isReturnBulk ? '来源托盘识别失败，请重新选择。' : '请扫描确认来源托盘'
+      else if (this.isReturnBulk && this.completedItems().length !== this.eligibleItems.length) reason = '请先完成 SKU 贴标登记'
       else if (!Number.isSafeInteger(Number(this.quantity)) || Number(this.quantity) <= 0 || Number(this.quantity) > this.selectedSource.movablePackages) reason = this.isReturnBulk ? '本托盘可操作件数不足，请刷新来源托盘。' : '请填写有效的拆出箱数，不能超过来源托盘可拆数量。'
       else if (!this.selectedDestination || !this.bindingSelectionValid()) reason = this.isReturnBulk ? `本托盘拆箱数量必须等于贴标预报分配数量 ${this.plannedPackages} 件。` : '本次拆出箱数必须对应已完成换标且尚未拆出的同目的仓箱唛。'
-      else if (this.requiresMeasuredBoxChoice && this.marks.some(mark => !this.measuredSelections?.[mark])) reason = '请选择本次移出的实测箱，系统将按所选箱扣减体积和重量。'
+      else if (this.measuredCartonBindings().some(row => !row.sourceCartonMark)) reason = '换标箱与来源实测箱不匹配，请核对来源托盘'
       else if (!this.targetCode.trim()) reason = '请扫描或输入目标托盘号。'
       if (reason) { this.error = reason; this.showBindingMessage('尚未绑定', reason); return }
       await this.resolve('target')
       if (this.error) { this.showBindingMessage('绑定失败', this.error); return }
       if (!this.readyToBind) { this.error = '请核对来源箱、目标托盘和换标数量后重新确认。'; this.showBindingMessage('尚未绑定', this.error); return }
-      if (!await this.confirmBindingChoice(`是否绑定目标托盘 ${this.target.palletCode}（${this.quantity} ${this.isReturnBulk ? '件' : '箱'}）？${this.samePallet(this.source, this.target) ? '整托保留原托盘且货物和包装未变可沿用原测量；包装变化请重新补测。' : ''}`)) { this.target = null; return }
+      if (!await this.confirmBindingChoice(`是否绑定目标托盘 ${this.target.palletCode}（${this.quantity} ${this.isReturnBulk ? '件' : '箱'}）？`)) { this.target = null; return }
       await this.bind()
     },
     destination(mark) { return this.task.items.find(item => item.cartonMark === mark)?.destinationFbaWarehouseCode || '目的仓待维护' },
@@ -309,8 +299,8 @@ export default {
     async createPallet() { const payload = { relabelNo: this.task.relabelNo }; const key = warehouseIdempotencyKey('relabel', 'new-pallet', payload); await this.run(async () => { this.newPallet = await createRelabelPallet({ ...payload, idempotencyKey: key.value }); this.target = null; this.targetCode = this.newPallet.palletCode || ''; this.activate('target') }) },
     async bind() {
       if (!this.readyToBind) { this.error = '请核对来源托盘、拆出箱数、本批箱唛和目标托盘'; return }
-      const measuredCartons = this.requiresMeasuredBoxChoice ? this.marks.map(mark => ({ cartonMark: mark, sourceCartonMark: this.measuredSelections?.[mark] })) : []
-      if (measuredCartons.some(row => !row.sourceCartonMark)) { this.error = '请选择本次移出的实测箱'; return }
+      const measuredCartons = this.measuredCartonBindings()
+      if (measuredCartons.some(row => !row.sourceCartonMark)) { this.error = '换标箱与来源实测箱不匹配，请核对来源托盘'; return }
       const expectation = value => ({ palletCode: value.palletCode, expectedVersion: value.palletVersion })
       const payload = { relabelNo: this.task.relabelNo, ...(this.unboundSourceMode ? {} : { source: expectation(this.source), actualSource: { positionId: this.selectedSource.positionId, expectedPositionVersion: this.selectedSource.positionVersion, packages: Number(this.quantity) } }), target: expectation(this.target), cartonMarks: [...this.marks], reason: this.unboundSourceMode ? 'PDA 扫描无来源托盘退货箱并绑定目的托盘' : 'PDA 按原入仓单箱数拆托并按新目的仓合托' }
       if (measuredCartons.length) payload.measuredCartons = measuredCartons
diff --git a/tests/relabel-pallet-measurement.test.mjs b/tests/relabel-pallet-measurement.test.mjs
index 2e3e6ec..bfe9647 100644
--- a/tests/relabel-pallet-measurement.test.mjs
+++ b/tests/relabel-pallet-measurement.test.mjs
@@ -57,7 +57,7 @@ test('unchanged source renders real grouped box specs and totals without zero pa
   assert.match(html, /60 × 50 × 50 cm · 2.5 kg\/箱 · 2 箱/)
   assert.match(html, /50 × 40 × 40 cm · 3.6 kg\/箱 · 2 箱/)
   assert.match(html, /来源汇总：0.31 m³ · 9.7 kg/)
-  assert.match(html, /未测整托长宽高/)
+  assert.doesNotMatch(html, /未测整托长宽高/)
   assert.equal((html.match(/class="measurement-inputs"/g) || []).length, 0)
   assert.doesNotMatch(html, /确认本托实测/)
 })
@@ -72,37 +72,54 @@ test('changed pallets and explicit packaging changes still render final pallet m
 test('box aggregated pallets render current totals and no manual pallet measurement even after moving', async () => {
   const html = await renderMeasurements([{ palletCode: 'NEW', packages: 1, inherited: true, cartonAggregated: true,
     grossWeightKg: 3.6, volumeCbm: 0.08, sourceCartonSpecs: [{lengthCm:50,widthCm:40,heightCm:40,grossWeightKg:3.6,cartons:1}] }])
-  assert.match(html, /移出扣减、移入增加/)
+  assert.doesNotMatch(html, /移出扣减、移入增加/)
   assert.match(html, /0.08 m³ · 3.6 kg/)
   assert.doesNotMatch(html, /确认本托实测|重新测量|measurement-inputs/)
 })
-test('mixed box selection is required and submits exact measured source box with binding', async () => {
+const mixedBoxes = [
+  { cartonMark: 'OTHER', lengthCm: 60, widthCm: 50, heightCm: 50, grossWeightKg: 2.5 },
+  { cartonMark: 'SMALL1', customerCartonMark: 'CUSTOMER', lengthCm: 50, widthCm: 40, heightCm: 40, grossWeightKg: 3.6 }
+]
+
+test('mixed specs automatically bind the submitted carton without another picker', async () => {
   const { value, calls } = setup()
-  Object.assign(value, { readyToBind:true, requiresMeasuredBoxChoice:true, marks:['CUSTOMER'],
-    source:{palletCode:'OLD',palletVersion:1}, target:{palletCode:'NEW',palletVersion:1},
-    selectedSource:{positionId:'1',positionVersion:1},quantity:'1', loadSources:async()=>{}, showBindingMessage(){} })
+  Object.assign(value, { readyToBind: true, requiresMeasuredBoxMapping: true, marks: ['CUSTOMER'], measuredBoxChoices: mixedBoxes,
+    source: { palletCode: 'OLD', palletVersion: 1 }, target: { palletCode: 'NEW', palletVersion: 1 },
+    selectedSource: { positionId: '1', positionVersion: 1 }, quantity: '1', loadSources: async () => {}, showBindingMessage() {} })
   await value.bind()
-  assert.equal(calls.length,0)
-  assert.match(value.error,/请选择/)
-  value.measuredSelections={CUSTOMER:'SMALL1'}
-  await value.bind()
-  assert.deepEqual(calls[0].measuredCartons,[{cartonMark:'CUSTOMER',sourceCartonMark:'SMALL1'}])
+  assert.deepEqual(calls[0].cartonMarks, ['CUSTOMER'])
+  assert.deepEqual(calls[0].measuredCartons, [{ cartonMark: 'CUSTOMER', sourceCartonMark: 'SMALL1' }])
+  assert.doesNotMatch(source, /<picker|chooseMeasuredBox|点击选择实测箱/)
 })
-test('measured box picker excludes a box selected for another item', () => {
+
+test('warehouse carton marks also match automatically and follow the current batch', () => {
   const { value } = setup()
-  Object.assign(value,{marks:['X','Y'],measuredSelections:{X:'A'},measuredBoxChoices:[
-    {cartonMark:'A',lengthCm:60,widthCm:50,heightCm:50,grossWeightKg:2.5},
-    {cartonMark:'B',lengthCm:50,widthCm:40,heightCm:40,grossWeightKg:3.6}]})
-  assert.deepEqual(value.measuredBoxOptions('Y').map(box=>box.cartonMark),['B'])
-  assert.equal(value.measuredBoxOptions('X').length,2)
+  Object.assign(value, { requiresMeasuredBoxMapping: true, measuredBoxChoices: mixedBoxes, marks: ['SMALL1'] })
+  assert.deepEqual(value.measuredCartonBindings(), [{ cartonMark: 'SMALL1', sourceCartonMark: 'SMALL1' }])
+  value.marks = ['OTHER']
+  assert.deepEqual(value.measuredCartonBindings(), [{ cartonMark: 'OTHER', sourceCartonMark: 'OTHER' }])
 })
-test('entering split quantity prepares measured box choices before target binding', () => {
+
+test('unmatched, ambiguous or duplicate physical boxes cannot bind another carton', async () => {
+  for (const [marks, boxes] of [
+    [['MISSING'], mixedBoxes],
+    [['CUSTOMER'], [...mixedBoxes, { ...mixedBoxes[0], customerCartonMark: 'CUSTOMER' }]],
+    [['CUSTOMER', 'SMALL1'], mixedBoxes]
+  ]) {
+    const { value, calls } = setup()
+    Object.assign(value, { readyToBind: true, requiresMeasuredBoxMapping: true, measuredBoxChoices: boxes, marks })
+    await value.bind()
+    assert.equal(calls.length, 0)
+    assert.match(value.error, /不匹配/)
+  }
+})
+
+test('entering split quantity prepares the batch and clears invalid quantities', () => {
   const { value } = setup()
-  Object.assign(value,{measuredBoxChoices:[{cartonMark:'A'}],eligibleItems:[{cartonMark:'X'}],
-    selectedSource:{movablePackages:1},measuredSelections:{OLD:'A'},fillBatch(){this.marks=['X']}})
-  value.prepareMeasuredBatch({detail:{value:'1'}})
-  assert.deepEqual(value.marks,['X'])
-  assert.deepEqual(value.measuredSelections,{})
-  value.prepareMeasuredBatch({detail:{value:'0'}})
-  assert.deepEqual(value.marks,[])
+  Object.assign(value, { measuredBoxChoices: [{ cartonMark: 'A' }], eligibleItems: [{ cartonMark: 'X' }],
+    selectedSource: { movablePackages: 1 }, fillBatch() { this.marks = ['X'] } })
+  value.prepareMeasuredBatch({ detail: { value: '1' } })
+  assert.deepEqual(value.marks, ['X'])
+  value.prepareMeasuredBatch({ detail: { value: '0' } })
+  assert.deepEqual(value.marks, [])
 })
diff --git a/tests/relabel-pallet-work.test.mjs b/tests/relabel-pallet-work.test.mjs
index 6b489af..208ec6f 100644
--- a/tests/relabel-pallet-work.test.mjs
+++ b/tests/relabel-pallet-work.test.mjs
@@ -59,7 +59,7 @@ test('pallet comparison tolerates mixed API versions and canonical code formatti
 test('quantity disassembly has no extra carton scanner', () => {
   assert.doesNotMatch(source, /relabel-move-carton/)
   assert.match(source, /actualSource:/)
-  assert.match(source, /来源已确认：.*尚未拆出.*绑定成功后才保存拆托明细/)
+  assert.match(source, /来源已确认：\{\{ source.palletCode \}\}<\/text>/)
   assert.match(source, /this\.message = `托盘 \$\{this\.target\.palletCode\} 已绑定`/)
 })
 
@@ -96,7 +96,7 @@ test('rescan same bound pallet does not call stock movement', async () => {
   value.showBindingMessage = (title, content) => { message = content }
   value.run = async () => assert.fail('same pallet must not move stock')
   await value.submitRebind()
-  assert.match(message, /不会重复扣库存/)
+  assert.match(message, /已绑定此托盘/)
 })
 
 test('target confirmation submits binding directly, with no second submit button', async () => {
@@ -183,7 +183,7 @@ test('missing source scan shows modal and never submits a binding', async () =>
   value.bind = async () => assert.fail('must not bind without source confirmation')
   value.resolve = async () => assert.fail('must validate source first')
   await value.confirmTargetAndBind()
-  assert.match(message, /扫描并确认实际来源托盘/)
+  assert.match(message, /扫描确认来源托盘/)
 })
 
 test('target lookup failure cannot submit binding or report success', async () => {

From 51ecbee653b8afe24b254482cc88a7e0aa7eeac8 Mon Sep 17 00:00:00 2001
From: liuyihe <2513762445@qq.com>
Date: Mon, 19 Oct 2026 16:40:39 +0800
Subject: [PATCH 8/8] =?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/fulfillment.js            |  1 +
 src/pages/outbound/outbound.vue   | 18 +++++++++---
 tests/outbound-lifecycle.test.mjs | 49 +++++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/src/api/fulfillment.js b/src/api/fulfillment.js
index 2aa4a04..c2a189f 100644
--- a/src/api/fulfillment.js
+++ b/src/api/fulfillment.js
@@ -163,6 +163,7 @@ export function normalizeCargoDiscardTask(value) {
 			itemId: String(sku?.itemId || ''),
 			skuCode: String(sku?.skuCode || ''),
 			productName: String(sku?.productName || ''),
+			quantityUnit: sku?.quantityUnit === '件' ? '件' : '箱',
 			plannedPackages: count(sku?.plannedPackages),
 			actualPackages: sku?.actualPackages == null ? null : count(sku.actualPackages),
 			status: String(sku?.status || 'PENDING')
diff --git a/src/pages/outbound/outbound.vue b/src/pages/outbound/outbound.vue
index 26c728c..bca0969 100644
--- a/src/pages/outbound/outbound.vue
+++ b/src/pages/outbound/outbound.vue
@@ -45,8 +45,9 @@
 
 				<template v-else-if="discardCurrent">
 					<view class="detail-toolbar"><view><text class="detail-kicker">废弃订单</text><text class="detail-title">{{ discardCurrent.discardNo }}</text><text v-if="discardCurrent.outboundNo" class="task-meta">出库单 {{ discardCurrent.outboundNo }}</text></view><button :disabled="discardBusy" @tap="closeDiscard">‹ 返回列表</button></view>
-					<view class="fulfillment-card"><ScanTargetInput name="cargo-discard" :model-value="discardPalletCode" :label="discardTask?.scanMode === 'CARTON' ? '废弃箱唛' : '废弃托盘码'" :placeholder="discardTask?.scanMode === 'CARTON' ? '扫描本单所选箱唛' : '扫描对应托盘码'" :active="true" @update:modelValue="updateDiscardPalletCode" @submit="resolveDiscardPallet" /><button class="secondary-button" :disabled="!discardPalletCode || discardLoading || discardBusy" @tap="resolveDiscardPallet">{{ discardLoading ? '读取中…' : discardTask?.scanMode === 'CARTON' ? '核对箱唛' : '打开托盘废弃作业' }}</button><text class="scan-help">整托废弃扫描托盘号；部分箱子废弃或散箱作业，核对本单所选箱唛，也可一键废弃所选箱子。未选箱子保留库存。</text></view>
-					<view v-if="discardTask" class="fulfillment-card item-card"><view class="task-head"><text class="business-code">{{ discardTask.scanMode === 'CARTON' ? (discardTask.palletNo === '散箱' ? '散箱废弃' : '按箱废弃 · ' + discardTask.palletNo) : '托盘 ' + discardTask.palletNo }}</text><text class="status-badge">{{ discardTask.status === 'COMPLETED' ? '已完成' : '待废弃' }}</text></view><view v-for="sku in discardTask.skus" :key="sku.itemId" class="outbound-line"><text class="line-code">{{ sku.skuCode || '—' }}</text><text class="line-meta">{{ sku.productName || '—' }} · 计划 {{ sku.plannedPackages }} 箱</text><view class="count-row"><text>本单所选废弃 {{ sku.plannedPackages }} 箱</text></view></view><view v-if="discardTask.scanMode === 'CARTON'"><text class="scan-help">已核对 {{ discardScannedMarks.length }}/{{ discardTask.cartonMarks.length }} 箱</text><view v-for="mark in discardTask.cartonMarks" :key="mark" class="outbound-line"><text>{{ mark }}</text><text>{{ discardAllCartons ? '全部废弃' : discardScannedMarks.includes(mark) ? '已扫描' : '待扫描' }}</text></view><button v-if="discardTask.status !== 'COMPLETED'" class="secondary-button" :disabled="discardBusy || discardLoading || discardPhotoBusy" @tap="discardAllCartons = true">一键废弃本单所选箱子（{{ discardTask.cartonMarks.length }} 箱）</button><text v-if="discardAllCartons" class="scan-help">已确认本单所选箱子全部废弃，拍照后点击废弃出库完成。</text></view><view class="discard-photo-section"><text class="business-code">废弃现场照片（至少 1 张）</text><text class="scan-help">照片关联当前废弃作业，完成出库后可在废弃单详情查看。</text><view class="discard-photo-grid"><view v-for="photo in discardPhotos" :key="photo.fileId" class="discard-photo-tile"><image v-if="discardPhotoUrls[photo.fileId]" :src="discardPhotoUrls[photo.fileId]" mode="aspectFill" @tap="previewDiscardPhoto(photo.fileId)" /><button v-else class="secondary-button" @tap="loadDiscardPhoto(photo.fileId)">{{ discardPhotoErrors[photo.fileId] ? '加载失败，点击重试' : '加载照片' }}</button></view></view><button v-if="discardTask.status !== 'COMPLETED'" class="secondary-button" :disabled="discardLoading || discardBusy || discardPhotoBusy || !discardPhotoReady || discardPhotos.length >= 20" @tap="takeDiscardPhoto">{{ discardPhotoBusy ? '照片上传中…' : '拍摄废弃现场照片' }}（{{ discardPhotos.length }}/20）</button><button v-if="!discardPhotoReady" class="secondary-button" :disabled="discardLoading || discardPhotoBusy" @tap="restoreDiscardPhotos">重试读取照片</button></view><button class="primary-button" :disabled="!canConfirmDiscard || discardBusy" @tap="confirmDiscard">{{ discardBusy ? '提交中…' : '废弃出库' }}</button></view>
+					<view class="fulfillment-card"><text class="card-title">本单废弃范围</text><view v-for="task in discardCurrentTasks" :key="task.palletNo" class="outbound-line"><view class="task-head"><text class="business-code">{{ task.palletNo === '散箱' ? '散箱' : task.palletNo }}</text><text>{{ task.status === 'COMPLETED' ? '已完成' : '待废弃' }}</text></view><text v-for="mark in task.cartonMarks" :key="mark" class="line-code">{{ mark }}</text><text v-if="!task.cartonMarks.length" class="scan-help">整托废弃，请核对托盘及计划数量。</text></view></view>
+					<view class="fulfillment-card"><ScanTargetInput name="cargo-discard" :model-value="discardPalletCode" :label="discardTask?.scanMode === 'CARTON' ? '废弃箱唛' : '废弃托盘码'" :placeholder="discardTask?.scanMode === 'CARTON' ? '扫描本单所选箱唛' : '扫描对应托盘码'" :active="true" @update:modelValue="updateDiscardPalletCode" @submit="resolveDiscardPallet" /></view>
+					<view v-if="discardTask" class="fulfillment-card item-card"><view class="task-head"><text class="business-code">{{ discardTask.scanMode === 'CARTON' ? (discardTask.palletNo === '散箱' ? '散箱废弃' : '按箱废弃 · ' + discardTask.palletNo) : '托盘 ' + discardTask.palletNo }}</text><text class="status-badge">{{ discardTask.status === 'COMPLETED' ? '已完成' : '待废弃' }}</text></view><text class="task-meta">本次废弃 {{ discardQuantitySummary }}</text><view v-for="sku in discardTask.skus" :key="sku.itemId" class="outbound-line"><text class="line-code">{{ sku.skuCode || '—' }}</text><text class="line-meta">{{ sku.productName || '—' }} · {{ sku.plannedPackages }} {{ sku.quantityUnit || '箱' }}</text></view><view v-if="discardTask.scanMode === 'CARTON'"><text class="scan-help">已核对 {{ discardScannedMarks.length }}/{{ discardTask.cartonMarks.length }} 箱</text><view v-for="mark in discardTask.cartonMarks" :key="mark" class="outbound-line"><text>{{ mark }}</text><text>{{ discardAllCartons ? '全部废弃' : discardScannedMarks.includes(mark) ? '已扫描' : '待扫描' }}</text></view><button v-if="discardTask.status !== 'COMPLETED'" class="secondary-button" :disabled="discardBusy || discardLoading || discardPhotoBusy" @tap="discardAllCartons = true">一键废弃本单所选箱子（{{ discardTask.cartonMarks.length }} 箱）</button><text v-if="discardAllCartons" class="scan-help">已确认本单所选箱子全部废弃，拍照后点击废弃出库完成。</text></view><view class="discard-photo-section"><text class="business-code">废弃现场照片（至少 1 张）</text><text class="scan-help">照片关联当前废弃作业，完成出库后可在废弃单详情查看。</text><view class="discard-photo-grid"><view v-for="photo in discardPhotos" :key="photo.fileId" class="discard-photo-tile"><image v-if="discardPhotoUrls[photo.fileId]" :src="discardPhotoUrls[photo.fileId]" mode="aspectFill" @tap="previewDiscardPhoto(photo.fileId)" /><button v-else class="secondary-button" @tap="loadDiscardPhoto(photo.fileId)">{{ discardPhotoErrors[photo.fileId] ? '加载失败，点击重试' : '加载照片' }}</button></view></view><button v-if="discardTask.status !== 'COMPLETED'" class="secondary-button" :disabled="discardLoading || discardBusy || discardPhotoBusy || !discardPhotoReady || discardPhotos.length >= 20" @tap="takeDiscardPhoto">{{ discardPhotoBusy ? '照片上传中…' : '拍摄废弃现场照片' }}（{{ discardPhotos.length }}/20）</button><button v-if="!discardPhotoReady" class="secondary-button" :disabled="discardLoading || discardPhotoBusy" @tap="restoreDiscardPhotos">重试读取照片</button></view><button class="primary-button" :disabled="!canConfirmDiscard || discardBusy" @tap="confirmDiscard">{{ discardBusy ? '提交中…' : '废弃出库' }}</button></view>
 				</template>
 
 				<view v-if="successMessage" class="fulfillment-success" role="status"><text>{{ successMessage }}</text></view>
@@ -101,6 +102,14 @@
 			canComplete() { return this.plannedPackages > 0 && this.remainingPackages === 0 && this.taskOperable },
 			discardOrders() { const groups = new Map(); for (const task of this.discardTasks) { const current = groups.get(task.discardNo) || { discardNo: task.discardNo, outboundNo: task.outboundNo, palletCount: 0, cartonCount: 0, pendingPalletCount: 0 }; if (task.scanMode === 'CARTON') current.cartonCount += (task.cartonMarks || []).length; else current.palletCount += 1; if (task.status !== 'COMPLETED') current.pendingPalletCount += 1; groups.set(task.discardNo, current) } return [...groups.values()] },
 			discardOrderCount() { return this.discardOrders.length },
+			discardCurrentTasks() { return this.discardTasks.filter(task => task.discardNo === this.discardCurrent?.discardNo) },
+			discardQuantitySummary() {
+				const task = this.discardTask
+				if (!task) return ''
+				const pieces = task.skus.filter(sku => sku.quantityUnit === '件').reduce((total, sku) => total + sku.plannedPackages, 0)
+				const boxes = new Set(task.cartonMarks || []).size || task.skus.filter(sku => sku.quantityUnit !== '件').reduce((total, sku) => total + sku.plannedPackages, 0)
+				return `${boxes} 箱${pieces ? ` · ${pieces} 件` : ''}`
+			},
 			canConfirmDiscard() { const task = this.discardTask; return Boolean(this.discardPhotoReady && this.discardPhotos.length > 0 && !this.discardPhotoBusy && !this.discardLoading && !this.discardBusy && task && task.status !== 'COMPLETED' && task.skus.length && task.skus.every(sku => Number(this.discardActuals[sku.itemId]) === sku.plannedPackages) && (task.scanMode !== 'CARTON' || (task.cartonMarks?.length && (this.discardAllCartons || task.cartonMarks.every(mark => this.discardScannedMarks.includes(mark)))))) }
 		},
 		onShow() { if (!requireSession()) return; this.user = session.currentUser; restoreFulfillmentDraft(`${this.user?.id || ''}:${this.user?.warehouseId || ''}`); this.startScanner(); if (this.discardPhotoBusy || this.discardBusy) return; if (this.discardCurrent) { if (this.discardTask) this.restoreDiscardPhotos(); return } if (!this.bootstrapped) { this.bootstrapped = true; this.scanCode = ''; this.loadTasks(); return } if (this.current?.taskNo) this.openTask(this.current.taskNo); else this.loadTasks() },
@@ -133,10 +142,11 @@
 			closeDiscard() { if (this.discardBusy || this.discardPhotoBusy) return; this.resetDiscardPhotos(); this.discardLoading = false; this.discardCurrent = null; this.discardTask = null; this.discardPalletCode = ''; this.discardActuals = {}; this.loadTasks() },
 			updateDiscardPalletCode(value) { this.discardPalletCode = value },
 			async resolveDiscardPallet(raw) {
-				const code = String(raw?.detail?.value ?? raw ?? this.discardPalletCode).trim()
+				const code = String(typeof raw === 'string' ? raw : raw?.detail?.value ?? this.discardPalletCode).trim()
 				if (!code || !this.discardCurrent || this.discardBusy || this.discardLoading || this.discardPhotoBusy) return
 				if (this.discardTask?.scanMode === 'CARTON' && this.discardTask.cartonMarks.includes(code)) { if (!this.discardScannedMarks.includes(code)) this.discardScannedMarks = [...this.discardScannedMarks, code]; this.error = null; playSuccessSound(); return }
-				if (this.discardTask?.scanMode === 'CARTON' && !this.discardTasks.some(task => task.discardNo === this.discardCurrent.discardNo && task.scanMode !== 'CARTON' && task.palletNo === code)) { this.setError(new Error('箱唛不属于当前废弃作业'), '箱唛核对失败'); return }
+				// 当前托盘可重扫，同一废弃单内也可通过托盘或所选箱唛切换任务。
+				if (this.discardTask?.scanMode === 'CARTON' && !this.discardTasks.some(task => task.discardNo === this.discardCurrent.discardNo && (task.palletNo === code || (task.cartonMarks || []).includes(code)))) { this.setError(new Error('托盘或箱唛不属于当前废弃单所选货物'), '箱唛核对失败'); return }
 				const order = this.discardCurrent
 				this.resetDiscardPhotos(); this.discardScannedMarks = []; this.discardAllCartons = false; this.discardPalletCode = code; this.discardLoading = true; this.discardTask = null; this.discardActuals = {}; this.error = null
 				try {
diff --git a/tests/outbound-lifecycle.test.mjs b/tests/outbound-lifecycle.test.mjs
index 787fee3..d7d92df 100644
--- a/tests/outbound-lifecycle.test.mjs
+++ b/tests/outbound-lifecycle.test.mjs
@@ -27,6 +27,16 @@ test('scanning a discard outbound document opens the discard workflow with its l
   assert.equal(vm.discardCurrent.outboundNo, 'OB-1')
 })
 
+test('退货废弃一箱五件分别展示，混装SKU按箱唛去重', () => {
+  const { vm } = page()
+  vm.discardTask = { cartonMarks: ['RETURN-BOX-1'], skus: [{ quantityUnit: '件', plannedPackages: 5 }] }
+  assert.equal(vm.discardQuantitySummary, '1 箱 · 5 件')
+  vm.discardTask.skus = [{ quantityUnit: '件', plannedPackages: 2 }, { quantityUnit: '件', plannedPackages: 3 }]
+  assert.equal(vm.discardQuantitySummary, '1 箱 · 5 件')
+  vm.discardTask = { cartonMarks: ['BOX-1', 'BOX-1'], skus: [{ quantityUnit: '箱', plannedPackages: 1 }] }
+  assert.equal(vm.discardQuantitySummary, '1 箱')
+})
+
 test('discard pallet resolution passes the selected discard number', async () => {
   let received
   const { vm } = page({ resolveCargoDiscardPallet: async (...args) => {
@@ -38,6 +48,45 @@ test('discard pallet resolution passes the selected discard number', async () =>
   assert.deepEqual(received, ['P-1', 'CD-2'])
 })
 
+test('点击打开废弃作业使用输入框值，不把 tap 事件当作托盘号', async () => {
+  let received
+  const { vm } = page({ resolveCargoDiscardPallet: async (...args) => {
+    received = args
+    return { discardNo: 'CD-2', palletNo: 'P-1', skus: [] }
+  } })
+  vm.discardCurrent = { discardNo: 'CD-2' }
+  vm.discardPalletCode = ' P-1 '
+  await vm.resolveDiscardPallet({ type: 'tap', detail: { x: 10, y: 20 } })
+  assert.deepEqual(received, ['P-1', 'CD-2'])
+  assert.equal(vm.discardPalletCode, 'P-1')
+})
+
+test('同单按箱废弃允许扫描当前托盘及其他托盘所选箱唛，范围不扩展到其他单据', async () => {
+  const requests = []
+  const tasks = [
+    { discardNo: 'CD-1', palletNo: 'P-1', scanMode: 'CARTON', cartonMarks: ['BOX-1'], skus: [], status: 'PENDING' },
+    { discardNo: 'CD-1', palletNo: 'P-2', scanMode: 'CARTON', cartonMarks: ['BOX-2'], skus: [], status: 'PENDING' },
+    { discardNo: 'CD-OTHER', palletNo: 'P-3', scanMode: 'CARTON', cartonMarks: ['BOX-3'], skus: [], status: 'PENDING' },
+  ]
+  const { vm } = page({ resolveCargoDiscardPallet: async code => {
+    requests.push(code)
+    return tasks.find(task => task.palletNo === code || task.cartonMarks.includes(code))
+  } })
+  vm.discardTasks = tasks
+  vm.openDiscardOrder('CD-1')
+  await Promise.resolve()
+  assert.equal(vm.discardCurrentTasks.length, 2)
+  await vm.resolveDiscardPallet('P-1')
+  assert.equal(vm.error, null)
+  await vm.resolveDiscardPallet('BOX-2')
+  assert.equal(vm.discardTask.palletNo, 'P-2')
+  assert.deepEqual(vm.discardScannedMarks, ['BOX-2'])
+  await vm.resolveDiscardPallet('BOX-3')
+  assert.deepEqual(requests, ['P-1', 'BOX-2'])
+  assert.equal(vm.discardTask.palletNo, 'P-2')
+  assert.deepEqual(vm.discardScannedMarks, ['BOX-2'])
+})
+
 test('discard requires restored photos and retains task while native camera returns', async () => {
   const { vm, definition } = page({ requireSession: () => true, restoreFulfillmentDraft() {} })
   vm.discardCurrent = { discardNo: 'CD-1' }; vm.discardTask = { palletNo: 'PALLET', status: 'PENDING', skus: [{ itemId: 'sku', plannedPackages: 3 }] }; vm.discardActuals = { sku: 3 }