This commit is contained in:
wujinliang
2026-08-27 21:48:15 +08:00
parent 550d8add97
commit b47323edf3
53 changed files with 624 additions and 82 deletions
@@ -26,6 +26,8 @@ describe('InboundTaskList measurement scope', () => {
expect(source).toContain('批量审核通过')
expect(source).toContain('getMeasurementReviewDetail')
expect(source).toContain('approveMeasurement')
expect(source).toContain('expectedVersion: detail.inboundVersion')
expect(source).not.toContain('expectedVersion: detail.version')
expect(source).toContain('approval.initialPricingSucceeded')
expect(source).toContain('费用初算未生成,可补价后重新计算')
})
@@ -219,7 +219,7 @@ async function batchApproveMeasurements() {
const detail = await getMeasurementReviewDetail(String(row.tenantId), String(row.id))
const approval = await approveMeasurement(String(row.tenantId), String(row.id), {
measurementId: detail.measurementId,
expectedVersion: detail.version,
expectedVersion: detail.inboundVersion,
})
successCount += 1
if (!approval.initialPricingSucceeded) {
+2
View File
@@ -66,7 +66,9 @@ export interface MeasurementReviewDetail {
measurementId: string
sourceType: string | null
measurementStatus: string | null
/** 入库单乐观锁版本;审核接口 expectedVersion 使用此字段。 */
inboundVersion: number
/** 测量批次自身版本,不用于入库单状态审核。 */
version: number
originalDocumentNo: string | null
originalGrossWeightKg: number | null