diff --git a/backend/src/controllers/__tests__/disposalBatch.integration.test.ts b/backend/src/controllers/__tests__/disposalBatch.integration.test.ts index 942c49a..18d53f1 100644 --- a/backend/src/controllers/__tests__/disposalBatch.integration.test.ts +++ b/backend/src/controllers/__tests__/disposalBatch.integration.test.ts @@ -9,7 +9,7 @@ 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 { createBatchDisposal, previewBatchDisposal } = await import('../disposalController') + const { approveBatchDisposal, approveDisposal, createBatchDisposal, getDisposalList, previewBatchDisposal } = await import('../disposalController') const { borrowEquipment, returnEquipment } = await import('../borrowController') const prefix = `disp-${randomUUID().slice(0, 12)}` const userIds: number[] = [] @@ -33,11 +33,12 @@ test('批量报废在本机隔离 MySQL 验证完整资产树、事务和审批 parent_id, mount_status: parent_id ? 'mounted' : 'none', status: '可用', total_quantity: 1, remaining_quantity: 1, unit_price: 100, total_value: 100, available_value: 100 }) - const call = async (handler: typeof createBatchDisposal, body: unknown, ip = '127.0.0.1') => { + const call = async (handler: typeof createBatchDisposal, body: unknown, ip = '127.0.0.1', + actor = applicant, params?: Record, query?: Record) => { const state = { status: 200, body: null as any } - const response = { locals: { user: applicant }, status(code: number) { state.status = code; return this }, + const response = { locals: { user: actor }, status(code: number) { state.status = code; return this }, json(payload: any) { state.body = payload; return this } } - await handler({ body, ip } as any, response as any) + await handler({ body, ip, params, query } as any, response as any) return state } const submit = (assets: { equipment_id: number; item_ids: number[]; @@ -284,6 +285,126 @@ test('批量报废在本机隔离 MySQL 验证完整资产树、事务和审批 assert.equal((await prisma.borrowRecord.findUniqueOrThrow({ where: { id: changingBorrowId } })).return_time, null) assert.equal(await prisma.disposalRecord.count({ where: { equipment_id: changingRoot.id } }), 0) }) + + const approveBatch = (disposal_ids: unknown[], approved: unknown, reject_reason?: string) => + call(approveBatchDisposal, { disposal_ids, approved, reject_reason }, '127.0.0.1', reviewer) + const apply = async (equipmentId: number, itemIds = [equipmentId], actor = applicant) => { + const result = await call(createBatchDisposal, { assets: [{ equipment_id: equipmentId, item_ids: itemIds }], + disposal_reason: '批量审批测试', disposal_method: '报废' }, '127.0.0.1', actor) + assert.equal(result.status, 200, JSON.stringify(result.body)) + return result.body.data.disposal_ids[0] as number + } + + await t.test('批量审批 336 张完整单据,按申请人合并结果且同时间列表顺序稳定', async () => { + const applicantPerson = await prisma.person.create({ data: { + nickname: `${prefix}-applicant`, real_name: prefix, source_userid: `${prefix}-applicant` + } }) + personIds.push(applicantPerson.id) + await prisma.user.update({ where: { id: applicant.id }, data: { person_id: applicantPerson.id } }) + const otherRoot = await prisma.equipment.create({ data: data('approval-other') }) + const otherId = await apply(otherRoot.id, [otherRoot.id], reviewer) + const applied = await prisma.disposalRecord.findMany({ where: { equipment_id: { in: roots.map(row => row.id) } }, + orderBy: { id: 'desc' } }) + assert.equal(applied.length, 335) + const [secondNewest, oldest] = [applied[0], applied[1]] + await prisma.disposalRecord.updateMany({ where: { id: { in: [secondNewest.id, oldest.id] } }, + data: { created_at: new Date('2099-01-01T00:00:00.000Z') } }) + for (const [index, expected] of [secondNewest.id, oldest.id].entries()) { + const list = await call(getDisposalList, {}, '127.0.0.1', reviewer, undefined, { + scope: 'pending', keyword: `${prefix}-list-`, page: String(index + 1), pageSize: '1' + }) + assert.equal(list.status, 200) + assert.equal(list.body.data.list[0].id, expected) + } + + const ids = [...applied.map(row => row.id), otherId] + const result = await approveBatch(ids, true) + assert.equal(result.status, 200, JSON.stringify(result.body)) + assert.deepEqual(result.body.data, { count: 336, disposal_ids: ids }) + assert.equal(await prisma.disposalRecord.count({ where: { id: { in: ids }, status: 'approved', approved_by: reviewer.id } }), 336) + assert.equal(await prisma.disposalAction.count({ where: { disposal_id: { in: ids }, action_type: 'approved', operator_id: reviewer.id } }), 336) + assert.equal(await prisma.operationLog.count({ where: { user_id: reviewer.id, operation_type: '报废审批通过', + equipment_id: { in: [...roots.map(row => row.id), otherRoot.id] } } }), 336) + assert.equal(await prisma.equipment.count({ where: { id: { in: [root.id, child.id, nested.id] }, status: '待报废' } }), 3) + + const notices = await prisma.notification.findMany({ where: { + type: 'disposal', title: { startsWith: '报废批量审批已通过' }, metadata: { contains: prefix } + }, include: { recipients: true } }) + assert.equal(notices.length, 2) + const groupedIds = new Map(notices.map(row => { + const metadata = JSON.parse(row.metadata!) + return [metadata.business_id, metadata.disposal_ids] + })) + assert.deepEqual(groupedIds.get(ids[0]), ids.slice(0, -1)) + assert.deepEqual(groupedIds.get(otherId), [otherId]) + assert.equal(notices.filter(row => row.recipients.some(recipient => recipient.user_id === applicant.id)).length, 1) + const delivery = await prisma.dingTalkDelivery.findMany({ where: { event_type: 'disposal_approved', + business_id: { in: ids }, recipient_user_id: applicant.id } }) + assert.equal(delivery.length, 1) + assert.match(JSON.parse(delivery[0].payload_json).content, /335 笔已通过/) + }) + + await t.test('批量驳回共享必填理由并恢复每件资产申请前状态', async () => { + const first = await prisma.equipment.create({ data: data('rejection-root') }) + const part = await prisma.equipment.create({ data: { ...data('rejection-part', first.id), status: '已损坏' } }) + const second = await prisma.equipment.create({ data: data('rejection-other') }) + const firstId = await apply(first.id, [first.id, part.id]) + const secondId = await apply(second.id) + await prisma.disposalItem.updateMany({ where: { disposal_id: secondId }, data: { snapshot_json: '{"status":"可用"}' } }) + const ids = [firstId, secondId] + assert.equal((await approveBatch(ids, false, ' ')).status, 422) + const result = await approveBatch(ids, false, ' 暂不处置 ') + assert.equal(result.status, 200, JSON.stringify(result.body)) + const restored = await prisma.equipment.findMany({ where: { id: { in: [first.id, part.id, second.id] } }, orderBy: { id: 'asc' } }) + assert.deepEqual(restored.map(row => row.status), ['可用', '已损坏', '可用']) + assert.equal(await prisma.disposalRecord.count({ where: { id: { in: ids }, status: 'rejected', reject_reason: '暂不处置' } }), 2) + assert.equal(await prisma.disposalAction.count({ where: { disposal_id: { in: ids }, action_type: 'rejected', detail: '暂不处置' } }), 2) + assert.equal(await prisma.operationLog.count({ where: { user_id: reviewer.id, operation_type: '报废审批驳回', + equipment_id: { in: [first.id, second.id] } } }), 2) + const grouped = await prisma.dingTalkDelivery.findMany({ where: { event_type: 'disposal_rejected', + business_id: { in: ids }, recipient_user_id: applicant.id } }) + assert.equal(grouped.length, 1) + assert.match(JSON.parse(grouped[0].payload_json).content, /暂不处置/) + }) + + await t.test('错误单据整批回滚,历史缺数量仍可单项确认,反序并发只成功一次', async () => { + const current = await prisma.equipment.create({ data: data('approval-current') }) + const historic = await prisma.equipment.create({ data: data('approval-legacy') }) + const currentId = await apply(current.id) + const historicId = await apply(historic.id) + await prisma.disposalItem.updateMany({ where: { disposal_id: historicId }, data: { snapshot_json: '{"status":"可用"}' } }) + for (const ids of [[], [currentId, currentId], [0], [String(currentId)], Array.from({ length: 501 }, (_, index) => index + 1)]) { + assert.equal((await approveBatch(ids, true)).status, 422) + } + assert.equal((await approveBatch([currentId], 'true')).status, 422) + const conflicted = await approveBatch([currentId, historicId], true) + assert.equal(conflicted.status, 409) + assert.match(conflicted.body.message, new RegExp(historic.equipment_code)) + assert.match(conflicted.body.message, /逐件核对/) + const ids = [currentId, historicId] + assert.equal(await prisma.disposalRecord.count({ where: { id: { in: ids }, status: 'pending' } }), 2) + assert.equal(await prisma.disposalAction.count({ where: { disposal_id: { in: ids }, action_type: 'approved' } }), 0) + assert.equal(await prisma.operationLog.count({ where: { user_id: reviewer.id, operation_type: '报废审批通过', + equipment_id: { in: [current.id, historic.id] } } }), 0) + const single = await call(approveDisposal, { approved: true, confirmed_quantities: [{ equipment_id: historic.id, total_quantity: 1 }] }, + '127.0.0.1', reviewer, { id: String(historicId) }) + assert.equal(single.status, 200, JSON.stringify(single.body)) + assert.equal((await approveBatch(ids, true)).status, 409) + assert.equal((await prisma.disposalRecord.findUniqueOrThrow({ where: { id: currentId } })).status, 'pending') + + const concurrent = await prisma.equipment.create({ data: data('approval-concurrent') }) + const concurrentId = await apply(concurrent.id) + const outcomes = await Promise.all([ + approveBatch([currentId, concurrentId], true), + approveBatch([concurrentId, currentId], false, '保留使用') + ]) + assert.deepEqual(outcomes.map(row => row.status).sort(), [200, 409]) + const completed = await prisma.disposalRecord.findMany({ where: { id: { in: [currentId, concurrentId] } } }) + assert.deepEqual(completed.map(row => row.status), [outcomes[0].status === 200 ? 'approved' : 'rejected', + outcomes[0].status === 200 ? 'approved' : 'rejected']) + assert.equal(await prisma.disposalAction.count({ where: { disposal_id: { in: [currentId, concurrentId] }, + action_type: { in: ['approved', 'rejected'] } } }), 2) + }) } finally { for (const [key, value] of Object.entries(previousEnv)) { if (value === undefined) delete process.env[key] @@ -296,7 +417,10 @@ test('批量报废在本机隔离 MySQL 验证完整资产树、事务和审批 const disposals = await tx.disposalRecord.findMany({ where: { equipment_id }, select: { id: true } }) const disposalIds = disposals.map(row => row.id) await tx.dingTalkDelivery.deleteMany({ where: { business_type: 'disposal', business_id: { in: disposalIds } } }) - await tx.notification.deleteMany({ where: { type: 'disposal', metadata: { contains: prefix } } }) + await tx.notification.deleteMany({ where: { type: 'disposal', OR: [ + { metadata: { contains: prefix } }, + { action_url: { in: disposalIds.map(id => `/workflows/disposals/${id}`) } } + ] } }) await tx.operationLog.deleteMany({ where: { user_id: { in: userIds } } }) await tx.disposalRecord.deleteMany({ where: { id: { in: disposalIds } } }) await tx.borrowRecord.deleteMany({ where: { equipment_id } }) diff --git a/backend/src/controllers/disposalController.ts b/backend/src/controllers/disposalController.ts index c4b4ce0..4938fc4 100644 --- a/backend/src/controllers/disposalController.ts +++ b/backend/src/controllers/disposalController.ts @@ -641,7 +641,7 @@ export const getDisposalList = async (req: Request, res: Response) => { where, skip, take: currentPageSize, - orderBy: { created_at: 'desc' }, + orderBy: [{ created_at: 'desc' }, { id: 'desc' }], include: { equipment: { select: { equipment_name: true, equipment_type: true, unit_price: true } }, applier: { select: { id: true, name: true, username: true } }, @@ -712,6 +712,22 @@ export const getDisposalDetail = async (req: Request, res: Response) => { } const disposalDecisionInclude = { items: { include: { equipment: true } } } as const +type DisposalDecisionRecord = Prisma.DisposalRecordGetPayload<{ include: typeof disposalDecisionInclude }> + +const getDisposalDecisionRoot = (disposal: DisposalDecisionRecord, expectedStatus: string, equipmentIds: Set) => { + if (disposal.status !== expectedStatus) throw new DisposalConflictError('该申请已被其他人处理,请刷新后查看') + const root = disposal.items.find(item => item.equipment_id === disposal.equipment_id)?.equipment + if (!root || root.parent_id !== null || !equipmentIds.has(root.id) || disposal.items.some(item => !equipmentIds.has(item.equipment_id))) { + throw new DisposalConflictError('报废明细范围已变化或缺少主资产,请先核查') + } + return root +} + +const assertDisposalDecisionTree = (disposal: DisposalDecisionRecord, tree: DisposalTreeItem[]) => { + assertDisposalItemsConfirmed(tree, disposal.items.map(item => item.equipment_id)) + const changedItem = disposal.items.find(item => item.equipment.status !== '待报废' || item.equipment.parent_id !== item.parent_equipment_id) + if (changedItem) throw new DisposalConflictError(`资产 ${changedItem.equipment_code} 的状态或挂载关系已变化,请先核查`) +} const loadLockedDisposalDecision = async (tx: Prisma.TransactionClient, id: number, expectedStatus: string) => { const initial = await tx.disposalRecord.findUnique({ where: { id }, include: disposalDecisionInclude }) @@ -719,21 +735,16 @@ const loadLockedDisposalDecision = async (tx: Prisma.TransactionClient, id: numb const equipmentIds = new Set([initial.equipment_id, ...initial.items.map(item => item.equipment_id)]) await lockEquipmentRows(tx, [...equipmentIds]) const disposal = await tx.disposalRecord.findUnique({ where: { id }, include: disposalDecisionInclude }) - if (!disposal || disposal.status !== expectedStatus) throw new DisposalConflictError('该申请已被其他人处理,请刷新后查看') - const root = disposal.items.find(item => item.equipment_id === disposal.equipment_id)?.equipment - if (!root || root.parent_id !== null || !equipmentIds.has(root.id) || disposal.items.some(item => !equipmentIds.has(item.equipment_id))) { - throw new DisposalConflictError('报废明细范围已变化或缺少主资产,请先核查') - } + if (!disposal) throw new DisposalConflictError('该申请已被其他人处理,请刷新后查看') + const root = getDisposalDecisionRoot(disposal, expectedStatus, equipmentIds) const trees = await loadDisposalTrees(tx, [root]) - assertDisposalItemsConfirmed(trees.get(root.id)!, disposal.items.map(item => item.equipment_id)) - const changedItem = disposal.items.find(item => item.equipment.status !== '待报废' || item.equipment.parent_id !== item.parent_equipment_id) - if (changedItem) throw new DisposalConflictError(`资产 ${changedItem.equipment_code} 的状态或挂载关系已变化,请先核查`) + assertDisposalDecisionTree(disposal, trees.get(root.id)!) return disposal } const verifyDisposalQuantities = async ( tx: Prisma.TransactionClient, - disposal: Awaited>, + disposal: DisposalDecisionRecord, confirmation?: Map ) => { if (confirmation) assertConfirmedDisposalQuantities(disposal.items.map(item => item.equipment), confirmation) @@ -792,22 +803,72 @@ const readConfirmedDisposalQuantities = (input: unknown) => { return confirmed } +const readDisposalDecision = (body: { approved?: unknown; reject_reason?: unknown }) => { + const { approved, reject_reason } = body + if (typeof approved !== 'boolean') { + throw Object.assign(new Error('审批结果必须明确为通过或驳回'), { status: 422 }) + } + const rejectReason = typeof reject_reason === 'string' ? reject_reason.trim() : '' + if (!approved && !rejectReason) { + throw Object.assign(new Error('驳回原因不能为空'), { status: 422 }) + } + return { approved, rejectReason } +} + +type DisposalDecision = ReturnType + +const writeDisposalDecision = async ( + tx: Prisma.TransactionClient, + disposal: DisposalDecisionRecord, + decision: DisposalDecision, + userId: number, + approvedAt: Date, + confirmation?: Map +) => { + const { approved, rejectReason } = decision + if (approved) await verifyDisposalQuantities(tx, disposal, confirmation) + const nextStatus = approved ? 'approved' : 'rejected' + const updated = await tx.disposalRecord.updateMany({ + where: { id: disposal.id, status: 'pending' }, + data: { + status: nextStatus, approved_by: userId, approved_at: approvedAt, + reject_reason: approved ? null : rejectReason + } + }) + 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) + } + } + await tx.disposalAction.create({ + data: { + disposal_id: disposal.id, action_type: nextStatus, operator_id: userId, + from_status: 'pending', to_status: nextStatus, detail: approved ? null : rejectReason + } + }) +} + +const getDisposalDecisionOperation = (disposal: DisposalDecisionRecord, approved: boolean) => ({ + operation_type: approved ? '报废审批通过' : '报废审批驳回', + operation_details: `${approved ? '批准' : '驳回'}资产 ${disposal.equipment_code} 的报废申请` +}) + export const approveDisposal = async (req: Request, res: Response) => { try { const disposalId = Number(req.params.id) - const { approved, reject_reason, confirmed_quantities, reconfirm_quantities } = req.body as { + const body = (req.body || {}) as { approved?: boolean reject_reason?: string confirmed_quantities?: unknown reconfirm_quantities?: boolean } + const decision = readDisposalDecision(body) + const { approved, rejectReason } = decision + const { confirmed_quantities, reconfirm_quantities } = body const userId = Number(res.locals.user?.id) - if (typeof approved !== 'boolean') { - return errorResponse(res, '审批结果必须明确为通过或驳回', 422) - } - if (!approved && !reject_reason?.trim()) { - return errorResponse(res, '驳回原因不能为空', 422) - } if (reconfirm_quantities === true && !approved) { return errorResponse(res, '数量复核必须明确确认通过', 422) } @@ -833,45 +894,8 @@ export const approveDisposal = async (req: Request, res: Response) => { const result = await prisma.$transaction(async (tx) => { const disposal = await loadLockedDisposalDecision(tx, disposalId, 'pending') - if (approved) await verifyDisposalQuantities(tx, disposal, confirmation) - - const nextStatus = approved ? 'approved' : 'rejected' const approvedAt = new Date() - const updated = await tx.disposalRecord.updateMany({ - where: { id: disposalId, status: 'pending' }, - data: { - status: nextStatus, - approved_by: userId, - approved_at: approvedAt, - reject_reason: approved ? null : reject_reason?.trim() - } - }) - 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 - ) - } - } - - await tx.disposalAction.create({ - data: { - disposal_id: disposalId, - action_type: approved ? 'approved' : 'rejected', - operator_id: userId, - from_status: 'pending', - to_status: nextStatus, - detail: approved ? null : reject_reason?.trim() - } - }) + await writeDisposalDecision(tx, disposal, decision, userId, approvedAt, confirmation) const recipients = await getResultRecipients(tx, disposal.applied_by) const rootItem = disposal.items.find((item) => item.equipment_id === disposal.equipment_id) @@ -880,7 +904,7 @@ export const approveDisposal = async (req: Request, res: Response) => { businessType: 'disposal', businessId: disposal.id, title: approved ? `报废已审批:${disposal.equipment_code}` : `报废已驳回:${disposal.equipment_code}`, - content: approved ? '报废申请已审批通过,等待完成处置' : `驳回原因:${reject_reason?.trim()}`, + content: approved ? '报废申请已审批通过,等待完成处置' : `驳回原因:${rejectReason}`, level: approved ? 'success' : 'warning', actionUrl: `/workflows/disposals/${disposal.id}`, stationRecipients: recipients.stationRecipients, @@ -904,7 +928,7 @@ export const approveDisposal = async (req: Request, res: Response) => { equipmentName: rootItem?.equipment.equipment_name, equipmentCode: disposal.equipment_code, rejectorName: res.locals.user?.name || res.locals.user?.username, - reason: reject_reason + reason: rejectReason }), actionTitle: '查看申请', messageVersion: 'v1' @@ -913,11 +937,12 @@ export const approveDisposal = async (req: Request, res: Response) => { return disposal }, { isolationLevel: Prisma.TransactionIsolationLevel.ReadCommitted }) + const operation = getDisposalDecisionOperation(result, approved) await logOperation( userId, res.locals.user?.username || res.locals.user?.name || 'unknown', - approved ? '报废审批通过' : '报废审批驳回', - `${approved ? '批准' : '驳回'}资产 ${result.equipment_code} 的报废申请`, + operation.operation_type, + operation.operation_details, result.equipment_id, result.equipment_code, req.ip @@ -928,6 +953,139 @@ export const approveDisposal = async (req: Request, res: Response) => { } } +const throwBatchDisposalConflict = (equipmentCode: string, error: unknown): never => { + if (error instanceof DisposalConflictError) { + throw new DisposalConflictError(`${equipmentCode}:${error.message}`) + } + throw error +} + +const loadLockedBatchDisposalDecisions = async (tx: Prisma.TransactionClient, disposalIds: number[]) => { + const initial = await tx.disposalRecord.findMany({ + where: { id: { in: disposalIds } }, + select: { id: true, equipment_id: true, equipment_code: true, items: { select: { equipment_id: true } } } + }) + const initialById = new Map(initial.map(disposal => [disposal.id, disposal])) + const equipmentIdsByDisposal = new Map>() + const equipmentIds = new Set() + for (const id of disposalIds) { + const disposal = initialById.get(id) + if (!disposal) throw new DisposalConflictError(`报废单 ${id} 不存在,请刷新列表`) + const ids = new Set([disposal.equipment_id, ...disposal.items.map(item => item.equipment_id)]) + for (const equipmentId of ids) { + if (equipmentIds.has(equipmentId)) { + throw new DisposalConflictError(`${disposal.equipment_code}:本批报废单的资产范围重叠,请逐单核查`) + } + equipmentIds.add(equipmentId) + } + equipmentIdsByDisposal.set(id, ids) + } + await lockEquipmentRows(tx, [...equipmentIds]) + + const current = await tx.disposalRecord.findMany({ + where: { id: { in: disposalIds } }, include: disposalDecisionInclude + }) + const currentById = new Map(current.map(disposal => [disposal.id, disposal])) + const decisions = disposalIds.map(id => { + const disposal = currentById.get(id) + const equipmentCode = initialById.get(id)!.equipment_code + if (!disposal) throw new DisposalConflictError(`${equipmentCode}:报废单已移除,请刷新列表`) + try { + const root = getDisposalDecisionRoot(disposal, 'pending', equipmentIdsByDisposal.get(id)!) + return { disposal, root } + } catch (error) { + return throwBatchDisposalConflict(equipmentCode, error) + } + }) + const trees = await loadDisposalTrees(tx, decisions.map(({ root }) => root)) + return decisions.map(({ disposal, root }) => { + try { + assertDisposalDecisionTree(disposal, trees.get(root.id)!) + return disposal + } catch (error) { + return throwBatchDisposalConflict(disposal.equipment_code, error) + } + }) +} + +const notifyBatchDisposalDecisions = async ( + tx: Prisma.TransactionClient, + disposals: DisposalDecisionRecord[], + { approved, rejectReason }: DisposalDecision, + operatorName: string, + decidedAt: Date +) => { + const byApplicant = new Map() + for (const disposal of disposals) { + const group = byApplicant.get(disposal.applied_by) + if (group) group.push(disposal) + else byApplicant.set(disposal.applied_by, [disposal]) + } + const statusText = approved ? '已通过' : '已驳回' + for (const [applicantId, group] of byApplicant) { + const codes = group.map(disposal => disposal.equipment_code) + const summary = codes.slice(0, 10).join('、') + (codes.length > 10 ? ` 等 ${codes.length} 个` : '') + const recipients = await getResultRecipients(tx, applicantId) + const title = `报废批量审批${statusText}:${group.length} 笔` + await createBusinessNotification(tx, { + ...recipients, + eventType: approved ? 'disposal_approved' : 'disposal_rejected', + businessType: 'disposal', + businessId: group[0].id, + title, + content: `${group.length} 笔报废申请${statusText}(${summary})${approved ? ',等待处置' : `。驳回原因:${rejectReason}`}`, + level: approved ? 'success' : 'warning', + actionUrl: group.length === 1 ? `/workflows/disposals/${group[0].id}` : '/workflows/disposals?scope=processed', + metadata: { disposal_ids: group.map(disposal => disposal.id), equipment_codes: codes, count: group.length }, + dingTalk: { + title, actionTitle: '查看审批结果', messageVersion: 'v1', + content: [ + `**审批时间:** ${formatBeijingDateTime(decidedAt)}`, + `**审批人:** ${escapeNotificationMarkdownInline(operatorName)}`, + `**审批结果:** ${group.length} 笔${statusText}(${escapeNotificationMarkdownInline(summary)})`, + approved ? '> 报废单现已进入待处置阶段。' : `**驳回原因:** ${escapeNotificationMarkdownInline(rejectReason)}` + ].join('\n\n') + } + }) + } +} + +export const approveBatchDisposal = async (req: Request, res: Response) => { + try { + const { id: userId } = getCurrentUser(res) + if (!isEquipmentId(userId)) return errorResponse(res, '用户未登录', 401) + const body = req.body || {} + const disposalIds = body.disposal_ids + if (!Array.isArray(disposalIds) || disposalIds.length < 1 || disposalIds.length > MAX_DISPOSAL_BATCH_ROOTS || + !disposalIds.every(isEquipmentId) || new Set(disposalIds).size !== disposalIds.length) { + return errorResponse(res, `每批须提供 1 至 ${MAX_DISPOSAL_BATCH_ROOTS} 个不重复的有效报废单 ID`, 422) + } + const decision = readDisposalDecision(body) + const operator = res.locals.user + const operatorName = operator?.name || operator?.username || 'unknown' + await prisma.$transaction(async tx => { + const disposals = await loadLockedBatchDisposalDecisions(tx, disposalIds) + const decidedAt = new Date() + for (const disposal of disposals) { + try { + await writeDisposalDecision(tx, disposal, decision, userId, decidedAt) + } catch (error) { + throwBatchDisposalConflict(disposal.equipment_code, error) + } + } + await tx.operationLog.createMany({ data: disposals.map(disposal => ({ + ...getDisposalDecisionOperation(disposal, decision.approved), + user_id: userId, username: operator?.username || operatorName, + equipment_id: disposal.equipment_id, equipment_code: disposal.equipment_code, ip_address: req.ip || null + })) }) + await notifyBatchDisposalDecisions(tx, disposals, decision, operatorName, decidedAt) + }, { isolationLevel: Prisma.TransactionIsolationLevel.ReadCommitted, timeout: 30000 }) + successResponse(res, { count: disposalIds.length, disposal_ids: disposalIds }, decision.approved ? '批量审批通过' : '批量驳回成功') + } 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/routes/disposal.ts b/backend/src/routes/disposal.ts index 44d6d56..6441d27 100644 --- a/backend/src/routes/disposal.ts +++ b/backend/src/routes/disposal.ts @@ -6,6 +6,7 @@ import { getDisposalList, getDisposalDetail, approveDisposal, + approveBatchDisposal, completeDisposal, getEquipmentDisposalHistory } from '../controllers/disposalController' @@ -27,6 +28,7 @@ router.post( ) router.get('/equipment/:equipment_id/history', requirePermission(PERMISSIONS.ASSETS_VIEW_ALL), getEquipmentDisposalHistory) 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/complete', requirePermission(PERMISSIONS.DISPOSALS_COMPLETE), completeDisposal) diff --git a/frontend/src/api/disposal.ts b/frontend/src/api/disposal.ts index 4fd0b45..cb2e488 100644 --- a/frontend/src/api/disposal.ts +++ b/frontend/src/api/disposal.ts @@ -193,6 +193,14 @@ export const approveDisposal = (id: number, data: { }) => request.put(`/disposal/${id}/approve`, data) +export const approveBatchDisposal = (data: { + disposal_ids: number[] + approved: boolean + reject_reason?: string +}) => request + .put>('/disposal/batch/approve', data, { timeout: 60000 }) + .then((response) => response.data) + export const completeDisposal = (id: number, data: { actual_value?: number; completion_notes?: string }) => request.put(`/disposal/${id}/complete`, data) diff --git a/frontend/src/components/BatchDisposalApprovalDialog.vue b/frontend/src/components/BatchDisposalApprovalDialog.vue new file mode 100644 index 0000000..cd31c44 --- /dev/null +++ b/frontend/src/components/BatchDisposalApprovalDialog.vue @@ -0,0 +1,121 @@ + + + + + diff --git a/frontend/src/views/settings/components/DisposalManagement.vue b/frontend/src/views/settings/components/DisposalManagement.vue index d049c7d..a227033 100644 --- a/frontend/src/views/settings/components/DisposalManagement.vue +++ b/frontend/src/views/settings/components/DisposalManagement.vue @@ -91,13 +91,25 @@

报废记录

当前范围共 {{ summary?.total || 0 }} 条,筛选结果 {{ total }} 条

- +
+ + +
+ +

{{ batchNotice }}

正在加载报废记录...

{{ listError }}

- +
@@ -276,11 +313,18 @@ + +