Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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

@@ -12,6 +12,159 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class MesEnumUtil {
 
     /**
+     * mes 图片面位
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_SIDE_LOCATION {
+
+        A_SIDE(10, "A面"),
+        B_SIDE(20, "B面"),
+        C_SIDE(30, "C面"),
+        D_SIDE(40, "D面");
+
+        private int value;
+        private String description;
+
+        MES_SIDE_LOCATION(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;
+        }
+
+    }
+
+    /**
+     * mes缺陷类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_DEFECT_TYPE {
+
+        DEFECT_TYPE1(10, "缺陷类型1"),
+        DEFECT_TYPE2(20, "缺陷类型2"),
+        DEFECT_TYPE3(30, "缺陷类型3");
+
+        private int value;
+        private String description;
+
+        MES_DEFECT_TYPE(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;
+        }
+
+    }
+
+    /**
+     * mes类型信息，业务类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_TYPE_CFG_BUSIN_TYPE {
+
+        BUSIN_TYPE1(10, "业务类型1"),
+        BUSIN_TYPE2(20, "业务类型2"),
+        BUSIN_TYPE3(30, "业务类型3");
+
+        private int value;
+        private String description;
+
+        MES_TYPE_CFG_BUSIN_TYPE(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;
+        }
+
+    }
+
+    /**
+     * mes缺陷原因类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_DEFECT_CAUSE_TYPE {
+
+        QUALITY_DEFECTS(10, "质量缺陷"),
+        PROCESS_DEFECTS(20, "工艺缺陷"),
+        EQUIPMENT_DEFECT(30, "设备缺陷");
+
+        private int value;
+        private String description;
+
+        MES_DEFECT_CAUSE_TYPE(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;
+        }
+
+    }
+
+    /**
      * mes设备作业任务明细-执行状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -452,8 +605,8 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_WORK_CELL_TYPE {
 
-        NORMAL(1, "正常"),
-        REWORK(2, "返修");
+        NORMAL(10, "正常"),
+        REWORK(20, "返修");
 
         private int value;
         private String description;
@@ -500,8 +653,8 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_ACTION_TYPE {
 
-        BIND(1, "绑定"),
-        UNTYING(2, "解绑");
+        BIND(10, "绑定"),
+        UNTYING(20, "解绑");
 
         private int value;
         private String description;
@@ -548,8 +701,8 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_IS_KEY {
 
-        IS_KEY(1, "是"),
-        NO_KEY(2, "否");
+        IS_KEY(10, "是"),
+        NO_KEY(20, "否");
 
         private int value;
         private String description;
@@ -596,8 +749,8 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_REPAIR_STATUS {
 
-        REPAIRED(1, "已维修"),
-        NO_REPAIR(2, "待维修");
+        REPAIRED(10, "已维修"),
+        NO_REPAIR(20, "待维修");
 
         private int value;
         private String description;
@@ -644,11 +797,11 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_OPERATE_TYPE {
 
-        WORKSTATION_SCAN(1, "工位扫描"),
-        QUALITY_JUDGEMENT(2, "质量判定"),
-        MATERIAL_DISMANTLING(3, "物料拆解"),
-        REWORK(4, "返修作业"),
-        WORKSTATION_MONITORING(5, "工位监控");
+        WORKSTATION_SCAN(10, "工位扫描"),
+        QUALITY_JUDGEMENT(20, "质量判定"),
+        MATERIAL_DISMANTLING(30, "物料拆解"),
+        REWORK(40, "返修作业"),
+        WORKSTATION_MONITORING(50, "工位监控");
 
         private int value;
         private String description;
@@ -1323,9 +1476,7 @@ public class MesEnumUtil {
     public enum PASS_FAIL {
 
         PASS(1, "合格"),
-        FAIL(2, "不合格"),
-        SCRAP(3, "报废"),
-        DISMANTLED(4, "已拆解");
+        FAIL(2, "不合格");
 
         private int value;
         private String description;
@@ -1796,7 +1947,8 @@ public class MesEnumUtil {
 
         QUALIFIED(10, "合格"),
         DEFECTED(20, "不合格"),
-        SCRAPED(30, "报废");
+        SCRAPED(30, "报废"),
+        DISMANTLED(40, "已拆解");
 
         private int value;
         private String description;
@@ -2104,7 +2256,8 @@ public class MesEnumUtil {
         UPDATE_SYNC_TIME(50, "UPDATE_SYNC_TIME"),
         PCN_PULL(60, "PCN_PULL"),
         PCN_PUSH(70, "PCN_PUSH"),
-        FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD");
+        FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD"),
+        REWORK_REPAIR(90, "REWORK_REPAIR");
 
         private int value;
         private String description;

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

@@ -13,6 +13,168 @@ import org.apache.commons.lang3.StringUtils;
 public class MesPcnEnumUtil {
 
     /**
+     * mes缺陷原因类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_DEFECT_CAUSE_TYPE {
+
+        QUALITY_DEFECTS(10, "质量缺陷"),
+        PROCESS_DEFECTS(20, "工艺缺陷"),
+        EQUIPMENT_DEFECT(30, "设备缺陷");
+
+        private int value;
+        private String description;
+
+        MES_DEFECT_CAUSE_TYPE(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;
+        }
+
+    }
+
+
+    /**
+     * mes 图片面位
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_SIDE_LOCATION {
+
+        A_SIDE(10, "A面"),
+        B_SIDE(20, "B面"),
+        C_SIDE(30, "C面"),
+        D_SIDE(40, "D面");
+
+        private int value;
+        private String description;
+
+        MES_SIDE_LOCATION(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;
+        }
+
+    }
+
+    /**
+     * mes 维修状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_REPAIR_STATUS {
+
+        REPAIRED(10, "已维修"),
+        NO_REPAIR(20, "待维修");
+
+        private int value;
+        private String description;
+
+        MES_REPAIR_STATUS(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;
+        }
+
+    }
+
+    /**
+     * mes过程质量检测类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_QC_CHECK_TYPE {
+
+        FIRST_CHECK(10, "首检"),
+        ON_SITE_CHECK(20, "巡检"),
+        END_CHECK(30, "尾检");
+
+        private int value;
+        private String description;
+
+        MES_QC_CHECK_TYPE(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;
+        }
+    }
+
+    /**
      * mes-pcn定时任务状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -11,6 +11,8 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description:
@@ -39,4 +41,12 @@ public class MesDefect extends BaseBean {
     @Column(name = "DEFECT_TYPE")
     @ApiParam("缺陷类型")
     private String defectType;
+
+    @Transient
+    @ApiParam("缺陷位置")
+    private String defectLocation;
+
+    @Transient
+    @ApiParam("缺陷类型子集")
+    private List<MesDefect> mesDefectList;
 }

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

@@ -11,6 +11,8 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description:
@@ -49,7 +51,7 @@ public class MesDefectRecord extends BaseBean {
 
     @Column(name="DEFECT_LOCATION")
     @ApiParam("缺陷位置")
-    private Integer defectLocation;
+    private String defectLocation;
 
     @Column(name="REPAIR_STATUS")
     @ApiParam("维修状态")
@@ -66,4 +68,7 @@ public class MesDefectRecord extends BaseBean {
     @Column(name="MEMO")
     @ApiParam("备注")
     private String memo;
+
+    @Transient
+    private List<MesDefect> mesDefectList;
 }

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

@@ -82,5 +82,5 @@ public class MesDismantleRecord extends BaseBean {
 
     @Column(name = "MEMO")
     @ApiParam("备注")
-    private String meno;
+    private String memo;
 }

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

@@ -87,7 +87,7 @@ public class MesProdBindRecord extends BaseBean {
 
     @Column(name = "IS_KEY")
     @ApiParam(value = "是否关键件")
-    private String isKey;
+    private Integer isKey;
 
     @Column(name = "ACTION_TYPE")
     @ApiParam(value = "动作类型")

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

@@ -80,7 +80,7 @@ public class MesQcCheckData extends BaseBean {
 
     @Column(name = "QTY")
     @ApiParam("产品数量")
-    private String qty;
+    private Integer qty;
 
     @Column(name = "MEMO")
     @ApiParam("备注")

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

@@ -34,7 +34,7 @@ public class MesRepair extends BaseBean {
 
     @Column(name = "REPAIR_NAME")
     @ApiParam("维修名称")
-    private String repariName;
+    private String repairName;
 
     @Column(name = "REPAIR_TYPE")
     @ApiParam("维修类型")

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

@@ -11,6 +11,8 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description:
@@ -82,5 +84,17 @@ public class MesRepairRecord extends BaseBean {
 
     @Column(name = "MEMO")
     @ApiParam("备注")
-    private String meno;
+    private String memo;
+
+    @Transient
+    @ApiParam("备注")
+    private String spareMemo;
+
+    @Transient
+    @ApiParam("不良记录id")
+    private Long defectRecordId;
+
+    @Transient
+    @ApiParam("缺陷集合")
+    private List<MesDefect> mesDefectList;
 }

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

@@ -46,7 +46,7 @@ public class MesScrapRecord extends BaseBean {
 
     @Column(name = "SCRAP_CODE")
     @ApiParam("报废代码")
-    private String repairCode;
+    private String scrapCode;
 
     @Column(name = "SCRAP_NAME")
     @ApiParam("报废名称")
@@ -66,5 +66,5 @@ public class MesScrapRecord extends BaseBean {
 
     @Column(name = "MEMO")
     @ApiParam("备注")
-    private String meno;
+    private String memo;
 }

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

@@ -45,5 +45,5 @@ public class MesWorkCell extends BaseBean {
 
     @Column(name = "WORK_CELL_TYPE")
     @ApiParam("工位类型")
-    private String workCellType;
+    private Integer workCellType;
 }

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

@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefect;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\24 22:04
+ * @Modify:
+ **/
+@Data
+public class MesDefectModel {
+
+    private String defectCode;
+
+    @ApiParam("缺陷名称")
+    private String defectName;
+
+    @ApiParam("缺陷类型")
+    private String defectType;
+
+    @Transient
+    @ApiParam("缺陷分类子集")
+    private List<MesDefect> mesDefectList;
+}

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

@@ -1,36 +0,0 @@
-package cn.estsh.i3plus.pojo.mes.pcn.model;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.Data;
-
-/**
- * @Description:
- * @Reference:
- * @Author: joke.wang
- * @CreateDate: 2019\10\18 19:15
- * @Modify:
- **/
-@Data
-@Api("mes 物料BOM")
-public class MesPartBomModel {
-
-    @ApiParam("物料编号")
-    private String partNo;
-
-    @ApiParam("物料名称")
-    private String partName;
-
-    @ApiParam("数量")
-    private Integer qty;
-
-    public MesPartBomModel() {
-
-    }
-
-    public MesPartBomModel(String partNo, String partName, Integer qty) {
-        this.partNo = partNo;
-        this.partName = partName;
-        this.qty = qty;
-    }
-}

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

@@ -0,0 +1,61 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\24 22:04
+ * @Modify:
+ **/
+@Data
+public class MesProcessBomModel {
+
+    private Long id;
+    @ApiParam("子物料编码")
+    private String itemPartNo;
+    @ApiParam("子物料名称")
+    private String itemPartName;
+    @ApiParam("产品数量")
+    private Double qty;
+    private Integer isValid;
+    private Integer isDeleted;
+    private String organizeCode;
+    private Integer isFeed;
+    private String workCenterCode;
+    private String workCellCode;
+    @ApiParam("拆解数")
+    private Double dismantleQty;
+
+    @ApiParam("产品物料编码")
+    private String parentPartNo;
+    @ApiParam("产品物料名称")
+    private String parentPartName;
+    @ApiParam("合格数")
+    private Integer okQty;
+    @ApiParam("缺失数")
+    private Integer missQty;
+    @ApiParam("报废数")
+    private Integer scrapQty;
+
+    public MesProcessBomModel() {
+
+    }
+
+    public MesProcessBomModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName) {
+        this.id = id;
+        this.itemPartNo = itemPartNo;
+        this.itemPartName = itemPartName;
+        this.qty = qty;
+        this.isValid = isValid;
+        this.isDeleted = isDeleted;
+        this.organizeCode = organizeCode;
+        this.isFeed = isFeed;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+        this.parentPartNo = parentPartNo;
+        this.parentPartName = parentPartName;
+    }
+}

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

