优化

src/modules/overseas-warehouse/components/DispatchWorkflowDialog.test.ts

@@ -7,12 +7,13 @@ import DispatchWorkflowDialog from './DispatchWorkflowDialog.vue'
 import * as api from '../api/dispatches'
 import { candidate, command, detail, destination, loadingPreview, page, sharedPalletCandidates } from '../dispatchTestFixtures'
 import type { ArrangeGroup, CargoLine, CommandResult, DispatchAction, DispatchDetail, PreviewGroup } from '../dispatchContracts'
+import { useDispatchCommandRecovery } from '../dispatchCommandRecovery'
 const identity = vi.hoisted(() => ({ id: '' }))
 vi.mock('@/core/auth/auth', () => ({ useAuthStore: () => ({ user: identity }) }))
 vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => true }) }))
 vi.mock('./DispatchResourceFields.vue', () => ({ default: { template: '<div />' } }))
 vi.mock('../api/dispatches', () => ({ getDispatch: vi.fn(), getDispatchItems: vi.fn(), getDispatchRoute: vi.fn(), reorderDispatchRoute: vi.fn(), removeDispatchItem: vi.fn(), getDispatchLoading: vi.fn(), getDispatchArrangement: vi.fn(), getDispatchCommand: vi.fn(), listDispatches: vi.fn(), listDispatchCandidates: vi.fn(), completeDispatchLoading: vi.fn(), departDispatch: vi.fn(), reviewDispatch: vi.fn(), reviewDispatchLoading: vi.fn(), returnDispatchToReview: vi.fn(), cancelDispatch: vi.fn(), updateDispatch: vi.fn(), addDispatchCargo: vi.fn(), submitDispatchReview: vi.fn(), transferDispatchToDelivery: vi.fn() }))
-interface State { submit(): Promise<void>; measurements: Array<{ weightKg: number | null; volumeCbm: number | null; deliveryIndex: number | null; palletSpaces: number | null }>; form: { reason: string; decision: string }; detail: DispatchDetail }
+interface State { submit(): Promise<void>; retryError(): Promise<void>; measurements: Array<{ weightKg: number | null; volumeCbm: number | null; deliveryIndex: number | null; palletSpaces: number | null }>; form: { reason: string; decision: string; remark: string }; detail: DispatchDetail }
 it('adds all hidden shared-pallet sources once and rejects a changed group composition before another command', async () => {
   const [first, second] = sharedPalletCandidates()
   vi.mocked(api.listDispatches).mockResolvedValue(page()); vi.mocked(api.listDispatchCandidates).mockResolvedValue({ candidates: [first!], complete: true, snapshotAt: '' })
@@ -155,3 +156,81 @@ it('refuses already picked item removal and a route that drops an authoritative
   vi.mocked(api.getDispatchRoute).mockResolvedValue({ dispatchNo: 'PC/1', recordVersion: 0, edit: { allowed: true, blockCode: null, blockReason: null }, stops: [{ index: 0, name: '起运仓', address: null, destinationKey: null }, { index: 1, name: 'ONT8', address: null, destinationKey: 'CODE:ONT8' }, { index: 2, name: '外接点', address: null, destinationKey: 'EXTERNAL:destination' }] })
   const route = await open('EDIT'); await route.wrapper.setProps({ operation: 'ROUTE' }); await flushPromises(); (route.wrapper.vm as unknown as { stops: unknown[] }).stops.pop(); route.state.form.reason = '调整'; await route.state.submit(); expect(api.reorderDispatchRoute).not.toHaveBeenCalled(); expect(route.wrapper.text()).toContain('完整保留'); route.wrapper.unmount()
 })
+it('refreshes current actions and notifies its parent after a fresh A0409, without presenting an unknown result or replay request', async () => {
+  const { wrapper, state } = await open('SUBMIT_REVIEW')
+  vi.mocked(api.submitDispatchReview).mockRejectedValueOnce(new ApiResponseError('本轮调度审核已提交，请勿重复提交', 'A0409', 409, undefined, 'review-request', 'review-trace'))
+  vi.mocked(api.getDispatch).mockResolvedValueOnce(detail({ recordVersion: 1, actions: { SUBMIT_REVIEW: { allowed: false, blockCode: 'ALREADY_SUBMITTED', blockReason: '审核已提交' } } }))
+  await state.submit(); await flushPromises()
+  expect(api.submitDispatchReview).toHaveBeenCalledTimes(1)
+  expect(api.getDispatch).toHaveBeenCalledTimes(2)
+  expect(api.getDispatchCommand).not.toHaveBeenCalled()
+  expect(useDispatchCommandRecovery(() => identity.id).pending.value).toBeNull()
+  expect(wrapper.emitted('rejected')).toEqual([[expect.objectContaining({ code: 'A0409', requestId: 'review-request', traceId: 'review-trace' })]])
+  expect(wrapper.emitted('update:modelValue')).toContainEqual([false])
+  expect(wrapper.emitted('saved')).toBeUndefined()
+  expect(wrapper.text()).not.toContain('原操作结果尚待核对')
+  wrapper.unmount()
+})
+it('retains edited values and the original validation response when the action is still allowed', async () => {
+  const { wrapper, state } = await open('EDIT'); state.form.remark = '用户未保存的本轮备注'
+  vi.mocked(api.updateDispatch).mockRejectedValueOnce(new ApiResponseError('预计到达时间须在发车之后', 'A0400', 400, undefined, 'validation-request'))
+  vi.mocked(api.getDispatch).mockResolvedValue(detail({ recordVersion: 7, actions: { EDIT: { allowed: true, blockCode: null, blockReason: null } } }))
+  await state.submit(); await flushPromises()
+  expect(state.form.remark).toBe('用户未保存的本轮备注')
+  expect(state.detail.recordVersion).toBe(7)
+  expect(wrapper.text()).toContain('预计到达时间须在发车之后')
+  expect(wrapper.text()).toContain('A0400')
+  expect(wrapper.text()).not.toContain('原操作结果尚待核对')
+  expect(wrapper.emitted('update:modelValue')).toBeUndefined()
+  await state.retryError()
+  expect(state.form.remark).toBe('用户未保存的本轮备注')
+  expect(api.updateDispatch).toHaveBeenCalledTimes(1)
+  expect(wrapper.text()).toContain('预计到达时间须在发车之后')
+  wrapper.unmount()
+})
+it('reports a definite rejection to its parent even if the follow-up GET fails and blocks a new write until refreshed', async () => {
+  const { wrapper, state } = await open('SUBMIT_REVIEW'); state.form.remark = '保留本次备注'
+  vi.mocked(api.submitDispatchReview).mockRejectedValueOnce(new ApiResponseError('审核已提交', 'A0409', 409, undefined, 'reject-request'))
+  vi.mocked(api.getDispatch).mockRejectedValueOnce(new Error('GET network failure'))
+  await state.submit(); await flushPromises()
+  expect(wrapper.emitted('rejected')).toEqual([[expect.objectContaining({ code: 'A0409', requestId: 'reject-request' })]])
+  expect(useDispatchCommandRecovery(() => identity.id).pending.value).toBeNull()
+  expect(wrapper.text()).toContain('A0409')
+  expect(wrapper.text()).not.toContain('原操作结果尚待核对')
+  expect(state.form.remark).toBe('保留本次备注')
+  await state.submit()
+  expect(api.submitDispatchReview).toHaveBeenCalledTimes(1)
+  wrapper.unmount()
+})
+it('keeps an unknown original command when its later replay is rejected instead of treating it as a fresh rejection', async () => {
+  const { wrapper, state } = await open('SUBMIT_REVIEW')
+  vi.mocked(api.submitDispatchReview).mockRejectedValueOnce(new Error('unknown transport outcome')).mockRejectedValueOnce(new ApiResponseError('当前已提交', 'A0409', 409))
+  await state.submit()
+  const original = structuredClone(vi.mocked(api.submitDispatchReview).mock.calls[0]![1])
+  expect(wrapper.text()).toContain('原操作结果尚待核对')
+  vi.mocked(api.getDispatchCommand).mockRejectedValueOnce(new ApiResponseError('未找到命令', 'A0404', 404))
+  await state.submit(); await flushPromises()
+  expect(api.submitDispatchReview).toHaveBeenNthCalledWith(2, 'PC/1', original)
+  expect(useDispatchCommandRecovery(() => identity.id).pending.value?.body).toEqual(original)
+  expect(wrapper.emitted('rejected')).toBeUndefined()
+  expect(wrapper.emitted('update:modelValue')).toBeUndefined()
+  expect(api.getDispatch).toHaveBeenCalledTimes(1)
+  expect(wrapper.text()).toContain('原操作结果尚待核对')
+  wrapper.unmount()
+})
+it('describes a proven success with a failed GET as completed and retries only its read', async () => {
+  const { wrapper, state } = await open('SUBMIT_REVIEW')
+  vi.mocked(api.submitDispatchReview).mockImplementationOnce(async (_, body) => command('SUBMIT_REVIEW', body.idempotencyKey))
+  vi.mocked(api.getDispatch).mockRejectedValueOnce(new Error('current detail unavailable'))
+  await state.submit(); await flushPromises()
+  expect(useDispatchCommandRecovery(() => identity.id).pending.value?.result).toMatchObject({ action: 'SUBMIT_REVIEW', recordVersion: 1 })
+  expect(wrapper.text()).toContain('操作已完成，页面资料待刷新')
+  expect(wrapper.text()).not.toContain('原操作结果尚待核对')
+  expect(wrapper.text()).not.toContain('核对并重试原请求')
+  vi.mocked(api.getDispatch).mockResolvedValueOnce(detail({ recordVersion: 1 }))
+  await state.submit()
+  expect(api.submitDispatchReview).toHaveBeenCalledTimes(1)
+  expect(api.getDispatchCommand).not.toHaveBeenCalled()
+  expect(wrapper.emitted('saved')).toHaveLength(1)
+  wrapper.unmount()
+})

src/modules/overseas-warehouse/components/DispatchWorkflowDialog.vue

@@ -14,14 +14,14 @@ import type { AddCargo, ArrangeDelivery, ArrangeGroup, ArrangementPreview, Candi
 import type { DispatchItems, DispatchRoute, DispatchRouteCommand, DispatchRouteStop } from '../dispatchContracts'
 import { DispatchInputError, requireVersion, requireBatchVersions, requireSelectionGroup, expandSelectionGroups, selectionGroupBlockReason } from '../dispatchContracts'
 import { canDispatchAction, dispatchActionLabels } from '../dispatchPresentation'
-import { useDispatchCommandRecovery, type PendingDispatchCommand } from '../dispatchCommandRecovery'
+import { isDefiniteDispatchRejection, useDispatchCommandRecovery, type PendingDispatchCommand } from '../dispatchCommandRecovery'
 import DispatchResourceFields from './DispatchResourceFields.vue'
 import DispatchArrangeFields from './DispatchArrangeFields.vue'
 import DispatchEvidenceFiles from './DispatchEvidenceFiles.vue'
 
 const open = defineModel<boolean>({ default: false })
 const props = defineProps<{ dispatchNo: string; action: DispatchAction; operation?: 'ROUTE' }>()
-const emit = defineEmits<{ saved: [] }>()
+const emit = defineEmits<{ saved: []; rejected: [details: ApiErrorDetails] }>()
 const auth = useAuthStore(), access = useAccessPreviewStore()
 const recovery = useDispatchCommandRecovery(() => auth.user?.id || '')
 const { pending, busy } = recovery
@@ -30,6 +30,7 @@ const currentNo = computed(() => pending.value?.dispatchNo || props.dispatchNo)
 const currentOperation = computed(() => pending.value ? pending.value.operation : props.operation)
 const items = ref<DispatchItems | null>(null), itemId = ref(''), route = ref<DispatchRoute | null>(null), stops = ref<DispatchRouteStop[]>([])
 const detail = ref<DispatchDetail | null>(null), loading = ref(false), error = ref<ApiErrorDetails | null>(null)
+const factsStale = ref(false)
 const preview = ref<LoadingPreview | null>(null), arrangement = ref<ArrangementPreview | null>(null), groups = ref<ArrangeGroup[]>([])
 const arrangeFields = ref<InstanceType<typeof DispatchArrangeFields> | null>(null)
 const candidates = ref<Candidate[]>([]), selected = ref<Array<{ sourceKey: string; groupKey: string; groupVersion: string }>>([]), candidateKeyword = ref('')
@@ -40,7 +41,7 @@ const vehicle = ref<Vehicle>(blankVehicle()), driver = ref<Driver>(blankDriver()
 const form = reactive({ plannedDepartureAt: '', estimatedArrivalAt: '', remark: '', decision: 'APPROVED' as 'APPROVED' | 'REJECTED', reason: '' })
 let generation = 0
 let editorRequestKey = ''
-const allowed = computed(() => !pending.value && canDispatchAction(detail.value?.actions, currentAction.value, access.can) && (currentOperation.value !== 'ROUTE' || route.value?.edit.allowed === true))
+const allowed = computed(() => !factsStale.value && !pending.value && canDispatchAction(detail.value?.actions, currentAction.value, access.can) && (currentOperation.value !== 'ROUTE' || route.value?.edit.allowed === true))
 const width = computed(() => ['EDIT', 'LOADING_COMPLETE', 'ARRANGE_DELIVERY', 'ADD_CARGO', 'REMOVE_CARGO'].includes(currentAction.value) ? '1120px' : ['DISPATCH_REVIEW', 'LOADING_REVIEW'].includes(currentAction.value) ? '760px' : '560px')
 const frozen = computed(() => busy.value || Boolean(pending.value))
 const evidenceBusy = reactive({ VEHICLE: false, DRIVER: false })
@@ -49,7 +50,7 @@ const uploadingEvidence = computed(() => evidenceBusy.VEHICLE || evidenceBusy.DR
 async function load() {
   const sequence = ++generation, no = currentNo.value, action = currentAction.value
   if (editorRequestKey && pending.value?.body.idempotencyKey === editorRequestKey && detail.value?.dispatchNo === no) { loading.value = false; return }
-  loading.value = true; error.value = null; detail.value = null; preview.value = null; arrangement.value = null; selected.value = []
+  loading.value = true; factsStale.value = false; error.value = null; detail.value = null; preview.value = null; arrangement.value = null; selected.value = []
   items.value = null; itemId.value = ''; route.value = null; stops.value = []
   try {
     if (action === 'CREATE') throw new DispatchInputError('请从排车列表的原请求入口恢复新建排车')
@@ -207,17 +208,46 @@ async function submit() {
     if (!result) return
     ElMessage.success(routeCommand ? '卸货顺序调整已确认，请重新核对两级审核' : result.alreadyArranged ? '已引用本车原派送安排，未重复生成单据和费用' : result.replayed ? '原操作结果已核对' : `${dispatchActionLabels[result.action]}已确认`)
     emit('saved'); open.value = false
-  } catch (cause) { error.value = getApiErrorDetails(cause, cause instanceof DispatchInputError ? cause.message : '操作结果尚未确认，请保留原请求核对') }
+  } catch (cause) {
+    error.value = getApiErrorDetails(cause, cause instanceof DispatchInputError ? cause.message : pending.value?.result ? '操作已完成，页面资料待刷新' : pending.value ? '操作结果尚未确认，请保留原请求核对' : '本次操作未通过，请核对后再提交')
+    // Recovery clears only a fresh, definite rejection. A later refusal must not erase an unknown write.
+    if (!pending.value && isDefiniteDispatchRejection(cause)) {
+      editorRequestKey = ''
+      emit('rejected', error.value)
+      await refreshFacts()
+    }
+  }
 }
+async function refreshFacts() {
+  const sequence = ++generation, no = currentNo.value
+  loading.value = true; factsStale.value = true
+  try {
+    const value = await api.getDispatch(no)
+    if (sequence !== generation) return
+    if (value.dispatchNo !== no) throw new DispatchInputError('排车业务号不一致，请重新打开')
+    detail.value = value
+    if (currentOperation.value === 'ROUTE') {
+      const data = await api.getDispatchRoute(no)
+      if (sequence !== generation) return
+      if (data.dispatchNo !== no) throw new DispatchInputError('路线与原排车单不一致')
+      route.value = data
+    }
+    factsStale.value = false
+    if (!pending.value && !allowed.value) open.value = false
+  } catch (cause) {
+    // Retain the original rejection and every editor value if its follow-up read also fails.
+    if (sequence === generation && !error.value) error.value = getApiErrorDetails(cause, '当前操作资格读取失败，请重试刷新')
+  } finally { if (sequence === generation) loading.value = false }
+}
+async function retryError() { if (pending.value) await submit(); else if (detail.value) await refreshFacts(); else await load() }
 function moveStop(index: number, offset: number) { const target = index + offset; if (frozen.value || target < 0 || target >= stops.value.length) return; [stops.value[index], stops.value[target]] = [stops.value[target]!, stops.value[index]!] }
 watch([open, () => props.dispatchNo, () => props.action, () => props.operation], ([value]) => { if (value) void load(); else generation++ }, { immediate: true })
 </script>
 <template>
-  <AppDialog v-model="open" class="admin-density-dialog admin-density" :title="(currentOperation === 'ROUTE' ? '调整卸货顺序' : dispatchActionLabels[currentAction]) + ' · ' + (currentNo || '—')" :width="width" :fullscreenable="width !== '560px'" :loading="loading" :confirm-loading="busy || uploadingEvidence" :confirm-disabled="loading || uploadingEvidence || !pending && !allowed" :confirm-text="pending ? '核对并重试原请求' : '确认提交'" @confirm="submit">
+  <AppDialog v-model="open" class="admin-density-dialog admin-density" :title="(currentOperation === 'ROUTE' ? '调整卸货顺序' : dispatchActionLabels[currentAction]) + ' · ' + (currentNo || '—')" :width="width" :fullscreenable="width !== '560px'" :loading="loading" :confirm-loading="busy || uploadingEvidence" :confirm-disabled="loading || uploadingEvidence || !pending && !allowed" :confirm-text="pending?.result ? '刷新页面资料' : pending ? '核对并重试原请求' : '确认提交'" @confirm="submit">
     <div class="density-dialog-sections">
-      <el-alert v-if="pending" role="status" title="原操作结果尚待核对，当前使用原版本和原请求内容。" type="warning" :closable="false" show-icon />
-      <LoadErrorState v-if="error" title="排车操作未完成" :message="error.message" :loading="loading || busy || uploadingEvidence" @retry="pending ? submit() : load()"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
-      <el-button v-if="pending?.rejected" :disabled="busy || loading || uploadingEvidence" @click="recovery.discardRejected(); load()">按明确驳回结果重新核对</el-button>
+      <el-alert v-if="pending" role="status" :title="pending.result ? '操作已完成，页面资料待刷新；刷新不会再次提交。' : '原操作结果尚待核对，当前使用原版本和原请求内容。'" :type="pending.result ? 'info' : 'warning'" :closable="false" show-icon />
+      <LoadErrorState v-if="error" :title="pending?.result ? '操作已完成，页面资料待刷新' : '排车操作未完成'" :message="error.message" :loading="loading || busy || uploadingEvidence" :retry-text="pending?.result ? '刷新页面资料' : pending ? '核对原请求' : '刷新当前资料'" @retry="retryError"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
       <el-alert v-if="detail && !allowed && !pending" :title="detail?.actions[currentAction]?.blockReason || '当前操作未获得允许，请核对权限与作业状态'" type="warning" :closable="false" show-icon />
       <el-form v-if="detail" class="density-form density-dialog-sections" label-position="left" label-width="130px" :disabled="frozen || loading || uploadingEvidence || !allowed">
         <section v-if="currentOperation === 'ROUTE' && route" class="density-dialog-section" data-tone="source" aria-label="本车卸货顺序"><h3 class="density-dialog-section__title">卸货顺序</h3>