feat: support dropship pallet loading

2026-09-08 17:24:49 +08:00
parent 2dc357e55b
commit 7ba81007a8
21 changed files with 300 additions and 52 deletions
@@ -13,6 +13,7 @@ import {
  assignPendingReviewSmartLoadingOrder,
  assignSmartLoadingGroup,
  assignSmartLoadingItem,
+  assignSmartLoadingPallet,
  getSmartLoadingPlanByBooking,
  listContainers,
  listSmartLoadingCandidates,
@@ -43,6 +44,7 @@ vi.mock('../api/platformContainerLoading', () => ({
  listSmartLoadingWorkbenchContainers: vi.fn(),
  createSmartLoadingPlan: vi.fn(),
  assignSmartLoadingItem: vi.fn(),
+  assignSmartLoadingPallet: vi.fn(),
  assignPendingReviewSmartLoadingOrder: vi.fn(),
  assignSmartLoadingGroup: vi.fn(),
  recommendSmartLoading: vi.fn(),
@@ -74,7 +76,7 @@ const plan = {
  canAssign: true, canEdit: true, blockedReason: null, finalCompletionStatus: 'NOT_STARTED' as const,
  pdaTaskId: null, pdaTaskStatus: null, pdaTaskVersion: null,
  coLoadGroups: [],
-  items: [{ id: '101', loadingPlanId: '99', accountId: '1', inboundId: '2', inboundDetailId: '3', orderId: '4', orderNo: 'ORD-1', inboundCode: 'IN-1', customerName: '示例企业', destinationWarehouseId: '9', destinationWarehouseCode: 'LAX9', destinationWarehouseName: 'LAX9', skuCode: 'SKU-1', productNameZh: '服装', packageCount: 6, productQuantity: 6, grossWeightKg: 60, volumeCbm: 1.2, loadSequence: 1, version: 1, pickedPackageCount: 0, minPackageCount: 1, canAdjust: true, canRemove: true }],
+  items: [{ id: '101', loadingPlanId: '99', accountId: '1', inboundId: '2', inboundDetailId: '3', orderId: '4', orderNo: 'ORD-1', inboundCode: 'IN-1', customerName: '示例企业', destinationWarehouseId: '9', destinationWarehouseCode: 'LAX9', destinationWarehouseName: 'LAX9', skuCode: 'SKU-1', productNameZh: '服装', unitType: 'PACKAGE' as const, palletId: null, palletNo: null, indivisible: false, packageCount: 6, productQuantity: 6, grossWeightKg: 60, volumeCbm: 1.2, loadSequence: 1, version: 1, pickedPackageCount: 0, minPackageCount: 1, canAdjust: true, canRemove: true }],
 }
 const candidate = {
  accountId: '1', inboundId: '5', orderId: '7', orderNo: 'ORD-2', inboundCode: 'IN-2',
@@ -89,7 +91,7 @@ function candidatePage(records: unknown[], page = 1, size = 20, total = records.
  return {
    records: records.map((record) => {
      const candidate = record as { accountId?: string; customerId?: string; groupMembers?: unknown[] }
-      return { customerId: candidate.customerId || candidate.accountId || '', groupMembers: [], ...candidate }
+      return { customerId: candidate.customerId || candidate.accountId || '', groupMembers: [], unitType: 'PACKAGE', palletId: null, palletNo: null, indivisible: false, ...candidate }
    }),
    page, size, total, pages: total ? Math.ceil(total / size) : 0,
  } as Awaited<ReturnType<typeof listSmartLoadingCandidates>>
@@ -116,7 +118,8 @@ describe('GlobalSmartLoadingView', () => {
  it('uses one-line shared text clamps for co-load and assigned-count summaries', () => {
    const source = readFileSync(resolve(process.cwd(), 'src/modules/container-loading/pages/GlobalSmartLoadingView.vue'), 'utf8')
    expect(source).toContain('<LineClampText :content="row.memberOrderSummaries.join(\'；\')" />')
-    expect(source).toContain('<LineClampText v-if="row.coLoadGroup" :content="`${row.packageCount} 箱（整组固定）`" />')
+    expect(source).toContain('<LineClampText v-else-if="row.coLoadGroup" :content="`${row.packageCount} 箱（整组固定）`" />')
+    expect(source).toContain("row.unitType === 'SEALED_PALLET'")
    expect(source).toContain('.candidate-group { display: grid; width: 100%; min-width: 0;')
    expect(source).toContain('.candidate-group :deep(.line-clamp-text) { width: 100%; }')
    expect(source).not.toContain('<span v-for="summary in row.memberOrderSummaries"')
@@ -18,6 +18,7 @@ import {
  assignPendingReviewSmartLoadingOrder,
  assignSmartLoadingGroup,
  assignSmartLoadingItem,
+  assignSmartLoadingPallet,
  getSmartLoadingPlanByBooking,
  listSmartLoadingCandidates,
  listSmartLoadingWorkbenchContainers,
@@ -97,6 +98,7 @@ const warehouseOptions = computed(() => {
 const editable = computed(() => plan.value?.canEdit === true)
 const assignable = computed(() => plan.value?.canAssign === true)
 const assignedInboundIds = computed(() => new Set((plan.value?.items || []).map((item) => item.inboundId)))
+const assignedPalletIds = computed(() => new Set((plan.value?.items || []).map((item) => item.palletId).filter(Boolean)))
 type SmartLoadingCandidateRow = SmartLoadingCandidate & { memberInboundIds: string[]; memberInboundCodes: string[]; memberOrderSummaries: string[]; memberOrderCount: number; inboundFragmentCount: number; totalGrossWeightKg: number | null; totalVolumeCbm: number | null }
 function memberOrderSummaries<T extends { orderId: string; orderNo?: string | null; inboundCode?: string | null }>(members: T[]) {
  const orders = new Map<string, { label: string; inboundCodes: string[] }>()
@@ -114,6 +116,7 @@ function groupMemberLabel(group: SmartLoadingPlanCoLoadGroup) {
    : `${group.memberOrderCount} 票 · ${group.inboundFragmentCount} 个入仓片段`
 }
 function candidateTotalGrossWeight(candidate: SmartLoadingCandidate) {
+  if (candidate.unitType === 'SEALED_PALLET') return candidate.unitGrossWeightKg
  return candidate.unitGrossWeightKg == null ? null : Number(candidate.unitGrossWeightKg) * Number(candidate.availablePackageCount || 0)
 }
 function candidateTotalVolume(candidate: SmartLoadingCandidate) {
@@ -221,20 +224,23 @@ function preferredContainerId() {
 const candidateColumns: DataTableColumn[] = [
  { key: 'actions', label: '操作', width: 90, fixed: 'left', slotName: 'actions' },
  { key: 'inboundCode', prop: 'inboundCode', label: '入仓码', minWidth: 140, fixed: 'left', showOverflowTooltip: true },
+  { key: 'palletNo', prop: 'palletNo', label: '托盘号', minWidth: 145, showOverflowTooltip: true },
+  { key: 'unitType', label: '分配单位', width: 105, slotName: 'unitType' },
  { key: 'coLoadGroup', label: '同柜', minWidth: 80, slotName: 'coLoadGroup' },
  { key: 'customerName', prop: 'customerName', label: '客户', minWidth: 70, slotName: 'customerName' },
  { key: 'orderStatusSnapshot', prop: 'orderStatusSnapshot', label: '订单状态', width: 100, slotName: 'orderStatusSnapshot' },
-  { key: 'availablePackageCount', prop: 'availablePackageCount', label: '可用箱数', width: 80 },
+  { key: 'availablePackageCount', prop: 'availablePackageCount', label: '箱数', width: 80 },
  // { key: 'cartonIdentityStatus', label: '箱号归属', width: 105, slotName: 'cartonIdentityStatus' },
-  { key: 'unitGrossWeightKg', label: '单箱毛重', width: 80, slotName: 'unitGrossWeight' },
+  { key: 'unitGrossWeightKg', label: '单位毛重', width: 90, slotName: 'unitGrossWeight' },
  { key: 'totalGrossWeightKg', label: '重量', width: 90, slotName: 'candidateTotalWeight' },
-  { key: 'averageUnitVolumeCbm', label: '单箱体积', width: 80, slotName: 'averageUnitVolume' },
+  { key: 'averageUnitVolumeCbm', label: '单位体积', width: 90, slotName: 'averageUnitVolume' },
  { key: 'totalVolumeCbm', label: '体积', width: 90, slotName: 'candidateTotalVolume' },
  { key: 'estimatedVolumeCbm', label: '预估体积', width: 100, slotName: 'estimatedVolume' },
 ]
 const itemColumns: DataTableColumn[] = [
  { key: 'actions', label: '操作', width: 90, fixed: 'left', slotName: 'actions' },
  { key: 'inboundCode', prop: 'inboundCode', label: '入仓码', minWidth: 140, fixed: 'left', showOverflowTooltip: true },
+  { key: 'palletNo', prop: 'palletNo', label: '托盘号', minWidth: 145, showOverflowTooltip: true },
  { key: 'coLoadGroup', label: '同柜', minWidth: 80, slotName: 'coLoadGroup' },
  { key: 'customerName', prop: 'customerName', label: '客户', minWidth: 70, slotName: 'customerName' },
  { key: 'packageCount', label: '分配箱数', width: 140, slotName: 'packageCount' },
@@ -490,7 +496,8 @@ function openAssign(source: object) {
  assignOpen.value = true
 }
 async function assign() {
-  if (!plan.value || !selectedCandidate.value || assignForm.packageCount < 1) return
+  if (!plan.value || !selectedCandidate.value) return
+  if (selectedCandidate.value.unitType !== 'SEALED_PALLET' && assignForm.packageCount < 1) return
  if (selectedCandidate.value.coLoadGroupId && (selectedCandidate.value.blockReason || selectedCandidate.value.locked)) return
  if (!selectedCandidate.value.coLoadGroupId && assignForm.packageCount > selectedCandidate.value.availablePackageCount) {
    ElMessage.warning(`本次最多可分配 ${selectedCandidate.value.availablePackageCount} 箱`)
@@ -498,7 +505,9 @@ async function assign() {
  }
  await mutate(async () => {
    const selected = selectedCandidate.value!
-    acceptPlan(selected.orderStatusSnapshot === 'PENDING_REVIEW'
+    acceptPlan(selected.unitType === 'SEALED_PALLET' && selected.palletId
+      ? await assignSmartLoadingPallet(plan.value!.id, { palletId: selected.palletId, expectedVersion: plan.value!.version })
+      : selected.orderStatusSnapshot === 'PENDING_REVIEW'
      ? await assignPendingReviewSmartLoadingOrder(plan.value!.id, {
        customerId: selected.accountId,
        orderId: selected.orderId,
@@ -519,6 +528,10 @@ async function assign() {
  }, '分配明细失败', { preserveAssign: true })
 }
 function candidateBlocked(candidate: SmartLoadingCandidateRow) {
+  if (candidate.unitType === 'SEALED_PALLET') {
+    return Boolean(candidate.blockReason) || candidate.locked === true || !candidate.palletId
+      || !candidate.indivisible || assignedPalletIds.value.has(candidate.palletId)
+  }
  if (candidate.orderStatusSnapshot === 'PENDING_REVIEW') {
    return Boolean(candidate.blockReason) || candidate.locked === true
      || !candidate.accountId || !candidate.inboundCode || candidate.availablePackageCount < 1
@@ -547,6 +560,7 @@ async function recommend() {
 }
 async function adjust(source: object) {
  const item = itemRow(source)
+  if (item.unitType === 'SEALED_PALLET') return
  if (!plan.value || mutating.value) return
  const count = Number(quantityDrafts[item.id])
  if (count === item.packageCount) return
@@ -712,10 +726,10 @@ onMounted(() => { void load(); void loadCustomers() })
                  plain
                  :disabled="mutating || candidateBlocked(row as SmartLoadingCandidateRow)"
                  @click="openAssign(row)"
-                ><Plus :size="15" />{{ row.coLoadGroupId ? '整组分配' : '加入' }}</el-button>
+                ><Plus :size="15" />{{ row.unitType === 'SEALED_PALLET' ? '整托分配' : row.coLoadGroupId ? '整组分配' : '加入' }}</el-button>
              </template>
              <template #customerName="{ row }"><LineClampText :content="row.customerName" /></template>
-              <template #coLoadGroup="{ row }"><div v-if="row.coLoadGroupId" class="candidate-group"><el-tag size="small" type="warning"><LineClampText :content="`${row.groupNo} · ${row.memberOrderCount} 票 · ${row.inboundFragmentCount} 个入仓片段`" /></el-tag><LineClampText :content="row.memberOrderSummaries.join('；')" /><LineClampText :content="`整组 ${row.groupTotalBoxes} 箱，必须全量进入同一柜`" /><LineClampText v-if="row.blockReason" class="candidate-block" :content="row.blockReason" /><LineClampText v-else-if="row.locked" content="该组已锁定，不能重复分配" /></div><LineClampText v-else content="普通单票" /></template>
+              <template #coLoadGroup="{ row }"><div v-if="row.coLoadGroupId" class="candidate-group"><el-tag size="small" type="warning"><LineClampText :content="`${row.groupNo} · ${row.memberOrderCount} 票 · ${row.inboundFragmentCount} 个入仓片段`" /></el-tag><LineClampText :content="row.memberOrderSummaries.join('；')" /><LineClampText :content="`整组 ${row.groupTotalBoxes} 箱，必须全量进入同一柜`" /><LineClampText v-if="row.blockReason" class="candidate-block" :content="row.blockReason" /><LineClampText v-else-if="row.locked" content="该组已锁定，不能重复分配" /></div><LineClampText v-else :content="row.unitType === 'SEALED_PALLET' ? '封托不可拆' : '普通单票'" /></template>
              <template #orderStatusSnapshot="{ row }"><el-tag size="small" effect="plain">{{ candidateStatusLabel(row.orderStatusSnapshot) }}</el-tag></template>
              <template #unitGrossWeight="{ row }">{{ formatMeasurement(row.unitGrossWeightKg, 'kg', 1) }}</template>
              <template #candidateTotalWeight="{ row }">{{ formatMeasurement(row.totalGrossWeightKg, 'kg', 1) }}</template>
@@ -789,8 +803,9 @@ onMounted(() => { void load(); void loadCustomers() })
              <DataTable :data="displayedPlanItems" :columns="itemColumns" :loading="selectionLoading || mutating" stripe preference-key="global-smart-loading-items" column-settings-mode="hide" empty-text="当前柜次暂无装柜明细">
                <template #actions="{ row }"><div class="row-actions"><el-button v-if="canDelete && editable && row.canRemove" size="small" type="danger" text :disabled="mutating" @click="remove(row)"><Trash2 :size="15" />删除</el-button></div></template>
                <template #customerName="{ row }"><LineClampText :content="row.customerName" /></template>
-                <template #coLoadGroup="{ row }"><div v-if="row.coLoadGroup" class="candidate-group"><el-tag size="small" type="warning"><LineClampText :content="`${row.coLoadGroup.groupNo} · ${groupMemberLabel(row.coLoadGroup)}`" /></el-tag><LineClampText :content="row.memberOrderSummaries.join('；')" /><LineClampText :content="`固定 ${row.coLoadGroup.fullPackageCount} 箱 · ${row.coLoadGroup.lockedPlanId ? '已锁定' : '未锁定'}`" /></div><LineClampText v-else content="普通单票" /></template>
-                <template #packageCount="{ row }"><LineClampText v-if="row.coLoadGroup" :content="`${row.packageCount} 箱（整组固定）`" /><div v-else class="package-count-editor"><el-input-number v-if="editingQuantityId === row.id" v-model="quantityDrafts[row.id]" :min="row.minPackageCount" :max="adjustmentMax(row)" :step="1" :controls="false" :disabled="mutating" placeholder="请输入使用箱数" @blur="adjust(row)" @keyup.enter="adjust(row)" /><div v-else class="package-count-summary"><div class="package-count-used"><strong>使用：{{ row.packageCount }}</strong><el-button v-if="canAssign && editable && row.canAdjust" link circle :disabled="mutating" aria-label="调整箱数" @click="startQuantityEdit(row)"><Pencil :size="14" /></el-button></div><small v-if="(row.remainingPackageCount ?? 0) > 0">未用：{{ row.remainingPackageCount }}</small></div><LineClampText v-if="row.detailCount > 1 && editable" content="多规格，需删除后重加" /><LineClampText v-if="row.pickedPackageCount > 0" :content="`已拣 ${row.pickedPackageCount} 箱`" /></div></template>
+                <template #coLoadGroup="{ row }"><div v-if="row.coLoadGroup" class="candidate-group"><el-tag size="small" type="warning"><LineClampText :content="`${row.coLoadGroup.groupNo} · ${groupMemberLabel(row.coLoadGroup)}`" /></el-tag><LineClampText :content="row.memberOrderSummaries.join('；')" /><LineClampText :content="`固定 ${row.coLoadGroup.fullPackageCount} 箱 · ${row.coLoadGroup.lockedPlanId ? '已锁定' : '未锁定'}`" /></div><LineClampText v-else :content="row.unitType === 'SEALED_PALLET' ? '封托不可拆' : '普通单票'" /></template>
+                <template #packageCount="{ row }"><LineClampText v-if="row.unitType === 'SEALED_PALLET'" :content="`${row.packageCount} 箱（整托固定）`" /><LineClampText v-else-if="row.coLoadGroup" :content="`${row.packageCount} 箱（整组固定）`" /><div v-else class="package-count-editor"><el-input-number v-if="editingQuantityId === row.id" v-model="quantityDrafts[row.id]" :min="row.minPackageCount" :max="adjustmentMax(row)" :step="1" :controls="false" :disabled="mutating" placeholder="请输入使用箱数" @blur="adjust(row)" @keyup.enter="adjust(row)" /><div v-else class="package-count-summary"><div class="package-count-used"><strong>使用：{{ row.packageCount }}</strong><el-button v-if="canAssign && editable && row.canAdjust" link circle :disabled="mutating" aria-label="调整箱数" @click="startQuantityEdit(row)"><Pencil :size="14" /></el-button></div><small v-if="(row.remainingPackageCount ?? 0) > 0">未用：{{ row.remainingPackageCount }}</small></div><LineClampText v-if="row.detailCount > 1 && editable" content="多规格，需删除后重加" /><LineClampText v-if="row.pickedPackageCount > 0" :content="`已拣 ${row.pickedPackageCount} 箱`" /></div></template>
+                <template #unitType="{ row }"><el-tag size="small" :type="row.unitType === 'SEALED_PALLET' ? 'success' : 'info'">{{ row.unitType === 'SEALED_PALLET' ? '封托托盘' : '箱件' }}</el-tag></template>
                <template #weight="{ row }">{{ formatNumber(Number(row.grossWeightKg || 0), 1) }} kg</template>
                <template #volume="{ row }">{{ formatNumber(Number(row.volumeCbm || 0)) }} m³</template>
              </DataTable>
@@ -798,7 +813,7 @@ onMounted(() => { void load(); void loadCustomers() })
          </section>
        </section>

-        <AppDialog v-model="assignOpen" :title="selectedCandidate?.coLoadGroupId ? '整组加入当前柜次' : '加入当前柜次'" :confirm-loading="mutating" :confirm-disabled="Boolean(selectedCandidate?.blockReason || selectedCandidate?.locked)" :confirm-text="selectedCandidate?.coLoadGroupId ? '确认整组分配' : '确认加入'" @confirm="assign">
+        <AppDialog v-model="assignOpen" :title="selectedCandidate?.unitType === 'SEALED_PALLET' ? '整托加入当前柜次' : selectedCandidate?.coLoadGroupId ? '整组加入当前柜次' : '加入当前柜次'" :confirm-loading="mutating" :confirm-disabled="Boolean(selectedCandidate?.blockReason || selectedCandidate?.locked)" :confirm-text="selectedCandidate?.unitType === 'SEALED_PALLET' ? '确认整托分配' : selectedCandidate?.coLoadGroupId ? '确认整组分配' : '确认加入'" @confirm="assign">
          <div v-if="selectedCandidate" class="assign-dialog">
            <p><strong>{{ selectedCandidate.groupNo || selectedCandidate.customerName || '客户待补充' }}</strong></p>
            <p>目标柜次：{{ displayCabinetNo(selectedContainer) }} · 集装箱号：{{ displayActualContainerNo(selectedContainer) }}</p>
@@ -810,6 +825,10 @@ onMounted(() => { void load(); void loadCustomers() })
              <p v-for="summary in selectedCandidate.memberOrderSummaries" :key="summary">{{ summary }}</p>
              <el-alert :title="selectedCandidate.blockReason || '同柜且不可拆：全部订单及其入仓片段按完整箱数一次加入，不能部分输入、单独分配或单独移除。'" :type="selectedCandidate.blockReason ? 'error' : 'warning'" :closable="false" />
            </template>
+            <template v-else-if="selectedCandidate.unitType === 'SEALED_PALLET'">
+              <p>托盘号 {{ selectedCandidate.palletNo || '—' }} · 入仓码 {{ selectedCandidate.inboundCode || '—' }} · {{ selectedCandidate.availablePackageCount }} 箱</p>
+              <el-alert title="该封托托盘将作为一个不可拆分单元整托加入；装柜阶段复用此托盘，不会重新生成工作托盘。" type="warning" :closable="false" />
+            </template>
            <template v-else>
              <p>入仓码 {{ selectedCandidate.inboundCode || '—' }} · 可用 {{ selectedCandidate.availablePackageCount }} 箱 · 平均单箱毛重 {{ formatMeasurement(selectedCandidate.unitGrossWeightKg, 'kg', 1) }} · 平均单箱体积 {{ formatMeasurement(selectedCandidate.averageUnitVolumeCbm, 'm³') }}</p>
              <small>本次只记录该入仓码的计划装柜箱数，具体箱号归属为未核验。</small>
@@ -7,11 +7,11 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { readFileSync } from 'node:fs'
 import { resolve } from 'node:path'
 import SmartLoadingWorkbenchView from './SmartLoadingWorkbenchView.vue'
-import { assignSmartLoadingGroup, assignSmartLoadingItem, getContainer, getSmartLoadingPlanByBooking, listSmartLoadingCandidates, recommendSmartLoading, removeSmartLoadingGroup } from '../api/platformContainerLoading'
+import { assignSmartLoadingGroup, assignSmartLoadingItem, assignSmartLoadingPallet, getContainer, getSmartLoadingPlanByBooking, listSmartLoadingCandidates, recommendSmartLoading, removeSmartLoadingGroup } from '../api/platformContainerLoading'

 vi.mock('../api/platformContainerLoading', () => ({
  getContainer: vi.fn(), getSmartLoadingPlanByBooking: vi.fn(), listSmartLoadingCandidates: vi.fn(),
-  createSmartLoadingPlan: vi.fn(), assignSmartLoadingItem: vi.fn(), assignSmartLoadingGroup: vi.fn(), recommendSmartLoading: vi.fn(),
+  createSmartLoadingPlan: vi.fn(), assignSmartLoadingItem: vi.fn(), assignSmartLoadingPallet: vi.fn(), assignSmartLoadingGroup: vi.fn(), recommendSmartLoading: vi.fn(),
  adjustSmartLoadingItem: vi.fn(), removeSmartLoadingItem: vi.fn(), removeSmartLoadingGroup: vi.fn(), pushSmartLoadingPreload: vi.fn(),
 }))
 vi.mock('../smartLoadingPlanGroups', () => ({ loadSmartLoadingPlanCoLoadGroups: vi.fn().mockResolvedValue(new Map()) }))
@@ -36,7 +36,7 @@ function candidatePage(records: unknown[]) {
  return {
    records: records.map((record) => {
      const candidate = record as { accountId?: string; customerId?: string; groupMembers?: unknown[] }
-      return { customerId: candidate.customerId || candidate.accountId || '', groupMembers: [], ...candidate }
+      return { customerId: candidate.customerId || candidate.accountId || '', groupMembers: [], unitType: 'PACKAGE', palletId: null, palletNo: null, indivisible: false, ...candidate }
    }),
    page: 1, size: 200, total: records.length, pages: records.length ? 1 : 0,
  } as Awaited<ReturnType<typeof listSmartLoadingCandidates>>
@@ -46,7 +46,8 @@ describe('SmartLoadingWorkbenchView', () => {
  it('uses one-line shared text clamps for co-load and assigned-count summaries', () => {
    const source = readFileSync(resolve(process.cwd(), 'src/modules/container-loading/pages/SmartLoadingWorkbenchView.vue'), 'utf8')
    expect(source).toContain('<LineClampText :content="row.memberOrderSummaries.join(\'；\')" />')
-    expect(source).toContain('<LineClampText v-if="row.coLoadGroup" :content="`${row.packageCount} 箱（整组固定）`" />')
+    expect(source).toContain('<LineClampText v-else-if="row.coLoadGroup" :content="`${row.packageCount} 箱（整组固定）`" />')
+    expect(source).toContain("row.unitType === 'SEALED_PALLET'")
    expect(source).toContain('.candidate-group { display: grid; width: 100%; min-width: 0;')
    expect(source).toContain('.candidate-group :deep(.line-clamp-text) { width: 100%;')
    expect(source).toContain('<template #goods="{ row }"><div class="goods-cell"><LineClampText')
@@ -201,4 +202,28 @@ describe('SmartLoadingWorkbenchView', () => {
    wrapper.unmount()
  })

+  it('assigns a sealed pallet atomically without a package-count input', async () => {
+    vi.mocked(listSmartLoadingCandidates).mockResolvedValue(candidatePage([{
+      ...candidate, unitType: 'SEALED_PALLET', palletId: '9007199254740998', palletNo: 'DP-260908-0001',
+      indivisible: true, availablePackageCount: 12,
+    }]))
+    vi.mocked(assignSmartLoadingPallet).mockResolvedValue(planResponse)
+    const router = createRouter({ history: createMemoryHistory(), routes: [{ path: '/container-loading/:containerId/smart-loading', component: SmartLoadingWorkbenchView }] })
+    await router.push(`/container-loading/${container.id}/smart-loading`); await router.isReady()
+    const wrapper = mount(SmartLoadingWorkbenchView, { attachTo: document.body, global: { plugins: [ElementPlus, router] } })
+    await flushPromises()
+
+    expect(wrapper.text()).toContain('DP-260908-0001')
+    await wrapper.find('.el-table__body-wrapper button').trigger('click')
+    await flushPromises()
+    expect(document.body.textContent).toContain('不可拆分单元整托加入')
+    expect(document.body.textContent).not.toContain('本次计划装柜箱数')
+    ;([...document.body.querySelectorAll('button')].find((button) => button.textContent?.trim() === '确认整托分配') as HTMLButtonElement).click()
+    await flushPromises()
+
+    expect(assignSmartLoadingPallet).toHaveBeenCalledWith(planResponse.id, { palletId: '9007199254740998', expectedVersion: planResponse.version })
+    expect(assignSmartLoadingItem).not.toHaveBeenCalled()
+    wrapper.unmount()
+  })
+
 })
@@ -12,7 +12,7 @@ import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import LineClampText from '@/shared/components/LineClampText.vue'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import {
-  adjustSmartLoadingItem, assignSmartLoadingGroup, assignSmartLoadingItem, getContainer,
+  adjustSmartLoadingItem, assignSmartLoadingGroup, assignSmartLoadingItem, assignSmartLoadingPallet, getContainer,
  getSmartLoadingPlanByBooking, listSmartLoadingCandidates,
  recommendSmartLoading, removeSmartLoadingGroup, removeSmartLoadingItem,
 } from '../api/platformContainerLoading'
@@ -46,6 +46,7 @@ const canViewLoadingList = computed(() => access.can('platform:firstleg:loading-
 const editable = computed(() => plan.value?.canEdit === true)
 const assignable = computed(() => plan.value?.canAssign === true)
 const assignedInboundIds = computed(() => new Set((plan.value?.items || []).map((item) => item.inboundId)))
+const assignedPalletIds = computed(() => new Set((plan.value?.items || []).map((item) => item.palletId).filter(Boolean)))
 type SmartLoadingCandidateRow = SmartLoadingCandidate & { memberInboundIds: string[]; memberInboundCodes: string[]; memberOrderSummaries: string[]; memberOrderCount: number; inboundFragmentCount: number }
 function memberOrderSummaries<T extends { orderId: string; orderNo?: string | null; inboundCode?: string | null }>(members: T[]) {
  const orders = new Map<string, { label: string; inboundCodes: string[] }>()
@@ -130,6 +131,7 @@ const itemColumns: DataTableColumn[] = [
  { key: 'actions', label: '操作', width: 90, fixed: 'left', slotName: 'actions' },
  { key: 'sequence', prop: 'loadSequence', label: '顺序', width: 75 },
  { key: 'order', label: '入仓码', minWidth: 190, slotName: 'order' },
+  { key: 'palletNo', prop: 'palletNo', label: '托盘号', minWidth: 150, showOverflowTooltip: true },
  { key: 'coLoadGroup', label: '同柜不可拆', minWidth: 210, slotName: 'coLoadGroup' },
  { key: 'customerName', prop: 'customerName', label: '客户', minWidth: 150, slotName: 'customerName' },
  { key: 'goods', label: '货物', minWidth: 190, slotName: 'goods' },
@@ -140,13 +142,15 @@ const itemColumns: DataTableColumn[] = [
 const candidateColumns: DataTableColumn[] = [
  { key: 'actions', label: '操作', width: 110, fixed: 'left', slotName: 'actions' },
  { key: 'inboundCode', prop: 'inboundCode', label: '入仓码', minWidth: 190, fixed: 'left', showOverflowTooltip: true },
+  { key: 'palletNo', prop: 'palletNo', label: '托盘号', minWidth: 150, showOverflowTooltip: true },
+  { key: 'unitType', label: '分配单位', width: 110, slotName: 'unitType' },
  { key: 'coLoadGroup', label: '同柜不可拆', minWidth: 210, slotName: 'coLoadGroup' },
  { key: 'customerName', prop: 'customerName', label: '客户', minWidth: 150, slotName: 'customerName' },
  { key: 'goodsSummary', prop: 'goodsSummary', label: '货物摘要', minWidth: 180, slotName: 'goodsSummary' },
-  { key: 'availablePackageCount', prop: 'availablePackageCount', label: '可用箱数', width: 110 },
+  { key: 'availablePackageCount', prop: 'availablePackageCount', label: '箱数', width: 90 },
  { key: 'cartonIdentityStatus', label: '箱号归属', width: 110, slotName: 'cartonIdentityStatus' },
-  { key: 'averageUnitVolumeCbm', label: '平均单箱体积', width: 145, slotName: 'averageUnitVolume' },
-  { key: 'unitGrossWeightKg', label: '平均单箱毛重', width: 140, slotName: 'unitGrossWeight' },
+  { key: 'averageUnitVolumeCbm', label: '单位体积', width: 120, slotName: 'averageUnitVolume' },
+  { key: 'unitGrossWeightKg', label: '单位毛重', width: 120, slotName: 'unitGrossWeight' },
 ]

 function formatNumber(value: number, digits = 3) { return Number.isFinite(value) ? value.toLocaleString('zh-CN', { maximumFractionDigits: digits }) : '0' }
@@ -231,12 +235,15 @@ async function assign() {
  const currentPlan = plan.value
  const selected = selectedCandidate.value
  const inboundId = selected?.inboundId
-  if (!currentPlan || !selected || !inboundId || assignForm.packageCount < 1) return
+  if (!currentPlan || !selected || !inboundId) return
+  if (selected.unitType !== 'SEALED_PALLET' && assignForm.packageCount < 1) return
  if (selected.coLoadGroupId && (selected.blockReason || selected.locked)) return
  mutating.value = true
  mutationError.value = null
  try {
-    const next = selected.coLoadGroupId
+    const next = selected.unitType === 'SEALED_PALLET' && selected.palletId
+      ? await assignSmartLoadingPallet(currentPlan.id, { palletId: selected.palletId, expectedVersion: currentPlan.version })
+      : selected.coLoadGroupId
      ? await assignSmartLoadingGroup(currentPlan.id, inboundId, currentPlan.version)
      : await assignSmartLoadingItem(currentPlan.id, { inboundId, packageCount: assignForm.packageCount, expectedVersion: currentPlan.version })
    await acceptPlanWithGroups(next)
@@ -246,6 +253,10 @@ async function assign() {
  finally { mutating.value = false }
 }
 function candidateBlocked(candidate: SmartLoadingCandidateRow) {
+  if (candidate.unitType === 'SEALED_PALLET') {
+    return Boolean(candidate.blockReason) || candidate.locked === true || !candidate.palletId
+      || !candidate.indivisible || assignedPalletIds.value.has(candidate.palletId)
+  }
  return Boolean(candidate.blockReason) || candidate.locked === true
    || !candidate.inboundId
    || candidate.memberInboundIds.some((inboundId) => assignedInboundIds.value.has(inboundId))
@@ -272,6 +283,7 @@ async function recommend() {
 }
 async function adjust(source: object) {
  const item = itemRow(source)
+  if (item.unitType === 'SEALED_PALLET') return
  if (!plan.value || mutating.value) return
  const count = Number(quantityDrafts[item.id])
  if (count === item.packageCount) return
@@ -372,24 +384,25 @@ onMounted(load)
          <template #actions="{ row }"><div class="row-actions"><el-button v-if="canDelete && editable && row.canRemove" size="small" type="danger" plain @click="remove(row)"><Trash2 :size="15" />删除</el-button></div></template>
          <template #order="{ row }"><strong>{{ row.inboundCode || '—' }}</strong></template>
          <template #customerName="{ row }"><LineClampText :content="row.customerName" /></template>
-          <template #coLoadGroup="{ row }"><div v-if="row.coLoadGroup" class="candidate-group"><el-tag size="small" type="warning"><LineClampText :content="`${row.coLoadGroup.groupNo} · ${groupMemberLabel(row.coLoadGroup)}`" /></el-tag><LineClampText :content="row.memberOrderSummaries.join('；')" /><LineClampText :content="`全部入仓片段联动，固定 ${row.coLoadGroup.fullPackageCount} 箱`" /></div><LineClampText v-else content="普通单票" /></template>
+          <template #coLoadGroup="{ row }"><div v-if="row.coLoadGroup" class="candidate-group"><el-tag size="small" type="warning"><LineClampText :content="`${row.coLoadGroup.groupNo} · ${groupMemberLabel(row.coLoadGroup)}`" /></el-tag><LineClampText :content="row.memberOrderSummaries.join('；')" /><LineClampText :content="`全部入仓片段联动，固定 ${row.coLoadGroup.fullPackageCount} 箱`" /></div><LineClampText v-else :content="row.unitType === 'SEALED_PALLET' ? '封托不可拆' : '普通单票'" /></template>
          <template #goods="{ row }"><div class="goods-cell"><LineClampText :content="row.productNameZh || '未命名货物'" /><LineClampText class="goods-cell__sku" :content="row.skuCode || '无 SKU'" /></div></template>
-          <template #packageCount="{ row }"><LineClampText v-if="row.coLoadGroup" :content="`${row.packageCount} 箱（整组固定）`" /><div v-else class="package-count-editor"><el-input-number v-if="editingQuantityId === row.id" v-model="quantityDrafts[row.id]" :min="row.minPackageCount" :max="adjustmentMax(row)" :step="1" :controls="false" :disabled="mutating" placeholder="请输入使用箱数" @blur="adjust(row)" @keyup.enter="adjust(row)" /><div v-else class="package-count-summary"><div class="package-count-used"><strong>使用：{{ row.packageCount }}</strong><el-button v-if="canAssign && editable && row.canAdjust" link circle :disabled="mutating" aria-label="调整箱数" @click="startQuantityEdit(row)"><Pencil :size="14" /></el-button></div><small v-if="(row.remainingPackageCount ?? 0) > 0">未用：{{ row.remainingPackageCount }}</small></div><LineClampText v-if="row.detailCount > 1 && editable" :content="`含 ${row.detailCount} 个规格，需删除后重加`" /><LineClampText v-if="row.pickedPackageCount > 0" :content="`已拣 ${row.pickedPackageCount} 箱`" /></div></template>
+          <template #packageCount="{ row }"><LineClampText v-if="row.unitType === 'SEALED_PALLET'" :content="`${row.packageCount} 箱（整托固定）`" /><LineClampText v-else-if="row.coLoadGroup" :content="`${row.packageCount} 箱（整组固定）`" /><div v-else class="package-count-editor"><el-input-number v-if="editingQuantityId === row.id" v-model="quantityDrafts[row.id]" :min="row.minPackageCount" :max="adjustmentMax(row)" :step="1" :controls="false" :disabled="mutating" placeholder="请输入使用箱数" @blur="adjust(row)" @keyup.enter="adjust(row)" /><div v-else class="package-count-summary"><div class="package-count-used"><strong>使用：{{ row.packageCount }}</strong><el-button v-if="canAssign && editable && row.canAdjust" link circle :disabled="mutating" aria-label="调整箱数" @click="startQuantityEdit(row)"><Pencil :size="14" /></el-button></div><small v-if="(row.remainingPackageCount ?? 0) > 0">未用：{{ row.remainingPackageCount }}</small></div><LineClampText v-if="row.detailCount > 1 && editable" :content="`含 ${row.detailCount} 个规格，需删除后重加`" /><LineClampText v-if="row.pickedPackageCount > 0" :content="`已拣 ${row.pickedPackageCount} 箱`" /></div></template>
          <template #volume="{ row }">{{ formatNumber(Number(row.volumeCbm || 0)) }} m³</template><template #weight="{ row }">{{ formatNumber(Number(row.grossWeightKg || 0),1) }} kg</template>
        </DataTable>
        <DataTable :data="displayedCandidates" :columns="candidateColumns" :loading="loading || mutating" stripe preference-key="smart-loading-candidates" column-settings-mode="hide" empty-text="当前仓库暂无可装柜货物">
          <template #toolbar-start><div><h2>候选货物</h2><p>系统基于装柜仓库、物流渠道、可用箱数及 150% 容量上限校验。</p></div></template>
-          <template #actions="{ row }"><el-button v-if="canAssign && assignable" size="small" type="primary" plain :disabled="candidateBlocked(row as SmartLoadingCandidateRow)" @click="openAssign(row)"><Plus :size="15" />{{ row.coLoadGroupId ? '整组分配' : '分配' }}</el-button></template>
+          <template #actions="{ row }"><el-button v-if="canAssign && assignable" size="small" type="primary" plain :disabled="candidateBlocked(row as SmartLoadingCandidateRow)" @click="openAssign(row)"><Plus :size="15" />{{ row.unitType === 'SEALED_PALLET' ? '整托分配' : row.coLoadGroupId ? '整组分配' : '分配' }}</el-button></template>
          <template #customerName="{ row }"><LineClampText :content="row.customerName" /></template>
          <template #goodsSummary="{ row }"><LineClampText :content="row.goodsSummary || '—'" /></template>
-          <template #coLoadGroup="{ row }"><div v-if="row.coLoadGroupId" class="candidate-group"><el-tag size="small" type="warning"><LineClampText :content="`${row.groupNo} · ${row.memberOrderCount} 票 · ${row.inboundFragmentCount} 个入仓片段`" /></el-tag><LineClampText :content="row.memberOrderSummaries.join('；')" /><LineClampText :content="`整组 ${row.groupTotalBoxes} 箱，必须全量进入同一柜`" /><LineClampText v-if="row.blockReason" class="candidate-block" :content="row.blockReason" /><LineClampText v-else-if="row.locked" content="该组已锁定，不能重复分配" /></div><LineClampText v-else content="普通单票" /></template>
+          <template #coLoadGroup="{ row }"><div v-if="row.coLoadGroupId" class="candidate-group"><el-tag size="small" type="warning"><LineClampText :content="`${row.groupNo} · ${row.memberOrderCount} 票 · ${row.inboundFragmentCount} 个入仓片段`" /></el-tag><LineClampText :content="row.memberOrderSummaries.join('；')" /><LineClampText :content="`整组 ${row.groupTotalBoxes} 箱，必须全量进入同一柜`" /><LineClampText v-if="row.blockReason" class="candidate-block" :content="row.blockReason" /><LineClampText v-else-if="row.locked" content="该组已锁定，不能重复分配" /></div><LineClampText v-else :content="row.unitType === 'SEALED_PALLET' ? '封托不可拆' : '普通单票'" /></template>
+          <template #unitType="{ row }"><el-tag size="small" :type="row.unitType === 'SEALED_PALLET' ? 'success' : 'info'">{{ row.unitType === 'SEALED_PALLET' ? '封托托盘' : '箱件' }}</el-tag></template>
          <template #averageUnitVolume="{ row }">{{ formatNumber(Number(row.averageUnitVolumeCbm || 0)) }} m³</template><template #unitGrossWeight="{ row }">{{ formatNumber(Number(row.unitGrossWeightKg || 0),1) }} kg</template>
          <template #cartonIdentityStatus><el-tag size="small" type="info" effect="plain">未核验</el-tag></template>
        </DataTable>
      </template>
      </template>
    </template>
-    <AppDialog v-model="assignOpen" :title="selectedCandidate?.coLoadGroupId ? '整组加入当前柜次' : '按入仓码分配箱数'" :confirm-loading="mutating" :confirm-disabled="Boolean(selectedCandidate?.blockReason || selectedCandidate?.locked)" :confirm-text="selectedCandidate?.coLoadGroupId ? '确认整组分配' : '确认分配'" @confirm="assign"><div v-if="selectedCandidate" class="assign-dialog"><p><strong>{{ selectedCandidate.groupNo || selectedCandidate.inboundCode || '入仓码暂缺' }}</strong></p><template v-if="selectedCandidate.coLoadGroupId"><p>组内 {{ selectedCandidate.memberOrderCount }} 票、{{ selectedCandidate.inboundFragmentCount }} 个入仓片段，共 {{ selectedCandidate.groupTotalBoxes }} 箱</p><p v-for="summary in selectedCandidate.memberOrderSummaries" :key="summary">{{ summary }}</p><el-alert :title="selectedCandidate.blockReason || '同柜且不可拆：全部订单及其入仓片段按完整箱数一次加入，不能部分输入或单独移除。'" :type="selectedCandidate.blockReason ? 'error' : 'warning'" :closable="false" /></template><template v-else><p>{{ selectedCandidate.goodsSummary || '货物摘要暂缺' }} · 可用 {{ selectedCandidate.availablePackageCount }} 箱</p><el-form label-position="top"><el-form-item label="本次计划装柜箱数" required><el-input-number v-model="assignForm.packageCount" :min="1" :max="selectedCandidate.availablePackageCount" :step="1" controls-position="right" placeholder="请输入本次分配箱数" /></el-form-item></el-form><el-alert :title="explainCandidate(selectedCandidate)" type="info" :closable="false" /><small>只记录数量，具体上柜箱号未核验。</small></template></div></AppDialog>
+    <AppDialog v-model="assignOpen" :title="selectedCandidate?.unitType === 'SEALED_PALLET' ? '整托加入当前柜次' : selectedCandidate?.coLoadGroupId ? '整组加入当前柜次' : '按入仓码分配箱数'" :confirm-loading="mutating" :confirm-disabled="Boolean(selectedCandidate?.blockReason || selectedCandidate?.locked)" :confirm-text="selectedCandidate?.unitType === 'SEALED_PALLET' ? '确认整托分配' : selectedCandidate?.coLoadGroupId ? '确认整组分配' : '确认分配'" @confirm="assign"><div v-if="selectedCandidate" class="assign-dialog"><p><strong>{{ selectedCandidate.palletNo || selectedCandidate.groupNo || selectedCandidate.inboundCode || '入仓码暂缺' }}</strong></p><template v-if="selectedCandidate.coLoadGroupId"><p>组内 {{ selectedCandidate.memberOrderCount }} 票、{{ selectedCandidate.inboundFragmentCount }} 个入仓片段，共 {{ selectedCandidate.groupTotalBoxes }} 箱</p><p v-for="summary in selectedCandidate.memberOrderSummaries" :key="summary">{{ summary }}</p><el-alert :title="selectedCandidate.blockReason || '同柜且不可拆：全部订单及其入仓片段按完整箱数一次加入，不能部分输入或单独移除。'" :type="selectedCandidate.blockReason ? 'error' : 'warning'" :closable="false" /></template><template v-else-if="selectedCandidate.unitType === 'SEALED_PALLET'"><p>托盘号 {{ selectedCandidate.palletNo || '—' }} · 入仓码 {{ selectedCandidate.inboundCode || '—' }} · {{ selectedCandidate.availablePackageCount }} 箱</p><el-alert title="该封托托盘将作为一个不可拆分单元整托加入；装柜阶段复用此托盘，不会重新生成工作托盘。" type="warning" :closable="false" /></template><template v-else><p>{{ selectedCandidate.goodsSummary || '货物摘要暂缺' }} · 可用 {{ selectedCandidate.availablePackageCount }} 箱</p><el-form label-position="top"><el-form-item label="本次计划装柜箱数" required><el-input-number v-model="assignForm.packageCount" :min="1" :max="selectedCandidate.availablePackageCount" :step="1" controls-position="right" placeholder="请输入本次分配箱数" /></el-form-item></el-form><el-alert :title="explainCandidate(selectedCandidate)" type="info" :closable="false" /><small>只记录数量，具体上柜箱号未核验。</small></template></div></AppDialog>
  </section>
  </AdminPage>
 </template>