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

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java

@@ -1,9 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.aps.enums.USE_TYPE;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
@@ -19,4 +22,27 @@ import javax.persistence.Table;
 @Table(name = "APS_ASSIST_RESOURCE_SET_TIME")
 @Api("副资源设置时间")
 public class AssistResourceSetTime extends BaseAPS {
+    @Column(name="RES_CODE")
+    @ApiParam(value ="资源编码")
+    private String resCode;
+
+    @Column(name="TYPE")
+    @ApiParam(value ="副资源使用类型")
+    private USE_TYPE type;
+
+    @Column(name="PREV_RESOURCE")
+    @ApiParam(value ="前资源编码")
+    private String prevResource;
+
+    @Column(name="POST_RESOURCE")
+    @ApiParam(value ="后资源编码")
+    private String postResource;
+
+    @Column(name="TIME")
+    @ApiParam(value ="设置时间")
+    private String time;
+
+    @Column(name="PRIORITY")
+    @ApiParam(value ="优先级")
+    private int priority;
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java

@@ -1,9 +1,13 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.aps.enums.DYNAMIC_SET_CALC;
+import cn.estsh.i3plus.pojo.aps.enums.DYNAMIC_SET_TYPE;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
@@ -19,4 +23,35 @@ import javax.persistence.Table;
 @Table(name = "APS_DYNAMIC_SET_TIME")
 @Api("动态设置时间")
 public class DynamicSetTime extends BaseAPS {
+    @Column(name="RES_CODE")
+    @ApiParam(value ="资源代码")
+    private String resCode;
+
+    @Column(name="TYPE")
+    @ApiParam(value ="应用工作计划类型")
+    private DYNAMIC_SET_TYPE type;
+
+    @Column(name="CONSIDER_ASS_RES")
+    @ApiParam(value ="是否启用副资源动态设置时间")
+    private Boolean considerAssRes;
+
+    @Column(name="CONSIDER_MATERIAL")
+    @ApiParam(value ="是否启用物料动态设置时间")
+    private Boolean considerMaterial;
+
+    @Column(name="ASS_RES_CALC")
+    @ApiParam(value ="副资源动态设置计算方式")
+    private DYNAMIC_SET_CALC assResCalc;
+
+    @Column(name="MATERIAL_CALC")
+    @ApiParam(value ="物料动态设置时间计算方式")
+    private DYNAMIC_SET_CALC materialCalc;
+
+    @Column(name="STATIC_CALC")
+    @ApiParam(value ="与静态设置时间计算方式")
+    private DYNAMIC_SET_CALC staticCalc;
+
+    @Column(name="PRIORITY")
+    @ApiParam(value ="优先级")
+    private int priority;
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java

@@ -2,8 +2,10 @@ package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
@@ -19,4 +21,23 @@ import javax.persistence.Table;
 @Table(name = "APS_MATERIAL_SET_TIME")
 @Api("物料设置时间")
 public class MaterialSetTime extends BaseAPS {
+    @Column(name="RES_CODE")
+    @ApiParam(value ="资源编码")
+    private String resCode;
+
+    @Column(name="PREV_MATERIAL")
+    @ApiParam(value ="前物料编码")
+    private String prevMaterial;
+
+    @Column(name="POST_MATERIAL")
+    @ApiParam(value ="后物料编码")
+    private String postMaterial;
+
+    @Column(name="TIME")
+    @ApiParam(value ="设置时间")
+    private String time;
+
+    @Column(name="PRIORITY")
+    @ApiParam(value ="优先级")
+    private int priority;
 }

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

@@ -60,8 +60,27 @@ public class MesEquTaskDetail extends BaseBean {
     private Integer repairFlag;
 
     @Transient
-    @ApiParam(value ="点检保养记录")
+    @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/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> {
+}