Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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

@@ -330,7 +330,7 @@ public class MesEnumUtil {
     public enum MES_EQU_TASK_NOTIFY_CFG_PATTERN {
 
         EMAIL(10, "邮件"),
-        USERPHONE(10, "手机号");
+        USERPHONE(20, "手机号");
 
         private int value;
         private String description;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.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 :设备作业任务明细
@@ -57,5 +59,28 @@ public class MesEquTaskDetail extends BaseBean {
     @ApiParam("维修标识")
     private Integer repairFlag;
 
+    @Transient
+    @ApiParam(value = "点检保养记录")
+    private List<MesEquTaskStandardRecord> equTaskStandardRecordList;
+
+    @Transient
+    @ApiParam(value = "工位")
+    private String workCellCode;
+
+    @Transient
+    @ApiParam(value = "生产线")
+    private String workCenterCode;
+
+    @Transient
+    @ApiParam(value = "故障现象")
+    private String fpCode;
+
+    @Transient
+    @ApiParam(value = "故障原因")
+    private String fcCode;
+
+    @Transient
+    @ApiParam(value = "处理方法")
+    private String fmCode;
 
 }

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

@@ -0,0 +1,68 @@
+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;
+
+/**
+ * @Description :设备维修作业记录
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-10-11
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EQU_TASK_REPAIR_RECORD")
+@Api("设备维修作业记录")
+public class MesEquTaskRepairRecord 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 = "FP_CODE")
+    @ApiParam("故障现象")
+    private String fpCode;
+
+    @Column(name = "FC_CODE")
+    @ApiParam("故障原因")
+    private String fcCode;
+
+    @Column(name = "FM_CODE")
+    @ApiParam("处理方法")
+    private String fmCode;
+
+    @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/EquTaskNotifyUserModel.java

@@ -31,7 +31,7 @@ import java.util.List;
 @Api("用户信息model")
 public class EquTaskNotifyUserModel extends BaseBean {
 
-    @ApiParam(value ="人员ID")
+    @ApiParam(value ="账户ID")
     private Long userId;
 
     @Column(name="USER_NAME_RDD")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskRepairRecordRepository.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.MesEquTaskRepairRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-10-11
+ * @Modify:
+ **/
+@Repository
+public interface MesEquTaskRepairRecordRepository extends BaseRepository<MesEquTaskRepairRecord, Long> {
+}