提交

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

@@ -1150,4 +1150,49 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * WC_CHECK_TYPE 开线检查的模块
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WC_CHECK_TYPE {
+
+        PERSON(10, "person", "人"),
+        EQUIPMENT(20, "equipment", "机"),
+        MATERIAL(30, "material", "料"),
+        ROUTE(40, "route", "法"),
+        ONLINE_SIGNAL(50, "onlineSignal", "开线信号");
+
+        private int value;
+        private String code;
+        private String description;
+
+        WC_CHECK_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -344,5 +344,158 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * MesWorkCenter 工作中心运行状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_CENTER_RUNNING_STATUS {
+
+        RUNNING(1, "开线"),
+        STOPPED(2, "停线");
+
+        private int value;
+        private String description;
+
+        WORK_CENTER_RUNNING_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;
+        }
+    }
+
+    /**
+     * WC_CHECK_TYPE 开线检查的模块
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WC_CHECK_TYPE {
+
+        PERSON(10, "person", "人"),
+        EQUIPMENT(20, "equipment", "机"),
+        MATERIAL(30, "material", "料"),
+        ROUTE(40, "route", "法"),
+        ONLINE_SIGNAL(50, "onlineSignal", "开线信号");
+
+        private int value;
+        private String code;
+        private String description;
+
+        WC_CHECK_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * 开线检查
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ONLINE_SIGNAL {
+
+        CHECK(10, "检查"),
+        NON_CHECK(20, "不检查");
+
+        private int value;
+        private String description;
+
+        ONLINE_SIGNAL(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;
+        }
+    }
+
+    /**
+     * 开线检查
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum IS_WCCHECK_PASS {
+
+        PASS(10, "通过"),
+        NON_PASS(20, "不通过");
+
+        private int value;
+        private String description;
+
+        IS_WCCHECK_PASS(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;
+        }
+    }
+
 
 }

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

@@ -0,0 +1,62 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/24 7:17 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_DB")
+@Api("地址清单")
+public class MesDB extends BaseBean {
+
+    @Column(name="DS_CODE")
+    @ApiParam("数据源代码")
+    private String dsCode;
+
+    @Column(name="DS_NAME")
+    @ApiParam("数据源名称")
+    private String dsName;
+
+    @Column(name="DS_TYPE")
+    @ApiParam("数据源类型")
+    private String dsType;
+
+    @Column(name="DS_HOST")
+    @ApiParam("主机")
+    private String dsHost;
+
+    @Column(name="DS_PORT")
+    @ApiParam("端口")
+    private Integer dsPort;
+
+    @Column(name="DS_USER")
+    @ApiParam("用户名")
+    private String dsUser;
+
+    @Column(name="DS_PASSWORD")
+    @ApiParam("密码")
+    private String dsPassword;
+
+    @Column(name="EQU_CODE")
+    @ApiParam("设备代码")
+    private String equCode;
+
+}

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

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/24 7:12 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_DATA_OBJECT")
+@Api("数据对象")
+public class MesDataObject extends BaseBean {
+
+    @Column(name="OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+
+    @Column(name="OBJECT_NAME")
+    @ApiParam("对象名称")
+    private String objectName;
+
+    @Column(name="DS_CODE")
+    @ApiParam("数据源代码")
+    private String dsCode;
+}

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

@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/24 7:14 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_OBJECT_CFG")
+@Api("对象结构")
+public class MesObjectCfg extends BaseBean {
+
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name = "FIELD_CODE")
+    @ApiParam("字段代码")
+    private String fieldCode;
+
+    @Column(name = "FIELD_NAME")
+    @ApiParam("字段名称")
+    private String fieldName;
+
+    @Column(name = "FIELD_TYPE")
+    @ApiParam("字段类型")
+    private String fieldType;
+
+    @Column(name = "FIELD_LENGTH")
+    @ApiParam("列长度")
+    private String fieldLength;
+
+    @Column(name = "FIELD_PK")
+    @ApiParam("主键标记")
+    private String fieldPk;
+
+}

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

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/21 1:45 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WC_CHECK")
+@Api("开线检查")
+public class MesWcCheck extends BaseBean {
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name="PART_NO")
+    @ApiParam("产品物料号")
+    private String partNo;
+
+    @Column(name="CHECK_TYPE")
+    @ApiParam("检查类型")
+    private String checkType;
+
+    @Column(name="CHECK_OBJ")
+    @ApiParam("检查对象")
+    private String checkObj;
+
+    @Column(name="CHECK_ITEM")
+    @ApiParam("检查项")
+    private String checkItem;
+
+    @Column(name="STANDARD")
+    @ApiParam("检查标准")
+    private String standard;
+
+}

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

@@ -0,0 +1,78 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/21 1:57 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WC_CHECK_RECORD")
+@Api("开线检查记录")
+public class MesWcCheckRecord extends BaseBean {
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_ORDER")
+    @ApiParam("工单号")
+    private String workOrder;
+
+    @Column(name = "PART_NO")
+    @ApiParam("产品物料号")
+    private String partNo;
+
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("检查类型")
+    private String checkType;
+
+    @Column(name = "CHECK_OBJ")
+    @ApiParam("检查对象")
+    private String checkObj;
+
+    @Column(name = "CHECK_ITEM")
+    @ApiParam("检查项")
+    private String checkItem;
+
+    @Column(name = "STANDARD")
+    @ApiParam("检查标准")
+    private String standard;
+
+    @Column(name = "CHECK_RESULT")
+    @ApiParam("检查结果")
+    private String checkResult;
+
+    @Column(name = "CHECK_VALUE")
+    @ApiParam("检查值")
+    private String checkValue;
+
+    @Column(name = "REASON")
+    @ApiParam("原因")
+    private String reason;
+
+    @Column(name = "GROUP_CODE")
+    @ApiParam("组名")
+    private String groupCode;
+
+    @Column(name = "OVERALL_RESULT")
+    @ApiParam("总体结果")
+    private Integer overAllResult;
+
+}

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

@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/24 2:31 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WC_EQUIPMENT")
+@Api("工作单元设备关系表")
+public class MesWcEquipment extends BaseBean {
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name="WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name="EQU_CODE")
+    @ApiParam("设备代码")
+    private String equCode;
+
+}

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

@@ -46,4 +46,9 @@ public class MesWorkCenter extends BaseBean {
     @Column(name = "AREA_CODE")
     @ApiParam("生产区域代码")
     private String areaCode;
+
+    @Column(name="RUNNING_STATUS")
+    @ApiParam("运行状态")
+    private Integer runningStatus;
+
 }

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

@@ -0,0 +1,29 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProcessBom;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/21 3:11 PM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("工序BOM model")
+public class ProcessBomModel extends MesProcessBom {
+
+    @ApiParam("上料数量")
+    private Long cellFeedQty;
+
+    @ApiParam("是否上料数量满足")
+    private Boolean isFeedSatisfied;
+
+
+}

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

@@ -0,0 +1,89 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+
+import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcCheckRecord;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.*;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/23 8:06 PM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("开线管控model")
+public class WcCheckModel {
+
+    @ApiParam("人")
+    private List<MesWcCheckRecord> people;
+    @ApiParam("人 列")
+    private Map<String, String> peopleColumn;
+
+    @ApiParam("机")
+    private List<MesWcCheckRecord> equipments;
+    @ApiParam("机 列")
+    private Map<String, String> equipmentsColumn;
+
+    @ApiParam("物料")
+    private List<MesWcCheckRecord> materials;
+    @ApiParam("物料 列")
+    private Map<String, String> materialsColumn;
+
+    @ApiParam("法")
+    private List<MesWcCheckRecord> routes;
+    @ApiParam("法 列")
+    private Map<String, String> routesColumn;
+
+    @ApiParam("对象list和列关系")
+    private Map<String, String> dataColumnRelation;
+
+    @ApiParam("开线信号")
+    private Integer onlineSignal;
+
+    @ApiParam("是否通过")
+    private Integer isPass;
+
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @ApiParam("工单")
+    private String workOrder;
+
+    @ApiParam("工单零件数量")
+    private Long qty;
+
+    @ApiParam("产品号")
+    private String partNo;
+
+
+    public WcCheckModel initialWcCheckModel() {
+        WcCheckModel wcCheckModel = new WcCheckModel();
+        wcCheckModel.setPeople(new ArrayList<>());
+        wcCheckModel.setEquipments(new ArrayList<>());
+        wcCheckModel.setMaterials(new ArrayList<>());
+        wcCheckModel.setRoutes(new ArrayList<>());
+        wcCheckModel.setPeopleColumn(new HashMap<>());
+        wcCheckModel.setEquipmentsColumn(new HashMap<>());
+        wcCheckModel.setMaterialsColumn(new HashMap<>());
+        wcCheckModel.setRoutesColumn(new HashMap<>());
+        wcCheckModel.setOnlineSignal(MesPcnEnumUtil.ONLINE_SIGNAL.NON_CHECK.getValue());
+        wcCheckModel.setIsPass(MesPcnEnumUtil.IS_WCCHECK_PASS.NON_PASS.getValue());
+
+        Map<String, String> dataColumnRelationMap = new HashMap<>();
+        dataColumnRelationMap.put("people", "peopleColumn");
+        dataColumnRelationMap.put("equipments", "equipmentsColumn");
+        dataColumnRelationMap.put("materials", "materialsColumn");
+        dataColumnRelationMap.put("routes", "routesColumn");
+        wcCheckModel.setDataColumnRelation(dataColumnRelationMap);
+        return wcCheckModel;
+    }
+
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcCheckRecord;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/23 7:30 PM
+ * @Description:
+ **/
+public interface MesWcCheckRecordRepository extends BaseRepository<MesWcCheckRecord, Long> {
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcCheck;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/23 7:30 PM
+ * @Description:
+ **/
+public interface MesWcCheckRepository extends BaseRepository<MesWcCheck, Long> {
+}

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

@@ -0,0 +1,62 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/24 7:17 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_DB")
+@Api("地址清单")
+public class MesDB extends BaseBean {
+
+    @Column(name = "DS_CODE")
+    @ApiParam("数据源代码")
+    private String dsCode;
+
+    @Column(name = "DS_NAME")
+    @ApiParam("数据源名称")
+    private String dsName;
+
+    @Column(name = "DS_TYPE")
+    @ApiParam("数据源类型")
+    private String dsType;
+
+    @Column(name = "DS_HOST")
+    @ApiParam("主机")
+    private String dsHost;
+
+    @Column(name = "DS_PORT")
+    @ApiParam("端口")
+    private Integer dsPort;
+
+    @Column(name = "DS_USER")
+    @ApiParam("用户名")
+    private String dsUser;
+
+    @Column(name = "DS_PASSWORD")
+    @ApiParam("密码")
+    private String dsPassword;
+
+    @Column(name = "EQU_CODE")
+    @ApiParam("设备代码")
+    private String equCode;
+
+}

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

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/24 7:12 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_DATA_OBJECT")
+@Api("数据对象")
+public class MesDataObject extends BaseBean {
+
+    @Column(name="OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+
+    @Column(name="OBJECT_NAME")
+    @ApiParam("对象名称")
+    private String objectName;
+
+    @Column(name="DS_CODE")
+    @ApiParam("数据源代码")
+    private String dsCode;
+}

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

@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/24 7:14 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_OBJECT_CFG")
+@Api("对象结构")
+public class MesObjectCfg extends BaseBean {
+
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name = "FIELD_CODE")
+    @ApiParam("字段代码")
+    private String fieldCode;
+
+    @Column(name = "FIELD_NAME")
+    @ApiParam("字段名称")
+    private String fieldName;
+
+    @Column(name = "FIELD_TYPE")
+    @ApiParam("字段类型")
+    private String fieldType;
+
+    @Column(name = "FIELD_LENGTH")
+    @ApiParam("列长度")
+    private String fieldLength;
+
+    @Column(name = "FIELD_PK")
+    @ApiParam("主键标记")
+    private String fieldPk;
+
+}

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

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/21 1:45 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WC_CHECK")
+@Api("开线检查")
+public class MesWcCheck extends BaseBean {
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name="PART_NO")
+    @ApiParam("产品物料号")
+    private String partNo;
+
+    @Column(name="CHECK_TYPE")
+    @ApiParam("检查类型")
+    private String checkType;
+
+    @Column(name="CHECK_OBJ")
+    @ApiParam("检查对象")
+    private String checkObj;
+
+    @Column(name="CHECK_ITEM")
+    @ApiParam("检查项")
+    private String checkItem;
+
+    @Column(name="STANDARD")
+    @ApiParam("检查标准")
+    private String standard;
+
+}

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

@@ -0,0 +1,78 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/21 1:57 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WC_CHECK_RECORD")
+@Api("开线检查记录")
+public class MesWcCheckRecord extends BaseBean {
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_ORDER")
+    @ApiParam("工单号")
+    private String workOrder;
+
+    @Column(name = "PART_NO")
+    @ApiParam("产品物料号")
+    private String partNo;
+
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("检查类型")
+    private String checkType;
+
+    @Column(name = "CHECK_OBJ")
+    @ApiParam("检查对象")
+    private String checkObj;
+
+    @Column(name = "CHECK_ITEM")
+    @ApiParam("检查项")
+    private String checkItem;
+
+    @Column(name = "STANDARD")
+    @ApiParam("检查标准")
+    private String standard;
+
+    @Column(name = "CHECK_RESULT")
+    @ApiParam("检查结果")
+    private String checkResult;
+
+    @Column(name = "CHECK_VALUE")
+    @ApiParam("检查值")
+    private String checkValue;
+
+    @Column(name = "REASON")
+    @ApiParam("原因")
+    private String reason;
+
+    @Column(name = "GROUP_CODE")
+    @ApiParam("组名")
+    private String groupCode;
+
+    @Column(name = "OVERALL_RESULT")
+    @ApiParam
+    private Integer overAllResult;
+
+}

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

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/24 2:31 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WC_EQUIPMENT")
+@Api("工作单元设备关系表")
+public class MesWcEquipment extends BaseBean {
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name="WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name="EQU_CODE")
+    @ApiParam("设备代码")
+    private String equCode;
+
+}

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

