Merge branch 'dev' into test

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

@@ -1963,6 +1963,31 @@ public class MesPcnEnumUtil {
     }
 
     /**
+     * 工站分组队列状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_CELL_POINT_GROUP_STATUS {
+        CREATE(10, "创建"),
+        COMPLETE(20, "完成");
+
+        private int value;
+        private String description;
+
+        WORK_CELL_POINT_GROUP_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
      * MesPartCategory实体对应的categoryType值  条码表条码质量状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -3138,4 +3163,40 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 表格颜色
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TABLE_COLOR {
+
+        GREEN("green", "绿色"),
+        YELLOW("Yellow", "黄色");
+
+        private String code;
+        private String description;
+
+        TABLE_COLOR(String code, String description) {
+            this.code = code;
+            this.description = description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -42,6 +42,9 @@ public class MesLabelTemplate extends BaseBean implements Serializable {
     @ApiParam(value = "模板内容")
     private String templateContent;
 
+    @ApiParam(value = "第二个模板内容")
+    private String otherTemplateContent;
+
     // 参数拼接，多参数都好分隔，后台在做处理
     @ApiParam(value = "模板参数拼接")
     @Transient

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

@@ -0,0 +1,89 @@
+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 javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @Description : 工站分组队列
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-22 17:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_CELL_POINT_GROUP")
+@Api("工站分组队列")
+public class MesWorkCellPointGroup extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -6817903235638554748L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+
+    @Column(name = "GROUP_NO")
+    @ApiParam("组内编号")
+    private Integer groupNo;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("主队列编号")
+    private String orderNo;
+
+    @Column(name = "QUEUE_SEQ")
+    @ApiParam("队列主表序号")
+    private Double queueSeq;
+
+    @Column(name = "QUEUE_DETAIL_SEQ")
+    @ApiParam("队列明细表序号")
+    private Double queueDetailSeq;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "STATUS")
+    @ApiParam("状态")
+    private Integer status;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @Transient
+    @ApiParam("显示颜色")
+    private String color;
+
+    public double getQueueSeqVal() {
+        return this.queueSeq == null ? 0 : this.queueSeq;
+    }
+
+    public double getQueueDetailSeqVal() {
+        return this.queueDetailSeq == null ? 0 : this.queueDetailSeq;
+    }
+}

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

@@ -3,12 +3,15 @@ package cn.estsh.i3plus.pojo.mes.model;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.mes.annotation.ElasticSearch;
 import cn.estsh.i3plus.pojo.mes.annotation.Json4Es;
+import com.sun.tools.javac.util.List;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Map;
 
 /**
  * @Description:
@@ -20,7 +23,7 @@ import java.io.Serializable;
 @AllArgsConstructor
 @NoArgsConstructor
 @ElasticSearch
-public class EsProductData extends BaseBean implements Serializable {
+public class EsProductDataModule extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = 4514407617515827040L;
 
@@ -80,7 +83,7 @@ public class EsProductData extends BaseBean implements Serializable {
 
     @Json4Es
     @ApiParam("生产数据")
-    private String lineData;
+    private ArrayList<ProductDataModel> lineData;
 
     @ApiParam("字段总数")
     private Integer fieldNum;

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

@@ -66,6 +66,11 @@ public class QueueOrderModel implements Serializable {
     private Integer groupNo;
     @ApiParam("产品配置代码")
     private String prodCfgCode;
+    @ApiParam("是否已扫描")
+    private int isScan;
+
+    @ApiParam("队列编号")
+    private String orderNo;
 
     public QueueOrderModel() {
     }
@@ -124,4 +129,16 @@ public class QueueOrderModel implements Serializable {
         this.groupNo = groupNo;
         this.prodCfgCode = prodCfgCode;
     }
+
+    public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo,
+                           Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode) {
+        this.queueGroupNo = queueGroupNo;
+        this.groupNo = groupNo;
+        this.orderNo = orderNo;
+        this.queueSeq = queueSeq;
+        this.queDetailSeq = queDetailSeq;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.organizeCode = organizeCode;
+    }
 }

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

@@ -97,6 +97,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("生产主队列编号")
     private String orderNo;
 
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+
     @ApiParam("数据map")
     private Map<String, Object> dataMap;
 

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

@@ -96,5 +96,9 @@ public class StepPrintSnModel extends MesProduceSn {
     private String jitCarNo;
     @ApiParam("车型代码")
     private String carModuleCode;
+    @ApiParam("上一个序列号")
+    private Double lastQueDetailSeq;
+    @ApiParam("包装数量")
+    private Integer pgCodeNum;
 
 }

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