From 7e73f33b5cacdaba275e3597df3959a3210c1d18 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 17 Dec 2021 18:53:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8B=E5=8F=91MES?= =?UTF-8?q?=E7=9A=84=E5=B7=A5=E4=BD=9C=E5=9D=97=E9=A2=9C=E8=89=B2?= 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/aps/bean/ResCalendar.java | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) 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 6f49931..a529eb1 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 @@ -54,10 +54,6 @@ public class HeuristicRule extends BaseRule { @ApiParam(value ="最大等待时间") private String waitingTime; - @Column(name="MAX_SHIFTS") - @ApiParam(value ="最大班次") - private Integer maxShifts; - @Column(name="BATCH_PERIOD") @ApiParam(value ="组炉区间") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java index e6af6a5..683e517 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java @@ -61,6 +61,10 @@ public class ResCalendar extends BaseAPS { @FieldAnnotation(defaultValue = "10") private Integer priority; + @Column(name="SHIFT_NUMBER") + @ApiParam(value ="班次数量") + private Integer shiftNumber; + @JsonBackReference public List getDayShifts() { return BeanRelation.list(this, EResCalendar.DayShifts);