From ae71f6a008f3d4a432417e5ba4aca53b90405498 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 24 May 2021 16:46:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9C=BA=20-=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 06aec88..44c290b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -94,6 +94,9 @@ public class StationRequestBean implements Serializable { @ApiParam("强制跳过工序") private Boolean forceJumpProcess = false; + @ApiParam("自动执行状态机") + private Boolean triggerAutoFsm = false; + @ApiParam("强制执行工步代码") private String forceSpecStepCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java index 1a8f7c8..9a15c9a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java @@ -97,6 +97,10 @@ public class StepResult { return new StepResult<>(true, data, "", nextTriggerEvent); } + public static StepResult getNewFailureData(T data, String nextTriggerEvent) { + return new StepResult<>(false, data, "", nextTriggerEvent); + } + public static StepResult getSuccessData(Collection data, String msg) { return new StepResult(true, data, msg); }