From bc21d0b46116c7be10baaf4bc95c861d27cb0102 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 16 Dec 2019 18:55:32 +0800 Subject: [PATCH] =?UTF-8?q?task=20`1308`=201=20PCN=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index efd4ce1..9846537 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -3568,7 +3568,8 @@ public class MesEnumUtil { PCN_LOGIN(160, "PCN_LOGIN", ""), PCN_MENU(170, "PCN_MENU", ""), PCN_MODULE(180, "PCN_MODULE", ""), - PCN_LOGOUT(190, "PCN_LOGOUT", ""); + PCN_LOGOUT(190, "PCN_LOGOUT", ""), + UPDATE_LOCALE_RES(190, "LOCALE_RES_URL", ""); private int value; 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 653955c..3147319 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 @@ -214,6 +214,7 @@ public class MesPcnEnumUtil { } } + /** * MES_TYPE_CFG 类型信息 */ @@ -253,6 +254,7 @@ public class MesPcnEnumUtil { return tmp; } } + /** * MesProdBindRecord 是否是关键件 */ @@ -2097,6 +2099,9 @@ public class MesPcnEnumUtil { NEVER(-1, "不过期"), ONE_HOUR(3600, "一小时"), + FIVE_MINS(300, "5分钟"), + HALF_HOUR(1800, "半小时"), + ONE_QUARTER(900, "一刻钟"), ONE_MIN(60, "一分钟"); private int value; @@ -2433,7 +2438,6 @@ public class MesPcnEnumUtil { } - @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ONLINE_SEND_TYPE {