From b5bbf7aefb1870303faec6207353d5b986731f1e Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 12 May 2021 09:31:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AD=89=E5=BE=85=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E8=AF=84=E4=BC=B0=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java | 1 + 2 files changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java index 6a96b97..294ec49 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java @@ -49,6 +49,10 @@ public class HeuristicRule extends BaseRule { @FieldAnnotation(defaultValue = "true") private Boolean insertIdle; + @Column(name="WAITING_TIME") + @ApiParam(value ="最大等待时间") + private String waitingTime; + @Column(name="BATCH_PERIOD") @ApiParam(value ="组炉区间") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index 0d7160b..f8a71a0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -444,6 +444,7 @@ public class ApsEnumUtil { PRODUCE_TIME("PRODUCE_TIME", "生产时间"), POST_SET_TIME("POST_SET_TIME", "后设置时间"), WORK_WAIT_TIME("WORK_WAIT_TIME", "工作等待时间"), + WAIT_TIME_LIMIT("WAIT_TIME_LIMIT", "等待时间限制"), RES_BALANCE("RES_BALANCE", "资源均衡度"), SAME_MATERIAL("SAME_MATERIAL", "相同物料"), SAME_ORDER("SAME_ORDER", "相同订单"),