Merge branch 'dev' into test

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 ="设备代码&工位")
+    @ApiParam(value ="设备&工位")
-    private String equipmentCodeAndworkCellCode;
+    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) {
+    public MesEquipmentModel(Long id, String equipmentNameAndworkCellName, String equipmentCode, String equipmentName, Integer status, String areaCode, 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) {
         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;