优化

2026-10-20 14:25:01 +08:00
parent 5679b156ca
commit 03b1e7163e
23 changed files with 425 additions and 54 deletions
@@ -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()
+})