From 7f078c176dcc31cf8f320af36b46184ca11538b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=AE=E7=AC=91=E7=9D=80=E9=9D=A2=E5=AF=B9=E6=98=8E?=
 =?UTF-8?q?=E5=A4=A9?= <752558143@qq.com>
Date: Wed, 12 Jun 2024 20:08:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=B8=BB=E6=95=B0=E6=8D=AEbu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/MesProdRuleNosortCfgService.java           | 21 ---------------------
 .../serviceimpl/base/MesProdRuleSortCfgService.java | 21 ---------------------
 2 files changed, 42 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleNosortCfgService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleNosortCfgService.java
index a0b7c9a..987a546 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleNosortCfgService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleNosortCfgService.java
@@ -66,29 +66,8 @@ public class MesProdRuleNosortCfgService extends BaseMesService<MesProdRuleNosor
 
     }
 
-    protected void onUpdateBean(MesProdRuleNosortCfg item) {
-        // 数据校验
-        ValidatorBean.checkNotNull(item.getOutPartNo(), "产成零件号不能为空");
-        ValidatorBean.checkNotNull(item.getOutPartNo(), "设备不能为空");
-
-        DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
-        if (StringUtils.isEmpty(item.getInPartNo())) {
-            DdlPreparedPack.getStringEqualPack(item.getInPartNo(), "inPartNo", seriesPackBean);
-        }
-        DdlPreparedPack.getStringEqualPack(item.getOutPartNo(), "outPartNo", seriesPackBean);
-        DdlPreparedPack.getStringEqualPack(item.getEquipmentCode(), "equipmentCode", seriesPackBean);
 
 
-        boolean flg = baseRDao.isExitByHql(seriesPackBean);
-        if (flg) {
-            throw ImppExceptionBuilder.newInstance()
-                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
-                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("该非排序加工规则已存在，请检查数据")
-                    .build();
-        }
-    }
-
     @Override
     public MesProdRuleNosortCfg findMesProdRuleNosortCfgByWorkCenterCode(String workCenterCode, String partNo, String organizeCode) {
         List<MesProdRuleNosortCfg> prodRuleNosortCfgList = mesProdRuleNosortCfgDao.findMesProdRuleNosortCfgByWorkCenterCode(workCenterCode, partNo, organizeCode);
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleSortCfgService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleSortCfgService.java
index 5e0c661..d2d4ddb 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleSortCfgService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleSortCfgService.java
@@ -59,26 +59,5 @@ public class MesProdRuleSortCfgService extends BaseMesService<MesProdRuleSortCfg
 
     }
 
-    protected void onUpdateBean(MesProdRuleSortCfg item) {
-        // 数据校验
-        //ValidatorBean.checkNotNull(item.getInPartNo(), "进件零件号不能为空");
-        ValidatorBean.checkNotNull(item.getWorkCenterCode(), "产线不能为空");
-        ValidatorBean.checkNotNull(item.getWorkCellCode(), "工位不能为空");
-        ValidatorBean.checkNotNull(item.getAssemblyPartNo(), "零件号不能为空");
-
-        DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
-        DdlPreparedPack.getStringEqualPack(item.getWorkCellCode(), "workCellCode", seriesPackBean);
-        DdlPreparedPack.getStringEqualPack(item.getWorkCenterCode(), "workCenterCode", seriesPackBean);
-        DdlPreparedPack.getStringEqualPack(item.getAssemblyPartNo(), "assemblyPartNo", seriesPackBean);
-        DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", seriesPackBean);
 
-        boolean flg = baseRDao.isExitByHql(seriesPackBean);
-        if (flg) {
-            throw ImppExceptionBuilder.newInstance()
-                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
-                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("该排序加工规则已存在，请检查数据")
-                    .build();
-        }
-    }
 }