From 00252caa0c609b3855ddc6d128bb2fd7d403b2ea Mon Sep 17 00:00:00 2001
From: luweihao <wynne.lu@estsh.com>
Date: Mon, 9 Mar 2020 19:19:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8mespcn=E5=85=AC=E7=94=A8model?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/mes/model/ActorMessageModel.java   | 37 ++++++++++++++++++++++
 .../i3plus/pojo/mes/model}/StationRequestBean.java |  2 +-
 .../cn/estsh/i3plus/pojo/mes/model}/StepModel.java |  2 +-
 3 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java
 rename modules/{i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes => i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model}/StationRequestBean.java (98%)
 rename modules/{i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes => i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model}/StepModel.java (98%)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java
new file mode 100644
index 0000000..822087a
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java
@@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/3/9 15:35
+ * @desc
+ */
+@Data
+public class ActorMessageModel<T> {
+
+    private String msgType;
+
+    private String clientInfo;
+
+    private String workCellCode;
+
+    private String workCenterCode;
+
+    private String organizeCode;
+
+    private String routeCode;
+
+    private String serialNumber;
+
+    private String productSn;
+
+    private T dataObj;
+
+    private List<? extends T> dataList;
+
+    private Map<String, Object> dataMap;
+}
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java
similarity index 98%
rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java
rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java
index 46134cc..d4961d3 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java
@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.model.mes;
+package cn.estsh.i3plus.pojo.mes.model;
 
 
 import io.swagger.annotations.ApiParam;
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java
similarity index 98%
rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java
rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java
index 6b7eedd..7636eae 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java
@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.model.mes;
+package cn.estsh.i3plus.pojo.mes.model;
 
 import io.swagger.annotations.ApiParam;
 import lombok.Data;