From 5374c2f32ed736b6f0df3c13d13f286c119b899c Mon Sep 17 00:00:00 2001 From: "JinLu.Yin" <411641505@qq.com> Date: Fri, 13 May 2022 23:20:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E7=BB=84=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProRouteProcessController.java | 60 +++++++++++++++++++ .../mes/pro/mapper/ProRouteProcessMapper.java | 5 ++ .../pro/service/IProRouteProcessService.java | 20 +++++++ .../impl/ProRouteProcessServiceImpl.java | 20 +++++++ .../mapper/pro/ProRouteProcessMapper.xml | 33 ++++++++++ 5 files changed, 138 insertions(+) diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProRouteProcessController.java b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProRouteProcessController.java index 254e677..a7c48cb 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProRouteProcessController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProRouteProcessController.java @@ -4,6 +4,9 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.ktg.common.constant.UserConstants; +import com.ktg.common.utils.StringUtils; +import com.ktg.mes.pro.domain.ProProcess; +import com.ktg.mes.pro.service.IProProcessService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -36,6 +39,9 @@ public class ProRouteProcessController extends BaseController @Autowired private IProRouteProcessService proRouteProcessService; + @Autowired + private IProProcessService proProcessService; + /** * 查询工艺组成列表 */ @@ -82,6 +88,33 @@ public class ProRouteProcessController extends BaseController if(UserConstants.NOT_UNIQUE.equals(proRouteProcessService.checkOrderNumExists(proRouteProcess))){ return AjaxResult.error("序号已存在！"); } + if(UserConstants.NOT_UNIQUE.equals(proRouteProcessService.checkProcessExists(proRouteProcess))){ + return AjaxResult.error("不能重复添加工序！"); + } + ProProcess process = proProcessService.selectProProcessByProcessId(proRouteProcess.getProcessId()); + proRouteProcess.setProcessCode(process.getProcessCode()); + proRouteProcess.setProcessName(process.getProcessName()); + + //更新上一个工序的nextProcess + ProRouteProcess preProcess = proRouteProcessService.findPreProcess(proRouteProcess); + if(StringUtils.isNotNull(preProcess)){ + preProcess.setNextProcessId(proRouteProcess.getProcessId()); + preProcess.setNextProcessCode(proRouteProcess.getProcessCode()); + preProcess.setNextProcessName(proRouteProcess.getProcessName()); + proRouteProcessService.updateProRouteProcess(preProcess); + } + + //设置当前工序的nextProcess + ProRouteProcess nextProcess = proRouteProcessService.findNextProcess(proRouteProcess); + if(StringUtils.isNotNull(nextProcess)){ + proRouteProcess.setNextProcessId(nextProcess.getProcessId()); + proRouteProcess.setNextProcessCode(nextProcess.getProcessCode()); + proRouteProcess.setNextProcessName(nextProcess.getProcessName()); + }else{ + proRouteProcess.setNextProcessId(0L); + proRouteProcess.setNextProcessName("无"); + } + return toAjax(proRouteProcessService.insertProRouteProcess(proRouteProcess)); } @@ -96,6 +129,33 @@ public class ProRouteProcessController extends BaseController if(UserConstants.NOT_UNIQUE.equals(proRouteProcessService.checkOrderNumExists(proRouteProcess))){ return AjaxResult.error("序号已存在！"); } + if(UserConstants.NOT_UNIQUE.equals(proRouteProcessService.checkProcessExists(proRouteProcess))){ + return AjaxResult.error("不能重复添加工序！"); + } + ProProcess process = proProcessService.selectProProcessByProcessId(proRouteProcess.getProcessId()); + proRouteProcess.setProcessCode(process.getProcessCode()); + proRouteProcess.setProcessName(process.getProcessName()); + + //更新上一个工序的nextProcess + ProRouteProcess preProcess = proRouteProcessService.findPreProcess(proRouteProcess); + if(StringUtils.isNotNull(preProcess)){ + preProcess.setNextProcessId(proRouteProcess.getProcessId()); + preProcess.setNextProcessCode(proRouteProcess.getProcessCode()); + preProcess.setNextProcessName(proRouteProcess.getProcessName()); + proRouteProcessService.updateProRouteProcess(preProcess); + } + + //设置当前工序的nextProcess + ProRouteProcess nextProcess = proRouteProcessService.findNextProcess(proRouteProcess); + if(StringUtils.isNotNull(nextProcess)){ + proRouteProcess.setNextProcessId(nextProcess.getProcessId()); + proRouteProcess.setNextProcessCode(nextProcess.getProcessCode()); + proRouteProcess.setNextProcessName(nextProcess.getProcessName()); + }else{ + proRouteProcess.setNextProcessId(0L); + proRouteProcess.setNextProcessName("无"); + } + return toAjax(proRouteProcessService.updateProRouteProcess(proRouteProcess)); } 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 8196b26..ac50ef4 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 @@ -2,6 +2,7 @@ package com.ktg.mes.pro.mapper; import java.util.List; import com.ktg.mes.pro.domain.ProRouteProcess; +import org.springframework.security.core.parameters.P; /** * 工艺组成Mapper接口 @@ -28,7 +29,11 @@ public interface ProRouteProcessMapper public List selectProRouteProcessList(ProRouteProcess proRouteProcess); public ProRouteProcess checkOrderNumExists(ProRouteProcess proRouteProcess); + public ProRouteProcess checkProcessExists(ProRouteProcess proRouteProcess); + public ProRouteProcess findPreProcess(ProRouteProcess proRouteProcess); + + public ProRouteProcess findNextProcess(ProRouteProcess proRouteProcess); /** * 新增工艺组成 * 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 a9ea50a..1c4d4eb 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 @@ -34,6 +34,26 @@ public interface IProRouteProcessService */ public String checkOrderNumExists(ProRouteProcess proRouteProcess); + /** + * 检查工序是否已经存在 + * @param proRouteProcess + * @return + */ + public String checkProcessExists(ProRouteProcess proRouteProcess); + + /** + * 查找上一个工序 + * @param proRouteProcess + * @return + */ + public ProRouteProcess findPreProcess(ProRouteProcess proRouteProcess); + + /** + * 查找下一个工序 + * @param proRouteProcess + * @return + */ + public ProRouteProcess findNextProcess(ProRouteProcess proRouteProcess); /** * 新增工艺组成 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 23e7dfe..4572601 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 @@ -57,6 +57,26 @@ public class ProRouteProcessServiceImpl implements IProRouteProcessService return UserConstants.UNIQUE; } + @Override + public String checkProcessExists(ProRouteProcess proRouteProcess) { + ProRouteProcess process = proRouteProcessMapper.checkProcessExists(proRouteProcess); + Long recordId = proRouteProcess.getRecordId()==null?-1L:proRouteProcess.getRecordId(); + if(StringUtils.isNotNull(process) && process.getRecordId().longValue() != recordId.longValue()){ + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + @Override + public ProRouteProcess findPreProcess(ProRouteProcess proRouteProcess) { + return proRouteProcessMapper.findPreProcess(proRouteProcess); + } + + @Override + public ProRouteProcess findNextProcess(ProRouteProcess proRouteProcess) { + return proRouteProcessMapper.findNextProcess(proRouteProcess); + } + /** * 新增工艺组成 * diff --git a/ktg-mes/src/main/resources/mapper/pro/ProRouteProcessMapper.xml b/ktg-mes/src/main/resources/mapper/pro/ProRouteProcessMapper.xml index 56353cf..f431930 100644 --- a/ktg-mes/src/main/resources/mapper/pro/ProRouteProcessMapper.xml +++ b/ktg-mes/src/main/resources/mapper/pro/ProRouteProcessMapper.xml @@ -62,6 +62,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where route_id = #{routeId} and order_num = #{orderNum} limit 1 + + + + + + insert into pro_route_process