From e2ce69232034b1aacbdaf537e8b6a2a4e586414b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LML=E4=B8=B6?= Date: Fri, 19 Apr 2024 19:51:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/controller/base/MesDefectRecordController.java | 2 +- .../ext/mes/apiservice/serviceimpl/base/MesDefectService.java | 9 +++++++++ .../apiservice/serviceimpl/base/MesPartPullDetailService.java | 7 +++++++ .../ext/mes/apiservice/serviceimpl/base/MesPartPullService.java | 7 +++++++ .../serviceimpl/base/MesPartShippingGroupDetailService.java | 7 +++++-- .../apiservice/serviceimpl/base/MesPartShippingGroupService.java | 9 +++++++++ .../ext/mes/apiservice/serviceimpl/base/MesPartTypeService.java | 8 +++++++- 7 files changed, 45 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesDefectRecordController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesDefectRecordController.java index cc11b12..7739435 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesDefectRecordController.java +++ b/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") diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectService.java index 7901a5f..51682ba 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectService.java +++ b/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 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); + } + } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartPullDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartPullDetailService.java index f8efafe..467d4fc 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartPullDetailService.java +++ b/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 implements IMesPartPullDetailService { + protected void setPackQueryBean(MesPartPull bean, DdlPackBean packBean) { + DdlPreparedPack.getStringLikerPack(bean.getPullCode(), "pullCode", packBean); + } + } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartPullService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartPullService.java index 3798b27..04b0dd8 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartPullService.java +++ b/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 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); + } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartShippingGroupDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartShippingGroupDetailService.java index e4f8eb3..5c5269c 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartShippingGroupDetailService.java +++ b/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 implements IMesPartShippingGroupDetailService { + protected void setPackQueryBean(MesPartShippingGroupDetail bean, DdlPackBean packBean) { + DdlPreparedPack.getStringEqualPack(bean.getShippingGroupNo(), "shippingGroupNo", packBean); + } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartShippingGroupService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartShippingGroupService.java index b98cbf5..b82abfd 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartShippingGroupService.java +++ b/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 implements IMesPartShippingGroupService { + + protected void setPackQueryBean(MesPartShippingGroup bean, DdlPackBean packBean) { + DdlPreparedPack.getStringLikerPack(bean.getShippingGroupNo(),"shippingGroupNo",packBean); + DdlPreparedPack.getStringLikerPack(bean.getShippingGroupName(),"shippingGroupName",packBean); + } + } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartTypeService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartTypeService.java index e50cca4..467e628 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartTypeService.java +++ b/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 implements IMesPartTypeService { - + protected void setPackQueryBean(MesPartType bean, DdlPackBean packBean) { + DdlPreparedPack.getStringLikerPack(bean.getPartTypeCode(), "partTypeCode", packBean); + DdlPreparedPack.getStringLikerPack(bean.getPartTypeName(), "partTypeName", packBean); + } }