[任务：1690 产能监控看板]

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

@@ -4996,4 +4996,93 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * 	看板类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BOARD_TYPE {
+        BOARD_CAPACITY_JIT("BOARD_CAPACITY_JIT", "产能监控看板(JIT)"),
+        BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)");
+
+        private String code;
+        private String description;
+
+        BOARD_TYPE(String code, String description) {
+            this.code = code;
+            this.description = description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static BOARD_TYPE getByCode(String code) {
+            for (BOARD_TYPE boardType : values()) {
+                if (boardType.getCode().equals(code)) {
+                    return boardType;
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(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;
+        }
+    }
+
+    /**
+     * 	看板类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BOARD_OBJECT_TYPE {
+        ORGANIZE_CODE("organizeCode", "工厂代码"),
+        AREA_CODE("areaCode", "区域代码"),
+        WORK_CENTER_CODE("workCenterCode", "产线代码");
+
+        private String value;
+        private String description;
+
+        BOARD_OBJECT_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static BOARD_OBJECT_TYPE getByCode(String code) {
+            for (BOARD_OBJECT_TYPE boardObjectType : values()) {
+                if (boardObjectType.getValue().equals(code)) {
+                    return boardObjectType;
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -3277,7 +3277,7 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SHIPPING_ACTUAL_STATUS {
         CREATE(10, "创建"),
-        SHIPPED(20, "已发运");
+        CANCEL(20, "已发运");
 
         private int value;
         private String description;

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

@@ -42,9 +42,11 @@ public class MesBoardEquDetail extends BaseBean implements Serializable {
     @ApiParam("设备名称")
     private String equName;
 
+    @Column(name = "HORIZONTAL_AXIS")
     @ApiParam(value = "横坐标")
     private Float horizontalAxis = 0f;
 
+    @Column(name = "VERTICAL_AXIS")
     @ApiParam(value = "纵坐标")
     private Float verticalAxis = 0f;
 }

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

@@ -57,6 +57,10 @@ public class MesBoardPlanCapacity extends BaseBean implements Serializable {
     private Integer planCapacity;
 
     @Transient
+    @ApiParam("班次名称")
+    private String shiftName;
+
+    @Transient
     @ApiParam("看板时段计划产量")
     private List<MesBoardShiftSectionCapacity> boardShiftSectionCapacities;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.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;
 import java.io.Serializable;
 
 /**
@@ -49,4 +50,8 @@ public class MesBoardShiftSection extends BaseBean implements Serializable {
     @Column(name = "IS_SPANDAY")
     @ApiParam("是否跨天")
     private Integer isSpanday;
+
+    @Transient
+    @ApiParam("班次名称")
+    private String shiftName;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCapacity.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;
 import java.io.Serializable;
 
 /**
@@ -53,4 +54,8 @@ public class MesBoardShiftSectionCapacity extends BaseBean implements Serializab
     @Column(name = "PLAN_CAPACITY")
     @ApiParam("计划产量")
     private Integer planCapacity;
+
+    @Transient
+    @ApiParam("实际产量")
+    private Integer actualCapacity;
 }

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

@@ -1,5 +1,7 @@
 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 io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -29,9 +31,21 @@ public class BoardModel {
     @ApiParam("实际人数")
     private Integer actualPeopleNum;
 
+    @ApiParam("计划产量")
+    private Integer planCapacity;
+
     @ApiParam("目标达成数")
-    private Integer achievedPeopleNum;
+    private Integer achievedNum;
+
+    @ApiParam("看板图片路径")
+    private String pictureUrl;
 
     @ApiParam("看板时段计划产量")
     private List<MesBoardShiftSectionCapacity> boardShiftSectionCapacityList;
+
+    @ApiParam("看板设备状态")
+    private List<MesBoardEquStatus> boardEquStatusList;
+
+    @ApiParam("看板设备明细")
+    private List<MesBoardEquDetail> boardEquDetailList;
 }