规格删除验证

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEnginSpecificationsController.java

@@ -109,6 +109,10 @@ public class ZEnginSpecificationsController extends BaseController {
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable String[] ids) {
-        return toAjax(iZEnginSpecificationsService.deleteWithValidByIds(Arrays.asList(ids), true));
+        Boolean b = iZEnginSpecificationsService.deleteWithValidByIds(Arrays.asList(ids), true);
+        if (!b){
+            return R.fail("规格已绑定用料预设,不能删除");
+        }
+        return R.ok("删除成功");
     }
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEnginSpecificationsServiceImpl.java

@@ -1,14 +1,17 @@
 package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.zdsz.domain.ZEngineeringMaterialsResets;
 import com.ruoyi.zdsz.domain.bo.ZBuildingBo;
 import com.ruoyi.zdsz.domain.vo.ZBuildingVo;
+import com.ruoyi.zdsz.mapper.ZEngineeringMaterialsResetsMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.ruoyi.zdsz.domain.bo.ZEnginSpecificationsBo;
@@ -17,9 +20,11 @@ import com.ruoyi.zdsz.domain.ZEnginSpecifications;
 import com.ruoyi.zdsz.mapper.ZEnginSpecificationsMapper;
 import com.ruoyi.zdsz.service.IZEnginSpecificationsService;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
+import java.util.stream.Collectors;
 
 /**
  * 工程材质规格Service业务层处理
@@ -32,6 +37,8 @@ import java.util.Collection;
 public class ZEnginSpecificationsServiceImpl implements IZEnginSpecificationsService {
 
     private final ZEnginSpecificationsMapper baseMapper;
+    @Resource
+    private ZEngineeringMaterialsResetsMapper materialsResetsMapper;
 
     /**
      * 查询工程材质规格
@@ -105,8 +112,14 @@ public class ZEnginSpecificationsServiceImpl implements IZEnginSpecificationsSer
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
+        if (isValid) {
+            if (!ObjectUtil.isEmpty(ids)) {
+                    LambdaQueryWrapper<ZEngineeringMaterialsResets> lqw1 = Wrappers.lambdaQuery();
+                    Long count = materialsResetsMapper.selectCount(lqw1.in(ZEngineeringMaterialsResets::getEstimatedSpecifications,ids));
+                    if (count > 0) {
+                        return false;
+                    }
+            }
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }