裁片基础数据完善

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCutSchemeEquipmentDetailServiceImpl.java

@@ -30,11 +30,14 @@ public class MesCutSchemeEquipmentDetailServiceImpl extends BaseMesService<MesCu
     @Override
     protected void onInsertBean(MesCutSchemeEquipmentDetail item) {
         ValidatorBean.checkNotNull(item.getName(), "名称不能为空");
+        ValidatorBean.checkNotNull(item.getValue(), "值不能为空");
+
     }
 
     @Override
     protected void onUpdateBean(MesCutSchemeEquipmentDetail item) {
         ValidatorBean.checkNotNull(item.getId(), "id不能为空");
         ValidatorBean.checkNotNull(item.getName(), "名称不能为空");
+        ValidatorBean.checkNotNull(item.getValue(), "值不能为空");
     }
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCutSchemeEquipmentProcessParamServiceImpl.java

@@ -1,11 +1,14 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesCutSchemeEquipmentProcessParamService;
+import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesCutSchemeEquipmentProcessParam;
+import cn.estsh.i3plus.pojo.mes.repository.MesEquipmentRepository;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -19,6 +22,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class MesCutSchemeEquipmentProcessParamServiceImpl extends BaseMesService<MesCutSchemeEquipmentProcessParam> implements IMesCutSchemeEquipmentProcessParamService {
 
+    @Autowired
+    private MesEquipmentRepository mesEquipmentRepository;
+
     @Override
     protected void setPackQueryBean(MesCutSchemeEquipmentProcessParam bean, DdlPackBean packBean) {
         Long pid = bean.getPid();
@@ -30,6 +36,11 @@ public class MesCutSchemeEquipmentProcessParamServiceImpl extends BaseMesService
     @Override
     protected void onInsertBean(MesCutSchemeEquipmentProcessParam item) {
         ValidatorBean.checkNotNull(item.getEquipmentCode(), "设备代码不能为空");
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getEquipmentCode(), "equipmentCode", ddlPackBean);
+        if(!mesEquipmentRepository.isExitByHql(ddlPackBean)){
+            MesException.throwMesBusiException("设备代码不存在", item.getEquipmentCode());
+        }
     }
 
     @Override

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCutSchemeEquipmentServiceImpl.java

@@ -4,8 +4,10 @@ import cn.estsh.i3plus.ext.mes.api.base.IMesCutSchemeEquipmentService;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesCutSchemeEquipment;
+import cn.estsh.i3plus.pojo.mes.repository.MesEquipmentRepository;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -20,11 +22,18 @@ import org.springframework.util.StringUtils;
 @Service
 public class MesCutSchemeEquipmentServiceImpl extends BaseMesService<MesCutSchemeEquipment> implements IMesCutSchemeEquipmentService {
 
+    @Autowired
+    private MesEquipmentRepository mesEquipmentRepository;
 
     @Override
     protected void onInsertBean(MesCutSchemeEquipment item) {
         ValidatorBean.checkNotNull(item.getCutCode(), "裁片代码不能为空");
         ValidatorBean.checkNotNull(item.getEquipmentCode(), "设备代码不能为空");
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getEquipmentCode(), "equipmentCode", ddlPackBean);
+        if(!mesEquipmentRepository.isExitByHql(ddlPackBean)){
+            throw new RuntimeException("设备代码不存在");
+        }
     }
 
     @Override

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCutSchemeService.java

@@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.*;
 import cn.estsh.i3plus.pojo.mes.repository.MesWorkCenterRepository;
+import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -47,20 +48,8 @@ public class MesCutSchemeService extends BaseMesService<MesCutScheme> implements
     }
 
     protected void onInsertBean(MesCutScheme item) {
-        // 数据校验
-        //ValidatorBean.checkNotNull(item.getDefectTypeCode(), "缺陷类型代码不能为空");
-        //ValidatorBean.checkNotNull(item.getDefectTypeName(), "缺陷类型名称不能为空");
-        //
-        //DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
-        //DdlPreparedPack.getStringEqualPack(item.getDefectTypeCode(), "defectTypeCode", packBean);
-        //boolean flg = baseRDao.isExitByHql(packBean);
-        //if (flg) {
-        //    throw ImppExceptionBuilder.newInstance()
-        //            .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
-        //            .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-        //            .setErrorDetail("【%s】缺陷类型代码已经存在，请检查数据", item.getDefectTypeCode())
-        //            .build();
-        //}
+        ValidatorBean.checkNotNull(item.getCutCode(),"裁片方案代码不能为空");
+        ValidatorBean.checkNotNull(item.getCutName(),"裁片方案名称不能为空");
     }