diff --git a/backend/src/controllers/__tests__/assetWorkflowIntegrity.integration.test.ts b/backend/src/controllers/__tests__/assetWorkflowIntegrity.integration.test.ts
index 17dced9..74040c2 100644
--- a/backend/src/controllers/__tests__/assetWorkflowIntegrity.integration.test.ts
+++ b/backend/src/controllers/__tests__/assetWorkflowIntegrity.integration.test.ts
@@ -73,9 +73,15 @@ test('资产数量、报废和盘点的本机 MySQL 回归', {
call(updateEquipment, operator, { total_quantity, description }, { id: String(row.id) })
const borrow = (row: Equipment, personId: number) =>
call(borrowEquipment, operator, { equipment_id: row.id, person_id: personId, is_long_term: true })
- const submit = (row: Equipment, item_ids = [row.id]) => call(createDisposal, operator, {
- equipment_id: row.id, item_ids, disposal_reason: '设备老化', disposal_method: '报废'
- })
+ const submit = async (row: Equipment, item_ids = [row.id], confirmed_quantities?: { equipment_id: number; total_quantity: number }[]) => {
+ const quantities = confirmed_quantities ?? (await prisma.equipment.findMany({
+ where: { id: { in: item_ids } }, select: { id: true, total_quantity: true }
+ })).map(item => ({ equipment_id: item.id, total_quantity: item.total_quantity }))
+ return call(createDisposal, operator, {
+ equipment_id: row.id, item_ids, disposal_reason: '设备老化', disposal_method: '报废',
+ confirmed_quantities: quantities
+ })
+ }
const approve = (id: number, extra = {}, user = reviewer) =>
call(approveDisposal, user, { approved: true, ...extra }, { id: String(id) })
const complete = (id: number) => call(completeDisposal, operator, {}, { id: String(id) })
@@ -128,6 +134,17 @@ test('资产数量、报废和盘点的本机 MySQL 回归', {
await t.test('审批冻结整棵树的数量,数量纠错和完成均检查冻结值', async () => {
const root = await asset('disposal-root', 2)
const child = await asset('disposal-child', 1, root.id)
+ const missing = await call(createDisposal, operator, {
+ equipment_id: root.id, item_ids: [root.id, child.id], disposal_reason: '设备老化', disposal_method: '报废'
+ })
+ assert.equal(missing.status, 422)
+ assert.match(missing.body.message, /缺少报废数量确认.*刷新页面/)
+ const stale = await submit(root, [root.id, child.id], [
+ { equipment_id: root.id, total_quantity: 1 }, { equipment_id: child.id, total_quantity: 1 }
+ ])
+ assert.equal(stale.status, 409)
+ assert.match(stale.body.message, /与本次确认不一致/)
+ assert.equal((await equipmentState(root)).status, '可用')
const created = await submit(root, [root.id, child.id])
assert.equal(created.status, 200, JSON.stringify(created.body))
const id = created.body.data.id
diff --git a/backend/src/controllers/__tests__/borrowController.return-concurrency.test.ts b/backend/src/controllers/__tests__/borrowController.return-concurrency.test.ts
index b7913f2..8c3aed1 100644
--- a/backend/src/controllers/__tests__/borrowController.return-concurrency.test.ts
+++ b/backend/src/controllers/__tests__/borrowController.return-concurrency.test.ts
@@ -203,6 +203,7 @@ test('行政可在报废前将唯一未归还资产快捷入库,并保留正
equipment_id: borrowedRoot.id,
person_id: 15,
status: '已借出',
+ return_time: null,
children_snapshot: null,
updated_at: now
}
@@ -259,10 +260,20 @@ test('行政可在报废前将唯一未归还资产快捷入库,并保留正
}
try {
+ await returnEquipmentBeforeDisposal({
+ params: { equipment_id: String(borrowedRoot.id) }, body: { borrow_record_id: borrowRecord.id - 1, return_condition: '损坏' }
+ } as any, res as any)
+ assert.equal(state.statusCode, 409)
+ assert.match(state.body.message, /借用单已变化/)
+ assert.equal(rootUpdates.length, 0)
+ assert.equal(movementReasons.length, 0)
+ assert.equal(borrowRecord.status, '已借出')
+
+ state.statusCode = 200
await returnEquipmentBeforeDisposal(
{
params: { equipment_id: String(borrowedRoot.id) },
- body: { return_condition: '损坏' }
+ body: { borrow_record_id: borrowRecord.id, return_condition: '损坏' }
} as any,
res as any
)
@@ -279,12 +290,12 @@ test('行政可在报废前将唯一未归还资产快捷入库,并保留正
}
})
-test('报废前快捷入库遇到多条未归还记录时拒绝自动处理', async () => {
+test('报废前快捷入库遇到多条或没有未归还记录时返回 409', async () => {
const originalTransaction = prisma.$transaction
const borrowedRoot = { ...root, status: '已借出', total_quantity: 1, remaining_quantity: 0 }
let transactionCount = 0
let businessWriteCount = 0
- const activeRecords = [
+ let activeRecords = [
{ id: 701, equipment_id: root.id, person_id: 1, status: '已借出', children_snapshot: null, updated_at: now },
{ id: 702, equipment_id: root.id, person_id: 2, status: '已借出', children_snapshot: null, updated_at: now }
]
@@ -331,13 +342,20 @@ test('报废前快捷入库遇到多条未归还记录时拒绝自动处理', as
try {
await returnEquipmentBeforeDisposal(
- { params: { equipment_id: String(root.id) }, body: {} } as any,
+ { params: { equipment_id: String(root.id) }, body: { borrow_record_id: 701 } } as any,
res as any
)
- assert.equal(state.statusCode, 422)
+ assert.equal(state.statusCode, 409)
assert.match(state.body.message, /多条未归还记录/)
- assert.equal(transactionCount, 1)
+ activeRecords = []
+ await returnEquipmentBeforeDisposal(
+ { params: { equipment_id: String(root.id) }, body: { borrow_record_id: 701 } } as any,
+ res as any
+ )
+ assert.equal(state.statusCode, 409)
+ assert.match(state.body.message, /没有对应的未归还记录.*刷新页面/)
+ assert.equal(transactionCount, 2)
assert.equal(businessWriteCount, 0)
} finally {
;(prisma.$transaction as any) = originalTransaction
@@ -393,7 +411,13 @@ test('报废前快捷入库拒绝未收回或多数量资产,且不会产生
try {
await returnEquipmentBeforeDisposal(
- { params: { equipment_id: String(root.id) }, body: { return_condition: '丢失' } } as any,
+ { params: { equipment_id: String(root.id) }, body: {} } as any, res as any
+ )
+ assert.equal(state.statusCode, 422)
+ assert.match(state.body.message, /缺少有效借用单.*刷新页面/)
+
+ await returnEquipmentBeforeDisposal(
+ { params: { equipment_id: String(root.id) }, body: { borrow_record_id: 701, return_condition: '丢失' } } as any,
res as any
)
assert.equal(state.statusCode, 422)
@@ -403,10 +427,10 @@ test('报废前快捷入库拒绝未收回或多数量资产,且不会产生
state.body = null
await returnEquipmentBeforeDisposal(
- { params: { equipment_id: String(root.id) }, body: { return_condition: '正常' } } as any,
+ { params: { equipment_id: String(root.id) }, body: { borrow_record_id: 701, return_condition: '正常' } } as any,
res as any
)
- assert.equal(state.statusCode, 422)
+ assert.equal(state.statusCode, 409)
assert.match(state.body.message, /仅支持单件资产/)
assert.equal(transactionCount, 1)
assert.equal(businessWriteCount, 0)
@@ -423,6 +447,7 @@ test('借出时无配件但当前新增配件时进入版本确认,配件再
id: 803,
equipment_id: borrowedRoot.id,
person_id: 15,
+ return_time: null,
children_snapshot: null,
updated_at: now
}
@@ -470,7 +495,7 @@ test('借出时无配件但当前新增配件时进入版本确认,配件再
try {
await returnEquipmentBeforeDisposal(
- { params: { equipment_id: String(root.id) }, body: { return_condition: '正常' } } as any,
+ { params: { equipment_id: String(root.id) }, body: { borrow_record_id: borrowRecord.id, return_condition: '正常' } } as any,
res as any
)
assert.equal(state.statusCode, 200)
@@ -490,7 +515,7 @@ test('借出时无配件但当前新增配件时进入版本确认,配件再
await returnEquipmentBeforeDisposal(
{
params: { equipment_id: String(root.id) },
- body: { return_condition: '正常', confirmation_token: firstToken }
+ body: { borrow_record_id: borrowRecord.id, return_condition: '正常', confirmation_token: firstToken }
} as any,
res as any
)
diff --git a/backend/src/controllers/__tests__/disposalBatch.integration.test.ts b/backend/src/controllers/__tests__/disposalBatch.integration.test.ts
index e3f3950..98d70e4 100644
--- a/backend/src/controllers/__tests__/disposalBatch.integration.test.ts
+++ b/backend/src/controllers/__tests__/disposalBatch.integration.test.ts
@@ -9,8 +9,9 @@ test('批量报废在本机隔离 MySQL 验证完整资产树、事务和审批
assert.ok(url.protocol === 'mysql:' && ['127.0.0.1', 'localhost'].includes(url.hostname)
&& url.port === '13309' && url.pathname === '/equipment_audit' && !url.search && !url.hash)
const prisma = (await import('../../utils/prisma')).default
- const { approveBatchDisposal, approveDisposal, createBatchDisposal, getDisposalList, previewBatchDisposal } = await import('../disposalController')
- const { borrowEquipment, returnEquipment } = await import('../borrowController')
+ const { approveBatchDisposal, approveDisposal, cancelDisposal, completeDisposal, createBatchDisposal,
+ getDisposalList, previewBatchDisposal } = await import('../disposalController')
+ const { borrowEquipment, returnEquipment, returnEquipmentBeforeDisposal } = await import('../borrowController')
const prefix = `disp-${randomUUID().slice(0, 12)}`
const userIds: number[] = []
const personIds: number[] = []
@@ -43,6 +44,7 @@ test('批量报废在本机隔离 MySQL 验证完整资产树、事务和审批
}
const submit = (assets: { equipment_id: number; item_ids: number[];
auto_return_token?: string;
+ auto_return_condition?: '正常' | '损坏';
confirmed_quantities?: { equipment_id: number; total_quantity: number }[] }[], ip?: string) => call(createBatchDisposal,
{ assets, disposal_reason: '设备老化', disposal_method: '报废', notes: '本机验证' }, ip)
const assetLines = (content: string) => {
@@ -220,11 +222,14 @@ test('批量报废在本机隔离 MySQL 验证完整资产树、事务和审批
assert.equal(available.blocked_reason, null)
assert.deepEqual(offered.items.map((item: { id: number }) => item.id), [checkedOut.id, accessory.id])
- const selection = (candidate: any) => ({
+ const selection = (candidate: any, auto_return_condition?: '正常' | '损坏') => ({
equipment_id: candidate.equipment_id, item_ids: candidate.items.map((item: { id: number }) => item.id),
- auto_return_token: candidate.auto_return_token
+ auto_return_token: candidate.auto_return_token, auto_return_condition
})
- const selected = [selection(offered), selection(available), selection(offeredAnother)]
+ const selected = [selection(offered, '损坏'), selection(available), selection(offeredAnother, '正常')]
+ const missingCondition = await submit([selection(offered)])
+ assert.equal(missingCondition.status, 422)
+ assert.match(missingCondition.body.message, /刷新页面.*实际状况/)
const noConsent = await submit([{ equipment_id: checkedOut.id, item_ids: [checkedOut.id, accessory.id] }])
assert.equal(noConsent.status, 409)
assert.match(noConsent.body.message, /已借出/)
@@ -264,7 +269,7 @@ test('批量报废在本机隔离 MySQL 验证完整资产树、事务和审批
assert.equal(await pendingNotices(), noticeCount + 1)
const returned = await prisma.borrowRecord.findMany({ where: { id: borrowIds }, orderBy: { id: 'asc' } })
assert.deepEqual(returned.map(row => [row.status, row.return_time !== null, row.return_condition]), [
- ['已归还', true, '正常'], ['已归还', true, '正常'], ['已借出', false, '正常']
+ ['已归还', true, '损坏'], ['已归还', true, '正常'], ['已借出', false, '正常']
])
const movement = await prisma.assetTransferRecord.findMany({
where: { root_equipment_id: returnedRoots, action_type: 'return', operated_by: applicant.id },
@@ -277,6 +282,22 @@ test('批量报废在本机隔离 MySQL 验证完整资产树、事务和审批
assert.deepEqual(returnedTree.map(item => [item.status, item.department_id, item.remaining_quantity, item.storage_location_id, item.parent_id]), [
['待报废', null, 1, location.id, null], ['待报废', null, 1, location.id, checkedOut.id]
])
+ const params = { id: String(ids[0]) }
+ assert.equal((await call(approveDisposal, { approved: true }, '127.0.0.1', reviewer, params)).status, 200)
+ const approved = await prisma.disposalRecord.findUniqueOrThrow({ where: { id: ids[0] } })
+ await prisma.disposalItem.updateMany({ where: { disposal_id: ids[0] }, data: { snapshot_json: '{"status":"已损坏"}' } })
+ const cancelled = await call(cancelDisposal, { cancel_reason: '需要继续核查' }, '127.0.0.1', reviewer, params)
+ assert.equal(cancelled.status, 200, JSON.stringify(cancelled.body))
+ const stored = await prisma.disposalRecord.findUniqueOrThrow({ where: { id: ids[0] }, include: { actions: true } })
+ assert.deepEqual([stored.status, stored.approved_by, stored.approved_at, stored.completed_at],
+ ['cancelled', approved.approved_by, approved.approved_at, null])
+ assert.equal(stored.actions.find(action => action.action_type === 'cancelled')?.detail, '需要继续核查')
+ const restored = await prisma.equipment.findMany({ where: { id: { in: [checkedOut.id, accessory.id] } } })
+ assert.ok(restored.every(item => item.status === '已损坏' && item.storage_location_id === location.id))
+ assert.equal(await prisma.borrowRecord.count({ where: { id: borrowedId, status: '已归还', return_condition: '损坏' } }), 1)
+ assert.equal(await prisma.dingTalkDelivery.count({ where: { event_type: 'disposal_cancelled', business_id: ids[0], recipient_user_id: reviewer.id } }), 1)
+ assert.equal((await call(completeDisposal, {}, '127.0.0.1', applicant, params)).status, 409)
+ assert.equal((await call(cancelDisposal, { cancel_reason: '重复撤销' }, '127.0.0.1', reviewer, params)).status, 409)
})
await t.test('还后重借、配件变动、缺失或损坏的配件快照均不能使用旧确认归还', async () => {
@@ -287,11 +308,20 @@ test('批量报废在本机隔离 MySQL 验证完整资产树、事务和审批
const manuallyReturned = await call(returnEquipment, { equipment_id: reborrowed.id, borrow_record_id: firstBorrow })
assert.equal(manuallyReturned.status, 200)
assert.equal(manuallyReturned.body.data.need_confirm, undefined)
+ const alreadyReturned = await call(returnEquipmentBeforeDisposal, { borrow_record_id: firstBorrow, return_condition: '正常' },
+ '127.0.0.1', applicant, { equipment_id: String(reborrowed.id) })
+ assert.equal(alreadyReturned.status, 409)
+ assert.match(alreadyReturned.body.message, /当前为可用.*刷新页面/)
const nextBorrow = await borrow(reborrowed.id)
+ const staleSingle = await call(returnEquipmentBeforeDisposal, { borrow_record_id: firstBorrow, return_condition: '正常' },
+ '127.0.0.1', applicant, { equipment_id: String(reborrowed.id) })
+ assert.equal(staleSingle.status, 409)
+ assert.match(staleSingle.body.message, /借用单已变化/)
const [newOffer] = await previewReturn(reborrowed.id)
assert.ok(newOffer.auto_return_token)
assert.notEqual(firstOffer.auto_return_token, newOffer.auto_return_token)
- const stale = await submit([{ equipment_id: reborrowed.id, item_ids: [reborrowed.id], auto_return_token: firstOffer.auto_return_token }])
+ const stale = await submit([{ equipment_id: reborrowed.id, item_ids: [reborrowed.id],
+ auto_return_token: firstOffer.auto_return_token, auto_return_condition: '正常' }])
assert.equal(stale.status, 409)
assert.match(stale.body.message, /重新预检/)
const freshRecord = await prisma.borrowRecord.findUniqueOrThrow({ where: { id: nextBorrow } })
@@ -319,7 +349,7 @@ test('批量报废在本机隔离 MySQL 验证完整资产树、事务和审批
const [afterMount] = await previewReturn(changingRoot.id)
assert.equal(afterMount.auto_return_token, undefined)
const changed = await submit([{ equipment_id: changingRoot.id, item_ids: [changingRoot.id, originalPart.id, attached.id],
- auto_return_token: beforeMount.auto_return_token }])
+ auto_return_token: beforeMount.auto_return_token, auto_return_condition: '正常' }])
assert.equal(changed.status, 409)
assert.equal((await prisma.borrowRecord.findUniqueOrThrow({ where: { id: changingBorrowId } })).return_time, null)
assert.equal(await prisma.disposalRecord.count({ where: { equipment_id: changingRoot.id } }), 0)
@@ -444,6 +474,28 @@ test('批量报废在本机隔离 MySQL 验证完整资产树、事务和审批
assert.equal(await prisma.disposalAction.count({ where: { disposal_id: { in: [currentId, concurrentId] },
action_type: { in: ['approved', 'rejected'] } } }), 2)
})
+
+ await t.test('同一已审批报废单并发撤销与完成时仅一个动作成功', async () => {
+ const root = await prisma.equipment.create({ data: data('cancel-race') })
+ const part = await prisma.equipment.create({ data: { ...data('cancel-race-part', root.id), status: '已损坏' } })
+ const id = await apply(root.id, [root.id, part.id])
+ const params = { id: String(id) }
+ assert.equal((await call(approveDisposal, { approved: true }, '127.0.0.1', reviewer, params)).status, 200)
+ const [cancelled, completed] = await Promise.all([
+ call(cancelDisposal, { cancel_reason: '继续使用' }, '127.0.0.1', reviewer, params),
+ call(completeDisposal, {}, '127.0.0.1', applicant, params)
+ ])
+ assert.deepEqual([cancelled.status, completed.status].sort(), [200, 409])
+ const wasCancelled = cancelled.status === 200
+ const record = await prisma.disposalRecord.findUniqueOrThrow({ where: { id }, include: { actions: true } })
+ assert.equal(record.status, wasCancelled ? 'cancelled' : 'completed')
+ assert.deepEqual(record.actions.filter(action => ['cancelled', 'completed'].includes(action.action_type))
+ .map(action => action.action_type), [record.status])
+ const equipment = await prisma.equipment.findMany({ where: { id: { in: [root.id, part.id] } }, orderBy: { id: 'asc' } })
+ assert.deepEqual(equipment.map(item => item.status), wasCancelled ? ['可用', '已损坏'] : ['已报废', '已报废'])
+ assert.equal(await prisma.dingTalkDelivery.count({ where: { business_id: id, recipient_user_id: reviewer.id,
+ event_type: { in: ['disposal_cancelled', 'disposal_completed'] } } }), 1)
+ })
} finally {
for (const [key, value] of Object.entries(previousEnv)) {
if (value === undefined) delete process.env[key]
diff --git a/backend/src/controllers/__tests__/disposalController.state-machine.test.ts b/backend/src/controllers/__tests__/disposalController.state-machine.test.ts
index 5b9c51e..f9f52a8 100644
--- a/backend/src/controllers/__tests__/disposalController.state-machine.test.ts
+++ b/backend/src/controllers/__tests__/disposalController.state-machine.test.ts
@@ -128,7 +128,8 @@ test('已丢失主资产或配件不能申请报废,写入前拒绝且不改
disposalRecord: { create: async () => { writes++; return { id: 1 } } }
})
const { res, state } = createResponse()
- await createDisposal({ body: { equipment_id: root.id, item_ids: [root.id, child.id], disposal_reason: '丢失后报废', disposal_method: '报废' } } as any, res as any)
+ await createDisposal({ body: { equipment_id: root.id, item_ids: [root.id, child.id], disposal_reason: '丢失后报废',
+ disposal_method: '报废', confirmed_quantities: [root, child].map(item => ({ equipment_id: item.id, total_quantity: item.total_quantity })) } } as any, res as any)
assert.equal(state.statusCode, 422)
assert.match(state.body.message, /已丢失.*不能申请报废/)
assert.equal(writes, 0)
@@ -234,6 +235,7 @@ test('主资产仍挂载未勾选配件时申请报废返回 409 且不写状态
body: {
equipment_id: 10,
item_ids: [10],
+ confirmed_quantities: [{ equipment_id: 10, total_quantity: 1 }],
disposal_reason: '设备老化',
disposal_method: '报废',
estimated_value: 0
@@ -298,6 +300,7 @@ test('初读资产树后并发挂载新配件时报废申请中止且不写数
body: {
equipment_id: rootEquipment.id,
item_ids: [rootEquipment.id],
+ confirmed_quantities: [{ equipment_id: rootEquipment.id, total_quantity: 1 }],
disposal_reason: '设备老化',
disposal_method: '报废',
estimated_value: 0
@@ -490,7 +493,7 @@ test('驳回报废时按每个 item.pre_status 分别恢复', async () => {
}
})
-test('行政已处理列表包含全部已审批、已驳回和已完成记录,不按处理人收窄', async () => {
+test('行政已处理列表包含已撤销,按状态筛选且不按处理人收窄', async () => {
const originalFindMany = prisma.disposalRecord.findMany
const originalCount = prisma.disposalRecord.count
const originalGroupBy = prisma.disposalRecord.groupBy
@@ -507,7 +510,8 @@ test('行政已处理列表包含全部已审批、已驳回和已完成记录
}
;(prisma.disposalRecord.count as any) = async () => 1
;(prisma.disposalRecord.groupBy as any) = async () => [
- { status: 'completed', _count: { _all: 1 } }
+ { status: 'completed', _count: { _all: 1 } },
+ { status: 'cancelled', _count: { _all: 1 } }
]
try {
@@ -519,11 +523,15 @@ test('行政已处理列表包含全部已审批、已驳回和已完成记录
assert.equal(state.statusCode, 200)
assert.deepEqual(capturedWhere.AND[1], {
- status: { in: ['approved', 'rejected', 'completed'] }
+ status: { in: ['approved', 'rejected', 'completed', 'cancelled'] }
})
assert.doesNotMatch(JSON.stringify(capturedWhere), /approved_by|completed_by/)
assert.equal(state.body.data.list[0].notes, '旧版处置备注')
assert.equal(state.body.data.list[0].historical_notes, '旧版处置备注')
+ assert.equal(state.body.data.summary.cancelled, 1)
+ await getDisposalList({ query: { scope: 'processed', status: 'cancelled' } } as any, res as any)
+ assert.equal(state.statusCode, 200)
+ assert.deepEqual(capturedWhere.AND[1], { status: 'cancelled' })
} finally {
;(prisma.disposalRecord.findMany as any) = originalFindMany
;(prisma.disposalRecord.count as any) = originalCount
diff --git a/backend/src/controllers/__tests__/mountController.concurrency.test.ts b/backend/src/controllers/__tests__/mountController.concurrency.test.ts
index 09e3aba..13fae25 100644
--- a/backend/src/controllers/__tests__/mountController.concurrency.test.ts
+++ b/backend/src/controllers/__tests__/mountController.concurrency.test.ts
@@ -151,19 +151,21 @@ test('A-B / B-A 交叉挂载会被祖先链校验拦截', async () => {
}
})
-test('挂载带后代的配件树时同步父资产部门和借出状态', async () => {
+test('多层挂载一次升序锁定祖先和配件树,再同步父资产部门和借出状态', async () => {
const originalTransaction = prisma.$transaction
- const borrowedParent = { ...parent, status: '已借出', remaining_quantity: 0 }
+ const borrowedParent = { ...parent, id: 9, parent_id: parent.id, status: '已借出', remaining_quantity: 0 }
const updates: any[] = []
+ const locks: number[][] = []
;(prisma.$transaction as any) = async (callback: any) => callback({
- $queryRaw: async (query: any) => readCurrentTree(
- query,
- [borrowedParent, child, grandchild]
- ),
+ $queryRaw: async (query: any) => {
+ if (query.sql.startsWith('SELECT id FROM equipment')) locks.push(query.values)
+ return readCurrentTree(query, [borrowedParent, child, grandchild])
+ },
equipment: {
findUnique: async (args: any) => {
- if (args.where.id === 1) {
+ if (args.where.id === parent.id) return parent
+ if (args.where.id === borrowedParent.id) {
return args.include?.children
? { ...borrowedParent, children: [{ unit_price: child.unit_price }] }
: borrowedParent
@@ -187,13 +189,14 @@ test('挂载带后代的配件树时同步父资产部门和借出状态', async
try {
const { res, state } = createResponse()
await mountChild(
- { params: { parentId: '1' }, body: { child_id: 2 } } as any,
+ { params: { parentId: String(borrowedParent.id) }, body: { child_id: 2 } } as any,
res as any
)
assert.equal(state.statusCode, 200)
+ assert.deepEqual(locks, [[1, 2, 3, 9]])
assert.equal(updates.length, 2)
- assert.equal(updates[0].data.parent_id, 1)
+ assert.equal(updates[0].data.parent_id, borrowedParent.id)
assert.equal(updates[0].data.mount_status, 'mounted')
assert.equal(updates[1].data.parent_id, undefined)
for (const update of updates) {
@@ -263,6 +266,38 @@ test('卸载配件树时整树恢复可用并清空部门', async () => {
}
})
+test('挂载等待锁期间祖先发生变化时不写配件或历史', async () => {
+ const originalTransaction = prisma.$transaction
+ const nestedParent = { ...parent, id: 9, parent_id: parent.id }
+ const otherAncestor = { ...parent, id: 4 }
+ let locked = false
+ let writes = 0
+ ;(prisma.$transaction as any) = async (callback: any) => callback({
+ $queryRaw: async (query: any) => {
+ assert.deepEqual(query.values, [1, 2, 9])
+ locked = true
+ return []
+ },
+ equipment: {
+ findUnique: async ({ where }: any) => where.id === nestedParent.id
+ ? { ...nestedParent, parent_id: locked ? otherAncestor.id : parent.id }
+ : [parent, child, otherAncestor].find(item => item.id === where.id),
+ findMany: async () => [],
+ updateMany: async () => { writes++; return { count: 1 } }
+ },
+ mountHistory: { create: async () => { writes++ } }
+ })
+ try {
+ const { res, state } = createResponse()
+ await mountChild({ params: { parentId: String(nestedParent.id) }, body: { child_id: child.id } } as any, res as any)
+ assert.equal(state.statusCode, 409)
+ assert.match(state.body.message, /父资产关系已变化/)
+ assert.equal(writes, 0)
+ } finally {
+ ;(prisma.$transaction as any) = originalTransaction
+ }
+})
+
test('卸载接口拒绝直接把配件设为维修中或待报废', async () => {
const originalTransaction = prisma.$transaction
let transactionCount = 0
@@ -298,6 +333,7 @@ test('maintenance parent rejects mounting and unmounting before any child or his
findUnique: async ({ where }: any) => where.id === parent.id
? { ...parent, status: '维护中' }
: { ...child, parent_id: parent.id, status: '维护中' },
+ findMany: async () => [],
updateMany: async () => { writes++; return { count: 1 } },
update: async () => { writes++; return {} }
},
diff --git a/backend/src/controllers/borrowController.ts b/backend/src/controllers/borrowController.ts
index aa2fe62..b6937f3 100644
--- a/backend/src/controllers/borrowController.ts
+++ b/backend/src/controllers/borrowController.ts
@@ -17,11 +17,10 @@ import {
import { logOperation } from './operationLogController'
import { completeLockedBorrowReturn } from '../services/borrowReturnService'
import {
+ AssetTreeConflictError,
assertReturnConditionSupported,
borrowAssetTree,
- createAssetMovementRecord,
finalizeBorrowAnomalyReturnState,
- finalizeNormalReturnState,
loadAndLockAssetTree,
loadAssetTree,
registerBorrowAnomalyAssetTree,
@@ -309,6 +308,7 @@ type DisposalReturnBorrowRecord = {
id: number
equipment_id: number
person_id: number
+ return_time: Date | null
children_snapshot: string | null
updated_at: Date
}
@@ -318,6 +318,7 @@ const buildDisposalReturnConfirmationToken = buildReturnConfirmationToken
const returnEquipmentBeforeDisposalInTransaction = async (input: {
equipmentId: number
+ borrowRecordId: number
returnCondition: string
confirmationToken?: string
operatedBy: number
@@ -325,30 +326,33 @@ const returnEquipmentBeforeDisposalInTransaction = async (input: {
const items = await loadAndLockAssetTree(tx, input.equipmentId)
const root = items[0]
if (root.parent_id !== null) {
- throw new Error('挂载中的子资产不能单独入库或申请报废,请先卸载')
+ throw new AssetTreeConflictError('资产已被挂载,请刷新页面并先卸载')
}
if (root.status !== '已借出') {
- throw new Error(`资产当前为${root.status},无需执行报废前入库`)
+ throw new AssetTreeConflictError(`资产当前为${root.status},请刷新页面后重新操作`)
}
if (root.total_quantity !== 1 || root.remaining_quantity !== 0) {
- throw new Error('快捷入库仅支持单件资产;该资产存在多数量库存,请先逐笔归还后再申请报废')
+ throw new AssetTreeConflictError('快捷入库仅支持单件资产,请刷新页面并逐笔归还后再申请报废')
}
const activeBorrowRecords = await tx.$queryRaw(Prisma.sql`
- SELECT id, equipment_id, person_id, children_snapshot, updated_at
+ SELECT id, equipment_id, person_id, return_time, children_snapshot, updated_at
FROM borrow_record
WHERE equipment_id = ${root.id} AND status = ${'已借出'}
ORDER BY id
FOR UPDATE
`)
if (activeBorrowRecords.length === 0) {
- throw new Error('资产状态为已借出,但没有对应的未归还记录,请先处理借用异常')
+ throw new AssetTreeConflictError('资产状态为已借出,但没有对应的未归还记录,请刷新页面后核对借用单')
}
if (activeBorrowRecords.length > 1) {
- throw new Error('该资产存在多条未归还记录,请先逐笔归还后再申请报废')
+ throw new AssetTreeConflictError('该资产存在多条未归还记录,请刷新页面并逐笔归还后再申请报废')
}
const borrowRecord = activeBorrowRecords[0]
+ if (borrowRecord.id !== input.borrowRecordId || borrowRecord.return_time !== null) {
+ throw new AssetTreeConflictError('当前借用单已变化,请刷新页面后重新确认归还')
+ }
const childrenDiff = getLockedDisposalChildrenDiff(items, borrowRecord)
const confirmationToken = buildDisposalReturnConfirmationToken(items, borrowRecord)
if (childrenDiff && input.confirmationToken !== confirmationToken) {
@@ -362,33 +366,10 @@ const returnEquipmentBeforeDisposalInTransaction = async (input: {
const notes = childrenDiff
? `报废前快捷入库;配件变更:移除${childrenDiff.removed.length}个,新增${childrenDiff.added.length}个`
: '报废前快捷入库'
- await createAssetMovementRecord(tx, {
- items,
- actionType: 'return',
- toDepartmentId: null,
- operatedBy: input.operatedBy,
- reason: notes
+ const { returnState, returnTime } = await completeLockedBorrowReturn(tx, {
+ items, borrowRecord, returnCondition: input.returnCondition, operatedBy: input.operatedBy,
+ notes, requireUnreturned: true
})
-
- const returnTime = new Date()
- const updatedBorrowRecord = await tx.borrowRecord.updateMany({
- where: {
- id: borrowRecord.id,
- equipment_id: root.id,
- status: '已借出'
- },
- data: {
- return_time: returnTime,
- status: '已归还',
- return_condition: input.returnCondition,
- notes
- }
- })
- if (updatedBorrowRecord.count !== 1) {
- throw new Error('该借用记录已归还,请刷新后重试')
- }
-
- const returnState = await finalizeNormalReturnState(tx, root, input.returnCondition, items)
return {
need_confirm: false as const,
equipment_id: root.id,
@@ -768,6 +749,7 @@ export const returnEquipment = async (req: Request, res: Response) => {
export const returnEquipmentBeforeDisposal = async (req: Request, res: Response) => {
try {
const equipmentId = parseNumber(req.params.equipment_id)
+ const borrowRecordId = req.body?.borrow_record_id
const returnCondition = String(req.body?.return_condition || '正常').trim()
const confirmationToken = typeof req.body?.confirmation_token === 'string'
? req.body.confirmation_token.trim()
@@ -780,6 +762,9 @@ export const returnEquipmentBeforeDisposal = async (req: Request, res: Response)
if (!userId) {
return errorResponse(res, '用户未登录', 401)
}
+ if (typeof borrowRecordId !== 'number' || !Number.isSafeInteger(borrowRecordId) || borrowRecordId <= 0) {
+ return errorResponse(res, '缺少有效借用单,请刷新页面后重新确认归还', 422)
+ }
if (!['正常', '损坏'].includes(returnCondition)) {
return errorResponse(res, '报废前快捷入库仅支持已收回的正常或损坏资产', 422)
}
@@ -789,6 +774,7 @@ export const returnEquipmentBeforeDisposal = async (req: Request, res: Response)
const result = await returnEquipmentBeforeDisposalInTransaction({
equipmentId,
+ borrowRecordId,
returnCondition,
confirmationToken,
operatedBy: userId
diff --git a/backend/src/controllers/disposalController.ts b/backend/src/controllers/disposalController.ts
index c297ff4..e341798 100644
--- a/backend/src/controllers/disposalController.ts
+++ b/backend/src/controllers/disposalController.ts
@@ -329,7 +329,7 @@ const getDisposalVisibility = (res: Response): Prisma.DisposalRecordWhereInput =
throw Object.assign(new Error('无权查看报废流程'), { status: 403 })
}
-const DISPOSAL_STATUSES = ['pending', 'approved', 'rejected', 'completed'] as const
+const DISPOSAL_STATUSES = ['pending', 'approved', 'rejected', 'completed', 'cancelled'] as const
const parseListPositiveInteger = (
value: unknown,
@@ -420,7 +420,8 @@ export const createDisposal = async (req: Request, res: Response) => {
const {
equipment_id,
item_ids,
- estimated_value
+ estimated_value,
+ confirmed_quantities
} = req.body as Record
const userId = Number(res.locals.user?.id)
const rootId = Number(equipment_id)
@@ -429,6 +430,8 @@ export const createDisposal = async (req: Request, res: Response) => {
return errorResponse(res, '请选择要报废的主资产', 422)
}
const input = readDisposalSubmission(req.body)
+ if (confirmed_quantities == null) return errorResponse(res, '缺少报废数量确认,请刷新页面后逐件核对数量', 422)
+ const quantities = readConfirmedDisposalQuantities(confirmed_quantities)
const estimatedValue = Number(estimated_value ?? 0)
if (!Number.isFinite(estimatedValue) || estimatedValue < 0) {
return errorResponse(res, '残值估价必须是大于或等于0的有效数字', 422)
@@ -445,6 +448,7 @@ export const createDisposal = async (req: Request, res: Response) => {
? [...new Set(item_ids.map(Number).filter((id) => Number.isInteger(id) && id > 0))]
: [rootId]
assertDisposalItemsConfirmed(tree, requestedIds)
+ assertConfirmedDisposalQuantities(tree, quantities)
const blocked = getDisposalBlockedReason(tree)
if (blocked) throw new Error(blocked)
const occupancy = await getDisposalOccupancy(tx, tree.map(item => item.id))
@@ -578,7 +582,11 @@ export const createBatchDisposal = async (req: Request, res: Response) => {
}
const input = readDisposalSubmission(req.body)
const rootIds: number[] = []
- const confirmed = new Map; autoReturnToken?: string }>()
+ const confirmed = new Map
+ autoReturn?: { token: string; condition: '正常' | '损坏' }
+ }>()
const lockedIds = new Set()
for (const asset of assets) {
if (!isEquipmentId(asset?.equipment_id) || !Array.isArray(asset.item_ids) ||
@@ -590,6 +598,9 @@ export const createBatchDisposal = async (req: Request, res: Response) => {
(typeof asset.auto_return_token !== 'string' || !/^[a-f0-9]{64}$/.test(asset.auto_return_token))) {
return errorResponse(res, '自动归还确认凭据无效,请重新预检', 422)
}
+ if (asset.auto_return_token && asset.auto_return_condition !== '正常' && asset.auto_return_condition !== '损坏') {
+ return errorResponse(res, '缺少有效的自动归还状况,请刷新页面后选择实际状况(正常或损坏)', 422)
+ }
for (const id of asset.item_ids as number[]) {
if (lockedIds.has(id)) return errorResponse(res, '批量报废明细包含重复资产', 422)
lockedIds.add(id)
@@ -597,7 +608,8 @@ export const createBatchDisposal = async (req: Request, res: Response) => {
rootIds.push(asset.equipment_id)
confirmed.set(asset.equipment_id, {
itemIds: asset.item_ids,
- autoReturnToken: asset.auto_return_token,
+ autoReturn: asset.auto_return_token
+ ? { token: asset.auto_return_token, condition: asset.auto_return_condition } : undefined,
quantities: asset.confirmed_quantities === undefined
? undefined : readConfirmedDisposalQuantities(asset.confirmed_quantities)
})
@@ -620,7 +632,7 @@ export const createBatchDisposal = async (req: Request, res: Response) => {
for (const id of rootIds) {
const tree = trees.get(id)!
const confirmation = confirmed.get(id)!
- if (!confirmation.autoReturnToken) {
+ if (!confirmation.autoReturn) {
const blocked = getDisposalBlockedReason(tree)
if (blocked) throw new DisposalConflictError(`${tree[0].equipment_code}:${blocked}`)
}
@@ -628,22 +640,23 @@ export const createBatchDisposal = async (req: Request, res: Response) => {
if (confirmation.quantities) assertConfirmedDisposalQuantities(tree, confirmation.quantities)
}
let occupancy = await getDisposalOccupancy(tx, [...lockedIds])
- const returnRoots = rootIds.filter(id => confirmed.get(id)!.autoReturnToken)
+ const returnRoots = rootIds.filter(id => confirmed.get(id)!.autoReturn)
if (returnRoots.length) {
const returnBorrows = await loadDisposalAutoReturnBorrows(tx,
returnRoots.flatMap(id => confirmed.get(id)!.itemIds), true)
const returns = returnRoots.map(id => {
const items = trees.get(id)!
const eligible = getDisposalAutoReturn(items, occupancy, returnBorrows)
- if (!eligible || eligible.token !== confirmed.get(id)!.autoReturnToken) {
+ const { token, condition } = confirmed.get(id)!.autoReturn!
+ if (!eligible || eligible.token !== token) {
throw new DisposalConflictError(`${items[0].equipment_code}:借用或资产状态已变化,请重新预检后确认归还`)
}
- return { items, borrowRecord: eligible.record }
+ return { items, borrowRecord: eligible.record, condition }
})
- for (const { items, borrowRecord } of returns) {
+ for (const { items, borrowRecord, condition } of returns) {
holders.set(items[0].id, borrowRecord.person_nickname.trim() || borrowRecord.person_name.trim() || '未登记领用人')
await completeLockedBorrowReturn(tx, {
- items, borrowRecord, returnCondition: '正常', operatedBy: userId,
+ items, borrowRecord, returnCondition: condition, operatedBy: userId,
reason: '批量报废前归还入库', requireUnreturned: true
})
}
@@ -733,7 +746,7 @@ export const getDisposalList = async (req: Request, res: Response) => {
} else if (resolvedScope === 'pending') {
summaryConditions.push({ status: 'pending' })
} else if (resolvedScope === 'processed') {
- summaryConditions.push({ status: { in: ['approved', 'rejected', 'completed'] } })
+ summaryConditions.push({ status: { in: ['approved', 'rejected', 'completed', 'cancelled'] } })
}
}
@@ -789,7 +802,8 @@ export const getDisposalList = async (req: Request, res: Response) => {
pending: 0,
approved: 0,
rejected: 0,
- completed: 0
+ completed: 0,
+ cancelled: 0
}
for (const group of statusGroups) {
const count = group._count._all
@@ -944,6 +958,12 @@ const readDisposalDecision = (body: { approved?: unknown; reject_reason?: unknow
type DisposalDecision = ReturnType
+const restoreDisposalPreStatuses = async (tx: Prisma.TransactionClient, disposal: DisposalDecisionRecord) => {
+ for (const item of disposal.items) {
+ await updateEquipmentLifecycle(tx, item.equipment, item.pre_status, '待报废', item.parent_equipment_id)
+ }
+}
+
const writeDisposalDecision = async (
tx: Prisma.TransactionClient,
disposal: DisposalDecisionRecord,
@@ -965,11 +985,7 @@ const writeDisposalDecision = async (
if (updated.count !== 1) {
throw new DisposalConflictError('该申请已被其他人处理,请刷新后查看')
}
- if (!approved) {
- for (const item of disposal.items) {
- await updateEquipmentLifecycle(tx, item.equipment, item.pre_status, '待报废', item.parent_equipment_id)
- }
- }
+ if (!approved) await restoreDisposalPreStatuses(tx, disposal)
await tx.disposalAction.create({
data: {
disposal_id: disposal.id, action_type: nextStatus, operator_id: userId,
@@ -1213,6 +1229,58 @@ export const approveBatchDisposal = async (req: Request, res: Response) => {
}
}
+export const cancelDisposal = async (req: Request, res: Response) => {
+ try {
+ const { id: userId } = getCurrentUser(res)
+ if (!isEquipmentId(userId)) return errorResponse(res, '用户未登录', 401)
+ const disposalId = parseListPositiveInteger(req.params.id, '报废记录ID', 0)
+ const reason = typeof req.body?.cancel_reason === 'string' ? req.body.cancel_reason.trim() : ''
+ if (!reason) return errorResponse(res, '撤销原因不能为空', 422)
+ const operator = res.locals.user?.name || res.locals.user?.username
+
+ await prisma.$transaction(async tx => {
+ const disposal = await loadLockedDisposalDecision(tx, disposalId, 'approved')
+ const updated = await tx.disposalRecord.updateMany({
+ where: { id: disposalId, status: 'approved', completed_at: null },
+ data: { status: 'cancelled' }
+ })
+ if (updated.count !== 1) throw new DisposalConflictError('该申请已处置或状态已变化,请刷新后查看')
+ await restoreDisposalPreStatuses(tx, disposal)
+ await tx.disposalAction.create({
+ data: {
+ disposal_id: disposalId, operator_id: userId, action_type: 'cancelled',
+ from_status: 'approved', to_status: 'cancelled', detail: reason
+ }
+ })
+ await tx.operationLog.create({
+ data: {
+ user_id: userId, username: res.locals.user?.username || operator || 'unknown',
+ operation_type: '报废撤销', operation_details: `撤销资产 ${disposal.equipment_code} 的报废申请,原因:${reason}`,
+ equipment_id: disposal.equipment_id, equipment_code: disposal.equipment_code, ip_address: req.ip || null
+ }
+ })
+ const recipients = await getResultRecipients(tx, disposal.applied_by)
+ const root = disposal.items.find(item => item.equipment_id === disposal.equipment_id)?.equipment
+ await createBusinessNotification(tx, {
+ ...recipients, eventType: 'disposal_cancelled', businessType: 'disposal', businessId: disposalId,
+ title: `报废已撤销:${disposal.equipment_code}`, content: `撤销原因:${reason}`,
+ level: 'warning', actionUrl: `/workflows/disposals/${disposalId}`,
+ dingTalk: {
+ title: '资产报废已撤销', actionTitle: '查看结果',
+ content: [
+ `**资产:** ${assetNotificationName(root?.equipment_name, disposal.equipment_code)}`,
+ `**撤销人:** ${escapeNotificationMarkdownInline(operator)}`,
+ `**撤销原因:** ${escapeNotificationMarkdownInline(reason)}`
+ ].join('\n\n')
+ }
+ })
+ }, { isolationLevel: Prisma.TransactionIsolationLevel.ReadCommitted })
+ successResponse(res, null, '报废已撤销')
+ } catch (error: any) {
+ errorResponse(res, error.message || '撤销报废失败', error.status || 500)
+ }
+}
+
export const completeDisposal = async (req: Request, res: Response) => {
try {
const disposalId = Number(req.params.id)
diff --git a/backend/src/controllers/mountController.ts b/backend/src/controllers/mountController.ts
index b5940d9..8f8fdaf 100644
--- a/backend/src/controllers/mountController.ts
+++ b/backend/src/controllers/mountController.ts
@@ -9,7 +9,8 @@ import {
refreshParentTotalValueWithChildren
} from '../utils/assetValue'
import {
- loadAndLockAssetTree,
+ getAssetTreeFingerprint,
+ loadAssetTree,
lockEquipmentRows,
type AssetTreeItem
} from '../services/assetMovementService'
@@ -139,12 +140,12 @@ const updateAssetTreeState = async (
}
}
-const ensureNoMountCycle = async (
+const loadMountAncestors = async (
client: TransactionClient,
parentId: number,
- childId: number
+ attachingChildId?: number
) => {
- if (parentId === childId) {
+ if (parentId === attachingChildId) {
throw new MountOperationError('父资产和子资产不能是同一条记录')
}
@@ -154,7 +155,7 @@ const ensureNoMountCycle = async (
if (depth >= 100) {
throw new MountOperationError('资产父子关系层级过深,请先检查资产关系', 409)
}
- if (currentId === childId) {
+ if (currentId === attachingChildId) {
throw new MountOperationError('不能把资产挂载到自己的下级节点上')
}
if (visited.has(currentId)) {
@@ -162,13 +163,55 @@ const ensureNoMountCycle = async (
}
visited.add(currentId)
- await lockEquipmentRows(client, [currentId])
const current: { parent_id: number | null } | null = await client.equipment.findUnique({
where: { id: currentId },
select: { parent_id: true }
})
- currentId = current?.parent_id ?? null
+ if (!current) {
+ throw new MountOperationError(currentId === parentId ? '父资产不存在' : '父资产关系已变化,请刷新后重试',
+ currentId === parentId ? 404 : 409)
+ }
+ currentId = current.parent_id
}
+ return [...visited]
+}
+
+const lockMountAssets = async (
+ client: TransactionClient,
+ parentId: number,
+ children: { id: number; missingMessage: string; missingStatus?: number }[],
+ attachingChildId?: number
+) => {
+ const ancestors = await loadMountAncestors(client, parentId, attachingChildId)
+ const trees = await Promise.all(children.map(async child => {
+ try {
+ return await loadAssetTree(client, child.id)
+ } catch (error) {
+ if (error instanceof Error && error.message === '资产不存在') {
+ throw new MountOperationError(child.missingMessage, child.missingStatus ?? 404)
+ }
+ throw error
+ }
+ }))
+ await lockEquipmentRows(client, [...ancestors, ...trees.flatMap(tree => tree.map(item => item.id))])
+ const currentAncestors = await loadMountAncestors(client, parentId)
+ if (ancestors.join(',') !== currentAncestors.join(',')) {
+ throw new MountOperationError('父资产关系已变化,请刷新后重试', 409)
+ }
+ const currentTrees = await Promise.all(children.map(async child => {
+ try {
+ return await loadAssetTree(client, child.id)
+ } catch (error) {
+ if (error instanceof Error && error.message === '资产不存在') {
+ throw new MountOperationError('配件已变化,请刷新后重试', 409)
+ }
+ throw error
+ }
+ }))
+ if (trees.some((tree, index) => getAssetTreeFingerprint(tree) !== getAssetTreeFingerprint(currentTrees[index]))) {
+ throw new MountOperationError('配件状态或挂载关系已变化,请刷新后重试', 409)
+ }
+ return currentTrees
}
const getMountErrorStatus = (error: any) => {
@@ -196,7 +239,8 @@ export const mountChild = async (req: Request, res: Response) => {
}
const updatedParent = await prisma.$transaction(async (tx) => {
- await lockEquipmentRows(tx, [numericParentId, numericChildId])
+ const [childTree] = await lockMountAssets(tx, numericParentId,
+ [{ id: numericChildId, missingMessage: '子资产不存在' }], numericChildId)
const [parent, child] = await Promise.all([
tx.equipment.findUnique({
where: { id: numericParentId },
@@ -219,8 +263,6 @@ export const mountChild = async (req: Request, res: Response) => {
if (child.parent_id !== null || !['none', 'unmounted'].includes(child.mount_status)) {
throw new MountOperationError('该配件已被挂载或关系已变化,请刷新后重试', 409)
}
- await ensureNoMountCycle(tx, numericParentId, numericChildId)
- const childTree = await loadAndLockAssetTree(tx, numericChildId)
await ensureAssetTreeAttachable(tx, childTree, '子资产树')
await updateAssetTreeState(tx, childTree, {
rootParentId: numericParentId,
@@ -284,7 +326,7 @@ export const unmountChild = async (req: Request, res: Response) => {
}
await prisma.$transaction(async (tx) => {
- await lockEquipmentRows(tx, [numericParentId, numericChildId])
+ const [childTree] = await lockMountAssets(tx, numericParentId, [{ id: numericChildId, missingMessage: '子资产不存在' }])
const [parent, child] = await Promise.all([
tx.equipment.findUnique({ where: { id: numericParentId } }),
tx.equipment.findUnique({ where: { id: numericChildId } })
@@ -295,7 +337,6 @@ export const unmountChild = async (req: Request, res: Response) => {
throw new MountOperationError('该配件未挂载到此资产或关系已变化', 409)
}
ensureParentMountOperable(parent, '父资产')
- const childTree = await loadAndLockAssetTree(tx, numericChildId)
await updateAssetTreeState(tx, childTree, {
rootParentId: null,
rootMountStatus: 'unmounted',
@@ -350,7 +391,10 @@ export const replaceChild = async (req: Request, res: Response) => {
}
await prisma.$transaction(async (tx) => {
- await lockEquipmentRows(tx, [numericParentId, numericOldChildId, numericNewChildId])
+ const [oldChildTree, newChildTree] = await lockMountAssets(tx, numericParentId, [
+ { id: numericOldChildId, missingMessage: '旧配件未挂载到此资产或关系已变化', missingStatus: 409 },
+ { id: numericNewChildId, missingMessage: '新配件不存在' }
+ ], numericNewChildId)
const [parent, oldChild, newChild] = await Promise.all([
tx.equipment.findUnique({
where: { id: numericParentId },
@@ -377,9 +421,6 @@ export const replaceChild = async (req: Request, res: Response) => {
throw new MountOperationError('新配件已被挂载或关系已变化,请刷新后重试', 409)
}
ensureParentMountOperable(parent, '父资产')
- await ensureNoMountCycle(tx, numericParentId, numericNewChildId)
- const oldChildTree = await loadAndLockAssetTree(tx, numericOldChildId)
- const newChildTree = await loadAndLockAssetTree(tx, numericNewChildId)
await ensureAssetTreeAttachable(tx, newChildTree, '新配件树')
await updateAssetTreeState(tx, oldChildTree, {
rootParentId: null,
diff --git a/backend/src/routes/disposal.ts b/backend/src/routes/disposal.ts
index 6441d27..3215900 100644
--- a/backend/src/routes/disposal.ts
+++ b/backend/src/routes/disposal.ts
@@ -8,6 +8,7 @@ import {
approveDisposal,
approveBatchDisposal,
completeDisposal,
+ cancelDisposal,
getEquipmentDisposalHistory
} from '../controllers/disposalController'
import { returnEquipmentBeforeDisposal } from '../controllers/borrowController'
@@ -30,6 +31,7 @@ router.get('/equipment/:equipment_id/history', requirePermission(PERMISSIONS.ASS
router.get('/:id', requirePermission(PERMISSIONS.NOTIFICATIONS_VIEW), getDisposalDetail)
router.put('/batch/approve', requirePermission(PERMISSIONS.DISPOSALS_APPROVE), approveBatchDisposal)
router.put('/:id/approve', requirePermission(PERMISSIONS.DISPOSALS_APPROVE), approveDisposal)
+router.put('/:id/cancel', requirePermission(PERMISSIONS.DISPOSALS_APPROVE), cancelDisposal)
router.put('/:id/complete', requirePermission(PERMISSIONS.DISPOSALS_COMPLETE), completeDisposal)
export default router
diff --git a/backend/src/services/assetMovementService.ts b/backend/src/services/assetMovementService.ts
index 22e7450..9e11c52 100644
--- a/backend/src/services/assetMovementService.ts
+++ b/backend/src/services/assetMovementService.ts
@@ -62,7 +62,7 @@ export const lockEquipmentRows = async (
)
}
-const getAssetTreeFingerprint = (items: AssetTreeItem[]) => JSON.stringify(
+export const getAssetTreeFingerprint = (items: AssetTreeItem[]) => JSON.stringify(
items
.map((item) => ({
id: item.id,
diff --git a/frontend/scripts/test-disposal-import.ts b/frontend/scripts/test-disposal-import.ts
new file mode 100644
index 0000000..1c8bedb
--- /dev/null
+++ b/frontend/scripts/test-disposal-import.ts
@@ -0,0 +1,24 @@
+import assert from 'node:assert/strict'
+import { test } from 'node:test'
+import * as XLSX from 'xlsx'
+import { parseDisposalImport } from '../src/utils/disposalImport.ts'
+
+test('报废清单跳过隐藏行和隐藏工作表,保留可见编码及重复项', () => {
+ const workbook = XLSX.utils.book_new()
+ const visible = XLSX.utils.aoa_to_sheet([
+ ['资产编码', '', '设备编号'],
+ ['JS-PC-0001', '', 'JS-PC-0002'],
+ ['JS-PC-0098', '', 'JS-PC-0099'],
+ ['JS-PC-0001', '', 'JS-PC-0003']
+ ])
+ visible['!rows'] = [{}, {}, { hidden: true }, {}]
+ XLSX.utils.book_append_sheet(workbook, visible, '当前清单')
+ XLSX.utils.book_append_sheet(workbook, XLSX.utils.aoa_to_sheet([['资产编码'], ['JS-PC-0096']]), '历史')
+ XLSX.utils.book_append_sheet(workbook, XLSX.utils.aoa_to_sheet([['资产编码'], ['JS-PC-0097']]), '归档')
+ XLSX.utils.book_set_sheet_visibility(workbook, '历史', 1)
+ XLSX.utils.book_set_sheet_visibility(workbook, '归档', 2)
+
+ const source = XLSX.write(workbook, { type: 'array', bookType: 'xlsx' })
+
+ assert.deepEqual(parseDisposalImport(source), ['JS-PC-0001', 'JS-PC-0002', 'JS-PC-0001', 'JS-PC-0003'])
+})
diff --git a/frontend/src/api/disposal.ts b/frontend/src/api/disposal.ts
index cb2e488..000c21d 100644
--- a/frontend/src/api/disposal.ts
+++ b/frontend/src/api/disposal.ts
@@ -9,7 +9,7 @@ export interface DisposalRecord {
disposal_method: string
estimated_value: number
actual_value?: number
- status: 'pending' | 'approved' | 'rejected' | 'completed'
+ status: 'pending' | 'approved' | 'rejected' | 'completed' | 'cancelled'
applied_by: number
applied_at: string
approved_by?: number
@@ -73,6 +73,7 @@ export interface DisposalAction {
export interface CreateDisposalParams {
equipment_id: number
item_ids?: number[]
+ confirmed_quantities: ConfirmedDisposalQuantity[]
disposal_reason: string
disposal_method: string
estimated_value: number
@@ -103,6 +104,7 @@ export interface DisposalSummary {
approved: number
rejected: number
completed: number
+ cancelled: number
}
export interface DisposalListData {
@@ -141,6 +143,7 @@ export interface CreateBatchDisposalParams {
item_ids: number[]
confirmed_quantities?: ConfirmedDisposalQuantity[]
auto_return_token?: string
+ auto_return_condition?: DisposalReturnCondition
}>
disposal_reason: string
disposal_method: string
@@ -155,8 +158,11 @@ export const createBatchDisposal = (data: CreateBatchDisposalParams) => request
.post>('/disposal/batch', data, { timeout: 60000 })
.then((response) => response.data)
+export type DisposalReturnCondition = '正常' | '损坏'
+
export const returnEquipmentBeforeDisposal = (equipmentId: number, data: {
- return_condition: '正常' | '损坏'
+ borrow_record_id: number
+ return_condition: DisposalReturnCondition
confirmation_token?: string
}) => request
.post>(
@@ -204,5 +210,8 @@ export const approveBatchDisposal = (data: {
export const completeDisposal = (id: number, data: { actual_value?: number; completion_notes?: string }) =>
request.put(`/disposal/${id}/complete`, data)
+export const cancelDisposal = (id: number, data: { cancel_reason: string }) =>
+ request.put(`/disposal/${id}/cancel`, data)
+
export const getEquipmentDisposalHistory = (equipmentId: number) =>
request.get(`/disposal/equipment/${equipmentId}/history`)
diff --git a/frontend/src/components/BatchDisposalDialog.vue b/frontend/src/components/BatchDisposalDialog.vue
index 185f7f1..886b5b7 100644
--- a/frontend/src/components/BatchDisposalDialog.vue
+++ b/frontend/src/components/BatchDisposalDialog.vue
@@ -93,6 +93,15 @@
>
自动归还
+
@@ -250,7 +277,8 @@ import {
previewBatchDisposal,
type BatchDisposalCandidate,
type BatchDisposalPreview,
- type BatchDisposalPreviewParams
+ type BatchDisposalPreviewParams,
+ type DisposalReturnCondition
} from '@/api/disposal'
const props = defineProps<{ equipmentIds: number[]; pickAssets?: boolean }>()
@@ -274,6 +302,7 @@ const loading = ref(false)
const submitting = ref(false)
const autoReturnEnabled = ref(false)
const selectedIds = ref
([])
+const returnConditions = ref>>({})
const expandedCodes = ref(new Set())
const previewScope = ref<'eligible' | 'blocked'>('eligible')
const previewPage = ref(1)
@@ -286,6 +315,9 @@ const canApply = (candidate: BatchDisposalCandidate): candidate is BatchDisposal
candidate.equipment_id !== null && candidate.items.length > 0 &&
(candidate.auto_return_token ? autoReturnEnabled.value : !candidate.blocked_reason)
+const hasMultiQuantityItems = (candidate: BatchDisposalCandidate) =>
+ candidate.items.some((item) => (item.total_quantity ?? 0) > 1)
+
const candidateSelectionLabel = (candidate: BatchDisposalCandidate) => {
const prefix = candidate.auto_return_token ? '归还后' : ''
return candidate.items.length > 1
@@ -319,13 +351,23 @@ const selectedCandidates = computed(() => {
})
const allEligibleSelected = computed(() => eligibleCandidates.value.length > 0 &&
selectedCandidates.value.length === eligibleCandidates.value.length)
+const selectedAutoReturns = computed(() => selectedCandidates.value.filter((candidate) => candidate.auto_return_token))
+const missingReturnConditions = computed(() =>
+ selectedAutoReturns.value.filter((candidate) => !returnConditions.value[candidate.equipment_id]).length
+)
const selectedQuantity = computed(() => {
const quantities = selectedCandidates.value.flatMap((candidate) => candidate.items.map((item) => item.total_quantity))
return quantities.every((quantity) => quantity !== undefined)
? quantities.reduce((sum, quantity) => sum + quantity, 0)
: null
})
-const canSubmit = computed(() => !picking.value && !busy.value && selectedCandidates.value.length > 0 && Boolean(reason.value.trim()))
+const canSubmit = computed(() => !picking.value && !busy.value && selectedCandidates.value.length > 0 &&
+ !missingReturnConditions.value && Boolean(reason.value.trim()))
+
+const markAllReturnsNormal = () => {
+ if (busy.value) return
+ for (const candidate of selectedAutoReturns.value) returnConditions.value[candidate.equipment_id] = '正常'
+}
const changePreviewScope = (scope: 'eligible' | 'blocked') => {
if (scope === previewScope.value) return
@@ -339,6 +381,7 @@ const changeAutoReturn = (event: Event) => {
if (!autoReturnEnabled.value) {
const autoReturnIds = new Set(autoReturnCandidates.value.map((candidate) => candidate.equipment_id))
selectedIds.value = selectedIds.value.filter((id) => !autoReturnIds.has(id))
+ returnConditions.value = {}
}
previewScope.value = eligibleCandidates.value.length ? 'eligible' : 'blocked'
previewPage.value = 1
@@ -368,6 +411,7 @@ const resetPreview = () => {
preview.value = null
autoReturnEnabled.value = false
selectedIds.value = []
+ returnConditions.value = {}
expandedCodes.value.clear()
previewPage.value = 1
previewScope.value = 'eligible'
@@ -455,7 +499,10 @@ const submit = async () => {
equipment_id: candidate.equipment_id,
item_ids: candidate.items.map((item) => item.id),
confirmed_quantities: quantities.length === candidate.items.length ? quantities : undefined,
- ...(autoReturnEnabled.value && candidate.auto_return_token ? { auto_return_token: candidate.auto_return_token } : {})
+ ...(candidate.auto_return_token ? {
+ auto_return_token: candidate.auto_return_token,
+ auto_return_condition: returnConditions.value[candidate.equipment_id]
+ } : {})
}
})
submitting.value = true
@@ -637,6 +684,13 @@ onMounted(() => {
background: var(--bg-tertiary);
}
+.disposal-return-condition {
+ min-height: 36px;
+ margin-block: var(--space-1);
+ padding-block: var(--space-1);
+ font-size: 0.75rem;
+}
+
.disposal-asset-choice {
display: flex;
align-items: center;
diff --git a/frontend/src/types/index.ts b/frontend/src/types/index.ts
index c452b7f..919b8dc 100644
--- a/frontend/src/types/index.ts
+++ b/frontend/src/types/index.ts
@@ -120,6 +120,7 @@ export interface EquipmentTreeNode {
equipment_model?: string
equipment_type?: string
unit_price?: number
+ total_quantity?: number
status?: string
mount_status?: string
parent_id?: number | null
diff --git a/frontend/src/utils/disposalImport.ts b/frontend/src/utils/disposalImport.ts
index b3a01a4..a4a4335 100644
--- a/frontend/src/utils/disposalImport.ts
+++ b/frontend/src/utils/disposalImport.ts
@@ -3,12 +3,12 @@ import * as XLSX from 'xlsx'
const codeHeaders = new Set(['编码', '资产编码', '设备编码', '资产编号', '设备编号', '资产代码', '设备代码'])
export const parseDisposalImport = (source: ArrayBuffer | string): string[] => {
- const workbook = XLSX.read(source, { type: typeof source === 'string' ? 'string' : 'array', raw: true })
+ const workbook = XLSX.read(source, { type: typeof source === 'string' ? 'string' : 'array', raw: true, cellStyles: true })
const codes: string[] = []
for (const [index, name] of workbook.SheetNames.entries()) {
if (workbook.Workbook?.Sheets?.[index]?.Hidden) continue
- const rows = XLSX.utils.sheet_to_json(workbook.Sheets[name], { header: 1, raw: false, defval: '' })
+ const rows = XLSX.utils.sheet_to_json(workbook.Sheets[name], { header: 1, raw: false, defval: '', skipHidden: true })
for (const [rowIndex, row] of rows.entries()) {
const columns = row.flatMap((cell, index) => codeHeaders.has(cell.replace(/\s/g, '')) ? [index] : [])
if (!columns.length) continue
diff --git a/frontend/src/views/equipment/EquipmentForm.vue b/frontend/src/views/equipment/EquipmentForm.vue
index 6d4f8fb..34ff0e2 100644
--- a/frontend/src/views/equipment/EquipmentForm.vue
+++ b/frontend/src/views/equipment/EquipmentForm.vue
@@ -368,7 +368,7 @@
-
{{ disposalPrerequisiteTitle }}
-
{{ disposalBlockReason }}
+
{{ disposalPreparationNotice ? '入库完成' : disposalPrerequisite.title }}
+
{{ disposalPreparationNotice || disposalPrerequisite.reason }}
-
当前状态:{{ currentEquipment?.status }}
+
{{ disposalPrerequisite.status }}
-
+
- 资产
- - {{ currentEquipment.equipment_name }}
- - {{ currentEquipment.equipment_code }}
+ - {{ disposalPrerequisite.name }}
+ - {{ disposalPrerequisite.code }}
-
+
- 当前使用者
- - {{ currentBorrowerLabel }}
- - 借出时间:{{ formatDateTime(activeBorrowRecord.borrow_time) }}
+ - {{ disposalPrerequisite.borrower }}
+ - 借出时间:{{ formatDateTime(disposalPrerequisite.borrowTime) }}
-
-
-
确认实物已经收回后再继续
-
系统会结束当前未归还记录并完成入库,然后自动打开该资产的报废申请表。
-
-
+
-