From 4f5e0bc1338a43e94cde82323196cd77ac7d1033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LML=E4=B8=B6?= Date: Sat, 18 May 2024 17:59:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E9=9D=A2=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=90=8E=E6=9C=AA?= =?UTF-8?q?=E6=8C=89=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/api/base/IMesCenterShiftGroupService.java | 13 ------------- .../ext/mes/api/base/IMesShiftGroupCenterCfgService.java | 13 +++++++++++++ ...ontroller.java => MesShiftGroupCenterCfgController.java} | 7 +++---- .../serviceimpl/base/MesCenterShiftGroupService.java | 8 +++----- 4 files changed, 19 insertions(+), 22 deletions(-) delete mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCenterShiftGroupService.java create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesShiftGroupCenterCfgService.java rename modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/{MesCenterShiftGroupController.java => MesShiftGroupCenterCfgController.java} (58%) diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCenterShiftGroupService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCenterShiftGroupService.java deleted file mode 100644 index c9c054c..0000000 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCenterShiftGroupService.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.ext.mes.api.base; - -import cn.estsh.i3plus.pojo.mes.bean.MesCenterShiftGroup; - -/** - * @Description: - * @CreateDate 2024/04/16 - * @Author mingliang.li - */ -public interface IMesCenterShiftGroupService extends IBaseMesService { - - -} diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesShiftGroupCenterCfgService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesShiftGroupCenterCfgService.java new file mode 100644 index 0000000..c4087fe --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesShiftGroupCenterCfgService.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesShiftGroupCenterCfg; + +/** + * @Description: + * @CreateDate 2024/04/16 + * @Author mingliang.li + */ +public interface IMesShiftGroupCenterCfgService extends IBaseMesService { + + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCenterShiftGroupController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShiftGroupCenterCfgController.java similarity index 58% rename from modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCenterShiftGroupController.java rename to modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShiftGroupCenterCfgController.java index 6be84ff..5254598 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCenterShiftGroupController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShiftGroupCenterCfgController.java @@ -1,8 +1,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.controller.base; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; -import cn.estsh.i3plus.pojo.mes.bean.MesCenterShiftGroup; -import cn.estsh.i3plus.pojo.mes.bean.MesShiftGroup; +import cn.estsh.i3plus.pojo.mes.bean.MesShiftGroupCenterCfg; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -12,6 +11,6 @@ import org.springframework.web.bind.annotation.RestController; */ @Api("产线与班组的对应关系") @RestController -@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCenterShiftGroup") -public class MesCenterShiftGroupController extends BaseMesController{ +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesShiftGroupCenterCfg") +public class MesShiftGroupCenterCfgController extends BaseMesController { } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCenterShiftGroupService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCenterShiftGroupService.java index 779bc26..8d09ac4 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCenterShiftGroupService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCenterShiftGroupService.java @@ -1,18 +1,16 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; -import cn.estsh.i3plus.ext.mes.api.base.IMesCenterShiftGroupService; -import cn.estsh.i3plus.ext.mes.api.base.IMesShiftGroupService; +import cn.estsh.i3plus.ext.mes.api.base.IMesShiftGroupCenterCfgService; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.mes.bean.MesCenterShiftGroup; import cn.estsh.i3plus.pojo.mes.bean.MesPart; -import cn.estsh.i3plus.pojo.mes.bean.MesShiftGroup; +import cn.estsh.i3plus.pojo.mes.bean.MesShiftGroupCenterCfg; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @Service @Slf4j -public class MesCenterShiftGroupService extends BaseMesService implements IMesCenterShiftGroupService { +public class MesCenterShiftGroupService extends BaseMesService implements IMesShiftGroupCenterCfgService { protected void setPackQueryBean(MesPart bean, DdlPackBean packBean) { DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean); From 5cc5637aea5b763fae6160e83d76be2930ff4cfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LML=E4=B8=B6?= Date: Sat, 18 May 2024 18:44:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E9=9D=A2=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=90=8E=E6=9C=AA?= =?UTF-8?q?=E6=8C=89=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rShiftGroupService.java => MesShiftGroupCenterCfgService.java} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/{MesCenterShiftGroupService.java => MesShiftGroupCenterCfgService.java} (52%) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCenterShiftGroupService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShiftGroupCenterCfgService.java similarity index 52% rename from modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCenterShiftGroupService.java rename to modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShiftGroupCenterCfgService.java index 8d09ac4..578fdcb 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCenterShiftGroupService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShiftGroupCenterCfgService.java @@ -10,11 +10,11 @@ import org.springframework.stereotype.Service; @Service @Slf4j -public class MesCenterShiftGroupService extends BaseMesService implements IMesShiftGroupCenterCfgService { +public class MesShiftGroupCenterCfgService extends BaseMesService implements IMesShiftGroupCenterCfgService { - protected void setPackQueryBean(MesPart bean, DdlPackBean packBean) { - DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean); - DdlPreparedPack.getStringLikerPack(bean.getPartName(), "partName", packBean); + protected void setPackQueryBean(MesShiftGroupCenterCfg bean, DdlPackBean packBean) { + DdlPreparedPack.getStringEqualPack(bean.getShiftGroup(), "shiftGroup", packBean); + DdlPreparedPack.getStringLikerPack(bean.getShiftGroupName(), "shiftGroupName", packBean); }