121

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/controller/ProdCategoryController.java

@@ -68,7 +68,7 @@ public class ProdCategoryController {
      */
     @RequestMapping("delete")
     public HttpRespMsg delete(@RequestParam Integer id){
-        return prodCategoryService.delete(id);
+        return prodCategoryService.delete(id,request);
     }
 
 }

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/ProdCategoryService.java

@@ -18,5 +18,5 @@ public interface ProdCategoryService extends IService<ProdCategory> {
 
     HttpRespMsg saveOrUpdateInfo(ProdCategory prodCategory, HttpServletRequest request);
 
-    HttpRespMsg delete(Integer id);
+    HttpRespMsg delete(Integer id, HttpServletRequest request);
 }

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/ProdCategoryServiceImpl.java

@@ -59,17 +59,28 @@ public class ProdCategoryServiceImpl extends ServiceImpl<ProdCategoryMapper, Pro
     }
 
     @Override
-    public HttpRespMsg delete(Integer id) {
+    public HttpRespMsg delete(Integer id, HttpServletRequest request) {
         HttpRespMsg msg=new HttpRespMsg();
+        String token = request.getHeader("Token");
+        User user = userMapper.selectById(token);
 
         Integer count = productMapper.selectCount(
                 new LambdaQueryWrapper<Product>()
                         .eq(id != null, Product::getCategoryId, id)
+                .eq(user.getCompanyId()!=null,Product::getCompanyId,user.getCompanyId())
         );
+
+
         if(count==0){
-            prodCategoryMapper.deleteById(id);
+
+             if(prodCategoryMapper.selectCount(new LambdaQueryWrapper<ProdCategory>().eq(user.getCompanyId()!=null,ProdCategory::getCompanyId,user.getCompanyId()))==1){
+                 msg.setError("产品分类数量不能低于1");
+             }else{
+                 prodCategoryMapper.deleteById(id);
+             }
+
         }else{
-            msg.setError("category is used");
+            msg.setError("已有产品为此分类，无法删除");
         }
 
         return msg;

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/ProdProcedureServiceImpl.java

@@ -2,11 +2,14 @@ package com.management.platform.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.management.platform.entity.PlanProcedureTotal;
 import com.management.platform.entity.ProdProcedure;
 import com.management.platform.entity.User;
+import com.management.platform.mapper.PlanProcedureTotalMapper;
 import com.management.platform.mapper.ProdProcedureMapper;
 import com.management.platform.mapper.ProductMapper;
 import com.management.platform.mapper.UserMapper;
+import com.management.platform.service.PlanProcedureTotalService;
 import com.management.platform.service.ProdProcedureService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.management.platform.util.HttpRespMsg;
@@ -38,7 +41,8 @@ public class ProdProcedureServiceImpl extends ServiceImpl<ProdProcedureMapper, P
     private UserMapper userMapper;
     @Resource
     private ProductMapper productMapper;
-
+    @Resource
+    private PlanProcedureTotalMapper planProcedureTotalMapper;
 
     @Override
     public HttpRespMsg changeProdProcedure(HttpServletRequest request, List<ProdProcedure> prodProcedureList, Integer productId, String productName, String version) {
@@ -113,11 +117,21 @@ public class ProdProcedureServiceImpl extends ServiceImpl<ProdProcedureMapper, P
 
     @Override
     public HttpRespMsg isDelete(HttpServletRequest request, Integer deleteId) {
-        HttpRespMsg msg = new HttpRespMsg();
-        //TODO: 检查工序是否已经被使用，被使用的不能删除
+        HttpRespMsg httpRespMsg=new HttpRespMsg();
         boolean flag=true;
-        msg.setData(flag);
-        return msg;
+
+
+        Integer count = planProcedureTotalMapper.selectCount(
+                new LambdaQueryWrapper<PlanProcedureTotal>()
+                        .eq(deleteId != null, PlanProcedureTotal::getProdProcedureId, deleteId)
+        );
+
+        if(count>0){
+            flag=false;
+        }
+
+        httpRespMsg.setData(flag);
+        return httpRespMsg;
     }
 
     @Override