From 2ee77bb6087ba2d1709233f82471fe5b613400cc Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 20 Feb 2025 17:41:58 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=BA=86=E6=8E=A8=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/base/IMesQueueOrderCellPushCfgService.java | 7 +++++++ .../base/MesQueueOrderCellPushCfgController.java | 13 ++++++++++++ .../base/MesQueueOrderCellPushCfgService.java | 24 ++++++++++++++++++++++ .../i3plus/ext/mes/pojo/util/MesExtConstWords.java | 4 ++++ 4 files changed, 48 insertions(+) create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesQueueOrderCellPushCfgService.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesQueueOrderCellPushCfgController.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQueueOrderCellPushCfgService.java diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesQueueOrderCellPushCfgService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesQueueOrderCellPushCfgService.java new file mode 100644 index 0000000..cae1181 --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesQueueOrderCellPushCfgService.java @@ -0,0 +1,7 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderCellPushCfg; + +public interface IMesQueueOrderCellPushCfgService extends IBaseMesService { + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesQueueOrderCellPushCfgController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesQueueOrderCellPushCfgController.java new file mode 100644 index 0000000..3d728c2 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesQueueOrderCellPushCfgController.java @@ -0,0 +1,13 @@ +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.MesQueueOrderCellPushCfg; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Api("生产队列工位推送配置信息") +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesQueueOrderCellPushCfg") +public class MesQueueOrderCellPushCfgController extends BaseMesController{ +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQueueOrderCellPushCfgService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQueueOrderCellPushCfgService.java new file mode 100644 index 0000000..10088b0 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQueueOrderCellPushCfgService.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.api.base.IMesQueueOrderCellPushCfgService; +import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderCellPushCfg; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Service +@Slf4j +public class MesQueueOrderCellPushCfgService extends BaseMesService implements IMesQueueOrderCellPushCfgService { + + @Override + protected void setPackQueryBean(MesQueueOrderCellPushCfg bean, DdlPackBean packBean) { + DdlPreparedPack.getStringLikerPack(bean.getPushSourceCode(), MesExtConstWords.PUSH_SOURCE_CODE, packBean); + DdlPreparedPack.getNumEqualPack(bean.getPushType(), MesExtConstWords.PUSH_TYPE, packBean); + DdlPreparedPack.getStringEqualPack(bean.getAreaCode(), MesExtConstWords.AREA_CODE, packBean); + DdlPreparedPack.getStringLikerPack(bean.getWorkCenterCode(), MesExtConstWords.WORK_CENTER_CODE, packBean); + DdlPreparedPack.getStringLikerPack(bean.getWorkCellCode(), MesExtConstWords.WORK_CELL_CODE, packBean); + } + +} diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java index 4ef475a..de03ae8 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java @@ -242,6 +242,10 @@ public class MesExtConstWords { public static final String DEFAULT_FLAG = "defaultFlag"; //零件类型 public static final String PART_TYPE = "partType"; + //推送来源代码 + public static final String PUSH_SOURCE_CODE = "pushSourceCode"; + //推送工位类型 + public static final String PUSH_TYPE = "pushType"; //时间[开始/结束]条件 public static final String START_TIME_START = "startTimeStart";