Start Task #2021,2022 Cost:8h Left:8h

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

@@ -4099,4 +4099,50 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 停机类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STOP_MACHINE_TYPE {
+        TIMER_TIME_OUT(10, "计时器超时停机"),
+        DELAY_HELP(20, "延时帮助停机"),
+        URGENT_STOP(30, "急停停机");
+
+        private int value;
+        private String description;
+
+        STOP_MACHINE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(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 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;
+        }
+    }
 }

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

@@ -0,0 +1,72 @@
+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 java.io.Serializable;
+
+/**
+ * @Description :停机记录表
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-06-03 15:38
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_AGV_STOP_RECORD")
+@Api("MES_停机记录表")
+public class MesAgvStopRecord extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -8961182851767690154L;
+    @Column(name = "STOP_TYPE")
+    @ApiParam("停机类型")
+    private Integer stopType;
+
+    @Column(name = "PRODUCT_SN")
+    @ApiParam("产品条码")
+    private String productSn;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "STOP_START_TIME")
+    @ApiParam("停机开始时间")
+    private String stopStartTime;
+
+    @Column(name = "STOP_END_TIME")
+    @ApiParam("停机结束时间")
+    private String stopEndTime;
+
+    @Column(name = "STOP_REASON")
+    @ApiParam("停机原因")
+    private String stopReason;
+}

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

@@ -44,6 +44,10 @@ public class MesDefect extends BaseBean implements Serializable {
     @ApiParam("缺陷类型")
     private String defectType;
 
+    @Column(name = "PROD_CFG_TYPE_CODE")
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
     @Transient
     @ApiParam("缺陷类型名称")
     private String defectTypeName;

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

@@ -132,6 +132,10 @@ public class MesQueueOrder extends BaseBean implements Serializable {
     @ApiParam("队列类型名称")
     private String queueTypeName;
 
+    @Transient
+    @ApiParam("产品颜色")
+    private String colorName;
+
     public int getStatusVal() {
         return this.status == null ? 0 : this.status;
     }

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesAgvStopRecord;
+
+/**
+ * @Description: 停机记录数据操作层
+ * @Reference:
+ * @Author: siliter.yuan
+ * @CreateDate: 2020\06\03 10:34
+ * @Modify:
+ **/
+public interface MesAgvStopRecordRepository extends BaseRepository<MesAgvStopRecord, Long> {
+}