From 2a1274df654d9d8b1de684bab7207284aaf11f7d Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 11 Oct 2019 11:03:58 +0800 Subject: [PATCH] =?UTF-8?q?mes=E7=BB=84=E7=BB=87=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/MesEquipmentModel.java | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) 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 85c2f18..cfe4f4d 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 @@ -31,8 +31,8 @@ public class MesEquipmentModel implements Serializable { @ApiParam(value ="设备工位关联ID") private Long wcId; - @ApiParam(value ="设备代码&工位") - private String equipmentCodeAndworkCellCode; + @ApiParam(value ="设备&工位") + private String equipmentNameAndworkCellName; public MesEquipmentModel() { @@ -49,22 +49,13 @@ public class MesEquipmentModel implements Serializable { this.areaCode = areaCode; } - public MesEquipmentModel(Long wcId, Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode) { - this.wcId = wcId; - this.id = id; - this.equipmentCode = equipmentCode; - this.equipmentName = equipmentName; - this.status = status; - this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; - } - - public MesEquipmentModel(Long id, String equipmentCodeAndworkCellCode, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode) { + public MesEquipmentModel(Long id, String equipmentNameAndworkCellName, String equipmentCode, String equipmentName, Integer status, String areaCode, String workCenterCode, String workCellCode) { this.id = id; - this.equipmentCodeAndworkCellCode = equipmentCodeAndworkCellCode; + this.equipmentNameAndworkCellName = equipmentNameAndworkCellName; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; this.status = status; + this.areaCode = areaCode; this.workCenterCode = workCenterCode; this.workCellCode = workCellCode;