Start Task #2522 Cost:8h Left:8h

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

@@ -1966,7 +1966,8 @@ public class MesEnumUtil {
         SCATTER_PART_PROD_CFG(480, "scatterPartProdCfgExcelService", "散件零件生产配置"),
         MES_WORK_ORDER_PAINT_ZS(490, "planZSOrderExcelService", "生产工单-注塑"),
         MES_KP_DATA(500, "kpDataExcelService", "物料关键数据关系"),
-        BLIND_CHECK_RULE(510, "blindCheckRuleExcelService", "盲检规则导入");
+        BLIND_CHECK_RULE(510, "blindCheckRuleExcelService", "盲检规则导入"),
+        BOARD_PLAN_CAPACITY(520, "BOARD_PLAN_CAPACITY", "计划产能看板导入");
 
         private int value;
         private String service;
@@ -6833,4 +6834,50 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 工位等级
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_CELL_GRADE {
+
+        COMMON(10, "普通工位"),
+        MONITOR(20, "监控工位");
+
+        private int value;
+        private String description;
+
+        WORK_CELL_GRADE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            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;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -66,6 +66,14 @@ public class MesWorkCell extends BaseBean implements Serializable {
     @ApiParam("工作单元端口")
     private String workCellPort;
 
+    @Column(name = "GRADE")
+    @ApiParam("工作等级")
+    private Integer grade;
+
+    @Column(name = "TARGET_PASS_RATE")
+    @ApiParam("目标合格率")
+    private Integer targetPassRate;
+
     @Transient
     @ApiParam(value = "子集列表")
     private List<MesEquipment> childTreeList;

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

@@ -71,6 +71,10 @@ public class MesWorkCenter extends BaseBean implements Serializable {
     @ApiParam("工位监控模式")
     private Integer monitorType;
 
+    @Column(name = "PLAN_TAKT")
+    @ApiParam("节拍")
+    private Integer planTakt;
+
     @Transient
     @ApiParam(value = "子集列表")
     private List<MesWorkCell> childTreeList;

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

@@ -20,11 +20,8 @@ public class BiModel {
     @ApiParam("工作中心名称")
     private String workCenterName;
 
-    @ApiParam("生产区域代码")
-    private String areaCode;
-
-    @ApiParam("运行状态")
-    private String runningStatus;
+    @ApiParam("工作单元代码")
+    private String workCellCode;
 
     @ApiParam(value = "物料号")
     private String partNo;
@@ -35,12 +32,6 @@ public class BiModel {
     @ApiParam(value = "计划数量")
     private double planQty;
 
-    @ApiParam(value = "产量")
-    private double outputQty;
-
-    @ApiParam(value = "完成率")
-    private double completeRate;
-
     @ApiParam(value = "合格数量")
     private double passQty = 0;
 
@@ -59,6 +50,15 @@ public class BiModel {
     @ApiParam(value = "警戒值")
     private double sentinelValue;
 
+    @ApiParam(value = "总数")
+    private double total;
+
+    @ApiParam(value = "合格数")
+    private double qualifiedQty = 0;
+
+    @ApiParam(value = "不合格数")
+    private double unQualifiedQty = 0;
+
     @ApiParam("客户代码")
     private String customerCode;
 
@@ -76,14 +76,4 @@ public class BiModel {
 
     @ApiParam("列名")
     private Map<String, String> colMap;
-
-    @Deprecated
-    public double getCompleteRate() {
-        if (this.planQty != 0) {
-            this.completeRate = outputQty / planQty;
-        } else {
-            this.completeRate = 0;
-        }
-        return this.completeRate;
-    }
 }

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

@@ -41,6 +41,25 @@ public class BoardModel {
     @ApiParam("当天停机时间(min)")
     private String theDayShutDownTime;
 
+
+    @ApiParam("今日产量")
+    private Integer actualCapacity;
+
+    @ApiParam("月计划产量")
+    private Integer monthPlanCapacity;
+
+    @ApiParam("停机时间")
+    private Integer stopTime;
+
+    @ApiParam("时段产能")
+    private Integer hourCapacity;
+
+    @ApiParam("计划节拍")
+    private Integer planTakt;
+
+    @ApiParam("今日完成产量")
+    private Integer completeCapacity = 0;
+
     @ApiParam("看板时段计划产量")
     private List<MesBoardShiftSectionCapacity> boardShiftSectionCapacityList;