From 940510ea5b15d78d54f1e6dedd160ac52caf6852 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 26 Aug 2020 14:36:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E6=B5=B7=E7=BA=B3=E5=B7=9D?= =?UTF-8?q?=E3=80=81=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC=E7=BA=B3=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 00acb59..97885c8 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -2591,7 +2591,7 @@ public class MesPcnEnumUtil { RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"), PROCESS_CONTENT("processContent", "过程组件内容"), TIME_MODULE_CONTENT("timeModuleContent", "定时组件内容"), -// TIME_MODULE_INIT("timeModuleInit", "初始化时间展示组件"), + TIME_MODULE_INIT("timeModuleInit", "初始化时间展示组件"), TIME_MODULE_START("timeModuleStart", "定时组件开始"), TIME_MODULE_STOP("timeModuleStop", "定时组件暂停"); //TIME_MODULE_INIT("timeModuleInit", "初始化时间展示组件"); diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java index d1220a7..5a21f16 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java @@ -106,13 +106,14 @@ public class MesEquipmentModel implements Serializable { } //根据条件查询设备所有有效数据-设备作业任务下拉框 queryMesEquipmentListByParams - public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String equipmentCategory) { + public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String equipmentCategory, + String modifyDatetime) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; this.status = status; this.workCenterCode = workCenterCode; - this.equipmentCategory = equipmentCategory; + this.modifyDatetime = modifyDatetime; } //根据生产线，工位获取设备集合 findMesEquipmentList