Merge branch 'test' into dev

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonTarget.java

@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.andon.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;
+
+/**
+ * @author Dominic
+ * @date 2021/6/27 10:46
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "ANDON_TARGET")
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Api("安灯目标")
+public class AndonTarget extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -8981868292756664265L;
+
+    @Column(name = "TARGET_TYPE")
+    @ApiParam("目标类型")
+    private String targetType;
+
+    @Column(name = "TARGET")
+    @ApiParam("目标值")
+    private String target;
+
+    @Column(name = "WEEK")
+    @ApiParam("星期")
+    private String week;
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesShiftRest.java

@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.andon.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.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description :mes系统业务动作
+ * @Reference :
+ * @Author : yiming.gu
+ * @CreateDate : 2019-05-20
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "MES_SHIFT_REST")
+@Api("班次休息信息")
+public class MesShiftRest extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 5486276486536860088L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name = "START_TIME")
+    @ApiParam("开始时间")
+    private String startTime;
+
+    @Column(name = "REST_TIMES", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam("休息时长")
+    private Double restTimes;
+
+    @Column(name = "AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Column(name = "REST_DESC")
+    @ApiParam("班休描述")
+    private String restDesc;
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java

@@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.andon.model;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
-import javax.persistence.Column;
 import java.io.Serializable;
 
 /**
@@ -34,10 +33,10 @@ public class AndonBoardModel implements Serializable {
     private String andonOrderNo;
 
     @ApiParam("安灯类型")
-    private String  alarmCode;
+    private String alarmCode;
 
     @ApiParam("安灯类型名称")
-    private String  alarmName;
+    private String alarmName;
 
     @ApiParam("故障时长  单位：分钟")
     private Long exceptionTimeCount = 0L;
@@ -70,7 +69,7 @@ public class AndonBoardModel implements Serializable {
     private String acDesc;
 
     @ApiParam("工位运行状态")
-    private String  cellStatus;
+    private String cellStatus;
 
     @ApiParam("图表类型颜色")
     private String color;
@@ -90,6 +89,15 @@ public class AndonBoardModel implements Serializable {
     @ApiParam(value = "小时")
     public String hour;
 
+    @ApiParam(value = "运行时长(分钟)")
+    public String runMinute;
+
+    @ApiParam(value = "平均故障时长(分钟)")
+    public String avgExceptionTime;
+
+    @ApiParam(value = "MTBF(总运行时间/停线次数)")
+    public String mtbf;
+
     public int getTotalTimeVal() {
         return totalTime == null ? 0 : totalTime;
     }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonTargetRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonTarget;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 安灯目标
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2021/6/27 11:39
+ * @Modify:
+ **/
+@Repository
+public interface IAndonTargetRepository extends BaseRepository<AndonTarget, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/MesShiftRestRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.MesShiftRest;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-05-20
+ * @Modify:
+ **/
+@Repository
+public interface MesShiftRestRepository extends BaseRepository<MesShiftRest, Long> {
+}

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

