增加查询条件

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesDefectRecordController.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@Api("零件类型")
+@Api("缺陷类型记录")
 @RestController
 @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesDefectRecord")
 

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

@@ -1,7 +1,10 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesDefectService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesDefect;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartShippingGroupDetail;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -9,4 +12,10 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class MesDefectService extends BaseMesService<MesDefect> implements IMesDefectService {
 
+    protected void setPackQueryBean(MesDefect bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringLikerPack(bean.getDefectCode(), "defectCode", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getDefectName(), "defectName", packBean);
+        DdlPreparedPack.getNumEqualPack(bean.getCategory(), "category", packBean);
+    }
+
 }

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

@@ -1,6 +1,9 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesPartPullDetailService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartPull;
 import cn.estsh.i3plus.pojo.mes.bean.MesPartPullDetail;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -9,4 +12,8 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class MesPartPullDetailService extends BaseMesService<MesPartPullDetail> implements IMesPartPullDetailService {
 
+    protected void setPackQueryBean(MesPartPull bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringLikerPack(bean.getPullCode(), "pullCode", packBean);
+    }
+
 }

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

@@ -2,6 +2,8 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesPartPullService;
 import cn.estsh.i3plus.ext.mes.api.base.IMesPartTypeService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesPartPull;
 import cn.estsh.i3plus.pojo.mes.bean.MesPartType;
 import lombok.extern.slf4j.Slf4j;
@@ -11,4 +13,9 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class MesPartPullService extends BaseMesService<MesPartPull> implements IMesPartPullService {
 
+    protected void setPackQueryBean(MesPartPull bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringLikerPack(bean.getPullCode(), "pullCode", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getPullName(), "pullName", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getWorkCenterCode(), "workCenterCode", packBean);
+    }
 }

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

@@ -1,8 +1,8 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesPartShippingGroupDetailService;
-import cn.estsh.i3plus.ext.mes.api.base.IMesPartShippingGroupService;
-import cn.estsh.i3plus.pojo.mes.bean.MesPartShippingGroup;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesPartShippingGroupDetail;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -11,4 +11,7 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class MesPartShippingGroupDetailService extends BaseMesService<MesPartShippingGroupDetail> implements IMesPartShippingGroupDetailService {
 
+    protected void setPackQueryBean(MesPartShippingGroupDetail bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getShippingGroupNo(), "shippingGroupNo", packBean);
+    }
 }

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

@@ -1,12 +1,21 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesPartShippingGroupService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesPartShippingGroup;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.stereotype.Service;
 
 @Service
 @Slf4j
 public class MesPartShippingGroupService extends BaseMesService<MesPartShippingGroup> implements IMesPartShippingGroupService {
 
+
+    protected void setPackQueryBean(MesPartShippingGroup bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringLikerPack(bean.getShippingGroupNo(),"shippingGroupNo",packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getShippingGroupName(),"shippingGroupName",packBean);
+    }
+
 }

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

@@ -1,6 +1,9 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesPartTypeService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartShippingGroupDetail;
 import cn.estsh.i3plus.pojo.mes.bean.MesPartType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -8,5 +11,8 @@ import org.springframework.stereotype.Service;
 @Service
 @Slf4j
 public class MesPartTypeService extends BaseMesService<MesPartType> implements IMesPartTypeService {
-
+    protected void setPackQueryBean(MesPartType bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringLikerPack(bean.getPartTypeCode(), "partTypeCode", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getPartTypeName(), "partTypeName", packBean);
+    }
 }