From 030343f2cea4168a85c27d1fdc114bcd3e45bd2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 25 Aug 2020 00:46:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E7=BA=B3=E5=B7=9D=E9=97=AE=E9=A2=98?= =?UTF-8?q?=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 | 3 ++- .../java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java | 4 +++- 2 files changed, 5 insertions(+), 2 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 d464a7f..e00b1a8 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 @@ -2592,7 +2592,8 @@ public class MesPcnEnumUtil { PROCESS_CONTENT("processContent", "过程组件内容"), TIME_MODULE_CONTENT("timeModuleContent", "定时组件内容"), TIME_MODULE_START("timeModuleStart", "定时组件开始"), - TIME_MODULE_STOP("timeModuleStop", "定时组件暂停"); + TIME_MODULE_STOP("timeModuleStop", "定时组件暂停"), + TIME_MODULE_INIT("timeModuleInit", "初始化时间展示组件"); private String value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java index 7ee2845..681d328 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java @@ -104,12 +104,14 @@ public class ProductInfoManageModel { this.queDetailSeq = queDetailSeq; } - public ProductInfoManageModel(String vinCode, String produceCategoryCode, String orderNo, Double queDetailSeq, Double queueSeq, String workType) { + public ProductInfoManageModel(String vinCode, String produceCategoryCode, String orderNo, Double queDetailSeq, + Double queueSeq, String workType, String produceColor) { this.vinCode = vinCode; this.produceCategoryCode = produceCategoryCode; this.orderNo = orderNo; this.queDetailSeq = queDetailSeq; this.queueSeq = queueSeq; this.workType = workType; + this.produceColor = produceColor; } }