Commit fd3d6ad8de4ed8f14c6b422deccab06006e8b12d
1 parent
1cd997fc
✨ feat(service): 添加点检保养方案未启用的错误码校验
Showing
3 changed files
with
7 additions
and
1 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
| @@ -169,6 +169,7 @@ public interface ErrorCodeConstants { | @@ -169,6 +169,7 @@ public interface ErrorCodeConstants { | ||
| 169 | ErrorCode DV_CHECK_PLAN_NO_SUBJECT = new ErrorCode(1_040_302_004, "启用方案时,至少需要关联一个点检保养项目"); | 169 | ErrorCode DV_CHECK_PLAN_NO_SUBJECT = new ErrorCode(1_040_302_004, "启用方案时,至少需要关联一个点检保养项目"); |
| 170 | ErrorCode DV_CHECK_PLAN_NOT_ENABLED = new ErrorCode(1_040_302_005, "点检保养方案未启用,不允许停用"); | 170 | ErrorCode DV_CHECK_PLAN_NOT_ENABLED = new ErrorCode(1_040_302_005, "点检保养方案未启用,不允许停用"); |
| 171 | ErrorCode DV_CHECK_PLAN_TYPE_MISMATCH = new ErrorCode(1_040_302_006, "点检保养方案类型与当前业务不匹配"); | 171 | ErrorCode DV_CHECK_PLAN_TYPE_MISMATCH = new ErrorCode(1_040_302_006, "点检保养方案类型与当前业务不匹配"); |
| 172 | + ErrorCode DV_CHECK_PLAN_NOT_ENABLED_FOR_RECORD = new ErrorCode(1_040_302_007, "点检保养方案未启用,不允许创建记录"); | ||
| 172 | // ========== MES 设备管理-点检方案设备(1-040-302-100) ========== | 173 | // ========== MES 设备管理-点检方案设备(1-040-302-100) ========== |
| 173 | ErrorCode DV_CHECK_PLAN_MACHINERY_NOT_EXISTS = new ErrorCode(1_040_302_100, "点检保养方案设备不存在"); | 174 | ErrorCode DV_CHECK_PLAN_MACHINERY_NOT_EXISTS = new ErrorCode(1_040_302_100, "点检保养方案设备不存在"); |
| 174 | ErrorCode DV_CHECK_PLAN_MACHINERY_DUPLICATE = new ErrorCode(1_040_302_101, "该设备已关联到当前方案,请勿重复添加"); | 175 | ErrorCode DV_CHECK_PLAN_MACHINERY_DUPLICATE = new ErrorCode(1_040_302_101, "该设备已关联到当前方案,请勿重复添加"); |
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/checkplan/MesDvCheckPlanService.java
| @@ -63,7 +63,7 @@ public interface MesDvCheckPlanService { | @@ -63,7 +63,7 @@ public interface MesDvCheckPlanService { | ||
| 63 | void validateCheckPlanExists(Long id); | 63 | void validateCheckPlanExists(Long id); |
| 64 | 64 | ||
| 65 | /** | 65 | /** |
| 66 | - * 校验点检保养方案存在,且类型匹配 | 66 | + * 校验点检保养方案存在、类型匹配,且方案已启用 |
| 67 | * | 67 | * |
| 68 | * @param id 方案编号 | 68 | * @param id 方案编号 |
| 69 | * @param type 期望的方案类型 | 69 | * @param type 期望的方案类型 |
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/checkplan/MesDvCheckPlanServiceImpl.java
| @@ -152,9 +152,14 @@ public class MesDvCheckPlanServiceImpl implements MesDvCheckPlanService { | @@ -152,9 +152,14 @@ public class MesDvCheckPlanServiceImpl implements MesDvCheckPlanService { | ||
| 152 | @Override | 152 | @Override |
| 153 | public MesDvCheckPlanDO validateCheckPlanExistsAndType(Long id, Integer type) { | 153 | public MesDvCheckPlanDO validateCheckPlanExistsAndType(Long id, Integer type) { |
| 154 | MesDvCheckPlanDO plan = doValidateCheckPlanExists(id); | 154 | MesDvCheckPlanDO plan = doValidateCheckPlanExists(id); |
| 155 | + // 校验类型匹配 | ||
| 155 | if (ObjUtil.notEqual(plan.getType(), type)) { | 156 | if (ObjUtil.notEqual(plan.getType(), type)) { |
| 156 | throw exception(DV_CHECK_PLAN_TYPE_MISMATCH); | 157 | throw exception(DV_CHECK_PLAN_TYPE_MISMATCH); |
| 157 | } | 158 | } |
| 159 | + // 校验方案已启用 | ||
| 160 | + if (ObjUtil.notEqual(MesDvCheckPlanStatusEnum.ENABLED.getStatus(), plan.getStatus())) { | ||
| 161 | + throw exception(DV_CHECK_PLAN_NOT_ENABLED_FOR_RECORD); | ||
| 162 | + } | ||
| 158 | return plan; | 163 | return plan; |
| 159 | } | 164 | } |
| 160 | 165 |