16496 19081-设备管理调整-

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -8503,4 +8503,106 @@ public class MesEnumUtil {
             return description;
         }
     }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TASK_INTEGRAL_JUNCTION {
+
+        TEMPORARY_RESOLVED(10, "临时解决"),
+        LONG_TERM_SOLUTION(20, "长期解决"),
+        UNRESOLVED(30, "未解决");
+
+        private int value;
+        private String description;
+
+        TASK_INTEGRAL_JUNCTION(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MAINTENANCE_TYPE {
+
+        PERIODIC_MAINTENANCE(10, "周期性维护"),
+        IMPROVING_MAINTENANCE(20, "改善性维护"),
+        EMERGENCY_MAINTENANCE(30, "紧急维护");
+
+        private int value;
+        private String description;
+
+        MAINTENANCE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRIORITY {
+
+        HIGH(10, "高"),
+        CENTER(20, "中"),
+        LOW(30, "低");
+
+        private int value;
+        private String description;
+
+        PRIORITY(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java

@@ -73,6 +73,30 @@ public class MesEquTask extends BaseBean implements Serializable {
     @ApiParam("关联任务")
     private String relateTask;
 
+    @Column(name = "FAULT_LOCATION")
+    @ApiParam("故障位置")
+    private String faultLocation;
+
+    @Column(name = "REPAIR_TYPE")
+    @ApiParam("维修类型")
+    private Integer repairType;
+
+    @Column(name = "PRIORITY")
+    @ApiParam("优先级")
+    private Integer priority;
+
+    @Column(name = "DESIGNATOR")
+    @ApiParam("指派人")
+    private String designator;
+
+    @Transient
+    @ApiParam("维修类型")
+    private String repairTypeName;
+
+    @Transient
+    @ApiParam("优先级")
+    private String priorityName;
+
     @Transient
     @ApiParam(value = "设备代码")
     private String equipmentCode;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java

@@ -92,6 +92,10 @@ public class MesEquipment extends BaseBean implements Serializable {
     @ApiParam("备注")
     private String memo;
 
+    @Column(name = "FIXED_ASSETS_NO")
+    @ApiParam("固定资产编号")
+    private String fixedAssetsNo;
+
     @Transient
     @ApiParam(value = "名称")
     private String name;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java

@@ -19,7 +19,7 @@ public class MesEquTaskModel implements Serializable {
     @ApiParam("作业状态")
     private Integer taskStatus;
 
-    @ApiParam(value="生产线")
+    @ApiParam(value = "生产线")
     private String workCenterCode;
 
     @ApiParam("计划日期")
@@ -73,12 +73,33 @@ public class MesEquTaskModel implements Serializable {
     @ApiParam("mes设备作业任务页面按钮控制")
     private MesButtonFlagModel mesButtonFlagModel;
 
+    @ApiParam("故障位置")
+    private String faultLocation;
+
+    @ApiParam("维修类型")
+    private Integer repairType;
+
+    @ApiParam("优先级")
+    private Integer priority;
+
+    @ApiParam("指派人")
+    private String designator;
+
+    @ApiParam("维修类型")
+    private String repairTypeName;
+
+    @ApiParam("优先级")
+    private String priorityName;
+
 
     public MesEquTaskModel() {
 
     }
 
-    public MesEquTaskModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+    public MesEquTaskModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode,
+                           String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask,
+                           String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime,
+                           String modifyUser, String modifyDatetime, String faultLocation, Integer repairType, Integer priority, String designator) {
         this.id = id;
         this.taskNo = taskNo;
         this.taskType = taskType;
@@ -96,5 +117,9 @@ public class MesEquTaskModel implements Serializable {
         this.createDatetime = createDatetime;
         this.modifyUser = modifyUser;
         this.modifyDatetime = modifyDatetime;
+        this.faultLocation = faultLocation;
+        this.repairType = repairType;
+        this.priority = priority;
+        this.designator = designator;
     }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java

@@ -100,6 +100,9 @@ public class MesEquipmentModel implements Serializable {
     @ApiParam("作业校验模式")
     private Integer checkModel;
 
+    @ApiParam("固定资产编号")
+    private String fixedAssetsNo;
+
 
     public MesEquipmentModel() {
 
@@ -143,7 +146,7 @@ public class MesEquipmentModel implements Serializable {
     }
 
     //获取设备分页数据 queryMesEquipmentByPager
-    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, Integer checkModel) {
+    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, Integer checkModel, String fixedAssetsNo) {
         this.id = id;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;
@@ -168,6 +171,7 @@ public class MesEquipmentModel implements Serializable {
         this.modifyUser = modifyUser;
         this.modifyDatetime = modifyDatetime;
         this.checkModel = checkModel;
+        this.fixedAssetsNo = fixedAssetsNo;
     }
 
 }