task `1300` 5 BI 产线运行情况

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

@@ -276,7 +276,8 @@ public class MesEnumUtil {
         DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"),
         REPAIR("REPAIR", "处理措施"),
         SCRAP("SCRAP", "报废原因"),
-        QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准");
+        QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"),
+        WC_CHECK("WC_CHECK", "开线检查项");
 
         private String value;
         private String description;
@@ -1462,8 +1463,8 @@ public class MesEnumUtil {
         MES_ROUTE_PROCESS_WORK_CELL(350, "工序工作单元"),
         MES_DATASOURCE(360, "DB地址清单"),
         MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"),
-        MES_EQU_NOTIFY_OBJECT_CFG(380,"设备通知对象"),
-        MES_PLC(390,"PLC地址清单");
+        MES_EQU_NOTIFY_OBJECT_CFG(380, "设备通知对象"),
+        MES_PLC(390, "PLC地址清单");
 
         private int value;
         private String description;

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

@@ -214,7 +214,45 @@ public class MesPcnEnumUtil {
         }
 
     }
+    /**
+     * MES_TYPE_CFG 类型信息
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_TYPE_CFG {
+
+        DEFECT("DEFECT", "缺陷"),
+        DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"),
+        REPAIR("REPAIR", "处理措施"),
+        SCRAP("SCRAP", "报废原因"),
+        QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"),
+        WC_CHECK("WC_CHECK", "开线检查项");
+
+        private String value;
+        private String description;
+
+        MES_TYPE_CFG(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String 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.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
     /**
      * MesProdBindRecord 是否是关键件
      */

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

@@ -36,6 +36,8 @@ public class WcCheckModel {
     private List<MesWcCheckRecord> materials;
     @ApiParam("物料 列")
     private Map<String, String> materialsColumn;
+    @ApiParam("普通列")
+    private Map<String, String> commonColumn;
 
     @ApiParam("法")
     private List<MesWcCheckRecord> routes;
@@ -66,6 +68,9 @@ public class WcCheckModel {
     @ApiParam("需要展示的数据")
     private Map<String, String> need2ShowMap;
 
+    @ApiParam("重构map")
+    private Map<String, List<MesWcCheckRecord>> showMap;
+
 
     public WcCheckModel initialWcCheckModel() {
         WcCheckModel wcCheckModel = new WcCheckModel();