From 93d9c8e7f2cbea25234ac31a0c276cc5e46ea943 Mon Sep 17 00:00:00 2001
From: "jhforever.wang@estsh.com" <jhforever.wang@estsh.com>
Date: Fri, 13 Dec 2024 17:03:43 +0800
Subject: [PATCH] =?UTF-8?q?44336=20PC-=E9=9D=9E=E6=8E=92=E5=BA=8F=E5=8A=A0?=
 =?UTF-8?q?=E5=B7=A5=E8=A7=84=E5=88=99-=E9=9C=80=E8=A6=81=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E7=BB=B4=E6=8A=A4=E4=B8=80=E4=B8=AA=E8=BF=9B=E6=96=99?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E5=A4=9A=E4=B8=AA=E4=BA=A7=E6=88=90=20?=
 =?UTF-8?q?=E5=92=8C=E5=A4=9A=E4=B8=AA=E8=BF=9B=E6=96=99=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E4=BA=A7=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/MesProdRuleNosortCfgService.java          | 70 ++--------------------
 1 file changed, 4 insertions(+), 66 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 b99f108..3403568 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
@@ -32,6 +32,7 @@ public class MesProdRuleNosortCfgService extends BaseMesService<MesProdRuleNosor
 
     protected void setPackQueryBean(MesProdRuleNosortCfg bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringLikerPack(bean.getInPartNo(), "inPartNo", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getInPartNoRule(), "inPartNoRule", packBean);
         DdlPreparedPack.getStringLikerPack(bean.getOutPartNo(), "outPartNo", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getEquipmentCode(), "equipmentCode", packBean);
 
@@ -47,17 +48,9 @@ public class MesProdRuleNosortCfgService extends BaseMesService<MesProdRuleNosor
     }
 
     protected void onInsertBean(MesProdRuleNosortCfg item) {
-        // 数据校验
-        //ValidatorBean.checkNotNull(item.getInPartNo(), "进件零件号不能为空");
         ValidatorBean.checkNotNull(item.getOutPartNo(), "产成零件号不能为空");
-        ValidatorBean.checkNotNull(item.getOutPartNo(), "设备不能为空");
+        ValidatorBean.checkNotNull(item.getEquipmentCode(), "设备不能为空");
 
-        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);
         if (!StringUtils.isEmpty(item.getInPartNo())) {
             MesPartSap inPart = partSapService.getMesPartSapByPartNo(item.getInPartNo(), item.getOrganizeCode());
             if (inPart == null) {
@@ -78,48 +71,9 @@ public class MesProdRuleNosortCfgService extends BaseMesService<MesProdRuleNosor
                         .build();
             }
         }
-        boolean flg = baseRDao.isExitByHql(seriesPackBean);
-        if (flg) {
-            throw ImppExceptionBuilder.newInstance()
-                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
-                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("该非排序加工规则已存在，请检查数据")
-                    .build();
-        }
-
     }
 
-    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);
-        if (!StringUtils.isEmpty(item.getInPartNo())) {
-            MesPartSap inPart = partSapService.getMesPartSapByPartNo(item.getInPartNo(), item.getOrganizeCode());
-            if (inPart == null) {
-                throw ImppExceptionBuilder.newInstance()
-                        .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
-                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                        .setErrorDetail("进料零件号不存在，请检查数据")
-                        .build();
-            }
-        }
-        if (!StringUtils.isEmpty(item.getOutPartNo())) {
-            MesPartSap outPart = partSapService.getMesPartSapByPartNo(item.getOutPartNo(), item.getOrganizeCode());
-            if (outPart == null) {
-                throw ImppExceptionBuilder.newInstance()
-                        .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
-                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                        .setErrorDetail("产成零件号不存在，请检查数据")
-                        .build();
-            }
-        }
-    }
+    protected void onUpdateBean(MesProdRuleNosortCfg item) { onInsertBean(item); }
 
     @Override
     public MesProdRuleNosortCfg findMesProdRuleNosortCfgByWorkCenterCode(String workCenterCode, String partNo, String organizeCode) {
@@ -129,6 +83,7 @@ public class MesProdRuleNosortCfgService extends BaseMesService<MesProdRuleNosor
         }
         return prodRuleNosortCfgList.iterator().next();
     }
+
     @Override
     public void validateImport(List<MesProdRuleNosortCfg> beanList) {
 
@@ -136,23 +91,6 @@ public class MesProdRuleNosortCfgService extends BaseMesService<MesProdRuleNosor
             // 数据校验
             ValidatorBean.checkNotNull(item.getOutPartNo(), "产成零件号不能为空");
             ValidatorBean.checkNotNull(item.getEquipmentCode(), "设备不能为空");
-
-            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();
-            }
         }
     }
 }