@@ -0,0 +1,59 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\24 22:05
+ * @Modify:
+ **/
+@Data
+public class MesProdBindRecordModel {
+    private Long id;
+    private String itemPartNo;
+    private String itemPartName;
+    private Double qty;
+    private Integer isValid;
+    private Integer isDeleted;
+    private String organizeCode;
+    private Integer isFeed;
+    private String workCenterCode;
+    private String workCellCode;
+    private String kpSn;
+    @ApiParam("拆解数")
+    private Double dismantleQty;
+
+    @ApiParam("产品物料编码")
+    private String parentPartNo;
+    @ApiParam("产品物料名称")
+    private String parentPartName;
+    @ApiParam("合格数")
+    private Integer okQty;
+    @ApiParam("缺失数")
+    private Integer missQty;
+    @ApiParam("报废数")
+    private Integer scrapQty;
+    public MesProdBindRecordModel() {
+
+    }
+
+    public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, Double dismantleQty) {
+        this.id = id;
+        this.itemPartNo = itemPartNo;
+        this.itemPartName = itemPartName;
+        this.qty = qty;
+        this.isValid = isValid;
+        this.isDeleted = isDeleted;
+        this.organizeCode = organizeCode;
+        this.isFeed = isFeed;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+        this.kpSn = kpSn;
+        this.parentPartNo = parentPartNo;
+        this.parentPartName = parentPartName;
+        this.dismantleQty = dismantleQty;
+    }
+}

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

@@ -38,5 +38,5 @@ public class MesRepair extends BaseBean {
 
     @Column(name = "REPAIR_TYPE")
     @ApiParam("维修类型")
-    private Integer repairType;
+    private String repairType;
 }

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

@@ -82,5 +82,5 @@ public class MesRepairRecord extends BaseBean {
 
     @Column(name = "MEMO")
     @ApiParam("备注")
-    private String meno;
+    private String memo;
 }

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

@@ -62,5 +62,5 @@ public class MesScrapRecord extends BaseBean {
 
     @Column(name = "MEMO")
     @ApiParam("备注")
-    private String meno;
+    private String memo;
 }

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

@@ -49,7 +49,7 @@ public class MesWorkCell extends BaseBean {
 
     @Column(name = "WORK_CELL_TYPE")
     @ApiParam("工位类型")
-    private String workCellType;
+    private Integer workCellType;
 
     @Transient
     @ApiParam(value = "子集列表")