[需求：1086， mes设备点检保养作业]

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

@@ -40,7 +40,7 @@ public class MesEquTask extends BaseBean {
     private Integer taskType;
 
     @Column(name = "TASK_STATUS")
-    @ApiParam("作业状态")
+    @ApiParam("任务状态")
     private Integer taskStatus;
 
     @Column(name = "WORK_CENTER_CODE")
@@ -80,6 +80,10 @@ public class MesEquTask extends BaseBean {
     private String planTimeEnd;
 
     @Transient
+    @ApiParam(value = "用于设备点检保养维修作业页面开窗查询任务，点检保养=1，维修=2")
+    private String pageType;
+
+    @Transient
     @ApiParam(value ="明细列表")
     private List<MesEquTaskDetail> mesEquTaskDetailList;
 

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

@@ -0,0 +1,73 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * @Description :设备点检保养作业记录
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-10-11
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EQU_TASK_STANDARD_RECORD")
+@Api("设备点检保养作业记录")
+public class MesEquTaskStandardRecord extends BaseBean {
+
+    @Column(name = "TASK_NO")
+    @ApiParam("作业任务编号")
+    private String taskNo;
+
+    @Column(name = "TASK_TYPE")
+    @ApiParam("作业类型")
+    private Integer taskType;
+
+    @Column(name = "EQUIPMENT_CODE")
+    @ApiParam("设备代码")
+    private String equipmentCode;
+
+    @Column(name = "EQUIPMENT_NAME")
+    @ApiParam("设备名称")
+    private String equipmentName;
+
+    @Column(name = "ACTION_ITEM")
+    @ApiParam("操作项")
+    private String actionItem;
+
+    @Column(name = "ACTION_STANDARD")
+    @ApiParam("操作标准")
+    private String actionStandard;
+
+    @Column(name = "ACTION_GUIDE")
+    @ApiParam("操作指导")
+    private String actionGuide;
+
+    @Column(name = "CHECK_RESULT")
+    @ApiParam("判定结果")
+    private Integer checkResult;
+
+    @Column(name = "FINAL_RESULT")
+    @ApiParam("整体结果")
+    private Integer finalResult;
+
+    @Column(name = "MEMO")
+    @ApiParam("备注")
+    private String memo;
+
+}

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

@@ -1,9 +1,11 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
+import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskStandardRecord;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 public class MesEquTaskDetailModel implements Serializable {
@@ -70,6 +72,12 @@ public class MesEquTaskDetailModel implements Serializable {
     @ApiParam("作业类型")
     private String taskTypeName;
 
+    @ApiParam("设备点检保养记录修改标识")
+    private Boolean isUpdate;
+
+    @ApiParam("设备点检保养记录")
+    private List<MesEquTaskStandardRecord> equTaskStandardRecordList;
+
 
     public MesEquTaskDetailModel() {
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskStandardRecordRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskStandardRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-10-11
+ * @Modify:
+ **/
+@Repository
+public interface MesEquTaskStandardRecordRepository extends BaseRepository<MesEquTaskStandardRecord, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -1530,4 +1530,27 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 按条件分页查询mes设备点检保养维修作业
+     * @param mesEquTaskDetail
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesEquTaskDetailByTaskNo(MesEquTaskDetail mesEquTaskDetail, String organizeCode) {
+        DdlPackBean packBean = getMesAllData(organizeCode);
+        if (!StringUtils.isEmpty(mesEquTaskDetail.getTaskNo())) {
+            DdlPreparedPack.getStringEqualPack(mesEquTaskDetail.getTaskNo(), "taskNo", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquTaskDetail.getEquipmentCode())) {
+            DdlPreparedPack.getStringLikerPack(mesEquTaskDetail.getEquipmentCode(), "equipmentCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquTaskDetail.getActionStatus())) {
+            DdlPreparedPack.getNumEqualPack(mesEquTaskDetail.getActionStatus(), "actionStatus", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquTaskDetail.getFinalResult())) {
+            DdlPreparedPack.getNumEqualPack(mesEquTaskDetail.getFinalResult(), "finalResult", packBean);
+        }
+        return packBean;
+    }
 }