From e2894143632ce5187b3aa5f2fb96ff706fefae8e Mon Sep 17 00:00:00 2001
From: wynne1005 <lu_1005@foxmail.com>
Date: Fri, 3 Apr 2020 22:23:33 +0800
Subject: [PATCH] Merge branch 'dev' of
 http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

---
 .../java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java     | 10 +++++++++-
 .../cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java     |  3 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java
index 809f29c..d97a57a 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java
@@ -18,8 +18,16 @@ public class CellFeedModel {
 
     private String partNo;
 
+    private String partName;
+
     private String itemPartNo;
 
-    private String qty;
+    private String itemPartName;
+
+    private String shouldQty;
+
+    private String remainQty;
+
+    private String scanQty;
 
 }
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 d1e1299..236115b 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
@@ -110,6 +110,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("当前流程状态")
     private MesRouteStatus curRouteStatus;
 
+    @ApiParam("展示组件")
+    private Object moduleService;
+
     @Override
     public String toString() {
         return "StationRequestBean{" +