fix(dispatch): release failed request state and return rejected reviews

2026-10-22 10:10:32 +08:00
parent ef85ed30e4
commit 090431b409
18 changed files with 373 additions and 536 deletions
@@ -17,7 +17,7 @@ import { useDispatchCandidates } from '../useDispatchCandidates'
 import type { Candidate, ConvertedDraft, ConvertDraft, CreateDispatch, DispatchDraft, DraftSelection, VersionCommand } from '../dispatchContracts'
 import { DispatchInputError, requireVersion, requireBatchVersions, requireSelectionGroup, expandSelectionGroups } from '../dispatchContracts'
 import { dispatchActionPermissions } from '../dispatchPresentation'
-import { useDispatchCommandRecovery, validateCurrentDispatch, isDefiniteDispatchRejection } from '../dispatchCommandRecovery'
+import { useDispatchCommandRecovery, validateCurrentDispatch } from '../dispatchCommandRecovery'
 import type { InboundOrderListItem } from '../types'
 import SmartDispatchCargoBoard from './SmartDispatchCargoBoard.vue'
 import SmartDispatchExistingCargo from './SmartDispatchExistingCargo.vue'
@@ -28,12 +28,9 @@ const emit = defineEmits<{ 'update:modelValue': [value: boolean]; created: [] }>
 const router = useRouter(), auth = useAuthStore(), access = useAccessPreviewStore()
 const recovery = useDispatchCommandRecovery(() => auth.user?.id || '')
 const owner = auth.user?.id || '', storageKey = `dispatch-draft-command:${owner}`
-type DraftCommand = { action: 'CREATE' | 'CONTAINER' | 'LOCK' | 'UNLOCK' | 'DELETE' | 'RELEASE' | 'CONVERT'; body: Record<string, unknown>; containerId?: string; priorContainerIds?: string[]; attempted: boolean; rejected: boolean; result?: ConvertedDraft }
+type DraftCommand = { action: 'CREATE' | 'CONTAINER' | 'LOCK' | 'UNLOCK' | 'DELETE' | 'RELEASE' | 'CONVERT'; body: Record<string, unknown>; containerId?: string; priorContainerIds?: string[] }
 const pending = ref<DraftCommand | null>(null)
-if (owner && sessionStorage.getItem(storageKey)) pending.value = JSON.parse(sessionStorage.getItem(storageKey)!) as DraftCommand
-// Only a recorded first-attempt rejection proves that no write occurred.
-let rejectedDraftToken = pending.value?.rejected && !pending.value.result ? String(pending.value.body.draftToken || '') : ''
-if (pending.value?.rejected && !pending.value.result) { pending.value = null; sessionStorage.removeItem(storageKey) }
+if (owner) sessionStorage.removeItem(storageKey)
 const workspace = ref<'create' | 'existing'>('create'), existingBusy = ref(false)
 const settingsExpanded = ref(false)
 const mode = ref<'cargo' | 'empty'>('cargo'), warehouseId = ref(''), warehouses = ref<PlatformWarehouseResource[]>([])
@@ -51,11 +48,10 @@ const currentSettings = computed(() => {
  return settings[key]!
 })
 const form = computed(() => currentSettings.value.form)
-const frozen = computed(() => !canCreate.value || preparing.value || saving.value || Boolean(pending.value) || Boolean(recovery.pending.value))
-const needsRecovery = computed(() => Boolean(pending.value || recovery.pending.value) && !saving.value && !preparing.value && !recovery.busy.value)
+const frozen = computed(() => !canCreate.value || preparing.value || saving.value || recovery.busy.value)
 const canCreate = computed(() => access.can(dispatchActionPermissions.CREATE))
 const canEditCargo = computed(() => access.can(dispatchActionPermissions.ADD_CARGO))
-const workspaceFrozen = computed(() => loading.value || preparing.value || saving.value || existingBusy.value || Boolean(pending.value) || Boolean(recovery.pending.value))
+const workspaceFrozen = computed(() => loading.value || preparing.value || saving.value || existingBusy.value || recovery.busy.value)
 const planIds = computed(() => [...new Set(props.orders.map(row => row.planId).filter(Boolean))])
 const currentContainer = computed(() => draft.value?.containers.find(row => row.draftContainerId === activeContainerId.value))
 const populatedGroupCount = computed(() => draft.value?.containers.filter(row => row.sourceKeys.length).length || 0)
@@ -113,25 +109,17 @@ function changeSize(value: number) { size.value = value; void search() }

 let generation = 0
 let candidateFilterKey = ''
