mes设备作业任务

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

@@ -289,10 +289,10 @@ public class MesEnumUtil {
     }
 
     /**
-     * mes设备作业要求-作业类型
+     * mes设备-作业类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_EQU_TASK_STANDARD_TASK_TYPE {
+    public enum MES_EQU_TASK_TYPE {
 
         CHECK(10, "点检"),
         MAINTAIN(20, "保养"),
@@ -301,7 +301,7 @@ public class MesEnumUtil {
         private int value;
         private String description;
 
-        MES_EQU_TASK_STANDARD_TASK_TYPE(int value, String description) {
+        MES_EQU_TASK_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }

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

@@ -12,6 +12,8 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description :设备作业任务
@@ -65,4 +67,20 @@ public class MesEquTask extends BaseBean {
     @ApiParam("关联任务")
     private String relateTask;
 
+    @Transient
+    @ApiParam(value = "设备代码")
+    private String equipmentCode;
+
+    @Transient
+    @ApiParam(value = "计划日期起始时间")
+    private String planTimeStart;
+
+    @Transient
+    @ApiParam(value = "计划日期结束时间")
+    private String planTimeEnd;
+
+    @Transient
+    @ApiParam(value ="明细列表")
+    private List<MesEquTaskDetail> mesEquTaskDetailList;
+
 }

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

@@ -0,0 +1,105 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class MesEquTaskDetailModel implements Serializable {
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("作业任务编号")
+    private String taskNo;
+
+    @ApiParam("设备代码")
+    private String equipmentCode;
+
+    @ApiParam("设备名称")
+    private String equipmentName;
+
+    @ApiParam("执行状态")
+    private Integer actionStatus;
+
+    @ApiParam("整体结果")
+    private Integer finalResult;
+
+    @ApiParam("备注")
+    private String memo;
+
+    @ApiParam("维修标识")
+    private Integer repairFlag;
+
+    @ApiParam("作业类型")
+    private Integer taskType;
+
+    @ApiParam(value="生产线")
+    private String workCenterCode;
+
+    @ApiParam("组织代码")
+    public String organizeCode;
+
+    @ApiParam("有效性")
+    public Integer isValid;
+
+    @ApiParam("是否已删除")
+    public Integer isDeleted;
+
+    @ApiParam("创建用户")
+    public String createUser;
+
+    @ApiParam("创建日期")
+    public String createDatetime;
+
+    @ApiParam("修改人")
+    public String modifyUser;
+
+    @ApiParam("修改日期")
+    public String modifyDatetime;
+
+    @ApiParam("执行状态")
+    private String actionStatusName;
+
+    @ApiParam("整体结果")
+    private String finalResultName;
+
+    @ApiParam("维修标识")
+    private String repairFlagName;
+
+    @ApiParam("作业类型")
+    private String taskTypeName;
+
+
+    public MesEquTaskDetailModel() {
+
+    }
+
+    public MesEquTaskDetailModel(Long id, String taskNo, String equipmentCode, String equipmentName, String workCenterCode) {
+        this.id = id;
+        this.taskNo = taskNo;
+        this.equipmentCode = equipmentCode;
+        this.equipmentName = equipmentName;
+        this.workCenterCode = workCenterCode;
+    }
+
+    public MesEquTaskDetailModel(Long id, String taskNo, String equipmentCode, String equipmentName, Integer actionStatus, Integer finalResult, String memo, Integer repairFlag, Integer taskType, String workCenterCode, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+        this.id = id;
+        this.taskNo = taskNo;
+        this.equipmentCode = equipmentCode;
+        this.equipmentName = equipmentName;
+        this.actionStatus = actionStatus;
+        this.finalResult = finalResult;
+        this.memo = memo;
+        this.repairFlag = repairFlag;
+        this.taskType = taskType;
+        this.workCenterCode = workCenterCode;
+        this.organizeCode = organizeCode;
+        this.isValid = isValid;
+        this.isDeleted = isDeleted;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+    }
+}

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

@@ -0,0 +1,97 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class MesEquTaskModel implements Serializable {
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("作业任务编号")
+    private String taskNo;
+
+    @ApiParam("作业类型")
+    private Integer taskType;
+
+    @ApiParam("作业状态")
+    private Integer taskStatus;
+
+    @ApiParam(value="生产线")
+    private String workCenterCode;
+
+    @ApiParam("计划日期")
+    private String planTime;
+
+    @ApiParam("任务来源")
+    private Integer taskSource;
+
+    @ApiParam("备注")
+    private String memo;
+
+    @ApiParam("通知标识")
+    private Integer notifyFlag;
+
+    @ApiParam("关联任务")
+    private String relateTask;
+
+    @ApiParam("组织代码")
+    public String organizeCode;
+
+    @ApiParam("有效性")
+    public Integer isValid;
+
+    @ApiParam("是否已删除")
+    public Integer isDeleted;
+
+    @ApiParam("创建用户")
+    public String createUser;
+
+    @ApiParam("创建日期")
+    public String createDatetime;
+
+    @ApiParam("修改人")
+    public String modifyUser;
+
+    @ApiParam("修改日期")
+    public String modifyDatetime;
+
+    @ApiParam("作业类型")
+    private String taskTypeName;
+
+    @ApiParam("作业状态")
+    private String taskStatusName;
+
+    @ApiParam("任务来源")
+    private String taskSourceName;
+
+    @ApiParam("通知标识")
+    private String notifyFlagName;
+
+
+    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) {
+        this.id = id;
+        this.taskNo = taskNo;
+        this.taskType = taskType;
+        this.taskStatus = taskStatus;
+        this.workCenterCode = workCenterCode;
+        this.planTime = planTime;
+        this.taskSource = taskSource;
+        this.memo = memo;
+        this.notifyFlag = notifyFlag;
+        this.relateTask = relateTask;
+        this.organizeCode = organizeCode;
+        this.isValid = isValid;
+        this.isDeleted = isDeleted;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+    }
+}

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

@@ -102,6 +102,15 @@ public class MesEquipmentModel implements Serializable {
 
     }
 
+    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String equipmentCategory) {
+        this.id = id;
+        this.equipmentCode = equipmentCode;
+        this.equipmentName = equipmentName;
+        this.status = status;
+        this.workCenterCode = workCenterCode;
+        this.equipmentCategory = equipmentCategory;
+    }
+
     public MesEquipmentModel(Long wcId, Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode) {
         this.wcId = wcId;
         this.id = id;