From fe1b02a121c173e9b2d56bbe5a1982e0e69e0548 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 28 四月 2026 18:06:08 +0800
Subject: [PATCH] feat(production): 新增生产工单管理功能 - 创建 ProductionOperationTask 实体类定义工单数据结构 - 实现 ProductionOperationTaskController 提供工单的增删改查接口 - 开发 ProductionOperationTaskService 和实现类处理业务逻辑 - 配置 ProductionOperationTaskMapper 及 XML 文件实现数据库操作 - 添加 ProductionOperationTaskVo 视图对象用于数据展示 - 扩展 ProductionOrder 实体类增加生产订单相关属性 - 更新 ProductionOrderMapper.xml 完善订单查询映射配置 - 优化 ProductionOrderPickRecordMapper.xml 记录物料领取明细 - 新增 ProductionOrderRoutingOperationParam 参数配置实体 - 完善 工序参数处理逻辑
---
src/main/java/com/ruoyi/safe/service/impl/SafeHazardServiceImpl.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/service/impl/SafeHazardServiceImpl.java b/src/main/java/com/ruoyi/safe/service/impl/SafeHazardServiceImpl.java
index de7efc7..a2cbc96 100644
--- a/src/main/java/com/ruoyi/safe/service/impl/SafeHazardServiceImpl.java
+++ b/src/main/java/com/ruoyi/safe/service/impl/SafeHazardServiceImpl.java
@@ -1,13 +1,18 @@
package com.ruoyi.safe.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.safe.pojo.SafeHazard;
-import com.ruoyi.safe.mapper.SafeHazardMapper;
-import com.ruoyi.safe.service.SafeHazardService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.safe.mapper.SafeHazardMapper;
+import com.ruoyi.safe.mapper.SafeHazardRecordMapper;
+import com.ruoyi.safe.pojo.SafeHazard;
+import com.ruoyi.safe.pojo.SafeHazardRecord;
+import com.ruoyi.safe.service.SafeHazardService;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -18,13 +23,28 @@
* @since 2026-01-28 10:09:24
*/
@Service
+@RequiredArgsConstructor
public class SafeHazardServiceImpl extends ServiceImpl<SafeHazardMapper, SafeHazard> implements SafeHazardService {
- @Autowired
- private SafeHazardMapper safeHazardMapper;
+ private final SafeHazardMapper safeHazardMapper;
+
+ private final SafeHazardRecordMapper safeHazardRecordMapper;
@Override
public IPage<SafeHazard> pageSafeHazard(Page page, SafeHazard safeHazard) {
return safeHazardMapper.pageSafeHazard(page, safeHazard);
}
+
+ @Override
+ public int delSafeHazard(List<Integer> ids) {
+ //鍒ゆ柇鏄惁鏈夋鍦ㄩ鐢ㄧ殑鍗遍櫓婧�
+ List<SafeHazardRecord> safeHazardRecords = safeHazardRecordMapper.selectList(Wrappers.<SafeHazardRecord>lambdaQuery()
+ .in(SafeHazardRecord::getSafeHazardId, ids)
+ .isNull(SafeHazardRecord::getReturnUserId));
+ if (safeHazardRecords.size()>0){
+ throw new RuntimeException("璇ュ嵄闄╂簮宸茬粡棰嗙敤,鏃犳硶鍒犻櫎,绛夊綊杩樹箣鍚庡啀杩涜鍒犻櫎!");
+ }
+ safeHazardMapper.deleteBatchIds(ids);
+ return 0;
+ }
}
--
Gitblit v1.9.3