@@ -8503,4 +8503,106 @@ public class MesEnumUtil {
             return description;
         }
     }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TASK_INTEGRAL_JUNCTION {
+
+        TEMPORARY_RESOLVED(10, "临时解决"),
+        LONG_TERM_SOLUTION(20, "长期解决"),
+        UNRESOLVED(30, "未解决");
+
+        private int value;
+        private String description;
+
+        TASK_INTEGRAL_JUNCTION(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MAINTENANCE_TYPE {
+
+        PERIODIC_MAINTENANCE(10, "周期性维护"),
+        IMPROVING_MAINTENANCE(20, "改善性维护"),
+        EMERGENCY_MAINTENANCE(30, "紧急维护");
+
+        private int value;
+        private String description;
+
+        MAINTENANCE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRIORITY {
+
+        HIGH(10, "高"),
+        CENTER(20, "中"),
+        LOW(30, "低");
+
+        private int value;
+        private String description;
+
+        PRIORITY(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }

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

@@ -45,6 +45,10 @@ public class MesElectrotestingPrintData extends BaseBean implements Serializable
     @ApiParam("佣金号")
     private String commissionNumber;
 
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("流水号")
+    private String serialNumber;
+
     @Column(name = "QAD_NO")
     @ApiParam("位置号")
     private String qadNo;

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

@@ -73,6 +73,30 @@ public class MesEquTask extends BaseBean implements Serializable {
     @ApiParam("关联任务")
     private String relateTask;
 
+    @Column(name = "FAULT_LOCATION")
+    @ApiParam("故障位置")
+    private String faultLocation;
+
+    @Column(name = "REPAIR_TYPE")
+    @ApiParam("维修类型")
+    private Integer repairType;
+
+    @Column(name = "PRIORITY")
+    @ApiParam("优先级")
+    private Integer priority;
+
+    @Column(name = "DESIGNATOR")
+    @ApiParam("指派人")
+    private String designator;
+
+    @Transient
+    @ApiParam("维修类型")
+    private String repairTypeName;
+
+    @Transient
+    @ApiParam("优先级")
+    private String priorityName;
+
     @Transient
     @ApiParam(value = "设备代码")
     private String equipmentCode;

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

@@ -65,6 +65,10 @@ public class MesEquTaskDetail extends BaseBean implements Serializable {
     @ApiParam("维修标识")
     private Integer repairFlag;
 
+    @Column(name = "FILE_ID")
+    @ApiParam("文件id")
+    private String fileId;
+
     @Transient
     @ApiParam(value = "点检保养记录")
     private List<MesEquTaskStandardRecord> equTaskStandardRecordList;

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

@@ -92,6 +92,10 @@ public class MesEquipment extends BaseBean implements Serializable {
     @ApiParam("备注")
     private String memo;
 
+    @Column(name = "FIXED_ASSETS_NO")
+    @ApiParam("固定资产编号")
+    private String fixedAssetsNo;
+
     @Transient
     @ApiParam(value = "名称")
     private String name;

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

@@ -58,6 +58,18 @@ public class MesTooling extends BaseBean implements Serializable {
     @ApiParam("提醒次数")
     private Integer remindCount;
 
+    @Column(name = "WARNING_TIME")
+    @ApiParam("预警次数")
+    private Integer warningTime;
+
+    @Column(name = "NOTIFY_USER_EMP_NO")
+    @ApiParam("通知员工号")
+    private String notifyUserEmpNo;
+
+    @Column(name = "NOTIFY_USER_NAME")
+    @ApiParam("通知员工名称")
+    private String notifyUserName;
+
     @Transient
     @ApiParam("使用次数")
     private Integer useCount;

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

@@ -19,7 +19,7 @@ public class MesEquTaskModel implements Serializable {
     @ApiParam("作业状态")
     private Integer taskStatus;
 
-    @ApiParam(value="生产线")
+    @ApiParam(value = "生产线")
     private String workCenterCode;
 
     @ApiParam("计划日期")
@@ -73,12 +73,33 @@ public class MesEquTaskModel implements Serializable {
     @ApiParam("mes设备作业任务页面按钮控制")
     private MesButtonFlagModel mesButtonFlagModel;
 
+    @ApiParam("故障位置")
+    private String faultLocation;
+
+    @ApiParam("维修类型")
+    private Integer repairType;
+
+    @ApiParam("优先级")
+    private Integer priority;
+
+    @ApiParam("指派人")
+    private String designator;
+
+    @ApiParam("维修类型")
+    private String repairTypeName;
+
+    @ApiParam("优先级")
+    private String priorityName;
+
 
     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) {
+    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, String faultLocation, Integer repairType, Integer priority, String designator) {
         this.id = id;
         this.taskNo = taskNo;
         this.taskType = taskType;
@@ -96,5 +117,9 @@ public class MesEquTaskModel implements Serializable {
         this.createDatetime = createDatetime;
         this.modifyUser = modifyUser;
         this.modifyDatetime = modifyDatetime;
+        this.faultLocation = faultLocation;
+        this.repairType = repairType;
+        this.priority = priority;
+        this.designator = designator;
     }
 }

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

@@ -100,6 +100,9 @@ public class MesEquipmentModel implements Serializable {
     @ApiParam("作业校验模式")
     private Integer checkModel;
 
+    @ApiParam("固定资产编号")
+    private String fixedAssetsNo;
+
 
     public MesEquipmentModel() {
 
@@ -143,7 +146,7 @@ public class MesEquipmentModel implements Serializable {
     }
 
     //获取设备分页数据 queryMesEquipmentByPager
-    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, Integer checkModel) {
+    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, Integer checkModel, String fixedAssetsNo) {
         this.id = id;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;
@@ -168,6 +171,7 @@ public class MesEquipmentModel implements Serializable {
         this.modifyUser = modifyUser;
         this.modifyDatetime = modifyDatetime;
         this.checkModel = checkModel;
+        this.fixedAssetsNo = fixedAssetsNo;
     }
 
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesToolingDetailRepository.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.MesToolingDetail;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2021/6/26 5:57 PM
+ * @Modify:
+ */
+public interface MesToolingDetailRepository extends BaseRepository<MesToolingDetail, Long> {
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java

@@ -46,7 +46,7 @@ public class SysLogRoleChange extends BaseBean {
     @ApiModelProperty(value = "之前的角色", access = "之前的角色")
     private String previousRoles;
 
-    @Column(name = "CURRENT_ROLES")
+    @Column(name = "CURRENT_ROLES", columnDefinition = "TEXT")
     @ApiModelProperty(value = "当前的角色", access = "当前的角色")
     private String currentRoles;