mgn-bj 总屏看板

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

@@ -7972,4 +7972,44 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * 看板-安灯监控状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ANDON_QUEUE_STATUS {
+        CALL(10, "呼叫"),
+        RESPONSE(20, "响应"),
+        SOLVE(30, "解决");
+
+        private int value;
+        private String description;
+
+        ANDON_QUEUE_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getValueStr() {
+            return value + "";
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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/MesWorkCell.java

@@ -98,4 +98,8 @@ public class MesWorkCell extends BaseBean implements Serializable {
     @ApiParam("工位类型名称")
     private String workCellTypeName;
 
+    @Transient
+    @ApiParam("安灯呼叫状态")
+    private Integer andonQueueStatus;
+
 }

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

@@ -111,4 +111,12 @@ public class QueueJitActualModel {
         this.createDatetime = createDatetime;
     }
 
+    public QueueJitActualModel(Long id, String vinCode, String jisActualNo, String produceCtgyCode, String custPlantCode, String createDatetime) {
+        this.id = id;
+        this.vinCode = vinCode;
+        this.jisActualNo = jisActualNo;
+        this.produceCtgyCode = produceCtgyCode;
+        this.custPlantCode = custPlantCode;
+        this.createDatetime = createDatetime;
+    }
 }

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

@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.mes.model.mgnbj;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/10/28 11:27 AM
+ * @Modify:
+ */
+@Data
+public class BjBoardModel implements Serializable {
+
+    @ApiParam("jsa数量")
+    private Integer jsaQty;
+    @ApiParam("完成数量")
+    private Integer completeQty;
+    @ApiParam("总数量")
+    private Integer totalQty;
+    @ApiParam("预警数量")
+    private Integer warnQty;
+    @ApiParam("预警率")
+    private Integer warnRate;
+    @ApiParam("目标合格率")
+    private Integer targetRate = 0;
+    @ApiParam("一次合格率")
+    private Integer onceQualityRate = 0;
+
+    @ApiParam("x坐标内容")
+    private String xAxis;
+
+    @ApiParam("x坐标内容")
+    private List<String> xAxisList;
+
+    @ApiParam("显示数据")
+    private List<BjBoardSeriesModel> seriesModels;
+}

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

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.mes.model.mgnbj;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/10/28 2:56 PM
+ * @Modify:
+ */
+@Data
+public class BjBoardSeriesModel {
+    @ApiParam("名称")
+    private String name;
+    @ApiParam("显示数量")
+    private Integer qty;
+}