From 40d921ddd6c92d9a698cae1b88e42334b7548415 Mon Sep 17 00:00:00 2001
From: wynne1005 <lu_1005@foxmail.com>
Date: Wed, 10 Jun 2020 20:15:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=82=B9=E7=B1=BB=E5=9E=8B=EF=BC=8C=E5=8F=91?=
 =?UTF-8?q?=E8=BF=90=E8=87=AA=E6=B5=8B1?=
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  | 4 +++-
 .../java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java     | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

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 67911a9..d82c3a2 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
@@ -3397,6 +3397,7 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum FSM_STATE_TYPE {
         BEGIN(10, "begin", "开始状态点"),
+        BACK(20, "back", "回退状态点"),
         END(40, "end", "结束状态点");
 
         private int value;
@@ -3599,7 +3600,8 @@ public class MesPcnEnumUtil {
         START(10, "START", "开始状态"),
         EXECUTING(20, "EXECUTING", "执行中状态"),
         TERMINATE(30, "TERMINATE", "中断状态"),
-        FINISH(40, "FINISH", "完成状态");
+        FINISH(40, "FINISH", "完成状态"),
+        BACK(99, "BACK", "回退状态");
 
         private int value;
         private String code;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java
index 4b8994b..5bc6718 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java
@@ -78,6 +78,10 @@ public class MesStateMachineStatus extends BaseBean implements Serializable {
     @ApiParam("状态类型 10=初始化状态")
     private Integer statusType;
 
+    @Column(name = "SEQ")
+    @ApiParam("状态点顺序")
+    private Integer seq;
+
     @Transient
     @ApiParam("状态点是否完成")
     private boolean isComplete;