From b41bb318b431b793c824e1708b0aa7f448439f7c Mon Sep 17 00:00:00 2001 From: YunaiV Date: Thu, 16 Apr 2026 09:25:19 +0800 Subject: [PATCH] ♻️ refactor(machinery): 移除设备存在性校验中的启用状态检查 --- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/checkplan/MesDvCheckPlanMachineryServiceImpl.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/checkrecord/MesDvCheckRecordServiceImpl.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryService.java | 7 ------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryServiceImpl.java | 11 ----------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/maintenrecord/MesDvMaintenRecordServiceImpl.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/repair/MesDvRepairServiceImpl.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationMachineServiceImpl.java | 2 +- 7 files changed, 5 insertions(+), 23 deletions(-) diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/checkplan/MesDvCheckPlanMachineryServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/checkplan/MesDvCheckPlanMachineryServiceImpl.java index 26eef1e..ca112e1 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/checkplan/MesDvCheckPlanMachineryServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/checkplan/MesDvCheckPlanMachineryServiceImpl.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); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/checkrecord/MesDvCheckRecordServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/checkrecord/MesDvCheckRecordServiceImpl.java index 2582106..6eca888 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/checkrecord/MesDvCheckRecordServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/checkrecord/MesDvCheckRecordServiceImpl.java @@ -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()); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryService.java index 05be55c..5a5588d 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryService.java @@ -76,13 +76,6 @@ public interface MesDvMachineryService { void validateMachineryExists(Long id); /** - * 校验设备存在且启用 - * - * @param id 编号 - */ - void validateMachineryExistsAndEnable(Long id); - - /** * 获得设备列表 * * @return 设备列表 diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryServiceImpl.java index 4213e14..9e74cf6 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryServiceImpl.java @@ -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; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/maintenrecord/MesDvMaintenRecordServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/maintenrecord/MesDvMaintenRecordServiceImpl.java index 897183c..b364041 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/maintenrecord/MesDvMaintenRecordServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/maintenrecord/MesDvMaintenRecordServiceImpl.java @@ -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()); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/repair/MesDvRepairServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/repair/MesDvRepairServiceImpl.java index 41640bc..ea4d90a 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/repair/MesDvRepairServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/repair/MesDvRepairServiceImpl.java @@ -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) { diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationMachineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationMachineServiceImpl.java index 4c050be..b970352 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationMachineServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationMachineServiceImpl.java @@ -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) { -- libgit2 0.21.4