Merge branch 'dev' into test

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

@@ -0,0 +1,50 @@
+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.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : ANDON_自处理配置
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2019-05-31 14:08
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_DISPOSAL_CFG")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_自处理配置")
+public class AndonDisposalCfg extends BaseBean {
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam(value = "工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型代码")
+    private String alarmCode;
+
+    @Column(name = "AC_CODE")
+    @ApiParam(value = "呼叫原因代码")
+    private String acCode;
+
+    @Column(name = "APPROVAL_STATUS")
+    @ApiParam(value = "审批状态")
+    private String approvalStatus;
+}

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

@@ -0,0 +1,42 @@
+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.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : ANDON_事件现象
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2019-05-31 9:47
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_EVENT_PHENOMENON")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_事件现象")
+public class AndonEventPhenoMenon extends BaseBean {
+
+    @Column(name = "EPM_CODE")
+    @ApiParam(value = "事件现象代码")
+    private String epmCode;
+
+    @Column(name = "EPM_NAME")
+    @ApiParam(value = "事件现象描述")
+    private String epmName;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型")
+    private String alarmCode;
+}

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

@@ -0,0 +1,38 @@
+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.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : ANDON_重要度
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2019-05-31 9:47
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_IMPORTANCE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_事件现象")
+public class AndonImportance extends BaseBean {
+
+    @Column(name = "IMPORTANCE_CODE")
+    @ApiParam(value = "重要等级代码")
+    private String importanceCode;
+
+    @Column(name = "IMPORTANCE_NAME")
+    @ApiParam(value = "重要等级名称")
+    private String importanceName;
+}

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

@@ -263,6 +263,13 @@ public class AndonManageQueue extends BaseBean {
     @ApiParam(value = "处理类型")
     private String disposalType;
 
+    /**
+     * 1 = 是，2 = 否
+     */
+    @Transient
+    @ApiParam(value = "是否勾选加入自处理问题库", example = "2")
+    private Integer isDisposal;
+
     @Column(name = "ALARM_DETAIL_CODE")
     @ApiParam(value = "安灯子类型代码")
     private String alarmDetailCode;
@@ -283,6 +290,7 @@ public class AndonManageQueue extends BaseBean {
     @ApiParam(value = "重要等级名称")
     private String importanceNameRdd;
 
+
     // 是否转呼
     public Integer getIsShiftCall() {
         return this.isShiftCall == null ? 0 : this.isShiftCall;

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonDisposalCfg;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : ANDON_自处理配置
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2019-05-31 14:14
+ * @Modify:
+ **/
+@Repository
+public interface IAndonDisposalCfgRepository extends BaseRepository<AndonDisposalCfg, Long> {
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonEventPhenoMenon;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 对象持久层仓用方法控制（ANDON_事件现象）
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2019-05-31 11:05
+ * @Modify:
+ **/
+@Repository
+public interface IAndonEventPhenoMenonRepository extends BaseRepository<AndonEventPhenoMenon, Long> {
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonImportance;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 对象持久层仓用方法控制（ANDON_重要度）
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2019-05-31 11:05
+ * @Modify:
+ **/
+@Repository
+public interface IAndonImportanceRepository extends BaseRepository<AndonImportance, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java

@@ -191,6 +191,23 @@ public class AndonHqlPack {
     }
 
     /**
+     * 按条件查询安灯自处理配置
+     * @param andonDisposalCfg
+     * @return
+     */
+    public static DdlPackBean packHqlAndonDisposalCfg(AndonDisposalCfg andonDisposalCfg){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getWorkCenterCode(),"workCenterCode", result);
+        DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getWorkCellCode(),"workCellCode", result);
+        DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getAlarmCode(),"alarmCode", result);
+        DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getAcCode(),"acCode", result);
+
+        getStringBuilderPack(andonDisposalCfg, result);
+        return  result;
+    }
+
+    /**
      * 按条件查询按灯记录信息
      * @param andonManageRecord
      * @return
@@ -382,4 +399,30 @@ public class AndonHqlPack {
 
         return result;
     }
+
+    /**
+     * 安灯类型查询条件封装
+     * @param andonAlarmType
+     * @return
+     */
+    public static DdlPackBean packAndonAlarmType(AndonAlarmType andonAlarmType) {
+        DdlPackBean result = new DdlPackBean();
+
+        getStringBuilderPack(andonAlarmType, result);
+
+        return result;
+    }
+
+    /**
+     * 安灯状态查询条件封装
+     * @param andonStatus
+     * @return
+     */
+    public static DdlPackBean packAndonStatus(AndonStatus andonStatus) {
+        DdlPackBean result = new DdlPackBean();
+
+        getStringBuilderPack(andonStatus, result);
+
+        return result;
+    }
 }

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

