From ad28d11486a43fe3a0f618bce4bb98e6b6c798bc Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 15 May 2019 14:07:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=89=E7=81=AF=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java index 083ce7a..769d648 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java @@ -208,9 +208,13 @@ public class AndonManageQueue extends BaseBean { private String haltDesc; @Transient - @ApiParam(value = "停机具体原因") + @ApiParam(value = "异常时长", example = "0") private Long execptionTime; + @Transient + @ApiParam(value = "响应时长", example = "0") + private Long signTime; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; From b90139312cb2dadcaff69e0c4d59eb26556fa15f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Wed, 15 May 2019 14:27:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E7=AE=A1=E6=8E=A7?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index e8a6b83..a11ca7c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -2331,4 +2331,38 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 是否条码管控（用于物料） + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IS_SN_CONTROL { + SN_CONTROL(1, "条码管控"), NOT_SN_CONTROL(2, "非条码管控"); + + private int value; + private String description; + + IS_SN_CONTROL(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } }