12112 设备周期作业计划需要与作业要求进行关联

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

@@ -0,0 +1,50 @@
+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.*;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2021/1/25 10:47 AM
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "MES_EQU_TASK_DETAIL_STANDARD")
+@Api("设备作业任务要求")
+public class MesEquTaskDetailStandard extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 8033976649492744091L;
+
+    @Column(name = "TASK_DETAIL_ID")
+    @ApiParam("任务明细ID")
+    private Long taskDetailId;
+
+    @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 = "ACTION_GUIDE_URL")
+    @ApiParam("指导文件路径")
+    private String actionGuideUrl;
+}

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

@@ -5,17 +5,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 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;
+import javax.persistence.*;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description :设备周期作业计划
@@ -78,4 +74,8 @@ public class MesEquTaskPlan extends BaseBean implements Serializable {
     @ApiParam("作业任务编号")
     private String taskNo;
 
+    @Transient
+    @ApiParam("设备作业要求")
+    private List<MesEquTaskStandard> equTaskStandards;
+
 }

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

@@ -0,0 +1,50 @@
+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.*;
+import java.io.Serializable;
+
+/**
+ * @Description: 设备周期计划作业要求
+ * @Author: jokelin
+ * @Date: 2021/1/25 10:43 AM
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "MES_EQU_TASK_PLAN_STANDARD")
+@Api("设备周期计划作业要求")
+public class MesEquTaskPlanStandard extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 8284644034068953809L;
+
+    @Column(name = "PLAN_ID")
+    @ApiParam("计划ID")
+    private Long planId;
+
+    @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 = "ACTION_GUIDE_URL")
+    @ApiParam("指导文件路径")
+    private String actionGuideUrl;
+}

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

@@ -1,12 +1,12 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskPlanCfg;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskPlanStandard;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
 
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 public class MesEquTaskPlanModel implements Serializable {
@@ -73,6 +73,9 @@ public class MesEquTaskPlanModel implements Serializable {
     @ApiParam("设备周期计划配置")
     private MesEquTaskPlanCfg planCfg;
 
+    @ApiParam("设备作业要求")
+    private List<MesEquTaskPlanStandard> equTaskStandards;
+
     public MesEquTaskPlanModel() {
 
     }

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

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskDetailStandard;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2021/1/25 10:49 AM
+ * @Modify:
+ */
+public interface MesEquTaskDetailStandardRepository extends BaseRepository<MesEquTaskDetailStandard, Long> {
+}

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

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskPlanStandard;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2021/1/25 10:46 AM
+ * @Modify:
+ */
+public interface MesEquTaskPlanStandardRepository extends BaseRepository<MesEquTaskPlanStandard, Long> {
+}