更新删除校验

admin/src/main/resources/i18n/messages.properties

@@ -224,4 +224,6 @@ qc.error.error7=\u68C0\u6D4B\u9879\u540D\u79F0\u5DF2\u5B58\u5728
 system.printer.error.repeat.bind=\u8BE5\u6253\u5370\u673A\u5DF2\u7ED1\u5B9A\u4E86
 rule.currentSerial.error= \u8BE5\u4EA7\u54C1\u5E8F\u5217\u53F7\u5269\u4F59:{0}\u4E0D\u6EE1\u8DB3\u5DE5\u5355\u6570\u91CF:{1}
 #\u5DE5\u4F5C\u5355\u5143\u7F16\u4E0D\u552F\u4E00
-md.workUnit.error.workunitCode.unique = \u5DE5\u5355\u5355\u5143\u7F16\u7801\u5DF2\u5B58\u5728
+md.workUnit.error.workunitCode.unique = \u5DE5\u5355\u5355\u5143\u7F16\u7801\u5DF2\u5B58\u5728
\ No newline at end of file
+#被删除数据已被使用错误
+delete.data.error.occupied = \u8be5\u6570\u636e\u5df2\u7ecf\u88ab\u5173\u8054\u4f7f\u7528\uff0c\u65e0\u6cd5\u5220\u9664
\ No newline at end of file

admin/src/main/resources/i18n/messages_en.properties

@@ -214,4 +214,6 @@ qc.error.error7=Inspection item name already exists.
 system.printer.error.repeat.bind=This printer has been bound.
 rule.currentSerial.error= The remaining quantity of the product serial number is insufficient ：{0} , workorder quantity :  {1}
 #工作单元编不唯一
-md.workUnit.error.workunitCode.unique =  unique workunitCode.
+md.workUnit.error.workunitCode.unique =  unique workunitCode.
\ No newline at end of file
+#被删除数据已被使用错误
+delete.data.error.occupied = The data that needs to be deleted has been used
\ No newline at end of file

admin/src/main/resources/i18n/messages_th.properties

@@ -224,4 +224,6 @@ md.workStation.error.productionSolutionCode.unique = ProductionSolutionCode:\u00
 md.workStation.error.productionSolutionCode.size = ProductionSolutionCode:\u0020\u0E21\u0E35\u0E04\u0E48\u0E32\u0E21\u0E32\u0E01\u0E02\u0E36\u0E49\u0E19\u0E2D\u0E22\u0E39\u0E48\u0E41\u0E25\u0E49\u0E27
 rule.currentSerial.error= \u0E2B\u0E21\u0E32\u0E22\u0E40\u0E25\u0E02\u0E1C\u0E25\u0E34\u0E15\u0E20\u0E31\u0E13\u0E11\u0E4C\u0020\u0E40\u0E2B\u0E25\u0E37\u0E2D {0},\u0E44\u0E21\u0E48\u0E40\u0E1B\u0E47\u0E19\u0E44\u0E1B\u0E15\u0E32\u0E21\u0E08\u0E33\u0E19\u0E27\u0E19\u0E43\u0E1A\u0E2A\u0E31\u0E48\u0E07\u0E07\u0E32\u0E19{1}
 #\u5DE5\u4F5C\u5355\u5143\u7F16\u4E0D\u552F\u4E00
-md.workUnit.error.workunitCode.unique = \u0E2B\u0E21\u0E32\u0E22\u0E40\u0E25\u0E02\u0E17\u0E35\u0E48\u0E21\u0E35\u0E2D\u0E22\u0E39\u0E48\u0E41\u0E25\u0E49\u0E27
+md.workUnit.error.workunitCode.unique = \u0E2B\u0E21\u0E32\u0E22\u0E40\u0E25\u0E02\u0E17\u0E35\u0E48\u0E21\u0E35\u0E2D\u0E22\u0E39\u0E48\u0E41\u0E25\u0E49\u0E27
\ No newline at end of file
+#被删除数据已被使用错误
+delete.data.error.occupied = \u0e02\u0e49\u0e2d\u0e21\u0e39\u0e25\u0e17\u0e35\u0e48\u0e15\u0e49\u0e2d\u0e07\u0e01\u0e32\u0e23\u0e25\u0e1a\u0e44\u0e14\u0e49\u0e16\u0e39\u0e01\u0e43\u0e0a\u0e49\u0e44\u0e1b\u0e41\u0e25\u0e49\u0e27
\ No newline at end of file

admin/src/main/resources/i18n/messages_zh_CN.properties

@@ -217,4 +217,6 @@ qc.error.error7=\u68C0\u6D4B\u9879\u540D\u79F0\u5DF2\u5B58\u5728
 system.printer.error.repeat.bind=\u8BE5\u6253\u5370\u673A\u5DF2\u7ED1\u5B9A\u4E86
 rule.currentSerial.error= \u8BE5\u4EA7\u54C1\u5E8F\u5217\u53F7\u5269\u4F59:{0}\u4E0D\u6EE1\u8DB3\u5DE5\u5355\u6570\u91CF:{1}
 #工作单元编不唯一
