✨ feat(mes): 添加工序存在性校验功能，优化物料表单

YunaiV
1 parent b49798aa
Showing 2 changed files with 24 additions and 0 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdProductSipServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdProductSopServiceImpl.java
@@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.sip.MesMdProductS
 import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.sip.MesMdProductSipSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdProductSipDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.md.item.MesMdProductSipMapper;
+import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -27,10 +28,17 @@ public class MesMdProductSipServiceImpl implements MesMdProductSipService {
     @Resource
     private MesMdProductSipMapper productSipMapper;
+    @Resource
+    private MesProProcessService processService;
+
     @Override
     public Long createProductSip(MesMdProductSipSaveReqVO createReqVO) {
         // 校验排列顺序的唯一性
         validateSortUnique(createReqVO.getItemId(), createReqVO.getSort(), null);
+        // 校验工序存在
+        if (createReqVO.getProcessId() != null) {
+            processService.validateProcessExists(createReqVO.getProcessId());
+        }
         // 插入
         MesMdProductSipDO sip = BeanUtils.toBean(createReqVO, MesMdProductSipDO.class);
@@ -44,6 +52,10 @@ public class MesMdProductSipServiceImpl implements MesMdProductSipService {
         validateProductSipExists(updateReqVO.getId());
         // 校验排列顺序的唯一性
         validateSortUnique(updateReqVO.getItemId(), updateReqVO.getSort(), updateReqVO.getId());
+        // 校验工序存在
+        if (updateReqVO.getProcessId() != null) {
+            processService.validateProcessExists(updateReqVO.getProcessId());
+        }
         // 更新
         MesMdProductSipDO updateObj = BeanUtils.toBean(updateReqVO, MesMdProductSipDO.class);
@@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.sop.MesMdProductS
 import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.sop.MesMdProductSopSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdProductSopDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.md.item.MesMdProductSopMapper;
+import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -27,10 +28,17 @@ public class MesMdProductSopServiceImpl implements MesMdProductSopService {
     @Resource
     private MesMdProductSopMapper productSopMapper;
+    @Resource
+    private MesProProcessService processService;
+
     @Override
     public Long createProductSop(MesMdProductSopSaveReqVO createReqVO) {
         // 校验排列顺序的唯一性
         validateSortUnique(createReqVO.getItemId(), createReqVO.getSort(), null);
+        // 校验工序存在
+        if (createReqVO.getProcessId() != null) {
+            processService.validateProcessExists(createReqVO.getProcessId());
+        }
         // 插入
         MesMdProductSopDO sop = BeanUtils.toBean(createReqVO, MesMdProductSopDO.class);
@@ -44,6 +52,10 @@ public class MesMdProductSopServiceImpl implements MesMdProductSopService {
         validateProductSopExists(updateReqVO.getId());
         // 校验排列顺序的唯一性
         validateSortUnique(updateReqVO.getItemId(), updateReqVO.getSort(), updateReqVO.getId());
+        // 校验工序存在
+        if (updateReqVO.getProcessId() != null) {
+            processService.validateProcessExists(updateReqVO.getProcessId());
+        }
         // 更新
         MesMdProductSopDO updateObj = BeanUtils.toBean(updateReqVO, MesMdProductSopDO.class);