diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index cf4522c..3a8daf1 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -53,6 +53,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonPLC.getChannelName(), "channelName", result); DdlPreparedPack.getStringEqualPack(andonPLC.getTagName(), "tagName", result); DdlPreparedPack.getStringEqualPack(andonPLC.getTagAddress(), "tagAddress", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getTagBusinessType(), "tagBusinessType", result); DdlPreparedPack.getStringEqualPack(andonPLC.getTagType(), "tagType", result); DdlPreparedPack.getStringEqualPack(andonPLC.getAlarmCode(), "alarmCode", result); DdlPreparedPack.getStringEqualPack(andonPLC.getGroupNo(), "groupNo", result); 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 96bc964..7a0e241 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 @@ -253,4 +253,31 @@ public class AndonEnumUtil { return tmp; } } + + /** + * 按灯停线标识 + * 1-停止产线,0-启动产线 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STOP_LINE_FLAG{ + + STOP("1","停止产线"), + RESTART("0","启动产线"); + + private String value; + private String description; + + STOP_LINE_FLAG(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } }