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

6 years ago · 727c1efea8
parent 507902473c b0faa179d1
commit 727c1efea8
31 changed files with 989 additions and 15 deletions
--- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
@ -126,6 +126,8 @@ public class AndonHqlPack {
    public static DdlPackBean packHqlAndonAlarmCause(AndonAlarmCause andonAlarmCause){
        DdlPackBean result = new DdlPackBean();

+        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcCode(),"acCode", result);
+        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcName(),"acName", result);
        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result);
        getStringBuilderPack(andonAlarmCause, result);

@ -425,4 +427,33 @@ public class AndonHqlPack {

        return result;
    }
+
+    /**
+     * ANDON通知方式查询条件封装
+     * @param andonResponse
+     * @return
+     */
+    public static DdlPackBean packAndonResponse(AndonResponse andonResponse){
+        DdlPackBean result = new DdlPackBean();
+
+        getStringBuilderPack(andonResponse, result);
+
+        return result;
+    }
+
+    /**
+     * ANDON通知对象查询条件封装
+     * @param andonResponseObject
+     * @return
+     */
+    public static DdlPackBean packAndonResponseObject(AndonResponseObject andonResponseObject){
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectCode(), "rpObjectCode", result);
+        DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectName(), "rpObjectName", result);
+        DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectValue(), "rpObjectValue", result);
+
+        getStringBuilderPack(andonResponseObject, result);
+
+        return result;
+    }
 }
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
@ -269,6 +269,46 @@ public class AndonEnumUtil {
    }

    /**
+     * 通知级别
+     * 10 - 一级，20 - 二级，30 - 三级，40 - 四级
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum NOTICE_LEVEL{
+
+        FIRST(10,"一级"),
+        SECOND(20,"二级"),
+        THIRD(30,"三级"),
+        FOUTH(40,"四级");
+
+        private int value;
+        private String description;
+
+        NOTICE_LEVEL(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;
+        }
+    }
+
+
+    /**
     * ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测
     */
    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
@ -16,8 +16,8 @@ public class BlockFormEnumUtil {
     */
    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
    public enum FORM_TABLE_TYPE {
-        TABLE(1, "table", "表"),
-        VIEW(2, "view", "视图");
+        TABLE(1, "TABLE", "表"),
+        VIEW(2, "VIEW", "视图");

        private int value;
        private String code;
@ -2117,4 +2117,209 @@ public class BlockFormEnumUtil {
        }
    }

+    /**
+     * 数据库连接方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DATA_SOURCE_TYPE {
+        SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306),
+        SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017","com.microsoft.sqlserver.jdbc.SQLServerDriver",1433),
+        SOURCE_ORACLE(300, "Oracle", "Oralce 12C","oracle.jdbc.driver.OracleDriver",1521),
+        SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432);
+
+        private int value;
+        private String code;
+        private String description;
+        private String driverClassName;
+        private int defaultPort;
+
+        private DATA_SOURCE_TYPE (int value, String code, String description,String driverClassName,int port) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+            this.driverClassName = driverClassName;
+            this.defaultPort = port;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getDriverClassName() {
+            return driverClassName;
+        }
+
+        public int getDefaultPort() {
+            return defaultPort;
+        }
+
+        public static String valueOfCode(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public static int codeOfValue(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        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 DATA_SOURCE_TYPE valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public String getJDBCUrl(String database,String host,Integer port){
+            if(this.getValue() == SOURCE_MARIA_DB.getValue()){
+                return getJDBCUrlMySQL(database,host,port);
+            }else if(this.getValue() == SOURCE_ORACLE.getValue()){
+                return getJDBCUrlOracle(database,host,port);
+            }else if(this.getValue() == SOURCE_POSTGRE_SQL.getValue()){
+                return getJDBCUrlPostgreSQL(database,host,port);
+            }else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){
+                return getJDBCUrlSQLServer(database,host,port);
+            }
+            return null;
+        }
+
+        private String getJDBCUrlMySQL(String database,String host,Integer port){
+            return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8";
+        }
+
+        private String getJDBCUrlOracle(String database,String host,Integer port){
+            return "jdbc:oracle:thin:@"+host+":"+port+":"+database;
+        }
+
+        private String getJDBCUrlPostgreSQL(String database,String host,Integer port){
+            return "jdbc:postgresql://"+host+":"+port+"/"+database;
+        }
+
+        private String getJDBCUrlSQLServer(String database,String host,Integer port){
+            return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database;
+        }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DATA_SOURCE_STATUS {
+        CONN_SUCCESS(10, "连接成功", "连接成功"),
+        CONN_FAILURE(20, "连接失败", "连接失败");
+//        TIME_OUT(30, "连接超时", "连接超时"),
+//        AUTH_ERROR(40, "账号密码错误", "账号密码错误");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private DATA_SOURCE_STATUS (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 valueOfCode(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public static int codeOfValue(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        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 DATA_SOURCE_STATUS valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@ -805,7 +805,7 @@ public class WmsEnumUtil {
        INSTOCKED(40, "入库"),
        PICKED(50, "配料"),
        OUT_STOCK(60, "出库"),
-        FRAZE(70, "报废"),
+//        FRAZE(70, "报废"),
        COMMING(80, "在途");

        private int value;
@ -850,7 +850,7 @@ public class WmsEnumUtil {
     */
    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
    public enum STOCK_SN_QC_STATUS {
-        NORMAL(10, "EMPTY", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离");
+        NORMAL(10, "EMPTY", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40,"ISOLATED", "报废");

        private int value;
        private String code;
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java
@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.form.bean;

 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@ -28,6 +30,15 @@ import java.util.List;
@Api(value="数据对象",description = "原数据对象，最原始数据")
 public class BfDataObject extends BaseBean {

+    @Column(name = "DATA_SOURCE_ID")
+    @ApiParam(value = "数据源ID", example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long dataSourceId;
+
+    @Column(name="DATA_SOURCE_CODE_RDD")
+    @ApiParam(value ="数据源编码")
+    private String dataSourceCodeRdd;
+
    @Column(name="OBJECT_NAME")
    @ApiParam(value ="数据名称")
    private String objectName;
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataSource.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataSource.java
@ -0,0 +1,72 @@
+package cn.estsh.i3plus.pojo.form.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
+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.*;
+import java.util.List;
+
+/**
+ * @Description : 数据对象
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2019-02-27 10:53
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="bf_data_source")
+@Api(value="数据对象",description = "原数据对象，最原始数据")
+public class BfDataSource extends BaseBean {
+
+    @Column(name="SOURCE_NAME")
+    @ApiParam(value ="数据源名称")
+    private String sourceName;
+
+    @Column(name="SOURCE_CODE")
+    @ApiParam(value ="数据源编码")
+    private String sourceCode;
+
+    @Column(name="SOURCE_STATUS")
+    @ApiParam(value ="数据源状态",name = "状态：可用，不可用 看枚举当中是否存在")
+    private Integer sourceStatus;
+
+    @Column(name="SOURCE_TYPE")
+    @ApiParam(value ="数据源类型",name = "BlockFormEnumUtil.DATA_SOURCE_TYPE")
+    private Integer sourceType;
+
+    @Column(name="SOURCE_HOST")
+    @ApiParam(value ="数据源连接地址")
+    private String sourceHost;
+
+    @Column(name="SOURCE_PORT")
+    @ApiParam(value ="数据源端口")
+    private Integer sourcePort;
+
+    @Column(name="SOURCE_DATA_BASE_NAME")
+    @ApiParam(value ="数据库名称")
+    private String sourceDataBaseName;
+
+    @Column(name="SOURCE_USER_NAME")
+    @ApiParam(value ="数据库用户名称")
+    private String sourceUserName;
+
+    @Column(name="SOURCE_PASSWORD")
+    @ApiParam(value ="数据库用户密码")
+    private String sourcePassword;
+
+    @Column(name="SOURCE_DESCRIPTION")
+    @ApiParam(value ="数据源描述")
+    private String sourceDescription;
+
+}
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java
@ -11,10 +11,7 @@ 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;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.util.List;

 /**
@ -49,9 +46,14 @@ public class BfElementPropertyVirtual extends BaseBean {
    private String propertyCode;

    @Column(name="PROPERTY_NAME")
-    @ApiParam(value ="虚拟属性名称")
+    @ApiParam(value ="显示名称")
    private String propertyName;

+    @Lob
+    @Column(name="PROPERTY_CODES")
+    @ApiParam(value ="属性代码")
+    private String propertyCodes;
+
    @Column(name="PROPERTY_TYPE")
    @ApiParam(value ="属性类型")
    private Integer propertyType;
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfDataSourceRepository.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfDataSourceRepository.java
@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.form.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.form.bean.BfDataObject;
+import cn.estsh.i3plus.pojo.form.bean.BfDataSource;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Adair Peng
+ * @CreateDate : 2019-06-03 18:05
+ * @Modify:
+ **/
+public interface BfDataSourceRepository  extends BaseRepository<BfDataSource,Long> {
+}
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java
@ -314,4 +314,19 @@ public final class FormHqlPack {

        return ddlPackBean;
    }
+
+    /**
+     * 元素信息复杂查询
+     * @param source 查询条件
+     * @return DdlPackBean
+     */
+    public static DdlPackBean packHqlBfDataSource(BfDataSource source){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(source.getSourceHost(), "sourceHost", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(source.getSourceType(), "sourceType", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(source.getSourceStatus(), "sourceStatus", ddlPackBean);
+
+        return ddlPackBean;
+    }
 }
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.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;
+
+/**
+ * @Description :配置表
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-06-04
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_CONFIG")
+@Api("mes配置表")
+public class MesConfig extends BaseBean {
+    @Column(name="CFG_CODE")
+    @ApiParam("配置代码")
+    private String cfgCode;
+
+    @Column(name="CFG_NAME")
+    @ApiParam("配置名称")
+    private String cfgName;
+
+    @Column(name="CFG_TYPE")
+    @ApiParam("配置类型")
+    private String cfgType;
+
+    @Column(name="CFG_KEY")
+    @ApiParam("配置key")
+    private String cfgkey;
+
+    @Column(name="CFG_VALUE")
+    @ApiParam("配置value")
+    private String cfgValue;
+
+    @Column(name="CFG_VAULE_DESC")
+    @ApiParam("配置value描述")
+    private String cfgValueDesc;
+}
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java
@ -0,0 +1,37 @@
+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;
+
+/**
+ * @Description :工序
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PROCESS")
+@Api("工序")
+public class MesProcess extends BaseBean {
+    @Column(name = "PROCESS_CODE")
+    @ApiParam("工序代码")
+    private String processCode;
+
+    @Column(name = "PROCESS_NAME")
+    @ApiParam("工序名称")
+    private String processName;
+}
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java
@ -87,4 +87,13 @@ public class MesQueueOrderDetail extends BaseBean {
    public int getStatusVal() {
        return this.status == null ? 0 : this.status;
    }
+
+    public MesQueueOrderDetail() {
+    }
+
+    public MesQueueOrderDetail(Double queueSeq, Double seq, String serialNumber) {
+        this.queueSeq = queueSeq;
+        this.seq = seq;
+        this.serialNumber = serialNumber;
+    }
 }
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.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;
+
+/**
+ * @Description :流程表
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_ROUTE")
+@Api("流程表")
+public class MesRoute extends BaseBean {
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name = "ROUTE_NAME")
+    @ApiParam("流程名称")
+    private String routeName;
+
+    @Column(name = "POSITION")
+    @ApiParam("GOJS位置")
+    private String position;
+}
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java
@ -33,9 +33,17 @@ public class MesWorkCellPoint extends BaseBean {

    @Column(name = "QUEUE_SEQ")
    @ApiParam("队列主表序号")
-    private String queueSeq;
+    private Double queueSeq;

    @Column(name = "QUEUE_DETAIL_SEQ")
    @ApiParam("队列明细表序号")
-    private String queueDetailSeq;
+    private Double queueDetailSeq;
+
+    public double getQueueSeqVal() {
+        return this.queueSeq == null ? 0 : this.queueSeq;
+    }
+
+    public double getQueueDetailSeqVal() {
+        return this.queueDetailSeq == null ? 0 : this.queueDetailSeq;
+    }
 }
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java
@ -0,0 +1,71 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-06-03-11:44
+ * @Modify:
+ **/
+
+public class TorqueModel {
+    private Long id;
+
+    private Double upperLimit;
+
+    private Double lowerLimit;
+
+    private Double torqueValue;
+
+    private boolean ok;
+
+    private String color;
+
+    public boolean isOk() {
+        return ok;
+    }
+
+    public void setOk(boolean ok) {
+        this.ok = ok;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Double getUpperLimit() {
+        return upperLimit;
+    }
+
+    public void setUpperLimit(Double upperLimit) {
+        this.upperLimit = (upperLimit == null ? 0 : upperLimit);
+    }
+
+    public Double getLowerLimit() {
+        return lowerLimit;
+    }
+
+    public void setLowerLimit(Double lowerLimit) {
+        this.lowerLimit = (lowerLimit == null ? 0 : lowerLimit);
+    }
+
+    public Double getTorqueValue() {
+        return torqueValue;
+    }
+
+    public void setTorqueValue(Double torqueValue) {
+        this.torqueValue = (torqueValue == null ? 0 : torqueValue);
+    }
+
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+}
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesConfigRepository.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesConfigRepository.java
@ -0,0 +1,17 @@
+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.MesArea;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesConfig;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-06-04
+ * @Modify:
+ **/
+@Repository
+public interface MesConfigRepository extends BaseRepository<MesConfig, Long> {
+}
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java
@ -0,0 +1,16 @@
+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.MesProcess;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesProcessRepository extends BaseRepository<MesProcess, Long> {
+}
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java
@ -0,0 +1,16 @@
+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.MesRoute;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesRouteRepository extends BaseRepository<MesRoute, Long> {
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.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;
+
+/**
+ * @Description :配置表
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-06-04
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_CONFIG")
+@Api("mes配置表")
+public class MesConfig extends BaseBean {
+    @Column(name="CFG_CODE")
+    @ApiParam("配置代码")
+    private String cfgCode;
+
+    @Column(name="CFG_NAME")
+    @ApiParam("配置名称")
+    private String cfgName;
+
+    @Column(name="CFG_TYPE")
+    @ApiParam("配置类型")
+    private String cfgType;
+
+    @Column(name="CFG_KEY")
+    @ApiParam("配置key")
+    private String cfgkey;
+
+    @Column(name="CFG_VALUE")
+    @ApiParam("配置value")
+    private String cfgValue;
+
+    @Column(name="CFG_VAULE_DESC")
+    @ApiParam("配置value描述")
+    private String cfgValueDesc;
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java
@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;

 /**
 * @Description:
@ -51,6 +52,14 @@ public class MesKpData extends BaseBean {
    @ApiParam("数据下限")
    private Double lowerLimit;

+    @Transient
+    @ApiParam("扭矩值")
+    private Double torqueValue;
+
+    @Transient
+    @ApiParam("是否在范围之内")
+    private Boolean ok;
+
    public double getKeyDataCountVal() {
        return this.keyDataCount == null ? 0 : this.keyDataCount;
    }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java
@ -0,0 +1,59 @@
+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;
+
+/**
+ * @Description :PLC设备信息配置表
+ * @Reference :
+ * @Author : Crish
+ * @CreateDate : 2019-05-17
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PLC_CONFIGURE")
+@Api("PLC设备信息配置表")
+public class MesPLCConfigure extends BaseBean {
+    @Column(name="IP")
+    @ApiParam("设备ip")
+    private String ipAddress;
+
+    @Column(name="CHANNEL_NAME")
+    @ApiParam("通道名称")
+    private String channelName;
+
+    @Column(name="DEVICE_NAME")
+    @ApiParam("设备地址")
+    private String deviceName;
+
+    @Column(name="TAG_NAME")
+    @ApiParam("标签地址")
+    private String tagName;
+
+    @Column(name="AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Column(name="WORK_CELL_CODE")
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java
@ -0,0 +1,80 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-05-30-17:32
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PCN_SYNC_CFG")
+@Api("MES_PCN_同步配置")
+public class MesPcnSyncCfg extends BaseBean {
+    @Column(name="PCN_CODE")
+    @ApiParam("PCN代码")
+    private String pcnCode;
+
+    @Column(name="OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name="OBJECT_NAME")
+    @ApiParam("对象名称")
+    private String objectName;
+
+    @Column(name="OBJECT_KEY")
+    @ApiParam("对象主键")
+    private String objectKey;
+
+    @Column(name="SYNC_FREQUENCY")
+    @ApiParam("同步频率")
+    private Integer syncFrequency;
+
+    @Column(name="SYNC_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value ="同步时间")
+    private String syncTime;
+
+    @Column(name="SYNC_PATTERN")//2、新增  1、修改
+    @ApiParam("同步方式")
+    private Integer syncPattern;
+
+    @Column(name="SYNC_TYPE")//1\pcn获取mes数据   2、pcn推送数据至mes
+    @ApiParam("同步类型")
+    private Integer syncType;
+
+    @Column(name="LAST_SYNC_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value ="上一同步时间")
+    private String lastSyncTime;
+
+    public int getSyncFrequencyVal() {
+        return this.syncFrequency == null ? 0 : this.syncFrequency;
+    }
+
+    public int getSyncTypeVal() {
+        return this.syncType == null ? 0 : this.syncType;
+    }
+
+    public int getSyncPatternVal() {
+        return this.syncPattern == null ? 0 : this.syncPattern;
+    }
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java
@ -37,9 +37,17 @@ public class MesWorkCellPoint extends BaseBean {

    @Column(name = "QUEUE_SEQ")
    @ApiParam("队列主表序号")
-    private String queueSeq;
+    private Double queueSeq;

    @Column(name = "QUEUE_DETAIL_SEQ")
    @ApiParam("队列明细表序号")
-    private String queueDetailSeq;
+    private Double queueDetailSeq;
+
+    public double getQueueSeqVal() {
+        return this.queueSeq == null ? 0 : this.queueSeq;
+    }
+
+    public double getQueueDetailSeqVal() {
+        return this.queueDetailSeq == null ? 0 : this.queueDetailSeq;
+    }
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesConfigRepository.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesConfigRepository.java
@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesConfig;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-06-04
+ * @Modify:
+ **/
+@Repository
+public interface MesConfigRepository extends BaseRepository<MesConfig, Long> {
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKpsnRuleRepository.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKpsnRuleRepository.java
@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository;
 * @Modify:
 **/
@Repository
-public interface MesKpsnRuleReposity extends BaseRepository<MesKpsnRule, Long> {
+public interface MesKpsnRuleRepository extends BaseRepository<MesKpsnRule, Long> {
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPLCConfigureRepository.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPLCConfigureRepository.java
@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPLCConfigure;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesPLCConfigureRepository extends BaseRepository<MesPLCConfigure, Long> {
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSyncCfgRepository.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSyncCfgRepository.java
@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPcnSyncCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-04-24-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesPcnSyncCfgRepository extends BaseRepository<MesPcnSyncCfg, Long> {
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
@ -717,4 +717,41 @@ public class MesHqlPack {

        return packBean;
    }
+
+    /**
+     * MES对象与dao对应关系查询条件封装
+     * @param objectDao
+     * @return
+     */
+    public static DdlPackBean getMesObjectDao(MesObjectDao objectDao, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(objectDao, organizeCode);
+        if (StringUtils.isNotEmpty(objectDao.getObjectCode())){
+            DdlPreparedPack.getStringEqualPack(objectDao.getObjectCode(), "objectCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(objectDao.getDaoClass())){
+            DdlPreparedPack.getStringEqualPack(objectDao.getDaoClass(), "daoClass", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES-PCN同步配置查询条件封装
+     * @param pcnSyncCfg
+     * @return
+     */
+    public static DdlPackBean getMesPcnSyncCfg(MesPcnSyncCfg pcnSyncCfg, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(pcnSyncCfg, organizeCode);
+        if (StringUtils.isNotEmpty(pcnSyncCfg.getObjectCode())){
+            DdlPreparedPack.getStringEqualPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(pcnSyncCfg.getPcnCode())){
+            DdlPreparedPack.getStringEqualPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean);
+        }
+        if (null != pcnSyncCfg.getSyncType()){
+            DdlPreparedPack.getNumEqualPack(pcnSyncCfg.getSyncType(), "syncType", packBean);
+        }
+
+        return packBean;
+    }
 }
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java
@ -17,6 +17,10 @@ public class TemplateModel {

    @ApiParam("模板ID")
    @JsonSerialize(using = ToStringSerializer.class)
+    private Long sourceId;
+
+    @ApiParam("模板ID")
+    @JsonSerialize(using = ToStringSerializer.class)
    private Long templateId;

    @ApiParam("执行 HQL ")
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.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 : 工厂仓库
@ -40,4 +42,8 @@ public class WareHouse extends BaseBean {
    @ApiParam("仓库地址")
    public String address;

+    @Transient
+    @ApiParam(value ="存储区列表")
+    private List<WmsZones> zoneList;
+
 }
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.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 :存储区
@ -45,9 +47,13 @@ public class WmsZones extends BaseBean {
    private String zoneName;

    @Column(name = "PARENT_ZONE_NO")
-    @ApiParam(value = "上层存储区")
+    @ApiParam(value = "父级存储区", example ="1")
    private String parentZoneNo;

+    @Column(name = "IS_SON_NODE")
+    @ApiParam(value = "是否子节点")
+    private Integer isSonNode;
+
    @Column(name = "IS_PM")
    @ApiParam(value = "零件级管控" , example = "2")
    private Integer isPm;
@ -80,4 +86,7 @@ public class WmsZones extends BaseBean {
    @ApiParam(value = "校验先进先出" , example = "1")
    private Integer checkFifo;

+    @Transient
+    @ApiParam(value ="子存储区列表")
+    private List<WmsZones> childList;
 }