From 45a7ff613240a2499981f67ba4361297e70f337c Mon Sep 17 00:00:00 2001
From: "jhforever.wang@estsh.com" <jhforever.wang@estsh.com>
Date: Thu, 7 Jan 2021 16:37:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E7=BB=84=E8=A3=85=E7=9C=8B?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/mes/model/MesPaintSnPrintModel.java       |  4 +++
 .../i3plus/pojo/mes/model/StationRequestBean.java  |  4 ++-
 .../mes/model/mgn/tj/AssemblyRealWorkModel.java    | 30 ++++++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AssemblyRealWorkModel.java

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java
index 45ed828..c92b82b 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java
@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate;
+import cn.estsh.i3plus.pojo.mes.bean.MesPackage;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -29,6 +30,9 @@ public class MesPaintSnPrintModel implements Serializable {
     @ApiParam("包装编号")
     private String packageNo;
 
+    @ApiParam("包装信息")
+    private MesPackage packageInfo;
+
     @ApiParam("工单号")
     private String workOrderNo;
 
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 846880d..30814e3 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
@@ -190,7 +190,7 @@ public class StationRequestBean implements Serializable {
     @ApiParam("创建时间")
     private String createDatetime;
 
-    @ApiParam("创建时间")
+    @ApiParam("包装编号")
     private String packageNo;
 
     @ApiParam("密码")
@@ -232,6 +232,8 @@ public class StationRequestBean implements Serializable {
                 ", workOrderNo='" + workOrderNo + '\'' +
                 ", tray='" + tray + '\'' +
                 ", finishCount=" + finishCount +
+                ", packageNo=" + packageNo +
+                ", createDatetime=" + createDatetime +
                 '}';
     }
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AssemblyRealWorkModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AssemblyRealWorkModel.java
new file mode 100644
index 0000000..ebb9bc8
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AssemblyRealWorkModel.java
@@ -0,0 +1,30 @@
+package cn.estsh.i3plus.pojo.mes.model.mgn.tj;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description: 总装实际产量model
+ * @Author: wangjie
+ * @Date: 2020/10/28 2:56 PM
+ * @Modify:
+ */
+@Data
+public class AssemblyRealWorkModel {
+
+    @ApiParam("生产线代码")
+    private String workCenterCode;
+
+    @ApiParam("实际产量")
+    private Double realProdQty;
+
+    @ApiParam("实际目标")
+    private Double realPlanQty;
+
+    @ApiParam("班产目标")
+    private Double shiftPlanQty;
+
+    @ApiParam("本班达成率")
+    private Integer shiftPassPercent;
+
+}