From 086c78f828a2391c3153411fc77d9b5b16112c7b Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 24 Aug 2020 16:04:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Epcn=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=9A=84=E8=BE=85=E5=8A=A9=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 45 +++++++++++++++++++++- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 9600ace..d464a7f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -63,7 +63,8 @@ public class MesPcnEnumUtil { BUTTON_MODULE(30, "按钮组件"), TIMING_MODULE(40, "定时组件"), PCS_BACK_MODULE(50, "工序后台组件"), - PLC_CALLBACK_MODULE(60, "PLC回调工位参数"); + PLC_CALLBACK_MODULE(60, "PLC回调工位参数"), + ASSIST_MODULE(70, "辅助组件"); private int value; private String description; @@ -2578,7 +2579,10 @@ public class MesPcnEnumUtil { STEP_LIST("stepList", "工步列表"), STATE_LIST("stateList", "状态列表"), STEP_CONTENT("stepContent", "工步内容"), - MODULE_CONTENT("moduleContent", "组件内容"), + MODULE_CONTENT("moduleContent", "展示组件内容"), + MODULE_HEAD("moduleHead", "展示组件头"), + GUIDE_CONTENT("guideContent", "指导内容"), + ASSISTANT_CONTENT("assistantContent", "辅助展示组件"), CUSTOM_COMPONENT("customComponent", "定制内容"), TASK_COMPLETE("taskComplete", "整个扫描完成"), STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"), @@ -2634,6 +2638,8 @@ public class MesPcnEnumUtil { FORM("form", "文本按钮"), SPEC_TEXT("spec_text", "工步弹框文本"), IMAGE_LIST("image_list", "图片列表"), + MODULE_HEAD("module_head", "展示组件头部"), + MODULE_GUIDE("module_guide", "展示组件知道内容"), SHOW_ASSEMBLE_TABLE("SHOW_ASSEMBLE_TABLE", "展示组件表格"), BACKGROUND_COLOR_TEXT("BACKGROUND_COLOR_TEXT", "背景色文字"); @@ -4808,4 +4814,39 @@ public class MesPcnEnumUtil { } } + /** + * JIT队列锁定池 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ASSISTANT_MODULE_DISPLAY { + MULTIMEDIA_PLUG(10, "多媒体插头"), + ATTENTION_INFO(20, "关注内容"); + + private Integer value; + private String description; + + ASSISTANT_MODULE_DISPLAY(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } + }