From 982f8ad7419e14f799cf32ca57993824d524fef0 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 10 Oct 2019 21:59:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?mes=E8=AE=BE=E7=BD=AE=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 2969233..f24ceee 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 @@ -46,7 +46,8 @@ public class MesEquipmentModel implements Serializable { this.areaCode = areaCode; } - public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode) { + 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; From 6c54f204b7fe9bd154c2910b75f61b46de8eb318 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 10 Oct 2019 23:25:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?mes=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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 f24ceee..85c2f18 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,6 +31,9 @@ public class MesEquipmentModel implements Serializable { @ApiParam(value ="设备工位关联ID") private Long wcId; + @ApiParam(value ="设备代码&工位") + private String equipmentCodeAndworkCellCode; + public MesEquipmentModel() { } @@ -55,4 +58,15 @@ public class MesEquipmentModel implements Serializable { this.workCenterCode = workCenterCode; this.workCellCode = workCellCode; } + + public MesEquipmentModel(Long id, String equipmentCodeAndworkCellCode, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode) { + this.id = id; + this.equipmentCodeAndworkCellCode = equipmentCodeAndworkCellCode; + this.equipmentCode = equipmentCode; + this.equipmentName = equipmentName; + this.status = status; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + + } }