From 258e51aaf114e68af2f88bb68f23c9584898dcd2 Mon Sep 17 00:00:00 2001 From: gsz Date: Wed, 11 Aug 2021 13:49:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=8C=E8=BD=A6=E9=97=B4?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=B7=A5=E5=BA=8F=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java index dcc25d2..d486f26 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java @@ -27,7 +27,7 @@ public class GanttOrderModel { private Boolean expanded;//是否展开树 private Boolean rollup;//自动把数据相加 在children的上层 当前 private String duration;//持续时间 天/小时/分钟 - private String durationUnit; +// private String durationUnit; private Boolean manuallyScheduled; private List children = new ArrayList<>(); private List lineModels = new ArrayList<>(); 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 f5e3f69..6154f40 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 @@ -1325,7 +1325,11 @@ public class ApsEnumUtil { FOUR_SULFIDATION("FOUR_SULFIDATION", "四车间硫化"), FOUR_TRAINBEARER("FOUR_TRAINBEARER", "四车间牵纱"), FOUR_COATING("FOUR_COATING", "四车间覆胶"), - FOUR_WRAPPING("FOUR_WRAPPING", "四车间包布"); + FOUR_WRAPPING("FOUR_WRAPPING", "四车间包布"), + TWO_SULFIDATION("TWO_SULFIDATION", "二车间硫化"), + TWO_TRAINBEARER("TWO_TRAINBEARER", "二车间牵纱"), + TWO_COATING("TWO_COATING", "二车间覆胶"), + TWO_WRAPPING("TWO_WRAPPING", "二车间包布"); private String value; private String description;