完善站点和辊道基础数据

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

@@ -5,8 +5,10 @@ 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.MesBallTrackRule;
+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;
 
 /**
@@ -20,9 +22,13 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class MesBallTrackRuleServiceImpl extends BaseMesService<MesBallTrackRule> implements IMesBallTrackRuleService {
 
+
+    @Autowired
+    private MesEquipmentRepository mesEquipmentRepository;
     @Override
     protected void setPackQueryBean(MesBallTrackRule bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getEquipmentCode(), "equipmentCode", packBean);
+        DdlPreparedPack.getNumEqualPack(bean.getBallTrackType(), "ballTrackType", packBean);
         DdlPreparedPack.getStringLikerPack(bean.getBallTrackName(), "ballTrackName", packBean);
     }
 
@@ -30,11 +36,12 @@ public class MesBallTrackRuleServiceImpl extends BaseMesService<MesBallTrackRule
     protected void onInsertBean(MesBallTrackRule item) {
         ValidatorBean.checkNotNull(item.getBallTrackName(), "轨道名称不能为空");
         ValidatorBean.checkNotNull(item.getEquipmentCode(), "设备代码不能为空");
+        ValidatorBean.checkNotNull(item.getBallTrackType(), "轨道类型不能为空");
         ValidatorBean.checkNotNull(item.getEquipVariableValue(), "轨道变量值不能为空");
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(item.getEquipmentCode(), "equipmentCode", ddlPackBean);
-        if (baseRDao.isExitByHql(ddlPackBean)){
+        if (!mesEquipmentRepository.isExitByHql(ddlPackBean)){
-            MesException.throwBusiException("轨道编码已存在");
+            MesException.throwBusiException("设备代码不存在");
         }
     }
 
@@ -42,13 +49,14 @@ public class MesBallTrackRuleServiceImpl extends BaseMesService<MesBallTrackRule
     protected void onUpdateBean(MesBallTrackRule item) {
         ValidatorBean.checkNotNull(item.getId(), "id不能为空");
         ValidatorBean.checkNotNull(item.getBallTrackName(), "轨道名称不能为空");
+        ValidatorBean.checkNotNull(item.getBallTrackType(), "轨道类型不能为空");
         ValidatorBean.checkNotNull(item.getEquipmentCode(), "设备代码不能为空");
         ValidatorBean.checkNotNull(item.getEquipVariableValue(), "轨道变量值不能为空");
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(item.getEquipmentCode(), "equipmentCode", ddlPackBean);
         DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", ddlPackBean);
-        if (baseRDao.isExitByHql(ddlPackBean)){
+        if (!mesEquipmentRepository.isExitByHql(ddlPackBean)){
-            MesException.throwBusiException("轨道编码已存在");
+            MesException.throwBusiException("设备代码不存在");
         }
     }
 }

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

@@ -5,8 +5,10 @@ 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.MesStation;
+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;
 
 /**
@@ -20,26 +22,36 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class MesStationServiceImpl extends BaseMesService<MesStation> implements IMesStationService {
 
+    @Autowired
+    private MesEquipmentRepository mesEquipmentRepository;
+    @Override
+    protected void setPackQueryBean(MesStation bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringLikerPack(bean.getStation(), "station", packBean);
+        DdlPreparedPack.getNumEqualPack(bean.getStationType(), "stationType", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getEquipmentCode(), "equipmentCode", packBean);
+    }
 
     @Override
     protected void onInsertBean(MesStation item) {
         ValidatorBean.checkNotNull(item.getEquipmentCode(),"设备代码不能为空");
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(item.getEquipmentCode(),"equipmentCode",ddlPackBean);
-        if (baseRDao.isExitByHql(ddlPackBean)){
+        if (!mesEquipmentRepository.isExitByHql(ddlPackBean)){
-            MesException.throwBusiException("设备代码已存在");
+            MesException.throwBusiException("设备代码不存在");
         }
     }
 
     @Override
     protected void onUpdateBean(MesStation item) {
         ValidatorBean.checkNotNull(item.getId(),"主键不能为空");
+        ValidatorBean.checkNotNull(item.getStation(),"站点不能为空");
+        ValidatorBean.checkNotNull(item.getStationType(),"站点类型不能为空");
         ValidatorBean.checkNotNull(item.getEquipmentCode(),"设备代码不能为空");
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(item.getEquipmentCode(),"equipmentCode",ddlPackBean);
         DdlPreparedPack.getNumNOEqualPack(item.getId(),"id",ddlPackBean);
-        if (baseRDao.isExitByHql(ddlPackBean)){
+        if (!mesEquipmentRepository.isExitByHql(ddlPackBean)){
-            MesException.throwBusiException("设备代码已存在");
+            MesException.throwBusiException("设备代码不存在");
         }
     }
 }