From e450cf0a4fa025d25dcb897d36ed40a48fd1bab2 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Mon, 25 Sep 2023 16:11:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E7=BB=84=E6=88=90=E5=B7=A5?= =?UTF-8?q?=E5=BA=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProRouteProcessController.java | 15 +++- .../mapper/ProRouteProcessMapper.java | 10 ++- .../service/IProRouteProcessService.java | 1 - .../impl/ProRouteProcessServiceImpl.java | 83 ++++++++++++++----- .../technology/ProRouteProcessMapper.xml | 48 ++++++++--- 5 files changed, 118 insertions(+), 39 deletions(-) diff --git a/op-modules/op-technology/src/main/java/com/op/technology/controller/ProRouteProcessController.java b/op-modules/op-technology/src/main/java/com/op/technology/controller/ProRouteProcessController.java index c82bbdb55..8ab224b9b 100644 --- a/op-modules/op-technology/src/main/java/com/op/technology/controller/ProRouteProcessController.java +++ b/op-modules/op-technology/src/main/java/com/op/technology/controller/ProRouteProcessController.java @@ -89,11 +89,14 @@ public class ProRouteProcessController extends BaseController // if(!proRouteProcessService.checkOrderNumExists(proRouteProcess)){ // return AjaxResult.error("序号已存在！"); // } - if(!proRouteProcessService.checkProcessExists(proRouteProcess)){ + if(proRouteProcessService.checkProcessExists(proRouteProcess)){ return AjaxResult.error("不能重复添加工序！"); } - if(UserConstants.YES.equals(proRouteProcess.getKeyFlag()) && !proRouteProcessService.checkUpdateFlagUnique(proRouteProcess)){ - return AjaxResult.error("当前工艺路线已经指定过关键工序"); +// if(UserConstants.YES.equals(proRouteProcess.getKeyFlag()) && !proRouteProcessService.checkUpdateFlagUnique(proRouteProcess)){ +// return AjaxResult.error("当前工艺路线已经指定过关键工序"); +// } + if(proRouteProcessService.checkUpdateFlagUnique(proRouteProcess) && proRouteProcess.getKeyFlag().equals("Y")){ + return AjaxResult.error("当前工艺路线已经指定过关键工序！"); } ProProcess process = proProcessService.selectProProcessByProcessId(proRouteProcess.getProcessId()); proRouteProcess.setProcessCode(process.getProcessCode()); @@ -133,12 +136,16 @@ public class ProRouteProcessController extends BaseController // if(!proRouteProcessService.checkOrderNumExists(proRouteProcess)){ // return AjaxResult.error("序号已存在！"); // } - if(!proRouteProcessService.checkProcessExists(proRouteProcess)){ + //判断修改的是本条数据 + if(proRouteProcessService.checkProcessExists(proRouteProcess)){ return AjaxResult.error("不能重复添加工序！"); } // if(UserConstants.YES.equals(proRouteProcess.getKeyFlag()) && !proRouteProcessService.checkUpdateFlagUnique(proRouteProcess)){ // return AjaxResult.error("当前工艺路线已经指定过关键工序"); // } + if(proRouteProcessService.checkUpdateFlagUnique(proRouteProcess) && proRouteProcess.getKeyFlag().equals("Y")){ + return AjaxResult.error("当前工艺路线已经指定过关键工序！"); + } ProProcess process = proProcessService.selectProProcessByProcessId(proRouteProcess.getProcessId()); proRouteProcess.setProcessCode(process.getProcessCode()); proRouteProcess.setProcessName(process.getProcessName()); diff --git a/op-modules/op-technology/src/main/java/com/op/technology/mapper/ProRouteProcessMapper.java b/op-modules/op-technology/src/main/java/com/op/technology/mapper/ProRouteProcessMapper.java index 8eb98f324..5d4ef44c1 100644 --- a/op-modules/op-technology/src/main/java/com/op/technology/mapper/ProRouteProcessMapper.java +++ b/op-modules/op-technology/src/main/java/com/op/technology/mapper/ProRouteProcessMapper.java @@ -32,8 +32,8 @@ public interface ProRouteProcessMapper public List selectProRouteProcessList(ProRouteProcess proRouteProcess); public ProRouteProcess checkOrderNumExists(ProRouteProcess proRouteProcess); - public ProRouteProcess checkProcessExists(ProRouteProcess proRouteProcess); - public ProRouteProcess checkUpdateFlagUnique(ProRouteProcess proRouteProcess); + public String checkProcessExists(ProRouteProcess proRouteProcess); + public List checkUpdateFlagUnique(ProRouteProcess proRouteProcess); public ProRouteProcess findPreProcess(ProRouteProcess proRouteProcess); @@ -76,4 +76,10 @@ public interface ProRouteProcessMapper * @return */ public int deleteByRouteId(String routeId); + + //查询修改的是不是本条数据 + String checkProcessIdExist(ProRouteProcess proRouteProcess); + + //查询关键工序是不是本条数据 + String checkProcessFlagExist(ProRouteProcess proRouteProcess); } diff --git a/op-modules/op-technology/src/main/java/com/op/technology/service/IProRouteProcessService.java b/op-modules/op-technology/src/main/java/com/op/technology/service/IProRouteProcessService.java index e5ee144da..02c5bc801 100644 --- a/op-modules/op-technology/src/main/java/com/op/technology/service/IProRouteProcessService.java +++ b/op-modules/op-technology/src/main/java/com/op/technology/service/IProRouteProcessService.java @@ -37,7 +37,6 @@ public interface IProRouteProcessService /** * 检查工序是否已经存在 - * @param proRouteProcess * @return */ public Boolean checkProcessExists(ProRouteProcess proRouteProcess); diff --git a/op-modules/op-technology/src/main/java/com/op/technology/service/impl/ProRouteProcessServiceImpl.java b/op-modules/op-technology/src/main/java/com/op/technology/service/impl/ProRouteProcessServiceImpl.java index 4fb70ab13..9b378b5e4 100644 --- a/op-modules/op-technology/src/main/java/com/op/technology/service/impl/ProRouteProcessServiceImpl.java +++ b/op-modules/op-technology/src/main/java/com/op/technology/service/impl/ProRouteProcessServiceImpl.java @@ -67,27 +67,27 @@ public class ProRouteProcessServiceImpl implements IProRouteProcessService return UserConstants.UNIQUE; } - @Override - @DS("#header.poolName") - public Boolean checkProcessExists(ProRouteProcess proRouteProcess) { - ProRouteProcess process = proRouteProcessMapper.checkProcessExists(proRouteProcess); - String recordId = proRouteProcess.getRecordId(); - if(StringUtils.isNotNull(process) && process.getRecordId().equals(recordId) ){ - return UserConstants.NOT_UNIQUE; - } - return UserConstants.UNIQUE; - } +// @Override +// @DS("#header.poolName") +// public Boolean checkProcessExists(ProRouteProcess proRouteProcess) { +// ProRouteProcess process = proRouteProcessMapper.checkProcessExists(proRouteProcess); +// String recordId = proRouteProcess.getRecordId(); +// if(StringUtils.isNotNull(process) && process.getRecordId().equals(recordId) ){ +// return UserConstants.NOT_UNIQUE; +// } +// return UserConstants.UNIQUE; +// } - @Override - @DS("#header.poolName") - public Boolean checkUpdateFlagUnique(ProRouteProcess proRouteProcess) { - ProRouteProcess process = proRouteProcessMapper.checkUpdateFlagUnique(proRouteProcess); - String recordId = proRouteProcess.getRecordId(); - if(StringUtils.isNotNull(process) && process.getRecordId().equals(recordId)){ - return UserConstants.NOT_UNIQUE; - } - return UserConstants.UNIQUE; - } +// @Override +// @DS("#header.poolName") +// public Boolean checkUpdateFlagUnique(ProRouteProcess proRouteProcess) { +// ProRouteProcess process = proRouteProcessMapper.checkUpdateFlagUnique(proRouteProcess); +// String recordId = proRouteProcess.getRecordId(); +// if(StringUtils.isNotNull(process) && process.getRecordId().equals(recordId)){ +// return UserConstants.NOT_UNIQUE; +// } +// return UserConstants.UNIQUE; +// } // @Override // public boolean checkKeyProcess(ProFeedback feedback) { @@ -191,4 +191,47 @@ public class ProRouteProcessServiceImpl implements IProRouteProcessService public int deleteByRouteId(String routeId) { return proRouteProcessMapper.deleteByRouteId(routeId); } + + + /** + * 判断工序编码信息 + * + * @return 结果 + */ + @Override + @DS("#header.poolName") + public Boolean checkProcessExists(ProRouteProcess proRouteProcess){ + String code = proRouteProcessMapper.checkProcessExists(proRouteProcess); + //查询修改的是不是本条数据 + String id = proRouteProcessMapper.checkProcessIdExist(proRouteProcess); + if(code == null || id.equals(proRouteProcess.getRecordId())){ + return false; + }else{ + return true; + } + } + + /** + * 判断关键工序是否唯一 + * + * @return 结果 + */ + @Override + @DS("#header.poolName") + public Boolean checkUpdateFlagUnique(ProRouteProcess proRouteProcess){ + List keyFlag = proRouteProcessMapper.checkUpdateFlagUnique(proRouteProcess); + //查询修改的是不是本条数据 + boolean exit = keyFlag.contains("Y");//查询是否存在一个 + //查询是否是本条数据 + String id = proRouteProcessMapper.checkProcessFlagExist(proRouteProcess); + if(exit){ + if(id.equals(proRouteProcess.getRecordId())){ + return false; + }else{ + return true; + } + }else{ + return false; + } + } } diff --git a/op-modules/op-technology/src/main/resources/mapper/technology/ProRouteProcessMapper.xml b/op-modules/op-technology/src/main/resources/mapper/technology/ProRouteProcessMapper.xml index 627b4e820..88d30688a 100644 --- a/op-modules/op-technology/src/main/resources/mapper/technology/ProRouteProcessMapper.xml +++ b/op-modules/op-technology/src/main/resources/mapper/technology/ProRouteProcessMapper.xml @@ -70,26 +70,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where route_id = #{routeId} and order_num = #{orderNum} - + select process_code from pro_route_process where route_id = #{routeId} and process_id = #{processId} - + select record_id + from pro_route_process + where route_id = #{routeId} and process_id = #{processId} + + + + + + + + + + + + + + +