-md.workUnit.error.workunitCode.unique = \u5de5\u5355\u5355\u5143\u7f16\u7801\u5df2\u5b58\u5728
+md.workUnit.error.workunitCode.unique = \u5de5\u5355\u5355\u5143\u7f16\u7801\u5df2\u5b58\u5728
\ No newline at end of file
+#被删除数据已被使用错误
+delete.data.error.occupied = \u8be5\u6570\u636e\u5df2\u7ecf\u88ab\u5173\u8054\u4f7f\u7528\uff0c\u65e0\u6cd5\u5220\u9664
\ No newline at end of file

mes/src/main/java/com/ximai/mes/md/service/impl/MdWorkstationWorkerServiceImpl.java

 package com.ximai.mes.md.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ximai.common.constant.UserConstants;
+import com.ximai.common.utils.MessageUtils;
 import com.ximai.common.utils.data.DateUtils;
+import com.ximai.common.utils.data.ExceptionUtil;
 import com.ximai.common.utils.data.StringUtils;
 import com.ximai.mes.md.domain.MdWorkstationWorker;
+import com.ximai.mes.md.domain.MdWorkunit;
 import com.ximai.mes.md.mapper.MdWorkstationWorkerMapper;
+import com.ximai.mes.md.mapper.MdWorkunitMapper;
 import com.ximai.mes.md.service.IMdWorkstationWorkerService;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -21,6 +27,9 @@ public class MdWorkstationWorkerServiceImpl implements IMdWorkstationWorkerServi
     @Autowired
     private MdWorkstationWorkerMapper mdWorkstationWorkerMapper;
 
+    @Autowired
+    private MdWorkunitMapper mdWorkunitMapper;
+
     /**
      * 查询人力资源
      *
@@ -111,6 +120,10 @@ public class MdWorkstationWorkerServiceImpl implements IMdWorkstationWorkerServi
 
     @Override
     public int deleteByWorkstationId(Long workstationId) {
+        //校验数据
+        QueryWrapper<MdWorkunit> query = new QueryWrapper<>();
+        query.eq("t1.workstation_id",workstationId);
+        ExceptionUtil.checkTrueThrowException(mdWorkunitMapper.selectListByQw(query).size() > 0, MessageUtils.message("delete.data.error.occupied"));
         return mdWorkstationWorkerMapper.deleteByWorkstationId(workstationId);
     }
 }

mes/src/main/java/com/ximai/mes/md/service/impl/MdWorkunitServiceImpl.java

@@ -8,12 +8,16 @@ import com.ximai.common.utils.MessageUtils;
 import com.ximai.common.utils.data.DateUtils;
 import com.ximai.common.utils.data.ExceptionUtil;
 import com.ximai.common.utils.data.StringUtils;
+import com.ximai.mes.cal.domain.CalPlanWorkunit;
+import com.ximai.mes.cal.mapper.CalPlanWorkunitMapper;
 import com.ximai.mes.constant.TaskStatusEnum;
 import com.ximai.mes.constant.TaskWorkunitStatusEnum;
 import com.ximai.mes.md.domain.MdWorkstation;
 import com.ximai.mes.md.domain.MdWorkunit;
+import com.ximai.mes.md.domain.MdWorkunitWorker;
 import com.ximai.mes.md.mapper.MdWorkstationMapper;
 import com.ximai.mes.md.mapper.MdWorkunitMapper;
+import com.ximai.mes.md.mapper.MdWorkunitWorkerMapper;
 import com.ximai.mes.md.service.IMdWorkunitService;
 import com.ximai.mes.md.vo.MdWorkunitVo;
 import com.ximai.mes.pro.domain.task.ProTask;
@@ -48,7 +52,10 @@ public class MdWorkunitServiceImpl implements IMdWorkunitService {
     private IProTaskService proTaskService;
     @Resource
     private MdWorkstationMapper mdWorkstationMapper;
-
+    @Autowired
+    private CalPlanWorkunitMapper calPlanWorkunitMapper;
+    @Autowired
+    private MdWorkunitWorkerMapper mdWorkunitWorkerMapper;
     /**
      * 查询工作单元
      *
@@ -141,6 +148,7 @@ public class MdWorkunitServiceImpl implements IMdWorkunitService {
      */
     @Override
     public int deleteMdWorkunitByWorkunitIds(Long[] workunitIds) {
+        deleteCheck(workunitIds);
         return mdWorkunitMapper.deleteMdWorkunitByWorkunitIds(workunitIds);
     }
 
