✨ feat(mes): 新增点检方案设备和项目的重复校验逻辑

新增设备和项目在同一方案下的重复校验，避免用户重复添加相同设备或项目。同时，增强了点检方案停用时的状态校验，确保只有已启用的方案才能被停用。

✨ feat(mes): 新增点检方案设备和项目的重复校验逻辑
新增设备和项目在同一方案下的重复校验，避免用户重复添加相同设备或项目。同时，增强了点检方案停用时的状态校验，确保只有已启用的方案才能被停用。
YunaiV
1 parent 4da4ddc1
Showing 6 changed files with 28 additions and 2 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/checkplan/MesDvCheckPlanMachineryMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/checkplan/MesDvCheckPlanSubjectMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/checkplan/MesDvCheckPlanMachineryServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/checkplan/MesDvCheckPlanServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/checkplan/MesDvCheckPlanSubjectServiceImpl.java
@@ -32,4 +32,10 @@ public interface MesDvCheckPlanMachineryMapper extends BaseMapperX&lt;MesDvCheckPla
         return selectCount(MesDvCheckPlanMachineryDO::getMachineryId, machineryId);
     }
+    default MesDvCheckPlanMachineryDO selectByPlanIdAndMachineryId(Long planId, Long machineryId) {
+        return selectOne(new LambdaQueryWrapperX<MesDvCheckPlanMachineryDO>()
+                .eq(MesDvCheckPlanMachineryDO::getPlanId, planId)
+                .eq(MesDvCheckPlanMachineryDO::getMachineryId, machineryId));
+    }
+
 }
@@ -32,4 +32,10 @@ public interface MesDvCheckPlanSubjectMapper extends BaseMapperX&lt;MesDvCheckPlanS
         return selectCount(MesDvCheckPlanSubjectDO::getSubjectId, subjectId);
     }
+    default MesDvCheckPlanSubjectDO selectByPlanIdAndSubjectId(Long planId, Long subjectId) {
+        return selectOne(new LambdaQueryWrapperX<MesDvCheckPlanSubjectDO>()
+                .eq(MesDvCheckPlanSubjectDO::getPlanId, planId)
+                .eq(MesDvCheckPlanSubjectDO::getSubjectId, subjectId));
+    }
+
 }
@@ -166,10 +166,13 @@ public interface ErrorCodeConstants {
     ErrorCode DV_CHECK_PLAN_NOT_PREPARE = new ErrorCode(1_040_302_002, "点检保养方案已启用，不允许修改或删除");
     ErrorCode DV_CHECK_PLAN_NO_MACHINERY = new ErrorCode(1_040_302_003, "启用方案时，至少需要关联一台设备");
     ErrorCode DV_CHECK_PLAN_NO_SUBJECT = new ErrorCode(1_040_302_004, "启用方案时，至少需要关联一个点检保养项目");
+    ErrorCode DV_CHECK_PLAN_NOT_ENABLED = new ErrorCode(1_040_302_005, "点检保养方案未启用，不允许停用");
     // ========== MES 设备管理-点检方案设备（1-040-302-100） ==========
     ErrorCode DV_CHECK_PLAN_MACHINERY_NOT_EXISTS = new ErrorCode(1_040_302_100, "点检保养方案设备不存在");
+    ErrorCode DV_CHECK_PLAN_MACHINERY_DUPLICATE = new ErrorCode(1_040_302_101, "该设备已关联到当前方案，请勿重复添加");
     // ========== MES 设备管理-点检方案项目（1-040-302-200） ==========
     ErrorCode DV_CHECK_PLAN_SUBJECT_NOT_EXISTS = new ErrorCode(1_040_302_200, "点检保养方案项目不存在");
+    ErrorCode DV_CHECK_PLAN_SUBJECT_DUPLICATE = new ErrorCode(1_040_302_201, "该项目已关联到当前方案，请勿重复添加");
     // ========== MES 设备管理-维修工单（1-040-303-000） ==========
     ErrorCode DV_REPAIR_NOT_EXISTS = new ErrorCode(1_040_303_000, "维修工单不存在");
@@ -38,6 +38,10 @@ public class MesDvCheckPlanMachineryServiceImpl implements MesDvCheckPlanMachine
         checkPlanService.validateCheckPlanPrepare(createReqVO.getPlanId());
         // 1.2 校验设备存在
         machineryService.validateMachineryExists(createReqVO.getMachineryId());
+        // 1.3 校验同一方案下设备不重复
+        if (checkPlanMachineryMapper.selectByPlanIdAndMachineryId(createReqVO.getPlanId(), createReqVO.getMachineryId()) != null) {
+            throw exception(DV_CHECK_PLAN_MACHINERY_DUPLICATE);
+        }
         // 2. 插入
         MesDvCheckPlanMachineryDO planMachinery = BeanUtils.toBean(createReqVO, MesDvCheckPlanMachineryDO.class);
@@ -91,8 +91,11 @@ public class MesDvCheckPlanServiceImpl implements MesDvCheckPlanService {
     @Override
     public void disableCheckPlan(Long id) {
-        // 1. 校验存在
-        validateCheckPlanExists(id);
+        // 1. 校验存在 + 校验已启用状态
+        MesDvCheckPlanDO plan = doValidateCheckPlanExists(id);
+        if (ObjUtil.notEqual(MesDvCheckPlanStatusEnum.ENABLED.getStatus(), plan.getStatus())) {
+            throw exception(DV_CHECK_PLAN_NOT_ENABLED);
+        }
         // 2. 更新状态为草稿
         checkPlanMapper.updateById(new MesDvCheckPlanDO().setId(id)
@@ -38,6 +38,10 @@ public class MesDvCheckPlanSubjectServiceImpl implements MesDvCheckPlanSubjectSe
         checkPlanService.validateCheckPlanPrepare(createReqVO.getPlanId());
         // 1.2 校验项目存在
         subjectService.validateSubjectExists(createReqVO.getSubjectId());
+        // 1.3 校验同一方案下项目不重复
+        if (checkPlanSubjectMapper.selectByPlanIdAndSubjectId(createReqVO.getPlanId(), createReqVO.getSubjectId()) != null) {
+            throw exception(DV_CHECK_PLAN_SUBJECT_DUPLICATE);
+        }
         // 2. 插入
         MesDvCheckPlanSubjectDO planSubject = BeanUtils.toBean(createReqVO, MesDvCheckPlanSubjectDO.class);