Merge branch 'dev' into test

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

@@ -226,7 +226,7 @@ public class AndonManageQueue extends BaseBean {
 
     @Transient
     @ApiParam(value = "ANDON次数（用于报表统计）", example = "0")
-    private Integer andonCount;
+    private Long andonCount;
 
     @Transient
     @ApiParam(value = "平均响应时长", example = "0")
@@ -257,4 +257,67 @@ public class AndonManageQueue extends BaseBean {
     public Integer getPriorityLevel() {
         return this.priorityLevel == null ? 0 : this.priorityLevel;
     }
+
+    /**
+     * 工位统计 构造函数
+     * @param workCenterCode
+     * @param workCellCode
+     * @param equipmentCode
+     * @param shiftCode
+     * @param alarmCode
+     * @param andonCount
+     */
+    public AndonManageQueue(String workCenterCode, String workCellCode, String equipmentCode, String shiftCode, String alarmCode, Long andonCount) {
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+        this.equipmentCode = equipmentCode;
+        this.shiftCode = shiftCode;
+        this.alarmCode = alarmCode;
+        this.andonCount = andonCount;
+    }
+
+    /**
+     * 原因统计 构造函数
+     * @param alarmCode
+     * @param workCenterCode
+     * @param workCellCode
+     * @param ecCode
+     * @param ecNameRdd
+     * @param emCode
+     * @param emNameRdd
+     * @param andonCount
+     * @param avgSignTime
+     * @param avgResolveTime
+     */
+    public AndonManageQueue(String workCenterCode, String workCellCode, String alarmCode, String ecCode, String ecNameRdd, String emCode, String emNameRdd, Long avgSignTime, Long avgResolveTime, Long andonCount) {
+        this.alarmCode = alarmCode;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+        this.ecCode = ecCode;
+        this.ecNameRdd = ecNameRdd;
+        this.emCode = emCode;
+        this.emNameRdd = emNameRdd;
+        this.andonCount = andonCount;
+        this.avgSignTime = avgSignTime;
+        this.avgResolveTime = avgResolveTime;
+    }
+
+    /**
+     * 柏拉图统计 构造函数
+     * @param alarmCode
+     * @param ecCode
+     * @param ecNameRdd
+     * @param proportion
+     * @param andonCount
+     */
+    public AndonManageQueue(String alarmCode, String ecCode, String ecNameRdd, Double proportion, Long andonCount) {
+        this.alarmCode = alarmCode;
+        this.ecCode = ecCode;
+        this.ecNameRdd = ecNameRdd;
+        this.andonCount = andonCount;
+        this.proportion = proportion;
+    }
+
+    public AndonManageQueue() {
+    }
 }

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

@@ -54,9 +54,9 @@ public class AndonEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALARM_BUSI_FLAG{
 
-        ALARM_FLAG("10","按灯状态"),
+        ALARM_FLAG("10","安灯呼叫标识"),
-        USER_CODE("20","工号"),
+        USER_CODE("20","用户工号"),
-        READ_FLAG("30", "读取状态");
+        READ_FLAG("30", "安灯读取状态");
 
         private String value;
         private String description;
@@ -192,11 +192,11 @@ public class AndonEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALARM_CODE{
 
-        PART("MM","物料"),
+        PART("PART_ALARM","物料"),
-        QUALITY("QM","质量"),
+        QUALITY("QUALITY_ALARM","质量"),
-        EQUIP("EQ","设备"),
+        EQUIP("EQUMENT_ALARM","设备"),
-        PROCESS("GY","工艺"),
+        PROCESS("ROUTING_ALARM","工艺"),
-        CHECK("JC","检测");
+        CHECK("OTHER_ALARM","其他");
 
         private String value;
         private String description;

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

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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.util.List;
+
+/**
+ * @Description : 工站队列
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2019-05-22 17:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_CELL_POINT")
+@Api("工站队列")
+public class MesWorkCellPoint extends BaseBean {
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "QUEUE_SEQ")
+    @ApiParam("队列主表序号")
+    private String queueSeq;
+
+    @Column(name = "QUEUE_DETAIL_SEQ")
+    @ApiParam("队列明细表序号")
+    private String queueDetailSeq;
+}

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

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description : JIT队列列表Model
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2019-05-22 16:34
+ * @Modify:
+ **/
+@Data
+@Api("JIT队列列表Model")
+public class QueueOrderModel implements Serializable {
+    @ApiParam("队列ID")
+    public Long queueId;
+    @ApiParam("队列明细ID")
+    public Long queueDetailId;
+    @ApiParam("队列序号")
+    public Integer queueSeq;
+    @ApiParam("队列明细序号")
+    public Integer queDetailSeq;
+    @ApiParam("客户标识号")
+    public String custFlagNo;
+    @ApiParam("产品配置名称")
+    public String prodCfgName;
+    @ApiParam("产品类型名称")
+    public String categoryName;
+    @ApiParam("产品条码")
+    public String serialNumber;
+    @ApiParam("物料号")
+    public String partNo;
+    @ApiParam("物料ID")
+    public Long partId;
+    @ApiParam("条码状态")
+    public Integer snStatus;
+    @ApiParam("生产类型")
+    public String workType;
+
+
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -382,6 +382,7 @@ public class CoreHqlPack {
         HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result);
         HqlPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result);
         HqlPack.getNumEqualPack(user.getUserStatus(),"userStatus",result);
+        HqlPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result);
 
         if(user.getRoleIdList() != null){
             HqlPack.getInPack(StringUtils.join(user.getRoleIdList(),","),"id",result);
@@ -493,6 +494,7 @@ public class CoreHqlPack {
 //        HqlPack.getNumEqualPack(userInfo.getDepartmentId(),"departmentId",result);
         HqlPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result);
         HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result);
+        HqlPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result);
 
         if(userInfo.getDepartmentIdList() != null && userInfo.getDepartmentIdList().size() > 0){
             HqlPack.getInPack(StringUtils.join(userInfo.getDepartmentIdList(), ","), "departmentId", result);

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java

@@ -10,10 +10,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description : 作业流程
@@ -67,6 +64,7 @@ public class WmsActionGroup extends BaseBean {
     @ApiParam(value = "任务自动初始化", example = "0")
     private Integer autoInit;
 
+    @Lob
     @Column(name = "POSITION")
     @ApiParam(value = "GOJS位置")
     private String position;