From 5fd51f6b1d477ba15b6b5c7cf0bdbd7d7ddc8998 Mon Sep 17 00:00:00 2001
From: luweihao <wynne.lu@estsh.com>
Date: Fri, 21 Feb 2020 18:03:05 +0800
Subject: [PATCH] =?UTF-8?q?task=20=20=20=E4=BB=BB=E5=8A=A1=E9=87=8D?=
 =?UTF-8?q?=E8=AF=95=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/mes/pcn/bean/MesWorkOrder.java     |  2 +-
 .../pojo/mes/model/PcsObserverStatusModel.java     | 25 ++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PcsObserverStatusModel.java

diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java
index 956a931..68de7f5 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java
@@ -155,7 +155,7 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")
-    public Integer lockVersion;
+    public transient Integer lockVersion;
 
     /**********************  冗余字段 *********************************/
     @Transient
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PcsObserverStatusModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PcsObserverStatusModel.java
new file mode 100644
index 0000000..ef483a5
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PcsObserverStatusModel.java
@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/2/21 17:20
+ * @desc
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("工位监控观察者对象")
+public class PcsObserverStatusModel {
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("运行状况")
+    private Boolean runningStatus;
+}