From 66b98dd6d56273efec559a21ab73f8ee7b940670 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= <sliter.yuan@estsh.com>
Date: Mon, 22 Jun 2020 20:17:51 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=BC=80=E5=8F=91=E6=B6=82=E8=A3=85=E4=B8=8A?=
 =?UTF-8?q?=E7=BA=BF=E5=8A=9F=E8=83=BD=E9=80=BB=E8=BE=91=202.=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E6=B6=82=E8=A3=85=E5=B7=A5=E5=8D=95=E6=9D=A1=E7=A0=81?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java |  5 ++
 .../pojo/mes/model/MesPaintSnPrintModel.java       | 45 ++++++++++++++++++
 .../i3plus/pojo/mes/model/PaintOnLineModel.java    | 55 ++++++++++++++++++++++
 3 files changed, 105 insertions(+)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java
index 41042ca..40939d5 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java
@@ -30,6 +30,11 @@ import java.io.Serializable;
 @Api("工位投料信息")
 public class MesCellFeed extends BaseBean implements Serializable {
     private static final long serialVersionUID = 1947971369479107782L;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("工单号")
+    private String orderNo;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")
     private String workCenterCode;
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
new file mode 100644
index 0000000..abf1eff
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java
@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: siliter.yuan
+ * @CreateDate: 2020\06\22 15:58
+ * @Modify:
+ **/
+@Data
+public class MesPaintSnPrintModel implements Serializable {
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("产品条码")
+    private String produceSn;
+
+    @ApiParam("包装编号")
+    private String packageNo;
+
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("工厂代码")
+    private String organizeCode;
+
+    @ApiParam("打印模板")
+    private MesLabelTemplate labelTemplate;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java
new file mode 100644
index 0000000..33f7751
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java
@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import cn.estsh.i3plus.pojo.mes.bean.MesCellFeed;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author: siliter.yuan
+ * @CreateDate: 2020/6/21 8:06 PM
+ * @Description:
+ **/
+@Data
+@Api("涂装上线MODEL")
+public class PaintOnLineModel {
+
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("颜色")
+    private String color;
+
+    @ApiParam("工单数量")
+    private Double orderNum;
+
+    @ApiParam("包装数量")
+    private Double packageNum;
+
+    @ApiParam("项目名称")
+    private String productName;
+
+    @ApiParam("创建时间")
+    private String createDateTime;
+
+    @ApiParam("圈数")
+    private Integer rounds;
+
+    @ApiParam("工位投料数据列表")
+    private List<MesCellFeed> cellFeedList;
+}