Merge remote-tracking branch 'origin/dev' into dev

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

@@ -40,7 +40,7 @@ public class AndonRouteStatusErrorRecord extends BaseBean implements Serializabl
     public String andonOrderNo;
 
     @Column(name = "ERROR_DESC")
-    @ApiParam(value = "失败描述")
+    @ApiParam(value = "异常描述")
     public String errorDesc;
 
     @Column(name = "WORK_CENTER_CODE")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java

@@ -16,6 +16,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.lang.reflect.Method;
 import java.sql.JDBCType;
 
@@ -122,11 +123,15 @@ public class FieldInfo extends BaseAPS {
     private Boolean notEmpty;
 
     @JsonIgnore
+    @Transient
     private transient Class<? extends BaseBean> clazz;
     @JsonIgnore
+    @Transient
     private transient Class<?> typeClass;
     @JsonIgnore
+    @Transient
     private transient Method getMethod;
     @JsonIgnore
+    @Transient
     private transient Method setMethod;
 }

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

@@ -5091,7 +5091,8 @@ public class MesEnumUtil {
     public enum BOARD_TYPE {
         BOARD_CAPACITY_JIT("BOARD_CAPACITY_JIT", "产能监控看板(JIT)"),
         BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"),
-        BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE");
+        BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"),
+        BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板");
 
         private String code;
         private String description;
@@ -6194,4 +6195,49 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 选配类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OPTION_TYPE {
+        OPTION(10, "选配件"),
+        BOM_DISASSEMBLY(20, "BOM拆解");
+
+        private int value;
+        private String description;
+
+        OPTION_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/MesBoardWorkCell.java

@@ -0,0 +1,91 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+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 : MES_看板工位信息
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2018-11-07 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_BOARD_WORK_CELL")
+@Api("MES_看板工位信息")
+public class MesBoardWorkCell extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 6251886604848913685L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "X_AXES")
+    @ApiParam("横坐标")
+    private Double xAxes = 0d;
+
+    @Column(name = "Y_AXES")
+    @ApiParam("纵坐标")
+    private Double yAxes = 0d;
+
+    @Column(name = "WORK_CELL_IP")
+    @ApiParam("工位IP")
+    private String workCellIp;
+
+    @Transient
+    @ApiParam("看板工位状态")
+    private Boolean boardWorkCellStatus;
+
+    @JsonProperty("xAxes")
+    public Double getxAxes() {
+        return xAxes;
+    }
+
+    public void setxAxes(Double xAxes) {
+        this.xAxes = xAxes;
+    }
+
+    @JsonProperty("yAxes")
+    public Double getyAxes() {
+        return yAxes;
+    }
+
+    public void setyAxes(Double yAxes) {
+        this.yAxes = yAxes;
+    }
+
+    public double getXAxes() {
+        return this.xAxes == null ? 0.0d : this.xAxes;
+    }
+
+    public double getYAxes() {
+        return this.yAxes == null ? 0.0d : this.yAxes;
+    }
+}

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

@@ -116,4 +116,8 @@ public class MesQcOrder extends BaseBean  implements Serializable {
     @Transient
     private String mesWorkNo;
 
+    @Transient
+    @ApiParam("产品条码")
+    private String productSn;
+
 }

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

@@ -57,4 +57,8 @@ public class MesQueueOrderBom extends BaseBean  implements Serializable {
     @Column(name = "COLOR_CODE")
     @ApiParam("颜色代码")
     private String colorCode;
+
+    @Column(name = "OPTION_TYPE")
+    @ApiParam("选配类型")
+    private Integer optionType;
 }

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

@@ -92,6 +92,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("产品颜色")
     private String produceColor;
 
+    @Column(name = "PRODUCE_COLOR_CODE")
+    @ApiParam("产品颜色代码")
+    private String produceColorCode;
+
     @Column(name = "OPTION_CODE")
     @ApiParam("选项代码")
     private String optionCode;

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

@@ -77,5 +77,5 @@ public class MesQueueShippingDetail extends BaseBean implements Serializable {
 
     @Column(name = "PRODUCE_COLOR")
     @ApiParam("产品颜色")
-    private Double produceColor;
+    private String produceColor;
 }

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

@@ -1,9 +1,6 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
-import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquDetail;
-import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquStatus;
-import cn.estsh.i3plus.pojo.mes.bean.MesBoardShiftSectionCapacity;
-import cn.estsh.i3plus.pojo.mes.bean.MesOee;
+import cn.estsh.i3plus.pojo.mes.bean.*;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -41,6 +38,9 @@ public class BoardModel {
     @ApiParam("看板图片路径")
     private String pictureUrl;
 
+    @ApiParam("当天停机时间(min)")
+    private String theDayShutDownTime;
+
     @ApiParam("看板时段计划产量")
     private List<MesBoardShiftSectionCapacity> boardShiftSectionCapacityList;
 
@@ -52,4 +52,7 @@ public class BoardModel {
 
     @ApiParam("oee")
     private List<MesOee> oeeList;
+
+    @ApiParam("工位状态监控明细")
+    private List<MesBoardWorkCell> boardWorkCellList;
 }

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

@@ -29,6 +29,6 @@ public class SpQueueShippingModel {
     private String gradeCode;
 
     @ApiParam("产品颜色")
-    private Double produceColor;
+    private String produceColor;
 
 }

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

@@ -138,6 +138,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("工步弹框状态")
     private Boolean stepDialogStatus = false;
 
+    @ApiParam("特殊展示数据")
+    private Map<String, Object> specialDisplayMap  = new HashMap<>();
+
     @Override
     public String toString() {
         return "StationRequestBean{" +

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

@@ -55,4 +55,7 @@ public class StationResultBean<T> implements Serializable {
 
     @ApiParam("定制页面名称")
     private String customPageName;
+
+    @ApiParam("特殊展示数据")
+    private Object specialDisplayData;
 }

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBoardWorkCell;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: adair.song
+ * @Date: 2020/06/04 13:23
+ * @Modify:
+ */
+@Repository
+public interface MesBoardWorkCellRepository extends BaseRepository<MesBoardWorkCell, Long> {
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java

@@ -42,7 +42,7 @@ public class PtlRouteStatusErrorRecord extends BaseBean implements Serializable
     private String taskNo;
 
     @Column(name = "ERROR_DESC")
-    @ApiParam(value = "失败描述")
+    @ApiParam(value = "异常描述")
     public String errorDesc;
 
     @Column(name = "AREA_NO")

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

@@ -202,6 +202,10 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
     @ApiParam(value = "库龄")
     private String age;
 
+    @Transient
+    @ApiParam(value = "库位箱数")
+    private Long qty;
+
     public WmsLocate() {
     }
 
@@ -252,6 +256,12 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
         this.z=z;
     }
 
+    public WmsLocate(Long qty, Integer status, String zoneNo) {
+        this.qty = qty;
+        this.status = status;
+        this.zoneNo = zoneNo;
+    }
+
     public Integer getMaxPackageQty() {
         return this.maxPackageQty == null ? 0 : this.maxPackageQty.intValue();
     }

sonar-project.properties

@@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 # defaults to project key
 sonar.projectName=i3plus-pojo
 # defaults to 'not provided'
-sonar.projectVersion=1.0-PROD-SNAPSHOT
+sonar.projectVersion=1.0-DEV-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./