@@ -11,6 +11,80 @@ import org.apache.commons.lang3.StringUtils;
  * @Modify:
  **/
 public class AndonEnumUtil {
+
+    /**
+     * 标准处理 = 10，自处理 = 20
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DISPOSAL_TYPE{
+        STANDARD("10","标准处理"),
+        SELF("20","自处理");
+
+        private String value;
+        private String description;
+
+        DISPOSAL_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].value,val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 审批状态：10=待审批，20=二级审批，30=三级审批，40=四级审批，100=已审批
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum APPROVAL_STATUS{
+        WAIT("10","待审批"),
+        SECOND_APPROVAL("20","二级审批"),
+        THIRD_APPROVAL("30","三级审批"),
+        FOUTH_APPROVAL("40","四级审批"),
+        FINISH("60","已审批");
+
+        private String value;
+        private String description;
+
+        APPROVAL_STATUS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].value,val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
     /**
      * 按灯状态
      * 10-是，20-否
@@ -89,7 +163,9 @@ public class AndonEnumUtil {
         CALL(1,"10","呼叫"),
         SIGN(2,"20","响应"),
         RESOLVE(3,"30","解决"),
-        CANCEL(4,"40", "撤销");
+        CANCEL(4,"40", "撤销"),
+        COMMIT(5,"50","提交"),
+        PASS(6,"60","审批");
 
         private int value;
         private String code;
@@ -124,16 +200,18 @@ public class AndonEnumUtil {
 
     /**
      * 按灯动作标志
-     * 10 = 呼叫，20 = 签到，30 = 撤销，40 = 解决，50 = 转呼 ,60 = 提交，70 = 审批
+     * 10 = 呼叫，20 = 签到，30 = 解决，40 = 撤销，50 = 提交，60 = 审批，70 = 转呼
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ANDON_ACTION_FLAG{
 
         CALL_ACTION("10","呼叫动作"),
         SIGN_ACTION("20","签到动作"),
-        CANCEL_ACTION("30", "撤销动作"),
-        RESOLVE_ACTION("40", "解决动作"),
-        SHIFG_CALL_ACTION("50", "转呼动作");
+        RESOLVE_ACTION("30", "解决动作"),
+        CANCEL_ACTION("40", "撤销动作"),
+        COMMIT_ACTION("50","提交动作"),
+        PASS_ACTION("60","审批动作"),
+        SHIFG_CALL_ACTION("70", "转呼动作");
 
         private String value;
         private String description;

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

@@ -335,7 +335,7 @@ public class BlockFormEnumUtil {
         }
     }
     /**
-     * 元素显示状态信息
+     * 元素属性显示状态信息
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ELEMENT_SHOW_STATUS {
@@ -2036,4 +2036,85 @@ public class BlockFormEnumUtil {
         }
     }
 
+    /**
+     * 元素树方向
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ELEMENT_TREE_DIRECTION {
+        horizontal(1, "horizontal", "横向"),
+        vertical(2, "vertical", "竖向");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private ELEMENT_TREE_DIRECTION (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 ELEMENT_TREE_DIRECTION  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-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-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java

@@ -113,6 +113,7 @@ public class CommonEnumUtil {
     /**
      * 处理标识
      */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TRUE_OR_FALSE {
         TRUE(1, "是"), FALSE(2, "否");
 

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java

@@ -45,11 +45,11 @@ public class BfElementPropertyVirtual extends BaseBean {
     private Long dataObjectId;
 
     @Column(name="PROPERTY_CODE")
-    @ApiParam(value ="类属性代码")
+    @ApiParam(value ="虚拟属性代码")
     private String propertyCode;
 
     @Column(name="PROPERTY_NAME")
-    @ApiParam(value ="元素名称")
+    @ApiParam(value ="虚拟属性名称")
     private String propertyName;
 
     @Column(name="PROPERTY_TYPE")

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:
@@ -24,48 +25,57 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="MES_QUEUE_ORDER_DETAIL")
+@Table(name = "MES_QUEUE_ORDER_DETAIL")
 @Api("生产队列明细")
 public class MesQueueOrderDetail extends BaseBean {
-    @Column(name="ORDER_NO")
+    @Column(name = "ORDER_NO")
     @ApiParam("主队列编号")
     private String orderNo;
 
-    @Column(name="PART_NO")
+    @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;
 
-    @Column(name="PART_NAME_RDD")
+    @Column(name = "PART_NAME_RDD")
     @ApiParam("物料名称")
     private String partNameRdd;
 
-    @Column(name="SERIAL_NUMBER")
+    @Column(name = "SERIAL_NUMBER")
     @ApiParam("产品条码")
     private String serialNumber;
 
-    @Column(name="SEQ")
+    @Column(name = "SEQ")
     @ApiParam("队列明细序号")
     private Double seq;
 
-    @Column(name="QTY")
+    @Column(name = "QTY")
     @ApiParam("数量")
     private Double qty;
 
-    @Column(name="STATUS")
+    @Column(name = "STATUS")
     @ApiParam("状态")
     private Integer status;
 
-    @Column(name="WORK_TYPE")
+    @Column(name = "WORK_TYPE")
     @ApiParam("生产类型")
     private String workType;
 
-    @Column(name="PRODUCE_CATEGORY_CODE")
+    @Column(name = "PRODUCE_CATEGORY_CODE")
     @ApiParam("产品类型代码")
     private String produceCategoryCode;
 
-    @Column(name="PRODUCE_CATEGORY_NAME_RDD")
+    @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> {
+}