Merge branch 'dev-temp-wj-2412130000-44336' into dev

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();
-            }
         }
     }
 }