♻️ refactor(machinery): 移除设备存在性校验中的启用状态检查

简化设备存在性校验逻辑，移除对设备启用状态的检查，确保代码更清晰且易于维护。

♻️ refactor(machinery): 移除设备存在性校验中的启用状态检查
简化设备存在性校验逻辑，移除对设备启用状态的检查，确保代码更清晰且易于维护。
YunaiV
1 parent 90a621a8
Showing 7 changed files with 5 additions and 23 deletions
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/checkrecord/MesDvCheckRecordServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/maintenrecord/MesDvMaintenRecordServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/repair/MesDvRepairServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationMachineServiceImpl.java
@@ -42,7 +42,7 @@ public class MesDvCheckPlanMachineryServiceImpl implements MesDvCheckPlanMachine
         // 1.1 校验方案草稿状态
         MesDvCheckPlanDO currentPlan = checkPlanService.validateCheckPlanPrepare(createReqVO.getPlanId());
         // 1.2 校验设备存在
-        machineryService.validateMachineryExistsAndEnable(createReqVO.getMachineryId());
+        machineryService.validateMachineryExists(createReqVO.getMachineryId());
         // 1.3 校验同一方案下设备不重复
         if (checkPlanMachineryMapper.selectByPlanIdAndMachineryId(createReqVO.getPlanId(), createReqVO.getMachineryId()) != null) {
             throw exception(DV_CHECK_PLAN_MACHINERY_DUPLICATE);
@@ -170,7 +170,7 @@ public class MesDvCheckRecordServiceImpl implements MesDvCheckRecordService {
     private void validateCheckRecordSave(MesDvCheckRecordSaveReqVO reqVO) {
         // 校验设备是否存在
-        machineryService.validateMachineryExistsAndEnable(reqVO.getMachineryId());
+        machineryService.validateMachineryExists(reqVO.getMachineryId());
         // 校验点检计划是否存在
         if (reqVO.getPlanId() != null) {
             checkPlanService.validateCheckPlanExistsAndType(reqVO.getPlanId(), MesDvCheckPlanTypeEnum.CHECK.getType());
@@ -76,13 +76,6 @@ public interface MesDvMachineryService {
     void validateMachineryExists(Long id);
     /**
-     * 校验设备存在且启用
-     *
-     * @param id 编号
-     */
-    void validateMachineryExistsAndEnable(Long id);
-
-    /**
      * 获得设备列表
      *
      * @return 设备列表
@@ -132,17 +132,6 @@ public class MesDvMachineryServiceImpl implements MesDvMachineryService {
         }
     }
-    @Override
-    public void validateMachineryExistsAndEnable(Long id) {
-        MesDvMachineryDO machinery = machineryMapper.selectById(id);
-        if (machinery == null) {
-            throw exception(DV_MACHINERY_NOT_EXISTS);
-        }
-        if (ObjUtil.notEqual(CommonStatusEnum.ENABLE.getStatus(), machinery.getStatus())) {
-            throw exception(DV_MACHINERY_IS_DISABLE);
-        }
-    }
-
     private void validateMachineryCodeUnique(Long id, String code) {
         if (code == null) {
             return;
@@ -106,7 +106,7 @@ public class MesDvMaintenRecordServiceImpl implements MesDvMaintenRecordService 
     private void validateMaintenRecordRelation(MesDvMaintenRecordSaveReqVO reqVO) {
         // 校验设备是否存在
-        machineryService.validateMachineryExistsAndEnable(reqVO.getMachineryId());
+        machineryService.validateMachineryExists(reqVO.getMachineryId());
         // 校验保养计划是否存在
         if (reqVO.getPlanId() != null) {
             checkPlanService.validateCheckPlanExistsAndType(reqVO.getPlanId(), MesDvCheckPlanTypeEnum.MAINTENANCE.getType());
@@ -79,7 +79,7 @@ public class MesDvRepairServiceImpl implements MesDvRepairService {
         // 校验编码唯一
         validateCodeUnique(reqVO.getId(), reqVO.getCode());
         // 校验设备存在
-        machineryService.validateMachineryExistsAndEnable(reqVO.getMachineryId());
+        machineryService.validateMachineryExists(reqVO.getMachineryId());
     }
     private void validateCodeUnique(Long id, String code) {
@@ -47,7 +47,7 @@ public class MesMdWorkstationMachineServiceImpl implements MesMdWorkstationMachi
     private void validateWorkstationMachineSaveData(MesMdWorkstationMachineSaveReqVO reqVO) {
         // 校验设备是否存在
-        machineryService.validateMachineryExistsAndEnable(reqVO.getMachineryId());
+        machineryService.validateMachineryExists(reqVO.getMachineryId());
         // 校验该设备是否已分配到其他工作站（一台设备只能分配到一个工作站）
         MesMdWorkstationMachineDO existing = workstationMachineMapper.selectByMachineryId(reqVO.getMachineryId());
         if (existing != null) {