From 763b88b4209d6d8d194c57f7f5658f971a26b616 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 13 Aug 2020 16:54:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E6=89=AB=E6=8F=8F=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E6=AD=A5=E8=A7=A6=E5=8F=91=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java index bad1874..7b08457 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java @@ -51,6 +51,10 @@ public class MesStep extends BaseBean implements Serializable { @ApiParam("工步对象") private String stepObject; + @Column(name = "TRIGGER_TYPE") + @ApiParam("触发类型") + private Integer triggerType; + /** * 工位扫描业务所需使用字段 */ diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java index 4d37f07..e3fcd90 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java @@ -82,11 +82,15 @@ public class StepModel implements Serializable { @ApiParam("工作单元代码") private String workCellCode; + @ApiParam("触发类型") + private Integer triggerType; + public StepModel() { } public StepModel(String stepCode, String stepName, String stepText, String stepType, String stepObject, - String routeCode, String processCode, Integer stepSeq, String paramCode, String stepDisplayName, String workCellCode) { + String routeCode, String processCode, Integer stepSeq, String paramCode, String stepDisplayName, + String workCellCode, Integer triggerType) { this.stepCode = stepCode; this.stepName = stepName; this.stepText = stepText; @@ -98,5 +102,6 @@ public class StepModel implements Serializable { this.paramCode = paramCode; this.stepDisplayName = stepDisplayName; this.workCellCode = workCellCode; + this.triggerType = triggerType; } }