From 24a3b0e2b0e06cad65f2e185be396f0cd4fe0094 Mon Sep 17 00:00:00 2001
From: "jhforever.wang@estsh.com" <jhforever.wang@estsh.com>
Date: Fri, 11 Oct 2019 20:32:53 +0800
Subject: [PATCH] =?UTF-8?q?mes=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/mes/bean/MesEquipment.java   |  4 ++
 .../i3plus/pojo/mes/model/MesEquipmentModel.java   | 51 ++++++++++++++++++++++
 2 files changed, 55 insertions(+)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java
index f7f03b2..bdda980 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java
@@ -79,6 +79,10 @@ public class MesEquipment extends BaseBean {
     @ApiParam("连接类型")
     private Integer connectType;
 
+    @Column(name="MEMO")
+    @ApiParam("备注")
+    private String memo;
+
     @Transient
     @ApiParam(value ="名称")
     private String name;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java
index cfe4f4d..2f34121 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java
@@ -34,6 +34,37 @@ public class MesEquipmentModel implements Serializable {
     @ApiParam(value ="设备&工位")
     private String equipmentNameAndworkCellName;
 
+    @ApiParam("设备类型")
+    private Integer equipmentType;
+
+    @ApiParam(value ="设备类别")
+    private String equipmentCategory;
+
+    @ApiParam(value ="备注")
+    private String memo;
+
+    @ApiParam(value ="设备型号")
+    private String equipmentModel;
+
+    @ApiParam(value ="设备规格")
+    private String equipmentSpec;
+
+    @ApiParam("制造商")
+    private String equipmentMaker;
+
+    @ApiParam("出厂日期")
+    private String releaseDate;
+
+    @ApiParam("接收日期")
+    private String receiveDate;
+
+    @ApiParam("启用日期")
+    private String enableDate;
+
+    @ApiParam("连接类型")
+    private Integer connectType;
+
+
     public MesEquipmentModel() {
 
     }
@@ -60,4 +91,24 @@ public class MesEquipmentModel implements Serializable {
         this.workCellCode = workCellCode;
 
     }
+
+    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType) {
+        this.id = id;
+        this.equipmentCode = equipmentCode;
+        this.equipmentName = equipmentName;
+        this.status = status;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+        this.areaCode = areaCode;
+        this.equipmentType = equipmentType;
+        this.equipmentCategory = equipmentCategory;
+        this.memo = memo;
+        this.equipmentModel = equipmentModel;
+        this.equipmentSpec = equipmentSpec;
+        this.equipmentMaker = equipmentMaker;
+        this.releaseDate = releaseDate;
+        this.receiveDate = receiveDate;
+        this.enableDate = enableDate;
+        this.connectType = connectType;
+    }
 }