Recognize disposed mounted assets in batch preview

This commit is contained in:
WuYongJie 2026-11-10 16:47:40 +08:00
parent ecd324fdc9
commit a19e64d25c
2 changed files with 14 additions and 4 deletions

View File

@ -56,6 +56,8 @@ test('批量报废在本机隔离 MySQL 验证完整资产树、事务和审批
const pending = await prisma.equipment.create({ data: data('pending') })
await prisma.disposalRecord.create({ data: { equipment_id: pending.id, equipment_code: pending.equipment_code,
disposal_reason: '旧待审批', disposal_method: '报废', estimated_value: 0, applied_by: applicant.id } })
const disposedRoot = await prisma.equipment.create({ data: { ...data('disposed'), status: '已报废' } })
const disposedChild = await prisma.equipment.create({ data: { ...data('disposed-part', disposedRoot.id), status: '已报废' } })
await t.test('335 个编码只读预检,根包含递归配件,去重与明确阻止各自独立', async t => {
const start = performance.now()
@ -73,12 +75,19 @@ test('批量报废在本机隔离 MySQL 验证完整资产树、事务和审批
assert.ok(response.body.data.candidates.every((row: { blocked_reason: string | null }) => row.blocked_reason === null))
const mixed = await call(previewBatchDisposal, {
equipment_ids: [root.id], equipment_codes: [root.equipment_code.toUpperCase(), child.equipment_code, 'missing-code',
loaned.equipment_code, repairing.equipment_code, pending.equipment_code]
disposedRoot.equipment_code, disposedChild.equipment_code, loaned.equipment_code, repairing.equipment_code, pending.equipment_code]
})
assert.equal(mixed.status, 200, JSON.stringify(mixed.body))
const [first, mounted, missing, borrowed, maintained, disposing] = mixed.body.data.candidates
const [first, mounted, missing, retired, retiredPart, borrowed, maintained, disposing] = mixed.body.data.candidates
assert.equal(first.equipment_id, root.id); assert.equal(mounted.equipment_id, child.id)
assert.match(mounted.blocked_reason, /挂载/); assert.equal(missing.equipment_id, null); assert.match(missing.blocked_reason, /未找到/)
assert.match(mounted.blocked_reason, /挂载/)
assert.equal(missing.equipment_id, null)
assert.equal(missing.equipment_code, 'missing-code')
assert.equal(missing.blocked_reason, '未找到资产')
assert.equal(retired.equipment_id, disposedRoot.id)
assert.equal(retiredPart.equipment_id, disposedChild.id)
assert.match(retired.blocked_reason, /已报废/)
assert.match(retiredPart.blocked_reason, /已报废/)
assert.match(borrowed.blocked_reason, /未归还/); assert.match(maintained.blocked_reason, /维修/); assert.match(disposing.blocked_reason, /已有/)
assert.deepEqual(mixed.body.data.duplicate_codes, [root.equipment_code])
const rootIds = roots.map(row => row.id)

View File

@ -69,7 +69,8 @@ export const getDisposalOccupancy = async (client: Prisma.TransactionClient, ids
}
export const getDisposalBlockedReason = (tree: DisposalTreeItem[], occupancy?: Awaited<ReturnType<typeof getDisposalOccupancy>>) => {
if (tree[0].parent_id !== null) return '挂载中的子资产不能单独申请报废,请先卸载'
const root = tree[0]
if (root.parent_id !== null && root.status !== '已报废') return '挂载中的子资产不能单独申请报废,请先卸载'
const blocked = tree.find(item => blockedStatuses.has(item.status))
if (blocked) return blocked.status === '维护中'
? '资产正在维修中,请先完成或取消维修'