Merge branch 'release/test' of http://8.163.30.128:10082/html/admin-web into release/test

src/modules/overseas-warehouse/api/dispatches.test.ts

@@ -1,10 +1,20 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { http } from '@/shared/api/http'
-import { cancelDispatch, createDispatchDraftContainer, deleteDispatchDraftContainer, getDispatch, getDispatchBolPdf, getDispatchExternalFreight, getDispatchFeeCoverage, listDispatchCandidates, listDispatchDrafts, listDispatches, lockDispatchDraftPallet, preArrangeDispatch, preArrangeDraftDispatch, releaseDispatchDraft, transferDispatchToDelivery, unlockDispatchDraftPallet, updateDispatch } from './dispatches'
+import { cancelDispatch, createDispatchDraftContainer, deleteDispatchDraftContainer, getDispatch, getDispatchBolPdf, getDispatchExternalFreight, getDispatchFeeCoverage, listDispatchCandidates, listDispatchDrafts, listDispatches, lockDispatchDraftPallet, preArrangeDispatch, preArrangeDraftDispatch, releaseDispatchDraft, transferDispatchToDelivery, unlockDispatchDraftPallet, updateDispatch, getBatchDispatchCandidates } from './dispatches'
 
 vi.mock('@/shared/api/http', async (importOriginal) => ({ ...(await importOriginal<typeof import('@/shared/api/http')>()), http: { get: vi.fn(), post: vi.fn(), put: vi.fn(), delete: vi.fn() } }))
 
 describe('dispatch overseas API', () => {
+  it('reads an immutable batch and preserves its exact per-source allocations on grouped submission', async () => {
+    const allocation = { planPalletId: '9007199254740993', batchKey: 'FBA_APPOINTMENT:9', customerId: '9007199254740999', sourceKey: 'BOOKING:2', destinationKey: 'FBA:ONT8', packageCount: 12 }
+    vi.mocked(http.get).mockResolvedValue({ code: '200', data: { batchKey: allocation.batchKey, version: 4, candidates: [], blockReasons: [] } })
+    await getBatchDispatchCandidates(allocation.batchKey)
+    expect(http.get).toHaveBeenCalledWith('/platform/v1/last-leg/appointment-planning/batches/FBA_APPOINTMENT%3A9/dispatch-candidates')
+    vi.mocked(http.post).mockResolvedValue({ code: '200', data: [] })
+    const request = { draftToken: 'draft-1', groups: [{ draftContainerId: 'container-1', planPalletIds: [allocation.planPalletId], returnReceiptIds: [], batchAllocations: [allocation] }] }
+    await preArrangeDraftDispatch(request)
+    expect(http.post).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/drafts/pre-arrange', request)
+  })
   it('submits all explicit draft groups once and preserves container and source identities', async () => {
     const payload = { draftToken: 'original-draft', groups: [
       { draftContainerId: '190000000000000099', planPalletIds: ['11', '13'], returnReceiptIds: [] },

src/modules/overseas-warehouse/api/dispatches.ts

@@ -66,6 +66,7 @@ export interface DispatchDraftContainerDto { id: string; capacity: number; palle
 export interface DispatchDraftDto { draftToken: string; containers?: DispatchDraftContainerDto[] }
 
 export interface PreArrangeDispatchPayload {
+  batchAllocations?: DispatchBatchAllocation[]
   planPalletIds: string[]
   returnReceiptIds?: string[]
   fbaAppointmentNo?: string
@@ -76,6 +77,7 @@ export interface PreArrangeDispatchPayload {
 }
 
 export interface PreArrangeDispatchDraftGroup {
+  batchAllocations?: DispatchBatchAllocation[]
   draftContainerId: string
   planPalletIds: string[]
   returnReceiptIds: string[]
@@ -88,6 +90,12 @@ export interface PreArrangeDispatchDraftResult {
   draftContainerId: string
   dispatch: DispatchSummaryDto
 }
+export interface DispatchBatchAllocation { planPalletId: string; batchKey: string; customerId: string; sourceKey: string; destinationKey: string; packageCount: number }
+export interface BatchDispatchCandidate { planPalletId: string; palletNo: string; planId: string; planNo: string; customerId: string; sourceStage: string; packageCount: number | null; allocations: DispatchBatchAllocation[]; blockReasons: string[] }
+export interface BatchDispatchCandidates { batchKey: string; version: number; candidates: BatchDispatchCandidate[]; blockReasons: string[] }
+export async function getBatchDispatchCandidates(batchKey: string) {
+  return unwrapApiResponse(await http.get<ApiEnvelope<BatchDispatchCandidates>, ApiEnvelope<BatchDispatchCandidates>>(`/platform/v1/last-leg/appointment-planning/batches/${encodeURIComponent(batchKey)}/dispatch-candidates`))
+}
 
 export interface DispatchSummaryDto {
   workflow?: DispatchWorkflow | null

src/modules/overseas-warehouse/api/inboundOrders.ts

@@ -91,7 +91,11 @@ export interface FbaAppointmentDto {
   appointmentRemark?: string | null
   selectedCount: number
   fbaWarehouseCode: string
-  items: Array<{ customerId: string; id: string; sourceKey: string; sourceVersion?: string | null; orderId?: string | null; inboundCode?: string | null; fbaWarehouseCode: string; packageCount?: number | null }>
+  batchKey?: string
+  replacementBatchKeys?: string[]
+  replacementAppointmentNos?: string[]
+  repartitionReason?: string | null
+  items: Array<{ customerId: string; id: string; sourceKey: string; sourceVersion?: string | null; orderId?: string | null; inboundCode?: string | null; fbaWarehouseCode: string; packageCount?: number | null; cargoVerificationVersion?: number | null; shipmentReferences?: string[]; destinationKey?: string | null }>
 }
 
 export interface UpdateFbaAppointmentPayload { details: FbaAppointmentDetailsPayload; version: number; idempotencyKey: string }

src/modules/overseas-warehouse/index.ts

@@ -6,3 +6,8 @@ export type { FbaAppointmentDto, BatchFbaAppointmentPayload, UpdateFbaAppointmen
 export { default as FbaAppointmentFields } from './components/FbaAppointmentFields.vue'
 export { createAppointmentForm, appointmentPayload, appointmentFormError } from './appointmentForm'
 export { overseasWarehousePermissions } from './permissions'
+export { getDispatch, getBatchDispatchCandidates, createDispatchDraftContainer, listDispatchDrafts, lockDispatchDraftPallet, preArrangeDraftDispatch, releaseDispatchDraft } from './api/dispatches'
+export type { BatchDispatchCandidate, BatchDispatchCandidates, DispatchBatchAllocation, DispatchSummaryDto, PreArrangeDispatchDraftPayload } from './api/dispatches'
+export { dispatchVehicleSpecs } from './dispatchVehicleSpecs'
+export { getContainerPlanProgress, getContainerInboundPlanPreview, convertLastMileContainerToInboundPlans } from './api/lastMileOrders'
+export type { ContainerPlanProgressDetailDto, ContainerInboundPlanPreviewDto, ConvertContainerInboundPlanPayload } from './api/lastMileOrders'

src/modules/overseas-warehouse/pages/DispatchesView.test.ts

@@ -16,7 +16,7 @@ vi.mock('@/modules/warehouses', () => ({
 }))
 
 const push = vi.hoisted(() => vi.fn())
-vi.mock('vue-router', () => ({ useRouter: () => ({ push }) }))
+vi.mock('vue-router', () => ({ useRouter: () => ({ push }), useRoute: () => ({ query: {} }) }))
 const canPermission = vi.hoisted(() => vi.fn<(permissionCode: string) => boolean>(() => true))
 vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: canPermission }) }))
 vi.mock('../api/dispatches', () => ({ listDispatches: vi.fn(), removeDispatchItem: vi.fn(), getDispatchBolPdf: vi.fn(), getDispatchExternalFreight: vi.fn(), getDispatchFeeCoverage: vi.fn(), updateDispatch: vi.fn(), cancelDispatch: vi.fn(), transferDispatchToDelivery: vi.fn() }))

src/modules/overseas-warehouse/pages/DispatchesView.vue

@@ -1,9 +1,10 @@
 <script setup lang="ts">
 import '@/styles/adminDensity.css'
+import { appointmentReturnTarget, appointmentReturnQuery } from '@/modules/appointment-calendar'
 import { TripPreparationDialog, TransportRouteDialog, routeLocation, type RouteLocation } from '@/modules/overseas-master-data'
 import { computed, onMounted, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import AdminPage from '@/shared/components/AdminPage.vue'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
@@ -24,7 +25,7 @@ import { formatOverseasDateTime } from '../lastMilePresentation'
 import { overseasWarehousePermissions as permission } from '../permissions'
 import { dispatchVehicleSizeOptions } from '../dispatchVehicleSpecs'
 
-const router = useRouter()
+const route = useRoute(), router = useRouter()
 const routeOpen = ref(false)
 const routeOrigin = ref<RouteLocation>(routeLocation('')), routeDestinations = ref<RouteLocation[]>([])
 function openRoute(row: DispatchListItem) {
@@ -75,10 +76,10 @@ function switchStage(value: typeof stage.value) {
 }
 function openTrip(row: DispatchListItem, tab: 'overview' | 'loading') {
   if (!row.workflow || !access.can('platform:fleet:trip:list')) return
-  void router.push({ name: 'overseas-master-data-trip-detail', params: { tripNo: row.workflow.tripNo }, query: { tab } })
+  void router.push({ name: 'overseas-master-data-trip-detail', params: { tripNo: row.workflow.tripNo }, query: { tab, ...appointmentReturnQuery(route.query) } })
 }
 const filters = ref<QueryModel>({
-  dispatchNo: '',
+  dispatchNo: typeof route.query.dispatchNo === 'string' ? route.query.dispatchNo : '',
   vehiclePlate: '',
   status: '',
   fbaAppointmentNo: '',
@@ -665,7 +666,7 @@ onMounted(load)
   <AdminPage class="admin-density"><ListPageLayout aria-label="海外仓排车列表">
     <OperationErrorToast :details="mutationError" /><TripPreparationDialog v-model="prepareOpen" :warehouse-id="prepareWarehouse" :warehouse-name="prepareWarehouseName" :dispatch-nos="prepareNumbers" @saved="load()" />
     <DataTable v-model:page="page" v-model:page-size="pageSize" appearance="integrated" :stripe="false" :data="rows" :columns="preparationColumns" @selection-change="selectedDispatches = $event" :loading="loading" :total="total" :preference-key="tablePreferenceKey" row-key="id" empty-text="暂无排车记录" @update:page="load()" @update:page-size="page = 1; load()">
-      <template #toolbar-start><h1>排车列表</h1></template><template #toolbar-end><el-button v-if="canPrepare" type="primary" :disabled="!selectedDispatches.length" @click="beginPreparation">安排车次</el-button></template>
+      <template #toolbar-start><el-button v-if="appointmentReturnTarget(route.query)" link @click="router.push(appointmentReturnTarget(route.query)!)">返回预约工作</el-button><h1>排车列表</h1></template><template #toolbar-end><el-button v-if="canPrepare" type="primary" :disabled="!selectedDispatches.length" @click="beginPreparation">安排车次</el-button></template>
       <template #filters><div class="integrated-query-group">
         <div class="density-status-tabs" role="tablist" aria-label="排车执行阶段">
           <button v-for="item in stages" :key="item.value" role="tab" :aria-selected="stage === item.value" :class="{ 'is-active': stage === item.value }" @click="switchStage(item.value)">{{ item.label }}</button>

src/modules/overseas-warehouse/pages/InboundOrderDetailView.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import '@/styles/adminDensity.css'
+import { appointmentReturnTarget } from '@/modules/appointment-calendar'
 import { computed, onMounted, ref } from 'vue'
 import { ElMessage } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
@@ -78,11 +79,11 @@ async function submitMove() {
   try { const warehouseId = String(detail.value?.overseasWarehouseId || ''); if (!warehouseId) { ElMessage.error('入库单未返回海外仓 ID，暂不能移库'); return }; const result = await moveInboundPallet({ overseasWarehouseId: warehouseId, sourcePalletCode: moveRow.value.palletNo, targetLocationCode: targetLocationCode.value, expectedPalletVersion: moveRow.value.palletVersion, reason: moveReason.value.trim(), idempotencyKey: `admin-inbound-move-${moveRow.value.palletNo}-${Date.now()}` }); if (result.canMove === false) { ElMessage.error(result.blockReason || '当前托盘不可移库'); return }; ElMessage.success('移库完成'); moveOpen.value = false; await load() } catch (error) { ElMessage.error(getApiErrorDetails(error, '移库失败').message) } finally { moveSaving.value = false }
 }
 async function load() { if (!planNo.value || !customerId.value) { loadError.value = { message: '详情缺少客户范围，请从入库单列表重新进入' }; return }; loading.value = true; loadError.value = null; try { detail.value = await getInboundPlan(planNo.value, customerId.value) } catch (error) { loadError.value = getApiErrorDetails(error, '入库单详情加载失败，请重试') } finally { loading.value = false } }
-function back() { void router.push({ name: 'overseas-inbound-orders' }) }
+function back() { void router.push(appointmentReturnTarget(route.query) || { name: 'overseas-inbound-orders' }) }
 onMounted(load)
 </script>
 
-<template><OverseasDetailShell class="admin-density" dense title="入库单详情" reference-label="入库单号" :reference-value="referenceValue" back-label="返回入库单" domain="入库单详情" :pending="false" :status-text="detail ? status(detail.status) : '加载中'" @back="back">
+<template><OverseasDetailShell class="admin-density" dense title="入库单详情" reference-label="入库单号" :reference-value="referenceValue" back-label="返回入库单" :back-text="appointmentReturnTarget(route.query) ? '返回预约工作' : '返回列表'" domain="入库单详情" :pending="false" :status-text="detail ? status(detail.status) : '加载中'" @back="back">
   <LoadErrorState v-if="loadError" title="入库单详情加载失败" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState>
   <template v-else><section v-loading="loading" class="detail-section" aria-label="入库单基本信息"><div class="detail-groups"><section v-for="group in summaryGroups" :key="group.title" class="detail-group" :aria-label="group.title"><h2>{{ group.title }}</h2><dl class="detail-fields density-fields"><div v-for="label in group.fields" :key="label"><dt>{{ label }}</dt><dd>{{ fieldValues[label] }}</dd></div></dl></section></div></section>
   <section class="detail-section pallet-section" aria-labelledby="inbound-pallet-heading"><div class="section-heading"><div><h2 id="inbound-pallet-heading">入库单托盘明细</h2><p class="pallet-note">PDA 合托后，参与合托的入库单会分别展示同一托盘及本单对应箱数；A0 为系统共享溢出位。</p></div><span class="section-count">{{ palletRows.length }} 条</span></div><div class="detail-table-wrap"><DataTable :data="palletRows" :columns="palletColumns" column-settings-mode="hide" row-key="id" empty-text="暂无托盘明细"><template #actions="{ row }"><el-button class="density-action" size="small" :disabled="!(row as typeof palletRows[number]).palletNo || !(row as typeof palletRows[number]).palletVersion" @click="openMove(row as typeof palletRows[number])">移库</el-button></template></DataTable></div></section>

src/modules/overseas-warehouse/pages/InboundOrdersView.appointment.test.ts

@@ -2,8 +2,9 @@ import { flushPromises, mount } from '@vue/test-utils'
 import { beforeEach, expect, it, vi } from 'vitest'
 import { onBeforeRouteLeave, onBeforeRouteUpdate } from 'vue-router'
 import InboundOrdersView from './InboundOrdersView.vue'
-import { getFbaAppointment, updateFbaAppointment } from '../api/inboundOrders'
-vi.mock('vue-router', () => ({ useRouter: () => ({push: vi.fn()}), onBeforeRouteLeave: vi.fn(), onBeforeRouteUpdate: vi.fn() }))
+import { getFbaAppointment, updateFbaAppointment, listInboundOrders } from '../api/inboundOrders'
+const routing = vi.hoisted(() => ({ push: vi.fn() }))
+vi.mock('vue-router', () => ({ useRouter: () => routing, onBeforeRouteLeave: vi.fn(), onBeforeRouteUpdate: vi.fn() }))
 const access=vi.hoisted(()=>({canWrite:true}))
 vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({can: (permission:string) => !permission.endsWith(':fba-appointment') || access.canWrite}) }))
 vi.mock('../api/inboundOrders', () => ({
@@ -48,3 +49,22 @@ it('keeps the inbound appointment retry across close, reopen and route attempts'
   expect((vi.mocked(onBeforeRouteLeave).mock.calls[0]![0] as () => boolean)()).toBe(true)
   wrapper.unmount()
 })
+it('renders MULTIPLE as multiple appointments and opens the exact source/customer instead of choosing an arbitrary appointment', async () => {
+  vi.mocked(listInboundOrders).mockResolvedValueOnce({records:[{lineId:'1',planId:'plan-1',planNo:'IP-1',orderId:'9007199254740993',customerId:'customer-a',appointmentNo:null,appointmentStatus:'MULTIPLE',fbaWarehouseCode:'ONT8'}],total:1,page:1,size:10,pages:1})
+  const wrapper = render(); await flushPromises()
+  const button = wrapper.findAll('button').find(button => button.text() === '管理多批预约')!
+  expect(button.exists()).toBe(true)
+  expect(wrapper.findAll('button').some(button => button.text() === '查看预约' || button.text() === '预约')).toBe(false)
+  await button.trigger('click'); await flushPromises()
+  expect(routing.push).toHaveBeenCalledWith({path:'/appointment-calendar',query:{orderId:'9007199254740993',customerId:'customer-a',destinationKey:'FBA:ONT8'}})
+  expect(getFbaAppointment).not.toHaveBeenCalled(); wrapper.unmount()
+})
+it('keeps replaced appointment snapshots read-only in the inbound dialog', async () => {
+  vi.mocked(getFbaAppointment).mockResolvedValueOnce({id:'1',appointmentNo:'AP-1',batchKey:'FBA_APPOINTMENT:1',replacementBatchKeys:['FBA_APPOINTMENT:2'],replacementAppointmentNos:['AP-NEW'],version:3,originWarehouseId:'100',fbaWarehouseCode:'ONT8',appointmentStatus:'PENDING',selectedCount:1,items:[]})
+  const wrapper=render(); await flushPromises()
+  await wrapper.findAll('button').find(button=>button.text()==='预约')!.trigger('click'); await flushPromises()
+  expect(wrapper.text()).toContain('替代预约：AP-NEW')
+  expect(wrapper.find('[data-save]').exists()).toBe(false)
+  wrapper.findComponent({name:'AppDialog'}).vm.$emit('confirm'); await flushPromises()
+  expect(updateFbaAppointment).not.toHaveBeenCalled(); wrapper.unmount()
+})

src/modules/overseas-warehouse/pages/InboundOrdersView.vue

@@ -42,7 +42,7 @@ const fields = computed<QueryField[]>(() => [
   { key: 'status', type: 'select', label: '状态', width: 130, placeholder: '全部状态', options: [{ label: '待入库', value: 'PENDING_ASSIGNMENT' }, { label: '已签收', value: 'SIGNED' }, { label: '拣货中', value: 'PICKING' }, { label: '全部入库', value: 'COMPLETED' }, { label: '部分入库', value: 'PARTIAL_INBOUND' }] },
   { key: 'warehouse', type: 'input', label: '海外仓', width: 155, placeholder: '全部海外仓' },
   { key: 'fbaWarehouse', type: 'input', label: 'FBA仓库', width: 145, placeholder: '全部FBA仓库' },
-  { key: 'appointmentStatus', type: 'select', label: '预约状态', width: 145, placeholder: '全部预约状态', options: [{ label: '未预约', value: 'UNAPPOINTED' }, { label: '预约中', value: 'PENDING' }, { label: '预约成功', value: 'SUCCESS' }, { label: '预约失败', value: 'FAILED' }, { label: '已取消', value: 'CANCELLED' }] },
+  { key: 'appointmentStatus', type: 'select', label: '预约状态', width: 145, placeholder: '全部预约状态', options: [{ label: '未预约', value: 'UNAPPOINTED' }, { label: '预约中', value: 'PENDING' }, { label: '预约成功', value: 'SUCCESS' }, { label: '预约失败', value: 'FAILED' }, { label: '已取消', value: 'CANCELLED' }, { label: '多批预约', value: 'MULTIPLE' }] },
   { key: 'dispatchStatus', type: 'select', label: '排车状态', width: 140, placeholder: '全部排车状态', options: [{ label: '未排车', value: 'UNSCHEDULED' }, { label: '已排车', value: 'SCHEDULED' }] },
   { key: 'inboundDate', type: 'daterange', label: '入库时间', width: 260 },
 ])
@@ -59,6 +59,7 @@ const appointmentForm = reactive(createAppointmentForm())
 const appointmentTimezone = ref<string | null>(null)
 const pendingAppointment = ref<{appointmentNo: string | null; version: number; originWarehouseId: string; fbaWarehouseCode: string; lineIds: string[]; details: ReturnType<typeof appointmentPayload>; idempotencyKey: string} | null>(null)
 const appointmentViewOnly = ref(false)
+const appointmentReplacementNos = ref<string[]>([])
 const appointmentReadOnly = computed(() => appointmentViewOnly.value || !access.can(permission.inboundOrderAppointment))
 const appointmentTitle = computed(() => appointmentReadOnly.value ? '查看预约' : appointmentMode.value === 'edit' ? '编辑预约' : '预约')
 const planEditOpen = ref(false); const planEditLoading = ref(false); const planEditSaving = ref(false); const planEditTarget = ref<InboundOrderListItem | null>(null); const planEditForm = reactive({ warehouseId: '', warehouseCode: '', warehouseName: '', version: 0 }); const warehouses = ref<ReceivingOverseasWarehouseDto[]>([])
@@ -103,7 +104,7 @@ function receivingWarehouse(code: unknown, name: unknown) {
 }
 function number(value: unknown) { const normalized = Number(value); return Number.isFinite(normalized) ? normalized : 0 }
 function typeLabel(value: unknown) { return lastMileOrderTypeLabel(value) }
-function appointmentStatusLabel(value: unknown) { return !value ? '未预约' : ({ PENDING: '预约中', SUCCESS: '预约成功', FAILED: '预约失败', CANCELLED: '已取消' } as Record<string, string>)[String(value)] || text(value) }
+function appointmentStatusLabel(value: unknown) { return !value ? '未预约' : ({ PENDING: '预约中', SUCCESS: '预约成功', FAILED: '预约失败', CANCELLED: '已取消', MULTIPLE: '多批预约' } as Record<string, string>)[String(value)] || text(value) }
 
 function toListItem(dto: InboundOrderSummaryDto): InboundOrderListItem {
   return {
@@ -122,6 +123,7 @@ function toListItem(dto: InboundOrderSummaryDto): InboundOrderListItem {
 function onSelectionChange(selection: object[]) { selectedRows.value = selection as InboundOrderListItem[] }
 function selectionError() {
   if (!selectedRows.value.length) return '请至少选择 1 条入库单'
+  if (selectedRows.value.some(row => row.appointmentStatus === '多批预约')) return '所选货物已有多批预约，请从“管理多批预约”逐批处理，不能重新按整票创建'
   if (selectedRows.value.some((row) => !row.fbaWarehouse || row.fbaWarehouse === '—')) return '所选入库单缺少 FBA 仓库信息'
   if (selectedRows.value.some(row => !row.originWarehouseId) || new Set(selectedRows.value.map(row => row.originWarehouseId)).size !== 1) return '所选入库单必须属于同一接仓点'
   if (new Set(selectedRows.value.map((row) => row.fbaWarehouse)).size !== 1) return '所选入库单必须属于同一 FBA 仓库'
@@ -131,6 +133,7 @@ function selectionError() {
 function openAppointment() {
   if (!access.can(permission.inboundOrderAppointment) || !canLeaveAppointment()) return
   appointmentViewOnly.value = false
+  appointmentReplacementNos.value = []
   const error = selectionError()
   if (error) { ElMessage.warning(error); return }
   appointmentMode.value = 'create'; editingAppointmentNo.value = ''
@@ -148,12 +151,15 @@ function openSmartDispatch() {
 async function openAppointmentEdit(source: object, readOnly = false) {
   if (!canLeaveAppointment()) return
   const row = source as InboundOrderListItem
+  if (row.appointmentStatus === '多批预约') { openMultipleAppointments(row); return }
   if (!row.appointmentNo || row.appointmentNo === '—') return
   appointmentViewOnly.value = readOnly
   appointmentMode.value = 'edit'; editingAppointmentNo.value = row.appointmentNo
   appointmentLoading.value = true; mutationError.value = null; appointmentOpen.value = true
   try {
     const detail = await getFbaAppointment(row.appointmentNo)
+    appointmentReplacementNos.value = detail.replacementAppointmentNos || []
+    appointmentViewOnly.value = readOnly || detail.appointmentStatus === 'CANCELLED' || !!appointmentReplacementNos.value.length || !!detail.replacementBatchKeys?.length
     appointmentSelectedCount.value = detail.selectedCount
     appointmentFbaWarehouse.value = detail.fbaWarehouseCode || row.fbaWarehouse
     appointmentVersion.value = detail.version
@@ -163,6 +169,11 @@ async function openAppointmentEdit(source: object, readOnly = false) {
     mutationError.value = getApiErrorDetails(caught, 'FBA 预约详情加载失败，请重试')
   } finally { appointmentLoading.value = false }
 }
+function openMultipleAppointments(row: InboundOrderListItem) {
+  if (!canLeaveAppointment() || !access.can('platform:appointment:list')) return
+  if (!row.orderId || !row.customerId || !row.fbaWarehouse || row.fbaWarehouse === '—') { ElMessage.warning('原货源或客户范围缺失，请重新读取入库单'); return }
+  void router.push({ path: '/appointment-calendar', query: { orderId: row.orderId, customerId: row.customerId, destinationKey: `FBA:${row.fbaWarehouse}` } })
+}
 
 function canLeaveAppointment() {
   if (saving.value || pendingAppointment.value) { ElMessage.warning('请先核实本次预约保存结果，再关闭或切换'); return false }
@@ -224,14 +235,14 @@ onMounted(() => { void load() })
 
 
       <template #toolbar-actions><el-button v-if="access.can(permission.inboundOrderAppointment)" plain :disabled="!selectedRows.length" @click="openAppointment"><CalendarCheck2 :size="16" />预约</el-button><el-button v-if="access.can(permission.inboundOrderSmartDispatch)" type="primary" @click="openSmartDispatch"><Truck :size="16" />智能排车</el-button></template>
-      <template #actions="{ row }"><div class="row-actions density-actions admin-text-actions"><el-button class="density-action" data-tone="neutral" size="small" @click="openDetail(row)">查看</el-button><el-button class="density-action" data-tone="neutral" v-if="access.can(permission.inboundOrderEdit) && ['待入库'].includes((row as InboundOrderListItem).status)" size="small" @click="openPlanEdit(row)">编辑</el-button><el-button class="density-action" data-tone="neutral" v-if="(row as InboundOrderListItem).appointmentNo !== '—' && access.can(permission.inboundOrderList)" size="small" @click="openAppointmentEdit(row, true)">查看预约</el-button><el-button class="density-action" data-tone="neutral" v-if="(row as InboundOrderListItem).appointmentNo !== '—' && access.can(permission.inboundOrderAppointment)" size="small" @click="openAppointmentEdit(row)">预约</el-button></div></template>
+      <template #actions="{ row }"><div class="row-actions density-actions admin-text-actions"><el-button class="density-action" data-tone="neutral" size="small" @click="openDetail(row)">查看</el-button><el-button class="density-action" data-tone="neutral" v-if="access.can(permission.inboundOrderEdit) && ['待入库'].includes((row as InboundOrderListItem).status)" size="small" @click="openPlanEdit(row)">编辑</el-button><el-button class="density-action" data-tone="neutral" v-if="(row as InboundOrderListItem).appointmentStatus !== '多批预约' && (row as InboundOrderListItem).appointmentNo !== '—' && access.can(permission.inboundOrderList)" size="small" @click="openAppointmentEdit(row, true)">查看预约</el-button><el-button class="density-action" data-tone="neutral" v-if="(row as InboundOrderListItem).appointmentStatus !== '多批预约' && (row as InboundOrderListItem).appointmentNo !== '—' && access.can(permission.inboundOrderAppointment)" size="small" @click="openAppointmentEdit(row)">预约</el-button><el-button v-if="(row as InboundOrderListItem).appointmentStatus === '多批预约' && access.can('platform:appointment:list')" class="density-action" @click="openMultipleAppointments(row as InboundOrderListItem)">管理多批预约</el-button></div></template>
       <template #pagination-left>共 {{ total }} 条入库单 · 已选 {{ selectedRows.length }} 条</template>
     </DataTable></section>
   </ListPageLayout>
   <AppDialog class="admin-density-dialog" :model-value="appointmentOpen" @update:model-value="closeAppointment" :before-close="beforeCloseAppointment" :title="appointmentTitle" :show-confirm="!appointmentReadOnly" width="min(1080px, calc(100vw - 48px))" :confirm-text="pendingAppointment ? '重试本次保存' : '保存预约安排'" :confirm-loading="saving" @confirm="submitAppointment">
     <div v-loading="appointmentLoading">
     <div class="appointment-summary">已选择 {{ appointmentSelectedCount }} 条，FBA仓库：{{ appointmentFbaWarehouse }}</div>
-    <FbaAppointmentFields :model="appointmentForm" :appointment-no="editingAppointmentNo || undefined" :timezone="appointmentTimezone" :disabled="appointmentReadOnly || appointmentLoading || saving || !!pendingAppointment" />
+    <p v-if="appointmentReplacementNos.length">原批次已被替代，当前只读。替代预约：{{ appointmentReplacementNos.join('、') }}</p><FbaAppointmentFields :model="appointmentForm" :appointment-no="editingAppointmentNo || undefined" :timezone="appointmentTimezone" :disabled="appointmentReadOnly || appointmentLoading || saving || !!pendingAppointment" />
 
     </div>
   </AppDialog>