-function persist() {
-  if (!owner || owner !== auth.user?.id) throw new DispatchInputError('登录身份已变化，请重新进入排车列表')
-  if (pending.value) sessionStorage.setItem(storageKey, JSON.stringify(pending.value)); else sessionStorage.removeItem(storageKey)
-}
 async function init() {
  const sequence = ++generation
  working.value = true; error.value = null
  try {
-    if (recovery.pending.value && ['ADD_CARGO', 'REMOVE_CARGO'].includes(recovery.pending.value.action)) workspace.value = 'existing'
-    else if (pending.value || recovery.pending.value?.action === 'CREATE') workspace.value = 'create'
-    else if (!canCreate.value && canEditCargo.value) workspace.value = 'existing'
+    if (!canCreate.value && canEditCargo.value) workspace.value = 'existing'
    if (workspace.value === 'existing' || !canCreate.value) return
-    if (recovery.pending.value?.action === 'CREATE') { mode.value = 'empty'; warehouseId.value = String(recovery.pending.value.body.warehouseId || '') }
    const [directory, saved] = await Promise.all([listAllPlatformWarehouses({ warehouseType: 'OVERSEAS', status: 'ACTIVE' }), api.listDispatchDrafts()])
    if (sequence !== generation) return
    warehouses.value = directory; drafts.value = saved
-    const resumeToken = pending.value?.body.draftToken || rejectedDraftToken
+    const resumeToken = draft.value?.draftToken
    if (resumeToken) draft.value = saved.find(row => row.draftToken === resumeToken) || null
-    rejectedDraftToken = ''
    if (draft.value) warehouseId.value = draft.value.warehouseId
    if (!warehouseId.value) {
      const selectedWarehouses = new Set(props.orders.map(row => row.originWarehouseId).filter(Boolean))
@@ -196,16 +184,17 @@ async function draftAction(action: DraftCommand['action'], source?: Candidate, c
          body = { ...common, groups } satisfies ConvertDraft
        }
      }
-      pending.value = { action, body: JSON.parse(JSON.stringify(body)) as Record<string, unknown>, containerId, ...(action === 'CONTAINER' ? { priorContainerIds: current!.containers.map(row => row.draftContainerId) } : {}), attempted: false, rejected: false }; persist()
+      if (!owner || owner !== auth.user?.id) throw new DispatchInputError('登录身份已变化，请重新进入排车列表')
+      pending.value = { action, body: JSON.parse(JSON.stringify(body)) as Record<string, unknown>, containerId, ...(action === 'CONTAINER' ? { priorContainerIds: current!.containers.map(row => row.draftContainerId) } : {}) }
    }
    await retryDraft()
    return true
-  } catch (cause) { error.value = getApiErrorDetails(cause, cause instanceof DispatchInputError ? cause.message : '草稿操作结果未确认，原请求已保留'); return false }
+  } catch (cause) { error.value = getApiErrorDetails(cause, cause instanceof DispatchInputError ? cause.message : '本次排车操作失败，请重试'); return false }
 }
 async function retryDraft() {
  if (!pending.value || saving.value) return
-  const command = pending.value, previousAttempt = command.attempted
-  saving.value = true; command.attempted = true; persist()
+  const command = pending.value
+  saving.value = true
  try {
    const body = command.body
    let result: DispatchDraft | ConvertedDraft
@@ -216,52 +205,55 @@ async function retryDraft() {
      case 'UNLOCK': result = await api.unlockDispatchDraftPallet(body as unknown as DraftSelection); break
      case 'RELEASE': result = await api.releaseDispatchDraft(body as unknown as VersionCommand & { draftToken: string }); break
      case 'DELETE': result = await api.deleteDispatchDraftContainer(String(body.draftToken), command.containerId!, body as unknown as VersionCommand & { reason: string }); break
-      case 'CONVERT': result = command.result || await api.convertDispatchDraft(body as unknown as ConvertDraft); break
+      case 'CONVERT': result = await api.convertDispatchDraft(body as unknown as ConvertDraft); break
    }
    if (body.draftToken && result.draftToken !== body.draftToken) throw new DispatchInputError('草稿结果与原请求不一致')
    if (command.action === 'CONVERT') {
      const converted = result as ConvertedDraft, expected = (body as unknown as ConvertDraft).groups
-      if (converted.vehicles.length !== expected.length || new Set(converted.vehicles.map(row => row.dispatch.dispatchNo)).size !== expected.length || expected.some(group => !converted.vehicles.some(row => row.draftContainerId === group.draftContainerId && row.dispatch.action === 'CREATE' && row.dispatch.idempotencyKey === group.dispatch.idempotencyKey && Boolean(row.dispatch.dispatchNo)))) throw new DispatchInputError('整车转换结果与原草稿容器不一致，请核对原请求')
-      command.result = converted; persist()
+      if (converted.vehicles.length !== expected.length || new Set(converted.vehicles.map(row => row.dispatch.dispatchNo)).size !== expected.length || expected.some(group => !converted.vehicles.some(row => row.draftContainerId === group.draftContainerId && row.dispatch.action === 'CREATE' && row.dispatch.idempotencyKey === group.dispatch.idempotencyKey && Boolean(row.dispatch.dispatchNo)))) throw new DispatchInputError('整车转换结果与本次草稿容器不一致，请刷新当前排车')
      await Promise.all(converted.vehicles.map(async row => validateCurrentDispatch(await api.getDispatch(row.dispatch.dispatchNo), row.dispatch)))
-      pending.value = null; persist(); emit('created'); emit('update:modelValue', false); draft.value = null; ElMessage.success('整车排车单已创建'); await router.push({ name: 'overseas-dispatches' }); return
+      emit('created'); emit('update:modelValue', false); draft.value = null; ElMessage.success('整车排车单已创建'); await router.push({ name: 'overseas-dispatches' }); return
    }
    requireVersion((result as DispatchDraft).recordVersion)
    let addedContainerId: string | undefined
    if (command.action === 'CONTAINER') {
      const updated = result as DispatchDraft, previous = command.priorContainerIds
      const added = previous && updated.containers.filter(row => !previous.includes(row.draftContainerId))
-      if (!previous || !added || added.length !== 1 || added[0]!.capacity !== body.capacity || updated.containers.length !== previous.length + 1 || previous.some(id => !updated.containers.some(row => row.draftContainerId === id))) throw new DispatchInputError('新增车辆结果尚未核对，请保留原请求重试')
+      if (!previous || !added || added.length !== 1 || added[0]!.capacity !== body.capacity || updated.containers.length !== previous.length + 1 || previous.some(id => !updated.containers.some(row => row.draftContainerId === id))) throw new DispatchInputError('新增车辆结果异常，请刷新后重试')
      addedContainerId = added[0]!.draftContainerId
    }
    draft.value = command.action === 'RELEASE' ? null : result as DispatchDraft
    if (draft.value) warehouseId.value = draft.value.warehouseId
    activeContainerId.value = addedContainerId || draft.value?.containers.find(row => row.draftContainerId === activeContainerId.value)?.draftContainerId || draft.value?.containers[0]?.draftContainerId || ''
-    // No new source mutation before the original response has been validated.
-    pending.value = null; persist()
    if (command.action !== 'CREATE' && command.action !== 'CONTAINER') await loadCandidates()
-  } catch (cause) { // A later rejection cannot erase an earlier unknown write result.
-    if (!previousAttempt && !command.result && isDefiniteDispatchRejection(cause)) pending.value = null
-    persist(); throw cause }
-  finally { saving.value = false }
+  } catch (cause) {
+    // 请求失败后读取服务器最新草稿，保留本地时间和备注，后续点击按当前版本重新提交。
+    if (command.body.draftToken) {
+      try {
+        const saved = await api.listDispatchDrafts()
+        drafts.value = saved; draft.value = saved.find(row => row.draftToken === command.body.draftToken) || null
+        activeContainerId.value = draft.value?.containers.find(row => row.draftContainerId === activeContainerId.value)?.draftContainerId || draft.value?.containers[0]?.draftContainerId || ''
+      } catch { /* 刷新失败只保留原错误，不锁住其他操作。 */ }
+    }
+    throw cause
+  } finally { pending.value = null; saving.value = false }
 }
 async function submit() {
  if (workspace.value === 'existing') return
  if (!canCreate.value || preparing.value || saving.value || loading.value) return
  error.value = null
  try {
-    if (pending.value) { await retryDraft(); return }
-    if (recovery.pending.value && recovery.pending.value.action !== 'CREATE') throw new DispatchInputError('另一次排车操作尚待核对，请从列表的原请求恢复入口继续')
-    if (!recovery.pending.value && mode.value === 'cargo') { await draftAction('CONVERT'); return }
-    if (!recovery.pending.value) { if (!warehouseId.value) throw new DispatchInputError('请选择真实起运仓'); recovery.begin('', 'CREATE', creation([])) }
-    const result = await recovery.execute(command => api.createDispatch(command.body as unknown as CreateDispatch), api.getDispatch, api.getDispatchCommand)
+    if (mode.value === 'cargo') { await draftAction('CONVERT'); return }
+    if (!warehouseId.value) throw new DispatchInputError('请选择真实起运仓')
+    recovery.begin('', 'CREATE', creation([]))
+    const result = await recovery.execute(command => api.createDispatch(command.body as unknown as CreateDispatch), api.getDispatch)
    if (result) { emit('created'); emit('update:modelValue', false); ElMessage.success(`空排车单 ${result.dispatchNo} 已创建`) }
-  } catch (cause) { error.value = getApiErrorDetails(cause, cause instanceof DispatchInputError ? cause.message : '建单结果尚未核对，请使用原请求重试') }
+  } catch (cause) { error.value = getApiErrorDetails(cause, cause instanceof DispatchInputError ? cause.message : '建单失败，请重试') }
 }
 watch(() => props.modelValue, value => { if (value) void init(); else { generation++; candidatePage.reset() } }, { immediate: true })
 </script>
 <template>