@@ -152,9 +160,34 @@ public class MdWorkunitServiceImpl implements IMdWorkunitService {
      */
     @Override
     public int deleteMdWorkunitByWorkunitId(Long workunitId) {
+        Long[] longs = new Long[1];
+        longs[0] = workunitId;
+        deleteCheck(longs);
         return mdWorkunitMapper.deleteMdWorkunitByWorkunitId(workunitId);
     }
 
+    public void deleteCheck(Long[] workunitIds){
+        for (Long  workunitId : workunitIds){
+            ProTaskWorkunit proTaskWorkunit = new ProTaskWorkunit();
+            proTaskWorkunit.setWorkunitId(workunitId);
+            List<ProTaskWorkunit> proTaskWorkunits = proTaskWorkunitMapper.selectProTaskWorkunitList(proTaskWorkunit);
+            if (proTaskWorkunits.size() != 0) {
+                ExceptionUtil.checkTrueThrowException(true, MessageUtils.message("md.workUnit.error.can.not.remove"));
+            }
+            CalPlanWorkunit calPlanWorkunit = new CalPlanWorkunit();
+            calPlanWorkunit.setWorkunitId(workunitId);
+            List<CalPlanWorkunit> calPlanWorkunits = calPlanWorkunitMapper.selectCalPlanWorkunitList(calPlanWorkunit);
+            if (calPlanWorkunits.size() != 0) {
+                ExceptionUtil.checkTrueThrowException(true, MessageUtils.message("md.workUnit.error.can.not.remove"));
+            }
+            MdWorkunitWorker mdWorkunitWorker = new MdWorkunitWorker();
+            mdWorkunitWorker.setWorkunitId(workunitId);
+            List<MdWorkunitWorker> mdWorkunitWorkers = mdWorkunitWorkerMapper.selectMdWorkunitWorkerList(mdWorkunitWorker);
+            if (mdWorkunitWorkers.size() != 0) {
+                ExceptionUtil.checkTrueThrowException(true, MessageUtils.message("md.workUnit.error.can.not.remove"));
+            }
+        }
+    }
 
     @Override
     @Transactional

mes/src/main/java/com/ximai/mes/pro/service/impl/productionSolution/ProProductionSolutionServiceImpl.java

@@ -15,6 +15,7 @@ import com.ximai.mes.md.domain.MdWorkstation;
 import com.ximai.mes.md.mapper.MdItemMapper;
 import com.ximai.mes.md.mapper.MdWorkstationMapper;
 import com.ximai.mes.pro.domain.ProProcess;
+import com.ximai.mes.pro.domain.proWorkOrder.ProWorkorder;
 import com.ximai.mes.pro.domain.productionSolution.*;
 import com.ximai.mes.pro.domain.prototypeRequest.ProPrototypeRequestProcessQcindex;
 import com.ximai.mes.pro.domain.vo.*;
@@ -22,12 +23,14 @@ import com.ximai.mes.pro.dto.productionSolution.ProProductionSolutionProcessDraw
 import com.ximai.mes.pro.dto.productionSolution.ProProductionSolutionProcessDrawingDto;
 import com.ximai.mes.pro.dto.productionSolution.ProProductionSolutionProcessDrawingUpdate;
 import com.ximai.mes.pro.mapper.ProProcessMapper;
+import com.ximai.mes.pro.mapper.proWorkOrder.ProWorkorderMapper;
 import com.ximai.mes.pro.mapper.productionSolution.*;
 import com.ximai.mes.pro.service.productionSolution.IProProductionSolutionProcessDrawingService;
 import com.ximai.mes.pro.service.productionSolution.IProProductionSolutionProcessQcindexService;
 import com.ximai.mes.pro.service.productionSolution.IProProductionSolutionProcessToolService;
 import com.ximai.mes.pro.service.productionSolution.IProProductionSolutionService;
 import com.ximai.system.strategy.AutoCodeUtil;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -97,6 +100,8 @@ public class ProProductionSolutionServiceImpl implements IProProductionSolutionS
     @Autowired
     private IProProductionSolutionProcessDrawingService productionSolutionProcessDrawingService;
 
+    @Autowired
+    private ProWorkorderMapper proWorkorderMapper;
     /**
      * 查询生产版本
      *
@@ -534,6 +539,15 @@ public class ProProductionSolutionServiceImpl implements IProProductionSolutionS
         return 1;
     }
 
+    public void deleteCheck(Long[] productionSolutionIds){
+        for (Long productionSolutionId : productionSolutionIds){
+            QueryWrapper<ProWorkorder> query = new QueryWrapper<>();
+            query.eq("t1.production_solution_id",productionSolutionId);
+            List<ProWorkorder>  proWorkorders = proWorkorderMapper.selectListByQw(query);
+            ExceptionUtil.checkTrueThrowException(proWorkorders.size() > 0 , MessageUtils.message("delete.data.error.occupied"));
+        }
+
+    }
 
     /**
      * 批量删除生产版本
@@ -544,6 +558,7 @@ public class ProProductionSolutionServiceImpl implements IProProductionSolutionS
     @Transactional
     @Override
     public int deleteProProductionSolutionByProductionSolutionIds(Long[] productionSolutionIds) {
+        deleteCheck(productionSolutionIds);
         if (StringUtils.isNotNull(productionSolutionIds)) {
             for (Long productionSolutionId : productionSolutionIds) {
                 deleteProProductionSolutionByProductionSolutionId(productionSolutionId);