From b279c8493d28f00dba9fea7ca4cecfab382d3746 Mon Sep 17 00:00:00 2001 From: zhangxuanming <2260476558@qq.com> Date: Thu, 19 Dec 2024 16:14:48 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=B7=A5=E5=BA=8F=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C=EF=BC=8C=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E6=98=AF=E5=90=A6=E8=A2=AB=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pro/controller/ProProcessController.java | 2 +- .../mes/pro/mapper/ProRouteProcessMapper.java | 2 ++ .../mes/pro/service/IProProcessService.java | 6 ++++-- .../pro/service/IProRouteProcessService.java | 2 ++ .../service/impl/ProProcessServiceImpl.java | 18 +++++++++++++++--- .../impl/ProRouteProcessServiceImpl.java | 5 +++++ .../mapper/pro/ProRouteProcessMapper.xml | 7 +++++++ 7 files changed, 36 insertions(+), 6 deletions(-) diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProProcessController.java b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProProcessController.java index 76ef3b8..41323b5 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProProcessController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProProcessController.java @@ -125,6 +125,6 @@ public class ProProcessController extends BaseController @DeleteMapping("/{processIds}") public AjaxResult remove(@PathVariable Long[] processIds) { - return toAjax(proProcessService.deleteProProcessByProcessIds(processIds)); + return proProcessService.deleteProProcessByProcessIds(processIds); } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/mapper/ProRouteProcessMapper.java b/ktg-mes/src/main/java/com/ktg/mes/pro/mapper/ProRouteProcessMapper.java index be2c36f..3e13b55 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/mapper/ProRouteProcessMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/mapper/ProRouteProcessMapper.java @@ -90,4 +90,6 @@ public interface ProRouteProcessMapper List selectByRouteId(Long routeId); void updateBatch(@Param("entity") List list); + + List selectByProcessIds(@Param("entity") Long[] processIds); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/service/IProProcessService.java b/ktg-mes/src/main/java/com/ktg/mes/pro/service/IProProcessService.java index 6445670..220555a 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/service/IProProcessService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/service/IProProcessService.java @@ -1,6 +1,8 @@ package com.ktg.mes.pro.service; import java.util.List; + +import com.ktg.common.core.domain.AjaxResult; import com.ktg.mes.pro.domain.ProProcess; /** @@ -48,11 +50,11 @@ public interface IProProcessService /** * 批量删除生产工序 - * + * * @param processIds 需要删除的生产工序主键集合 * @return 结果 */ - public int deleteProProcessByProcessIds(Long[] processIds); + public AjaxResult deleteProProcessByProcessIds(Long[] processIds); /** * 删除生产工序信息 diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/service/IProRouteProcessService.java b/ktg-mes/src/main/java/com/ktg/mes/pro/service/IProRouteProcessService.java index 1be8850..e6083e0 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/service/IProRouteProcessService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/service/IProRouteProcessService.java @@ -109,4 +109,6 @@ public interface IProRouteProcessService * @return */ public int deleteByRouteId(Long routeId); + + List selectByProcessIds(Long[] processIds); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProProcessServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProProcessServiceImpl.java index 8512e3a..c3a59ce 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProProcessServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProProcessServiceImpl.java @@ -3,8 +3,12 @@ package com.ktg.mes.pro.service.impl; import java.util.List; import com.ktg.common.constant.UserConstants; +import com.ktg.common.core.domain.AjaxResult; import com.ktg.common.utils.DateUtils; import com.ktg.common.utils.StringUtils; +import com.ktg.mes.pro.domain.ProRouteProcess; +import com.ktg.mes.pro.service.IProRouteProcessService; +import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ktg.mes.pro.mapper.ProProcessMapper; @@ -23,6 +27,9 @@ public class ProProcessServiceImpl implements IProProcessService @Autowired private ProProcessMapper proProcessMapper; + @Autowired + private IProRouteProcessService proRouteProcessService; + /** * 查询生产工序 * @@ -106,14 +113,19 @@ public class ProProcessServiceImpl implements IProProcessService /** * 批量删除生产工序 - * + * * @param processIds 需要删除的生产工序主键 * @return 结果 */ @Override - public int deleteProProcessByProcessIds(Long[] processIds) + public AjaxResult deleteProProcessByProcessIds(Long[] processIds) { - return proProcessMapper.deleteProProcessByProcessIds(processIds); + // 查询当前工序有无关联工序流程 + List list = proRouteProcessService.selectByProcessIds(processIds); + if (list != null && list.size() > 0) { + return AjaxResult.error("工序已经被使用，无法删除"); + } + return AjaxResult.success(); } /** diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProRouteProcessServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProRouteProcessServiceImpl.java index a6f38d1..0864b37 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProRouteProcessServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProRouteProcessServiceImpl.java @@ -211,4 +211,9 @@ public class ProRouteProcessServiceImpl implements IProRouteProcessService public int deleteByRouteId(Long routeId) { return proRouteProcessMapper.deleteByRouteId(routeId); } + + @Override + public List selectByProcessIds(Long[] processIds) { + return proRouteProcessMapper.selectByProcessIds(processIds); + } } diff --git a/ktg-mes/src/main/resources/mapper/pro/ProRouteProcessMapper.xml b/ktg-mes/src/main/resources/mapper/pro/ProRouteProcessMapper.xml index eddfa83..b9feb17 100644 --- a/ktg-mes/src/main/resources/mapper/pro/ProRouteProcessMapper.xml +++ b/ktg-mes/src/main/resources/mapper/pro/ProRouteProcessMapper.xml @@ -114,6 +114,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + insert into pro_route_process