From a32c922f12c1458d35ca9720243dd3c09be22cf7 Mon Sep 17 00:00:00 2001 From: gsz Date: Sat, 18 May 2024 15:15:27 +0800 Subject: [PATCH] =?UTF-8?q?Mes=E8=AE=BE=E5=A4=87=E5=81=9C=E6=9C=BA?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0+=E8=AE=BE=E5=A4=87=E5=81=9C=E6=9C=BA?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/ext/mes/api/base/IMesBasDowntimeReasonService.java | 5 +++-- .../ext/mes/api/base/IMesBasDowntimeReasonTypeService.java | 4 ++-- .../controller/base/MesBasDowntimeReasonController.java | 6 +++--- .../controller/base/MesBasDowntimeReasonTypeController.java | 6 +++--- .../serviceimpl/base/MesBasDowntimeReasonServiceImpl.java | 8 ++++---- .../serviceimpl/base/MesBasDowntimeReasonTypeServiceImpl.java | 10 +++++----- 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBasDowntimeReasonService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBasDowntimeReasonService.java index 7796346..eaa6b09 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBasDowntimeReasonService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBasDowntimeReasonService.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.ext.mes.api.base; -import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReason; + +import cn.estsh.i3plus.pojo.mes.bean.MesDowntimeReason; /** * @Description :设备停机原因 @@ -9,5 +10,5 @@ import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReason; * @CreateDate 2024/5/17 14:06 * @Modify: **/ -public interface IMesBasDowntimeReasonService extends IBaseMesService { +public interface IMesBasDowntimeReasonService extends IBaseMesService { } diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBasDowntimeReasonTypeService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBasDowntimeReasonTypeService.java index 32c2ccd..b30ba63 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBasDowntimeReasonTypeService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBasDowntimeReasonTypeService.java @@ -1,6 +1,6 @@ package cn.estsh.i3plus.ext.mes.api.base; -import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReasonType; +import cn.estsh.i3plus.pojo.mes.bean.MesDowntimeReasonType; /** * @Description :设备停机类型 @@ -9,5 +9,5 @@ import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReasonType; * @CreateDate 2024/5/17 14:06 * @Modify: **/ -public interface IMesBasDowntimeReasonTypeService extends IBaseMesService { +public interface IMesBasDowntimeReasonTypeService extends IBaseMesService { } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBasDowntimeReasonController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBasDowntimeReasonController.java index 7b6df07..dd827fb 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBasDowntimeReasonController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBasDowntimeReasonController.java @@ -1,7 +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.MesBasDowntimeReason; +import cn.estsh.i3plus.pojo.mes.bean.MesDowntimeReason; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -13,6 +13,6 @@ import org.springframework.web.bind.annotation.RestController; * @Modify: **/ @RestController -@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesBasDowntimeReason") -public class MesBasDowntimeReasonController extends BaseMesController{ +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesDowntimeReason") +public class MesBasDowntimeReasonController extends BaseMesController{ } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBasDowntimeReasonTypeController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBasDowntimeReasonTypeController.java index b5b33da..cb4f78e 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBasDowntimeReasonTypeController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBasDowntimeReasonTypeController.java @@ -1,7 +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.MesBasDowntimeReasonType; +import cn.estsh.i3plus.pojo.mes.bean.MesDowntimeReasonType; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -13,6 +13,6 @@ import org.springframework.web.bind.annotation.RestController; * @Modify: **/ @RestController -@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesBasDowntimeReasonType") -public class MesBasDowntimeReasonTypeController extends BaseMesController{ +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesDowntimeReasonType") +public class MesBasDowntimeReasonTypeController extends BaseMesController{ } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonServiceImpl.java index e6c2010..7bccd77 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonServiceImpl.java @@ -3,7 +3,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; import cn.estsh.i3plus.ext.mes.api.base.IMesBasDowntimeReasonService; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReason; +import cn.estsh.i3plus.pojo.mes.bean.MesDowntimeReason; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -17,12 +17,12 @@ import org.springframework.stereotype.Service; **/ @Service @Slf4j -public class MesBasDowntimeReasonServiceImpl extends BaseMesService implements IMesBasDowntimeReasonService { +public class MesBasDowntimeReasonServiceImpl extends BaseMesService implements IMesBasDowntimeReasonService { - protected void setPackQueryBean(MesBasDowntimeReason bean, DdlPackBean packBean) { + protected void setPackQueryBean(MesDowntimeReason bean, DdlPackBean packBean) { DdlPreparedPack.getStringEqualPack(bean.getReasonCode(), "reasonCode", packBean); DdlPreparedPack.getStringEqualPack(bean.getReasonName(), "reasonName", packBean); - DdlPreparedPack.getStringEqualPack(bean.getReasonType(), "reasonType", packBean); + DdlPreparedPack.getStringEqualPack(bean.getReasonTypeCode(), "reasonTypeCode", packBean); } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonTypeServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonTypeServiceImpl.java index 38d7566..f96d1b8 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonTypeServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonTypeServiceImpl.java @@ -3,7 +3,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; import cn.estsh.i3plus.ext.mes.api.base.IMesBasDowntimeReasonTypeService; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReasonType; +import cn.estsh.i3plus.pojo.mes.bean.MesDowntimeReasonType; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -17,11 +17,11 @@ import org.springframework.stereotype.Service; **/ @Service @Slf4j -public class MesBasDowntimeReasonTypeServiceImpl extends BaseMesService implements IMesBasDowntimeReasonTypeService { +public class MesBasDowntimeReasonTypeServiceImpl extends BaseMesService implements IMesBasDowntimeReasonTypeService { - protected void setPackQueryBean(MesBasDowntimeReasonType bean, DdlPackBean packBean) { - DdlPreparedPack.getStringEqualPack(bean.getTypeCode(), "typeCode", packBean); - DdlPreparedPack.getStringEqualPack(bean.getTypeName(), "typeName", packBean); + protected void setPackQueryBean(MesDowntimeReasonType bean, DdlPackBean packBean) { + DdlPreparedPack.getStringEqualPack(bean.getReasonTypeCode(), "reasonTypeCode", packBean); + DdlPreparedPack.getStringEqualPack(bean.getReasonTypeName(), "reasonTypeName", packBean); } }