Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesCutSchemeEquipmentDetailService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesCutSchemeEquipmentDetail;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import lombok.extern.slf4j.Slf4j;
@@ -18,6 +20,14 @@ import org.springframework.stereotype.Service;
 public class MesCutSchemeEquipmentDetailServiceImpl extends BaseMesService<MesCutSchemeEquipmentDetail> implements IMesCutSchemeEquipmentDetailService {
 
     @Override
+    protected void setPackQueryBean(MesCutSchemeEquipmentDetail bean, DdlPackBean packBean) {
+        Long pid = bean.getPid();
+        if (pid != null) {
+            DdlPreparedPack.getNumEqualPack(pid, "pid", packBean);
+        }
+    }
+
+    @Override
     protected void onInsertBean(MesCutSchemeEquipmentDetail item) {
         ValidatorBean.checkNotNull(item.getName(), "名称不能为空");
     }

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesCutSchemeEquipmentProcessParamService;
+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.impp.framework.boot.util.ValidatorBean;
 import lombok.extern.slf4j.Slf4j;
@@ -18,6 +20,14 @@ import org.springframework.stereotype.Service;
 public class MesCutSchemeEquipmentProcessParamServiceImpl extends BaseMesService<MesCutSchemeEquipmentProcessParam> implements IMesCutSchemeEquipmentProcessParamService {
 
     @Override
+    protected void setPackQueryBean(MesCutSchemeEquipmentProcessParam bean, DdlPackBean packBean) {
+        Long pid = bean.getPid();
+        if (pid != null) {
+            DdlPreparedPack.getNumEqualPack(pid, "pid", packBean);
+        }
+    }
+
+    @Override
     protected void onInsertBean(MesCutSchemeEquipmentProcessParam item) {
         ValidatorBean.checkNotNull(item.getEquipmentCode(), "设备代码不能为空");
     }