基础主数据bug

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

@@ -28,7 +28,14 @@ public class MesEquipmentService extends BaseMesService<MesEquipment> implements
     public MesEquipment insert(MesEquipment bean) {
         //插入前构造并校验数据
         onInsertBean(bean);
-
+        Integer equipId = 1;
+        DdlPackBean packBean =  DdlPackBean.getDdlPackBean();
+        packBean.setOrderByStr(" order by equipId desc");
+        MesEquipment mesEquipment = baseRDao.getByProperty(packBean);
+        if (mesEquipment != null && mesEquipment.getEquipId() != null) {
+            equipId = mesEquipment.getEquipId() + 1;
+        }
+        bean.setEquipId(equipId);
         bean = baseRDao.insert(bean);
         return bean;
     }

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

@@ -1,7 +1,10 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesEquipmentVariableService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentVariable;
+import cn.estsh.i3plus.pojo.mes.bean.MesErpWorkCenter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -16,5 +19,8 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class MesEquipmentVariableService extends BaseMesService<MesEquipmentVariable> implements IMesEquipmentVariableService {
 
-
+    protected void setPackQueryBean(MesEquipmentVariable bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringLikerPack(bean.getEquipmentCode(), "equipmentCode", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getCode(), "code", packBean);
+    }
 }