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

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

@@ -14,85 +14,6 @@ import java.util.List;
  **/
 public class BlockReportEnumUtil {
 
-    /**
-     * 软件类型
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum SOFT_TYPE {
-        CORE(2, "i3core", "i3业务平台");
-
-        private int value;
-        private String code;
-        private String description;
-
-        private SOFT_TYPE(int value, String code, String description) {
-            this.value = value;
-            this.code = code;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getCode() {
-            return code;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public static String valueOfCode(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].code;
-                }
-            }
-            return tmp;
-        }
-
-        public static int codeOfValue(String code) {
-            int tmp = 1;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].code.equals(code)) {
-                    tmp = values()[i].value;
-                }
-            }
-            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;
-        }
-
-        public static SOFT_TYPE valueOf(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    return values()[i];
-                }
-            }
-            return null;
-        }
-
-        public static String codeOfDescription(String code) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].code.equals(code)) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-    }
 
     /**
      * 报表元素枚举

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

@@ -37,6 +37,10 @@ public class MesProduceSn extends BaseBean {
     @ApiParam("物料号")
     private String partNo;
 
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
     @Column(name="QTY")
     @ApiParam("数量")
     private Double qty;

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

@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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 javax.persistence.Transient;
+
+/**
+* @Description : 产品条码履历实体类
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2019-05-29 16:22
+* @Modify: 
+**/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PRODUCE_SN_TRAVEL")
+@Api("产品条码履历表")
+public class MesProduceSnTravel extends MesProduceSn {
+}

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description:
@@ -66,6 +67,15 @@ public class MesQueueOrderDetail extends BaseBean {
     @Column(name = "PRODUCE_CATEGORY_NAME_RDD")
     @ApiParam("产品类型名称")
     private String produceCategoryNameRdd;
+
+    @Transient
+    @ApiParam("队列序号")
+    private Double queueSeq;
+
+    public double getQueueSeqVal() {
+        return this.queueSeq == null ? 0.0d : this.queueSeq;
+    }
+
     public double getSeqVal() {
         return this.seq == null ? 0.0d : this.seq;
     }

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSnTravel;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description : 条码履历Dao层接口
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2019-05-29 16:36
+* @Modify: 
+**/
+@Repository
+public interface MesProduceSnTravelRepository extends BaseRepository<MesProduceSnTravel, Long> {
+}

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCell;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellPoint;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :工站队列Dao层接口
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2019-05-29 14:40
+ * @Modify:
+ **/
+@Repository
+public interface MesWorkCellPointRepository extends BaseRepository<MesWorkCellPoint, Long> {
+}

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description:
@@ -108,6 +109,10 @@ public class MesProduceSn extends BaseBean {
     @ApiParam("包装条码")
     private String packageSn;
 
+    @Transient
+    @ApiParam("返回信息")
+    private String resultMsg;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import io.swagger.annotations.Api;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+* @Description : 产品条码履历实体类
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2019-05-29 16:22
+* @Modify: 
+**/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PRODUCE_SN_TRAVEL")
+@Api("产品条码履历表")
+public class MesProduceSnTravel extends MesProduceSn {
+}

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description:
@@ -66,6 +67,14 @@ public class MesQueueOrderDetail extends BaseBean {
     @Column(name="PRODUCE_CATEGORY_NAME_RDD")
     @ApiParam("产品类型名称")
     private String produceCategoryNameRdd;
+
+    @Transient
+    @ApiParam("队列序号")
+    private Double queueSeq;
+
+    public double getQueueSeqVal() {
+        return this.queueSeq == null ? 0.0d : this.queueSeq;
+    }
     public double getSeqVal() {
         return this.seq == null ? 0.0d : this.seq;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceSnTravelRepository.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.MesProduceSnTravel;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description : 条码履历Dao层接口
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2019-05-29 16:36
+* @Modify: 
+**/
+@Repository
+public interface MesProduceSnTravelRepository extends BaseRepository<MesProduceSnTravel, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellPointRepository.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.MesWorkCellPoint;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :工站队列Dao层接口
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2019-05-29 14:40
+ * @Modify:
+ **/
+@Repository
+public interface MesWorkCellPointRepository extends BaseRepository<MesWorkCellPoint, Long> {
+}