From 339f1a86c275ef7725ddff3ede03f6c2147303f1 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 19 Dec 2019 09:16:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9E=9A=E4=B8=BE=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=B8=AD=E9=97=B4=E7=9A=84=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 13 +++++++++---- .../cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 8 -------- .../cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 5 ----- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index b05d85c..a18d99a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -730,6 +730,10 @@ public class AndonEnumUtil { /** * 按灯标识 * 1-呼叫，2-签到，3-解决 + * + * 20190917将“提交”更改为“解决待审” + * 20190917将“审批”更改为“审批完成” + * 20190917增加"撤销已确认"枚举 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ANDON_ACTION_TAG { @@ -737,10 +741,10 @@ public class AndonEnumUtil { SIGN(2,"20","响应"), RESOLVE(3,"30","解决"), CANCEL(4,"40", "撤销"), - COMMIT(5,"50","解决待审"),// 20190917将“提交”更改为“解决待审” - PASS(6,"60","审批完成"), // 20190917将“审批”更改为“审批完成” + COMMIT(5,"50","解决待审"), + PASS(6,"60","审批完成"), REJECT(7,"70","驳回"), - CONFIRMED_CANCEL(8,"80","撤销已确认"); // 20190917增加这个枚举 + CONFIRMED_CANCEL(8,"80","撤销已确认"); private int value; private String code; @@ -944,10 +948,11 @@ public class AndonEnumUtil { /** * ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测 + * + * 下面的顺序不要更改，packBrokenTimeTypeRatioList方法有用到此枚举的顺序 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_TYPE { - //下面的顺序不要更改，packBrokenTimeTypeRatioList方法有用到此枚举的顺序 EQUIP("EQUMENT_ALARM", 110060106, "设备", "#D06D6A"), QUALITY("QUALITY_ALARM", 110060105, "质量", "#9084FF"), PART("PART_ALARM", 110060104, "物料", "#24BDBA"), 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 0d04f5e..a22ef11 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 @@ -495,7 +495,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static ORGANIZATION_INIT_DATA getByValue(String value) { for (ORGANIZATION_INIT_DATA organizationInitData : values()) { if (organizationInitData.getValue().equals(value)) { @@ -1488,7 +1487,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_INSERT_EXCEL getByValue(int value) { for (MES_INSERT_EXCEL mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -1647,7 +1645,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_STATION_BOM_IS_REPEAT getByValue(int value) { for (MES_STATION_BOM_IS_REPEAT mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -1846,7 +1843,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_WORK_CELL_TYPE getByValue(int value) { for (MES_WORK_CELL_TYPE mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -1904,7 +1900,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_ACTION_TYPE getByValue(int value) { for (MES_ACTION_TYPE mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -1952,7 +1947,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_IS_BIND_KEY getByValue(int value) { for (MES_IS_BIND_KEY mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -2000,7 +1994,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_REPAIR_STATUS getByValue(int value) { for (MES_REPAIR_STATUS mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -2051,7 +2044,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_OPERATE_TYPE getByValue(int value) { for (MES_OPERATE_TYPE mesInsertExcel : values()) { if (mesInsertExcel.getValue() == 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 988baf8..ecda007 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 @@ -75,7 +75,6 @@ public class MesPcnEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_STATION_BOM_IS_REPEAT getByValue(int value) { for (MES_STATION_BOM_IS_REPEAT mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -193,7 +192,6 @@ public class MesPcnEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_ACTION_TYPE getByValue(int value) { for (MES_ACTION_TYPE mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -281,7 +279,6 @@ public class MesPcnEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_IS_BIND_KEY getByValue(int value) { for (MES_IS_BIND_KEY mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -405,7 +402,6 @@ public class MesPcnEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_OPERATE_TYPE getByValue(int value) { for (MES_OPERATE_TYPE mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -466,7 +462,6 @@ public class MesPcnEnumUtil { return tmp; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_MATCH_TYPE getByValue(int value) { for (MES_MATCH_TYPE mesMatchType : values()) { if (mesMatchType.getValue() == value) {