-  <AppDialog class="admin-density-dialog admin-density admin-workbench is-dialog smart-dispatch-dialog" :class="{ 'is-cargo-workspace': workspace === 'create' && mode === 'cargo' }" append-to-body :lock-scroll="true" :model-value="modelValue" title="智能排车" width="min(1800px, calc(100vw - 40px))" fullscreenable default-fullscreen :loading="working" :show-confirm="workspace === 'create'" :confirm-loading="saving || recovery.busy.value || existingBusy" :confirm-disabled="confirmDisabled" :confirm-text="needsRecovery ? '重试原请求' : mode === 'empty' ? '保存空排车单' : '生成排车单'" @update:model-value="emit('update:modelValue', $event)" @confirm="submit">
+  <AppDialog class="admin-density-dialog admin-density admin-workbench is-dialog smart-dispatch-dialog" :class="{ 'is-cargo-workspace': workspace === 'create' && mode === 'cargo' }" append-to-body :lock-scroll="true" :model-value="modelValue" title="智能排车" width="min(1800px, calc(100vw - 40px))" fullscreenable default-fullscreen :loading="working" :show-confirm="workspace === 'create'" :confirm-loading="saving || recovery.busy.value || existingBusy" :confirm-disabled="confirmDisabled" :confirm-text="mode === 'empty' ? '保存空排车单' : '生成排车单'" @update:model-value="emit('update:modelValue', $event)" @confirm="submit">
    <div class="density-status-tabs" role="tablist" aria-label="智能排车工作方式">
      <button v-if="canCreate" type="button" role="tab" :aria-selected="workspace === 'create'" :class="{ 'is-active': workspace === 'create' }" :disabled="workspaceFrozen" @click="switchWorkspace('create')">新建排车</button>
      <button v-if="canEditCargo" type="button" role="tab" :aria-selected="workspace === 'existing'" :class="{ 'is-active': workspace === 'existing' }" :disabled="workspaceFrozen" @click="switchWorkspace('existing')">调整已有排车货物</button>
