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] =?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')
+})