From 665a0369a6cd23f0abf267959b7476ceb23136d6 Mon Sep 17 00:00:00 2001
From: gsz <fightgoo@qq.com>
Date: Mon, 17 Jun 2024 15:31:24 +0800
Subject: [PATCH] =?UTF-8?q?41404=20=E4=B8=BB=E5=B7=A5=E4=BD=8D=E4=B8=8E?=
 =?UTF-8?q?=E5=AD=90=E5=B7=A5=E4=BD=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/MesWorkCellExtendCfgService.java          | 26 +++++++++++++++++++---
 .../serviceimpl/base/MesWorkCellService.java       |  1 +
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellExtendCfgService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellExtendCfgService.java
index 71a1bf3..8f7237a 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellExtendCfgService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellExtendCfgService.java
@@ -18,23 +18,43 @@ public class MesWorkCellExtendCfgService extends BaseMesService<MesWorkCellExten
     protected void setPackQueryBean(MesWorkCellExtendCfg bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getWorkCellCode(), "workCellCode", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCodeBak(), "workCenterCodeBak", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getWorkCellCodeBak(), "workCellCodeBak", packBean);
     }
 
     protected void onInsertBean(MesWorkCellExtendCfg item) {
         // 数据校验
+
         ValidatorBean.checkNotNull(item.getWorkCenterCode(), "产线不能为空");
         ValidatorBean.checkNotNull(item.getWorkCellCode(), "主工位不能为空");
+        ValidatorBean.checkNotNull(item.getWorkCenterCodeBak(), "子产线不能为空");
         ValidatorBean.checkNotNull(item.getWorkCellCodeBak(), "子工位不能为空");
+        ValidatorBean.checkNotZero(item.getSeq(), "顺序不能为0");
 
+        if(item.getExtendType().equalsIgnoreCase("10")){
+            if(!item.getWorkCenterCode().equalsIgnoreCase(item.getWorkCenterCodeBak())){
+                MesException.throwMesBusiException("主子关系时产线【%s】与子产线【%s】需一致，请检查数据",
+                        item.getWorkCenterCode(),item.getWorkCenterCodeBak());
+            }
+        }
+        //1.子产线 子工位表里面唯一（无论类型）
+        DdlPackBean mainPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getWorkCenterCode(), "workCenterCode", mainPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getWorkCellCode(), "workCellCode", mainPackBean);
+        if (baseRDao.isExitByHql(mainPackBean)) {
+            MesException.throwMesBusiException("工作中心【%s】主工位【%s】数据已经存在，请检查数据",
+                    item.getWorkCenterCode(),item.getWorkCellCode(),item.getWorkCellCodeBak());
+        }
+        //2.主工位和子工位各自唯一
         DdlPackBean partPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
-        DdlPreparedPack.getStringEqualPack(item.getWorkCenterCode(), "workCenterCode", partPackBean);
-        DdlPreparedPack.getStringEqualPack(item.getWorkCellCode(), "workCellCode", partPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getWorkCenterCodeBak(), "workCenterCodeBak", partPackBean);
         DdlPreparedPack.getStringEqualPack(item.getWorkCellCodeBak(), "workCellCodeBak", partPackBean);
         if (baseRDao.isExitByHql(partPackBean)) {
-            MesException.throwMesBusiException("工作中心【%s】主工位【%s】子工位【%s】数据界已经存在，请检查数据",
+            MesException.throwMesBusiException("工作中心【%s】子工位【%s】数据界已经存在，请检查数据",
                     item.getWorkCenterCode(),item.getWorkCellCode(),item.getWorkCellCodeBak());
         }
 
+
     }
 
     protected void onUpdateBean(MesWorkCellExtendCfg item) {
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellService.java
index b4a8045..e79d66a 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellService.java
@@ -17,6 +17,7 @@ public class MesWorkCellService extends BaseMesService<MesWorkCell>  implements
         DdlPreparedPack.getStringEqualPack(bean.getWorkCellCode(), "workCellCode", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringLikerPack(bean.getWorkCellName(), "workCellName", packBean);
+        DdlPreparedPack.getNumEqualPack(bean.getGrade(), "grade", packBean);
     }
 
 }