@@ -269,8 +261,7 @@ watch(() => props.modelValue, value => { if (value) void init(); else { generati
    <SmartDispatchExistingCargo v-if="workspace === 'existing' && modelValue" @saved="emit('created')" @busy="existingBusy = $event" />
    <template v-else-if="workspace === 'create'">
    <div class="density-dialog-sections dispatch-workspace">
-      <LoadErrorState v-if="error" title="排车未完成" :message="error.message" :loading="loading || saving || recovery.busy.value" @retry="pending || recovery.pending.value ? submit() : init()"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
-      <el-alert v-if="needsRecovery" role="status" title="原请求结果尚待核对，请勿更改选择、版本或重新建单。" type="warning" :closable="false" show-icon />
+      <LoadErrorState v-if="error" title="排车未完成" :message="error.message" :loading="loading || saving || recovery.busy.value" @retry="init()"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
        <section class="density-dialog-section dispatch-search" aria-label="候选货物查询">
          <div class="dispatch-candidate-query">
            <template v-if="mode === 'cargo'"><el-input v-model="query.orderNo" :disabled="frozen || loading" placeholder="订单号／入仓码" /><el-input v-model="query.destinationWarehouseCode" :disabled="frozen || loading" placeholder="目的仓码" /><el-select v-model="query.sourceStage" :disabled="frozen || loading" clearable placeholder="全部来源"><el-option label="在途预排（已离港）" value="PLAN" /><el-option label="已收货实物" value="RECEIVED" /><el-option label="待出库换标" value="RELABEL" /></el-select><el-button type="primary" :disabled="frozen || loading" @click="search">查询</el-button><el-button :disabled="frozen || loading" @click="resetSearch">重置</el-button></template><el-button :aria-expanded="settingsExpanded" aria-controls="smart-dispatch-settings" @click="settingsExpanded = !settingsExpanded">排车设置</el-button></div>