From 434570baeba8b849d552d78d4fb4a673f6ba528a Mon Sep 17 00:00:00 2001
From: "DESKTOP-J7ED0MB\\yinjinlu" <411641505@qq.com>
Date: Thu, 17 Nov 2022 21:24:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A5=E5=BA=8F=E6=97=B6?=
 =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=B7=A5=E5=BA=8F=E5=88=A4=E6=96=AD=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ktg/mes/pro/controller/ProRouteProcessController.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 95d5526..33ecf31 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
@@ -120,7 +120,7 @@ public class ProRouteProcessController extends BaseController
         if(UserConstants.NOT_UNIQUE.equals(proRouteProcessService.checkProcessExists(proRouteProcess))){
             return AjaxResult.error("不能重复添加工序！");
         }
-        if(UserConstants.NOT_UNIQUE.equals(proRouteProcessService.checkUpdateFlagUnique(proRouteProcess))){
+        if(UserConstants.YES.equals(proRouteProcess.getKeyFlag()) && UserConstants.NOT_UNIQUE.equals(proRouteProcessService.checkUpdateFlagUnique(proRouteProcess))){
             return AjaxResult.error("当前工艺路线已经指定过关键工序");
         }
         ProProcess process = proProcessService.selectProProcessByProcessId(proRouteProcess.getProcessId());
@@ -164,6 +164,9 @@ public class ProRouteProcessController extends BaseController
         if(UserConstants.NOT_UNIQUE.equals(proRouteProcessService.checkProcessExists(proRouteProcess))){
             return AjaxResult.error("不能重复添加工序！");
         }
+        if(UserConstants.YES.equals(proRouteProcess.getKeyFlag()) && UserConstants.NOT_UNIQUE.equals(proRouteProcessService.checkUpdateFlagUnique(proRouteProcess))){
+            return AjaxResult.error("当前工艺路线已经指定过关键工序");
+        }
         ProProcess process = proProcessService.selectProProcessByProcessId(proRouteProcess.getProcessId());
         proRouteProcess.setProcessCode(process.getProcessCode());
         proRouteProcess.setProcessName(process.getProcessName());