优化

src/modules/inbounds/review/MeasurementReviewPanel.test.ts

@@ -5,7 +5,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { useAuthStore } from '@/core/auth/auth'
 import DataTable from '@/shared/components/DataTable.vue'
-import { approveMeasurement, getMeasurementReviewDetail, listMeasurementReviewHistory } from './api'
+import { approveMeasurement, getMeasurementReviewDetail, listMeasurementReviewHistory, rejectMeasurement } from './api'
 import MeasurementReviewPanel from './MeasurementReviewPanel.vue'
 
 vi.mock('./api', () => ({
@@ -19,7 +19,7 @@ vi.mock('./api', () => ({
 const detail = {
   inboundId: '90001', inboundCode: 'RK90001', companyName: '柏悦客户', channelCode: 'SEA', channelName: '海运',
   processStatus: 'MEASURE_PENDING', measureReviewStatus: 'PENDING', recommendedPalletType: 'STANDARD', reviewReason: null, reviewerId: null, reviewerName: null,
-  measurementId: '70001', sourceType: 'DEVICE', measurementStatus: 'SUBMITTED', version: 4,
+  measurementId: '70001', sourceType: 'DEVICE', measurementStatus: 'SUBMITTED', inboundVersion: 7, version: 4,
   originalDocumentNo: 'ORD-001', originalGrossWeightKg: 100, originalVolumeCbm: 2, originalPackageCount: 10,
   actualPackageCount: 10, actualGrossWeightKg: 110, actualVolumeCbm: 2.2, volumeWeightKg: 367.4, actualGoodsName: '测试货物',
   items: [{ id: '1', boxCode: 'RK90001#10-1', itemNo: '001', boxSpecification: '60×40×30', packageCount: 10, lengthCm: 60, widthCm: 40, heightCm: 30, girthCm: 240, unitWeightKg: 11, unitVolumeCbm: 0.072, totalWeightKg: 110, totalVolumeCbm: 0.72, volumeWeightKg: 120.24, intelligentImageFileId: '30001', machineNo: 'MJ20210327', measuredAt: '2026-08-04T10:30:00+08:00', overLimitWarning: '周长超过渠道限制，请人工核验尺寸后再作出审核决定', outerLengthCm: 61, outerWidthCm: 41, outerHeightCm: 31, remark: '外箱存在轻微变形' }],
@@ -92,7 +92,26 @@ describe('MeasurementReviewPanel', () => {
       '确认测量审核通过',
       expect.objectContaining({ confirmButtonText: '通过并完成入库' }),
     )
-    expect(approveMeasurement).toHaveBeenCalledWith('10001', '90001', { measurementId: '70001', expectedVersion: 4 })
+    expect(approveMeasurement).toHaveBeenCalledWith('10001', '90001', { measurementId: '70001', expectedVersion: 7 })
     expect(wrapper.emitted('changed')).toHaveLength(1)
   })
+
+  it('rejects with the inbound optimistic-lock version instead of the measurement version', async () => {
+    vi.mocked(rejectMeasurement).mockResolvedValue(undefined)
+    const wrapper = mount(MeasurementReviewPanel, { props: { customerId: '10001', inboundId: '90001' }, global: { plugins: [ElementPlus] } })
+    await flushPromises()
+
+    const reject = wrapper.findAll('button').find((button) => button.text().includes('驳回'))
+    await reject?.trigger('click')
+    await wrapper.find('textarea').setValue('重量图片需要重新核对')
+    const confirm = wrapper.findAll('button').find((button) => button.text().includes('确认驳回'))
+    await confirm?.trigger('click')
+    await flushPromises()
+
+    expect(rejectMeasurement).toHaveBeenCalledWith('10001', '90001', {
+      measurementId: '70001',
+      expectedVersion: 7,
+      reason: '重量图片需要重新核对',
+    })
+  })
 })

src/modules/inbounds/review/MeasurementReviewPanel.vue

@@ -156,7 +156,7 @@ async function confirmApprove() {
   try {
     await approveMeasurement(customerId.value, props.inboundId, {
       measurementId: detail.value.measurementId,
-      expectedVersion: detail.value.version,
+      expectedVersion: detail.value.inboundVersion,
     })
     ElMessage.success('审核已通过，费用发布和入库正在完成')
     await reload()
@@ -187,14 +187,14 @@ async function submitReason() {
     if (kind === 'reject') {
       await rejectMeasurement(customerId.value, props.inboundId, {
         measurementId: detail.value.measurementId,
-        expectedVersion: detail.value.version,
+        expectedVersion: detail.value.inboundVersion,
         reason: value,
       })
       ElMessage.success('测量已驳回，已退回测量修正')
     } else {
       await releaseRejectedMeasurement(customerId.value, props.inboundId, {
         measurementId: detail.value.measurementId,
-        expectedVersion: detail.value.version,
+        expectedVersion: detail.value.inboundVersion,
         reason: value,
       })
       ElMessage.success('异常放行已提交，后续计费入库将继续处理')

src/modules/inbounds/review/types.ts

@@ -60,6 +60,7 @@ export interface MeasurementReviewDetail {
   measurementId: string
   sourceType: string | null
   measurementStatus: string | null
+  inboundVersion: number
   version: number
   originalDocumentNo: string | null
   originalGrossWeightKg: number | null