@@ -51,6 +51,10 @@ public class MesWorkCenter extends BaseBean {
     @ApiParam("生产区域代码")
     private String areaCode;
 
+    @Column(name="RUNNING_STATUS")
+    @ApiParam("运行状态")
+    private Integer runningStatus;
+
     @Transient
     @ApiParam(value ="子集列表")
     private List<MesWorkCell> childTreeList;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcCheckRecordRepository.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesWcCheckRecord;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/23 7:30 PM
+ * @Description:
+ **/
+public interface MesWcCheckRecordRepository extends BaseRepository<MesWcCheckRecord, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcCheckRepository.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesWcCheck;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/23 7:30 PM
+ * @Description:
+ **/
+public interface MesWcCheckRepository extends BaseRepository<MesWcCheck, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -364,6 +364,7 @@ public class MesHqlPack {
 
     /**
      * MES班组信息查询条件封装
+     *
      * @param shiftGroup
      * @param organizeCode
      * @return
@@ -397,7 +398,7 @@ public class MesHqlPack {
 
         return packBean;
     }
-/******************created by wynne*************/
+
     /**
      * MES 报废信息查询
      *
@@ -418,6 +419,24 @@ public class MesHqlPack {
         return packBean;
     }
 
+
+    /**
+     * MES 开线管控
+     *
+     * @param mesWcCheck
+     * @return
+     */
+    public static DdlPackBean getMesWcCheck(MesWcCheck mesWcCheck, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesWcCheck,organizeCode);
+//        DdlPreparedPack.getNumEqualPack(mesWcCheck.getIsValid(),"isValid",packBean);
+        DdlPreparedPack.getStringLikerPack(mesWcCheck.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringLikerPack(mesWcCheck.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringEqualPack(mesWcCheck.getCheckType(), "checkType", packBean);
+        DdlPreparedPack.getStringLikerPack(mesWcCheck.getCheckObj(), "checkObj", packBean);
+        DdlPreparedPack.getStringLikerPack(mesWcCheck.getCheckItem(), "checkItem", packBean);
+        return packBean;
+    }
+
     /**
      * MES PCN系统配置信息条件查询
      *