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

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java

@@ -157,6 +157,10 @@ public class AndonManageQueue extends BaseBean {
     @ApiParam(value = "解决人")
     private String resetUser;
 
+    @Column(name = "SOURCE_TYPE")
+    @ApiParam(value = "安灯来源类型")
+    private String sourceType = AndonEnumUtil.ALARM_SOURCE_TYPE.SOFT.getValue();
+
     @Transient
     @ApiParam(value = "解决人名字")
     private String resetUserName;
@@ -279,6 +283,10 @@ public class AndonManageQueue extends BaseBean {
     @ApiParam(value = "发送标志")
     private String sendFlag;
 
+    @Column(name = "SIGN_SEND_FLAG")
+    @ApiParam(value = "响应已通知标识")
+    private String signSendFlag;
+
     /**
      * 处理类型：10=标准处理，20=自处理
      */
@@ -325,6 +333,10 @@ public class AndonManageQueue extends BaseBean {
     @ApiParam(value = "驳回意见")
     private String rejectOpinion;
 
+    @Column(name = "OPEN_INFO")
+    @ApiParam(value = "放行说明")
+    private String openInfo;
+
     @Transient
     @ApiParam(value = "安灯状态集合")
     private List<String> statusCodeList;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java

@@ -264,6 +264,10 @@ public class AndonManageRecord extends BaseBean {
     @ApiParam(value = "驳回意见")
     private String rejectOpinion;
 
+    @Column(name = "OPEN_INFO")
+    @ApiParam(value = "放行说明")
+    private String openInfo;
+
     // 是否转呼
     public Integer getIsShiftCall() {
         return this.isShiftCall == null ? 0 : this.isShiftCall;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.andon.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-09-27 19:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="ANDON_MANAGE_ATTACH")
+@Api(value="安灯任务附属信息")
+public class AndonQueueAttach extends BaseBean {
+
+    @Column(name="PROD_INFO")
+    @ApiParam(value ="产品信息" , example ="-1")
+    private String prodInfo;
+
+    @Column(name="LINE_INFO")
+    @ApiParam(value ="产线信息")
+    private String lineInfo;
+
+    @Column(name="ANDON_ORDER_NO")
+    @ApiParam(value ="安灯任务编号")
+    private String andonOrderNo;
+
+    @Column(name="STATUS_CODE")
+    @ApiParam(value ="安灯状态")
+    private String statusCode;
+}

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

@@ -49,6 +49,10 @@ public class MesWorkCell extends BaseBean {
     private String areaCode;
 
     @Transient
+    @ApiParam(value ="工作单元中安灯队列标识")
+    private String workCellSignal;
+
+    @Transient
     @ApiParam(value ="子集列表")
     @AnnoOutputColumn(hidden = true)
     private List<MesEquipment> childTreeList;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonQueueAttachRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause;
+import cn.estsh.i3plus.pojo.andon.bean.AndonQueueAttach;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 安灯附属表
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-09-28
+ * @Modify:
+ **/
+@Repository
+public interface IAndonQueueAttachRepository extends BaseRepository<AndonQueueAttach, Long> {
+}

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java

@@ -134,7 +134,7 @@ public abstract class BaseBean implements Serializable {
         String result = "";
         if (orderByParam!=null&&orderByParam.trim().length()>0) {
             result = " order by " + orderByParam;
-            if(ascOrDesc!= null && ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) {
+            if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) {
                 result += " asc";
             }else{
                 result += " desc";

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java

@@ -9,6 +9,8 @@ import com.thoughtworks.xstream.io.naming.NameCoder;
 import com.thoughtworks.xstream.io.naming.NoNameCoder;
 import com.thoughtworks.xstream.io.xml.PrettyPrintWriter;
 import com.thoughtworks.xstream.io.xml.XppDomDriver;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.Writer;
 import java.lang.reflect.Field;
@@ -23,8 +25,13 @@ import java.lang.reflect.Field;
  **/
 public class XStreamFactory {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(XStreamFactory.class);
+
     private static final XStream xStream = XStreamFactory.getXStream();
 
+    /* 转换重试次数 */
+    private static final int RETRY_NUM = 3;
+
     public static final String CDATA_PREFIX = "<![CDATA[";
     public static final String CDATA_SUFFIX = "]]>";
 
@@ -120,7 +127,14 @@ public class XStreamFactory {
     public static <T> String toXml(T t) {
         xStream.processAnnotations(t.getClass());
         String headLine = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
+        for (int i = 1; i < RETRY_NUM; i++) {
+            try {
                 return headLine + xStream.toXML(t);
+            }catch (Exception e){
+                LOGGER.error("Bean To Xml Error Message:{} Number:{}",e.getMessage(),i);
+            }
+        }
+        return null;
     }
 
     /**

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

@@ -58,6 +58,51 @@ public class AndonEnumUtil {
     }
 
     /**
+     * 标准类型 = 10，异常类型 = 20
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_CELL_TYPE{
+        NORMAL("10","标准类型"),
+        ABNORMAL("20","异常类型");
+
+        private String value;
+        private String description;
+
+        WORK_CELL_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].value,val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * 审批状态：10=待审批，20=二级审批，30=三级审批，40=四级审批，100=已审批
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -199,7 +244,7 @@ public class AndonEnumUtil {
 
     /**
      * 按灯业务状态
-     * 安灯状态=10，工号 =20 ，读取状态=30, 停线=40, 安灯子类型=50, 原因代码=60
+     * 安灯状态=10，工号 =20 ，读取状态=30, 停线=40, 安灯子类型=50, 原因代码=60, 产品信息=70， 产品产量=80
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALARM_BUSI_FLAG{
@@ -208,7 +253,9 @@ public class AndonEnumUtil {
         READ_FLAG("30", "安灯读取状态"),
         STOP_FLAG("40", "停线状态"),
         DETAIL_TYPE("50", "安灯子类型"),
-        AC_CODE("60", "原因代码");
+        AC_CODE("60", "原因代码"),
+        PROD_INFO("70", "产品信息"),
+        LINE_INFO("80", "产量信息");
 
         private String value;
         private String description;
@@ -362,6 +409,51 @@ public class AndonEnumUtil {
         }
     }
 
+    /**
+     * 安灯来源
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ALARM_SOURCE_TYPE{
+        PHYSICAL("10","物理安灯"),
+        SOFT("20","软件安灯");
+
+        private String value;
+        private String description;
+
+        ALARM_SOURCE_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].value, val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String val) {
+            String tmp = "";
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
 
     /**
      * ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测
@@ -625,7 +717,8 @@ public class AndonEnumUtil {
         CANCEL_ACTION("40", "撤销动作"),
         COMMIT_ACTION("50","提交动作"),
         PASS_ACTION("60","审批动作"),
-        REJECT_ACTION("70", "驳回动作");
+        REJECT_ACTION("70", "驳回动作"),
+        OPEN_ACTION("80","放行动作");
 
         private String value;
         private String description;

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

@@ -113,14 +113,22 @@ public class BlockSoftSwitchEnumUtil {
         /* WebService */
         SERVER_WEB_SERVICE_SEND_EMAIL(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240001,"Server IMPP 服务邮件服务"),
         SERVER_WEB_SERVICE_HELLO(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240003,"Server Hello测试服务"),
-        CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"),
+//        CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"),
         CLIENT_WEB_SERVICE_DEFAULT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140003,"Client 默认设置"),
 
         /* 数据源 */
         CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"Client 数据库适配服务"),
 
         /* Restful */
-        CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"Client Impp Test");
+        CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"Client Impp Test"),
+
+        /* Socket */
+        SERVER_SOCKET_HELLO(SUIT_MODE.SERVER ,CASE_TYPE.SOCKET,210001,"Socket Server Hello测试服务"),
+        CLIENT_SOCKET_HELLO(SUIT_MODE.CLIENT ,CASE_TYPE.SOCKET,110001,"Socket Client Hello测试服务"),
+
+        /* MQ */
+        SERVER_MQ_RABBIT_HELLO(SUIT_MODE.SERVER ,CASE_TYPE.MQ,250001,"RabbitMQ Server Hello测试服务"),
+        CLIENT_MQ_RABBIT_HELLO(SUIT_MODE.CLIENT ,CASE_TYPE.MQ,150001,"RabbitMQ Client Hello测试服务");
 
         private int value;
         private String description;

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.base.enumutil;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @Description :
@@ -350,14 +351,16 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WORK_CENTER_RUNNING_STATUS {
 
-        RUNNING(1, "开线"),
+        RUNNING(1, "start", "开线"),
-        STOPPED(2, "停线");
+        STOPPED(2, "stop", "停线");
 
         private int value;
+        private String code;
         private String description;
 
-        WORK_CENTER_RUNNING_STATUS(int value, String description) {
+        WORK_CENTER_RUNNING_STATUS(int value, String code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
@@ -365,6 +368,10 @@ public class MesPcnEnumUtil {
             return value;
         }
 
+        public String getCode() {
+            return code;
+        }
+
         public String getDescription() {
             return description;
         }
@@ -378,6 +385,16 @@ public class MesPcnEnumUtil {
             }
             return tmp;
         }
+
+        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;
+        }
     }
 
     /**
@@ -386,10 +403,10 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WC_CHECK_TYPE {
 
-        PERSON(10, "person", "人"),
+        PERSON(10, "people", "人"),
-        EQUIPMENT(20, "equipment", "机"),
+        EQUIPMENT(20, "equipments", "设备"),
-        MATERIAL(30, "material", "料"),
+        MATERIAL(30, "materials", "物料"),
-        ROUTE(40, "route", "法"),
+        ROUTE(40, "routes", "工艺"),
         ONLINE_SIGNAL(50, "onlineSignal", "开线信号");
 
         private int value;
@@ -423,6 +440,16 @@ public class MesPcnEnumUtil {
             }
             return tmp;
         }
+
+        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;
+        }
     }
 
     /**
@@ -498,4 +525,639 @@ public class MesPcnEnumUtil {
     }
 
 
+    /**
+     * 设备连接类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EQP_CONNECT_TYPE {
+
+        PLC(10, "PLC"),
+        DB(20, "DB"),
+        OTHER(30, "OTHER");
+
+        private int value;
+        private String description;
+
+        EQP_CONNECT_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;
+        }
+    }
+
+    /**
+     * 数据库操作类型 开线检查的模块
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DB_OPERATION_TYPE {
+
+        INSERT(10, "insert", "新增"),
+        SELECT(20, "select", "查询"),
+        UPDATE(30, "update", "更新");
+
+        private int value;
+        private String code;
+        private String description;
+
+        DB_OPERATION_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;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * 数据库连接方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DATA_SOURCE_TYPE {
+        SOURCE_MARIA_DB(10, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null),
+        SOURCE_SQL_SERVER(20, "SQL Server", "SQL Server 2017","com.microsoft.sqlserver.jdbc.SQLServerDriver",1433,"dbo"),
+        SOURCE_ORACLE(30, "Oracle", "Oralce 12C","oracle.jdbc.driver.OracleDriver",1521,null),
+        SOURCE_POSTGRE_SQL(40, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public");
+
+        private int value;
+        private String code;
+        private String description;
+        private String driverClassName;
+        private int defaultPort;
+        private String defaultSchemaPattern;
+
+        private DATA_SOURCE_TYPE (int value, String code, String description,String driverClassName,int port,String defaultSchemaPattern) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+            this.driverClassName = driverClassName;
+            this.defaultPort = port;
+            this.defaultSchemaPattern = defaultSchemaPattern;
+        }
+
+        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 String getDefaultSchemaPattern() {
+            return defaultSchemaPattern;
+        }
+
+        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;
+        }
+
+        public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){
+            if(StringUtils.isNotBlank(databaseProductName)){
+                if(databaseProductName.indexOf(":mysql:") != -1){
+                    return SOURCE_MARIA_DB;
+                }else if(databaseProductName.indexOf(":oracle:") != -1){
+                    return SOURCE_ORACLE;
+                }else if(databaseProductName.indexOf(":postgresql:") != -1){
+                    return SOURCE_POSTGRE_SQL;
+                }else if(databaseProductName.indexOf(":sqlserver:") != -1){
+                    return SOURCE_SQL_SERVER;
+                }
+            }
+            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;
+        }
+    }
+
+    /**
+     * MesPlanOrder实体对应的status值   计划状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PLAN_ORDER_STATUS {
+
+        CREATE(10, "CREATED", "创建"),
+        DE_COMPOSE_ING(20, "DE_COMPOSE_ING", "分解中"),
+        DE_COMPOSE_ED(30, "DE_COMPOSE_ED", "分解完成"),
+        CLOSE(40, "CLOSE", "关闭");
+
+        private int value;
+        private String code;
+        private String description;
+
+        PLAN_ORDER_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 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;
+        }
+    }
+
+    /**
+     * MesWorkOrder实体对应的workOrderStatus值  工单状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_ORDER_STATUS {
+
+        CREATE(10, "创建"),
+        LANDED(20, "下达"),
+        OPEN(30, "启动"),
+        PAUSE(40, "暂停"),
+        CANCEL(50, "取消"),
+        CLOSE(60, "关闭");
+
+        private int value;
+        private String description;
+
+        WORK_ORDER_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;
+        }
+    }
+
+    /**
+     * MesWorkOrder实体对应的workOrderType值  工单类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_ORDER_TYPE {
+
+        STANDARD_ORDER(10, "标准工单"),
+        BTS_ORDER(20, "BTS工单"),
+        ATTEMPT_ORDER(30, "试制工单");
+
+        private int value;
+        private String description;
+
+        WORK_ORDER_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;
+        }
+    }
+
+    /**
+     * MesPlanOrder实体对应的planType值  计划类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PLAN_ORDER_TYPE {
+
+        STANDARD_ORDER(10, "标准");
+
+        private int value;
+        private String description;
+
+        PLAN_ORDER_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;
+        }
+    }
+
+    /**
+     * MesPlanOrder实体对应的source值  计划来源
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PALN_ORDER_SOURCE {
+
+        MES("MES", "来源于MES"),
+        SAP("SAP", "来源于SAP");
+
+        private String value;
+        private String description;
+
+        PALN_ORDER_SOURCE(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;
+        }
+    }
+
+    /**
+     * MesWorkOrder实体对应的source值  计划来源
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_ORDER_SOURCE {
+
+        MES("MES", "来源于MES"),
+        AMES("AMES", "来源于AMES"),
+        SAP("SAP", "来源于SAP"),
+        CREATE("CREATE", "手工新增"),
+        RESOLVE("RESOLVE", "计划分解");
+
+        private String value;
+        private String description;
+
+        WORK_ORDER_SOURCE(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;
+        }
+    }
+
+    /**
+     * MesQueueOrder实体对应的status值  队列主表状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_ORDER_STATUS {
+
+        NORMAL(10, "正常"),
+        ONLINE(20, "已上线"),
+        OFFLINE(30, "已下线"),
+        CLOSE(40, "已关闭"),
+        ;
+
+        private int value;
+        private String description;
+
+        QUEUE_ORDER_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;
+        }
+    }
+
+    /**
+     * MesQueueOrderDetail实体对应的status值  队列详情状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_ORDER_DETAIL_STATUS {
+
+        NORMAL(10, "正常"),
+        CLOSE(20, "关闭");
+
+        private int value;
+        private String description;
+
+        QUEUE_ORDER_DETAIL_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;
+        }
+    }
+
+    /**
+     * MesPartCategory实体对应的categoryType值  条码表条码质量状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PART_CATEGORY_TYPE {
+
+        CATEGORY_ONE("Category1", "类型1"),
+        CATEGORY_TWO("Category2", "类型2"),
+        CATEGORY_THREE("Category3", "类型3");
+
+        private String value;
+        private String description;
+
+        PART_CATEGORY_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (val.equals(values()[i].value)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * MesWorkOrder实体对应的approvalStatus值  审批状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_ORDER_APPROVAL_STATUS {
+
+        WAIT_APPROVAL(10, "待审批"),
+        COMPLETE_APPROVAL(20, "已审批"),
+        REJECT_APPROVAL(30, "驳回");
+
+        private int value;
+        private String description;
+
+        WORK_ORDER_APPROVAL_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;
+        }
+
+        public static String valueOfDescription2(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -767,7 +767,11 @@ public class WmsEnumUtil {
         INSTOCK("INSTOCK", "入库"),
         MOVESTOCK("MOVESTOCK", "移库"),
         CS("CS", "盘点"),
-        VDARC("VDARC", "VDA收货");
+        VDARC("VDARC", "VDA收货"),
+        VDAINSTOCK("VDAINSTOCK", "VDA入库"),
+        VDAMOVESTOCK("VDAMOVESTOCK", "VDA内部移库"),
+        VDA_FAST_STOCK("VDA_FAST_STOCK", "VDA采购快速入库"),
+        VDAREPORT("VDAREPORT", "VDA生产报工");
 
         private String value;
         private String description;
@@ -1868,7 +1872,8 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum COMMON_SN {
-        PO_SN("PO_SN", "PO条码");
+        PO_SN("PO_SN", "PO条码"),
+        VDA_SN("VDA_SN", "VDA条码");
 
         private String code;
         private String description;
@@ -3448,4 +3453,184 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * 打印类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRINT_TYPE {
+        SN(10, "SN");
+
+        private int value;
+        private String description;
+
+        PRINT_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(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 ETC_PRINT_STATUS {
+        NOT_HIT (10, "未打"),
+        ALREADY_HIT(20, "已打");
+
+        private int value;
+        private String description;
+
+        ETC_PRINT_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(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 PART_ASSOCIATE_TYPE {
+        LINE(10, "LINE", "产线"),
+        CUSTOMER(20, "CUSTOMER", "客户"),
+        VENDOR(30, "VENDOR", "供应商");
+
+        private int value;
+        private String code;
+        private String description;
+
+        PART_ASSOCIATE_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(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 String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 条码操作记录信息 操作类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SN_OPERATE_TYPE {
+        REPORT(10, "REPORT", "生产报工"),
+        BOXING_ERROR_PROOFING(20, "BOXING_ERROR_PROOFING", "装箱防错");
+
+        private int value;
+        private String code;
+        private String description;
+
+        SN_OPERATE_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(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 String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -39,4 +39,8 @@ public class MesDataObject extends BaseBean {
     @Column(name="DS_CODE")
     @ApiParam("数据源代码")
     private String dsCode;
+
+    @Column(name="OPERATE_TYPE")
+    @ApiParam("操作类型")
+    private Integer operateType;
 }

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

@@ -25,7 +25,7 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_DB")
 @Api("地址清单")
-public class MesDB extends BaseBean {
+public class MesDb extends BaseBean {
 
     @Column(name="DS_CODE")
     @ApiParam("数据源代码")

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

@@ -55,6 +55,10 @@ public class MesEquipment extends BaseBean {
     @ApiParam("区域代码")
     private String areaCode;
 
+    @Column(name="CONNECT_TYPE")
+    @ApiParam("连接类型")
+    private Integer connectType;
+
     @Transient
     @ApiParam(value ="名称")
     private String name;

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

@@ -52,4 +52,8 @@ public class MesObjectCfg extends BaseBean {
     @ApiParam("主键标记")
     private String fieldPk;
 
+    @Column(name="POJO_ATTR")
+    @ApiParam("对应的pojo属性")
+    private String pojoAttr;
+
 }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.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;
+
+/**
+ * @Description :零件种类
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PART_CATEGORY")
+@Api("零件种类")
+public class MesPartCategory extends BaseBean {
+    @Column(name="CATEGORY_CODE")
+    @ApiParam("分类代码")
+    private String categoryCode;
+
+    @Column(name="CATEGORY_NAME")
+    @ApiParam("分类名称")
+    private String categoryName;
+
+    @Column(name="CATEGORY_TYPE")
+    @ApiParam("分类类型")
+    private String categoryType;
+}

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

@@ -0,0 +1,81 @@
+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/25 8:07 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PLC")
+@Api("PLC配置表")
+public class MesPlc extends BaseBean {
+
+    @Column(name = "PLC_CODE")
+    @ApiParam("PLC代码")
+    private String plcCode;
+
+    @Column(name = "PLC_NAME")
+    @ApiParam("PLC名称")
+    private String plcName;
+
+    @Column(name = "PLC_MODEL")
+    @ApiParam("PLC型号")
+    private String plcModel;
+
+    @Column(name = "PLC_IP")
+    @ApiParam("PLC IP")
+    private String plcIp;
+
+    @Column(name = "CHANNEL")
+    @ApiParam("通道")
+    private String channel;
+
+    @Column(name = "TAG_NAME")
+    @ApiParam("标签名称")
+    private String tagName;
+
+    @Column(name = "TAG_ADDRESS")
+    @ApiParam("标签地址")
+    private String tagAddress;
+
+    @Column(name = "DATA_TYPE")
+    @ApiParam("标签数据类型")
+    private String dataType;
+
+    @Column(name = "GROUP_NAME")
+    @ApiParam("分组名称")
+    private String groupName;
+
+    @Column(name = "EQU_CODE")
+    @ApiParam("设备代码")
+    private String equCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @Column(name = "ENABLED")
+    @ApiParam("是否启用 0 false 1 true")
+    private Integer enabled;
+}

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

@@ -163,6 +163,10 @@ public class MesWorkOrder extends BaseBean {
     public String prodCfgName;
 
     @Transient
+    @ApiParam("区域代码名称")
+    private String areaCodeName;
+
+    @Transient
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="计划开始日期查询用，查询开始日期",example = "2018-12-31 23:59:59")
     public String startTimeStart;

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

@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Map;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/25 7:41 PM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("PLC交互model")
+public class PLCInteracticeModel {
+
+    private String serverIp;
+
+    private String serverPort;
+
+    private String mwContext;
+
+    private String protocol;
+
+    private String plcCode;
+
+    private String dataType;
+
+    private String userName;
+
+    private String password;
+
+    private Integer enabled;
+
+    private String realm;
+
+    private String tag;
+
+    private String value;
+
+    private String comment;
+
+    private String authenKey;
+
+}

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

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/28 10:17 AM
+ * @Description:
+ **/
+@Data
+@Api("PLC Redis Cache key")
+public class PlcCacheKeyModel {
+
+    private String channel;
+
+    private String device;
+
+    private String tag;
+
+    public PlcCacheKeyModel(String channel, String device, String tag) {
+        this.channel = channel;
+        this.device = device;
+        this.tag = tag;
+    }
+
+    public String getPlcCacheKey() {
+        return channel + ":" + device + ":" + tag;
+    }
+
+
+}

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

@@ -48,6 +48,9 @@ public class WcCheckModel {
     @ApiParam("开线信号")
     private Integer onlineSignal;
 
+    @ApiParam("开线对象")
+    MesWcCheckRecord onlineSignalEqu;
+
     @ApiParam("是否通过")
     private Integer isPass;
 
@@ -57,12 +60,12 @@ public class WcCheckModel {
     @ApiParam("工单")
     private String workOrder;
 
-    @ApiParam("工单零件数量")
-    private Long qty;
-
     @ApiParam("产品号")
     private String partNo;
 
+    @ApiParam("需要展示的数据")
+    private Map<String, String> need2ShowMap;
+
 
     public WcCheckModel initialWcCheckModel() {
         WcCheckModel wcCheckModel = new WcCheckModel();
@@ -76,6 +79,8 @@ public class WcCheckModel {
         wcCheckModel.setRoutesColumn(new HashMap<>());
         wcCheckModel.setOnlineSignal(MesPcnEnumUtil.ONLINE_SIGNAL.NON_CHECK.getValue());
         wcCheckModel.setIsPass(MesPcnEnumUtil.IS_WCCHECK_PASS.NON_PASS.getValue());
+        onlineSignalEqu=new MesWcCheckRecord();
+        wcCheckModel.setNeed2ShowMap(new HashMap<>());
 
         Map<String, String> dataColumnRelationMap = new HashMap<>();
         dataColumnRelationMap.put("people", "peopleColumn");

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.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.MesDataObject;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/27 1:59 PM
+ * @Description:
+ **/
+public interface MesDataObjectRepository extends BaseRepository<MesDataObject,Long> {
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDbRepository.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.MesDb;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/27 1:58 PM
+ * @Description:
+ **/
+public interface MesDbRepository extends BaseRepository<MesDb,Long> {
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesObjectCfgRepository.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.MesObjectCfg;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/27 1:59 PM
+ * @Description:
+ **/
+public interface MesObjectCfgRepository extends BaseRepository<MesObjectCfg, Long> {
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.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.MesPartCategory;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesPartCategoryRepository extends BaseRepository<MesPartCategory, Long> {
+}

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

@@ -0,0 +1,15 @@
+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.MesPlc;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/26 7:47 PM
+ * @Description:
+ **/
+@Repository
+public interface MesPlcRepository extends BaseRepository<MesPlc, Long> {
+}

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

@@ -33,6 +33,20 @@ public class MesHqlPack {
     }
 
     /**
+     * 通用查询条件
+     *
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAllBaseDataByNormalPro(BaseBean baseBean, String organizeCode) {
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
+        DdlPreparedPack.getNumEqualPack(baseBean.getIsValid(), "isValid", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
+        return packBean;
+    }
+
+    /**
      * MES PCN系统配置信息条件查询
      *
      * @param mesConfig
@@ -153,4 +167,55 @@ public class MesHqlPack {
         return packBean;
     }
 
+    /**
+     * 物料信息查询条件封装
+     *
+     * @param mesPart
+     * @return
+     */
+    public static DdlPackBean getPartCondition(MesPart mesPart, String organizeCode) {
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
+
+        if (StringUtils.isNotEmpty(mesPart.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(mesPart.getPartNo(), "partNo", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesPart.getPartName())) {
+            DdlPreparedPack.getStringLikerPack(mesPart.getPartName(), "partName", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesPart.getCategoryCode1())) {
+            DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode1(), "categoryCode1", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesPart.getCategoryCode2())) {
+            DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode2(), "categoryCode2", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesPart.getCategoryCode3())) {
+            DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean);
+        }
+
+        DdlPreparedPack.getOrderDefault(mesPart);
+        DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesPart.getOrderByParam()}, packBean);
+        return packBean;
+    }
+
+    /**
+     * MES 客户信息查询条件封装
+     *
+     * @param customer
+     * @return
+     */
+    public static DdlPackBean getMesCustomer(MesCustomer customer, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(customer, organizeCode);
+        if (StringUtils.isNotEmpty(customer.getCustomerCode())) {
+            DdlPreparedPack.getStringLikerPack(customer.getCustomerCode(), "customerCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(customer.getCustomerName())) {
+            DdlPreparedPack.getStringLikerPack(customer.getCustomerName(), "customerName", packBean);
+        }
+
+        return packBean;
+    }
+
 }

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

@@ -39,4 +39,8 @@ public class MesDataObject extends BaseBean {
     @Column(name="DS_CODE")
     @ApiParam("数据源代码")
     private String dsCode;
+
+    @Column(name="OPERATE_TYPE")
+    @ApiParam("操作类型")
+    private Integer operateType;
 }

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

@@ -25,7 +25,7 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_DB")
 @Api("地址清单")
-public class MesDB extends BaseBean {
+public class MesDb extends BaseBean {
 
     @Column(name = "DS_CODE")
     @ApiParam("数据源代码")

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

@@ -52,4 +52,8 @@ public class MesObjectCfg extends BaseBean {
     @ApiParam("主键标记")
     private String fieldPk;
 
+    @Column(name="POJO_ATTR")
+    @ApiParam("对应的pojo属性")
+    private String pojoAttr;
+
 }

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

@@ -163,6 +163,10 @@ public class MesWorkOrder extends BaseBean {
     public String prodCfgName;
 
     @Transient
+    @ApiParam("区域代码名称")
+    private String areaCodeName;
+
+    @Transient
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="计划开始日期查询用，查询开始日期",example = "2018-12-31 23:59:59")
     public String startTimeStart;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.softswitch.bean.*;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import java.io.Serializable;
 
@@ -32,6 +33,9 @@ public class BsSuitCaseModel implements Serializable {
     @ApiParam(value = "Web Service 适配套件")
     private BsSuitCaseWebService webService;
 
+    @ApiParam(value = " MQ 适配套件")
+    private BsSuitCaseMq mq;
+
     @ApiParam(value = "REST 适配套件")
     private BsSuitCaseREST bsSuitCaseREST;
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java

@@ -11,6 +11,16 @@ import lombok.Data;
  **/
 @Data
 public class SoftswitchIocModel {
+    /* Spring Ioc Bean 名称 */
     private String beanName;
+    /* Spring Ioc 需要管理的Bean */
     private Object obj;
+    /* 需要 管理 Bean 类型 */
+    private Integer objType;
+    /* 需要 管理 Bean 状态 */
+    private Integer objStatus;
+    /* 需要 管理 Bean 唯一 */
+    private String objKey;
+    /* Bean 的描述信息 */
+    private String objDescription;
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java

@@ -27,6 +27,8 @@ public class SuitServerModel {
     /* 认证使用 以后使用 */
     private String token;
 
+    // 请求ID
+    private String requestId;
     // 传输单对象
     private Object obj;
     // 传输集合

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/wmsCSOrderDetailsModel.java

@@ -0,0 +1,72 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class wmsCSOrderDetailsModel implements Serializable {
+
+
+    /******
+     *
+     * 库位编码
+     */
+    public String  locateNo;
+
+    /******
+     *
+     * 订单编码
+     */
+    public String  orderNo;
+
+
+    /******
+     *
+     * 物料代码
+     */
+    public String  partNo;
+
+    /******
+     *
+     * 物料名称
+     */
+    public String  partNameRdd;
+
+    /******
+     *
+     * 冻结数量
+     */
+    public String  qty;
+
+    /******
+     *
+     * 实盘数量
+     */
+    public String  factQty;
+
+    /******
+     *
+     * 条码
+     */
+    public String  sn;
+
+
+    /******
+     *
+     * 仓库编码
+     */
+    public String  whNo;
+
+    /******
+     *
+     * 区域编码
+     */
+    public String  zoneNo;
+
+    /******
+     *
+     * 状态
+     */
+    public String  wmStatus;
+}

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseMq.java

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.softswitch.bean;
+
+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;
+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 :   MQ 适配套件
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 2019/9/9 上午11:09
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "BS_SUIT_CASE_MQ")
+@Api(value = "MQ", description = "MQ 适配套件")
+public class BsSuitCaseMq extends BaseBean {
+
+    @Column(name = "SUIT_CASE_ID")
+    @ApiParam(value = "套件id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long suitCaseId;
+
+    @Column(name = "USER_LOGIN_NAME")
+    @ApiParam(value = "登录名称")
+    private String userLoginName;
+
+    @Column(name = "USER_LOGIN_PWD")
+    @ApiParam(value = "登录密码")
+    private String userLoginPwd;
+
+    @Column(name = "VIRTUAL_HOST")
+    @ApiParam(value = "虚拟 Host")
+    private String virtualHost;
+
+    @Column(name = "QUEUE_NAME")
+    @ApiParam(value = "队列名称")
+    private String queueName;
+
+}

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.softswitch.bean;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -26,6 +27,7 @@ import java.util.List;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@XStreamAlias("param")
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "BS_SUIT_CASE_PARAM")
 @Api(value = "适配器出入参", description = "适配器出入参")

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseMqRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.softswitch.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseMq;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 2019/9/26 下午3:25
+ * @Modify:
+ **/
+@Repository
+public interface BsSuitCaseMqRepository extends BaseRepository<BsSuitCaseMq,Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java

@@ -163,10 +163,12 @@ public class WmsActionGroupDetails extends BaseBean {
     public WmsActionGroupDetails() {
     }
 
-    public WmsActionGroupDetails(Long agId, Integer seq, Integer okSeq, Integer ngSeq, Integer valueType, Integer toUpper,
+    public WmsActionGroupDetails(Long id, Long agId, Integer seq, Integer okSeq, Integer ngSeq, Integer valueType, Integer toUpper,
                                  Integer lenCheck, String regularCheck, String regularCheckFailMsg, Long asId, Long atId,
                                  String asName, String atName, String goToBtnCode, String goToBtnName, Integer preShow,
-                                 Long showAmId, Integer isCommitAble, Integer isAutoOpenWindow, String searchKey, String groupKey) {
+                                 Long showAmId, Integer isCommitAble, Integer isAutoOpenWindow, String searchKey,
+                                 String groupKey, String organizeCode) {
+        this.id = id;
         this.agId = agId;
         this.seq = seq;
         this.okSeq = okSeq;
@@ -188,5 +190,6 @@ public class WmsActionGroupDetails extends BaseBean {
         this.isAutoOpenWindow = isAutoOpenWindow;
         this.searchKey = searchKey;
         this.groupKey = groupKey;
+        this.organizeCode = organizeCode;
     }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java

@@ -133,7 +133,7 @@ public class WmsCSOrderDetails extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class,refForeignKey = "value",value = "description")
     public Integer differenceType;
 
-    public Integer getDifferenceType() {
+    public Integer getDifferenceTypeVal() {
         return this.differenceType == null ?
         -1: this.differenceType;
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java

@@ -147,6 +147,22 @@ public class WmsPart extends BaseBean {
     @ApiParam("保质期天数")
     private Integer qualityDays;
 
+    @Column(name = "IS_REPORT_PARTNO")
+    @ApiParam("是否报工零件")
+    private Integer isReportPartNo;
+
+    @Column(name = "REPORT_LOCATE_NO")
+    @ApiParam("报工库位")
+    private String reportLocateNo;
+
+    @Column(name = "REPORT_ZONE_NO")
+    @ApiParam("报工存储区")
+    private String reportZoneNo;
+
+    @Column(name = "PRODUCT_LINES")
+    @ApiParam("报工产线")
+    private String productLines;
+
     @Transient
     @ApiParam("总数量")
     private Double qty;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java

@@ -0,0 +1,51 @@
+package cn.estsh.i3plus.pojo.wms.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 : jimmy.zeng
+ * @CreateDate : 2019-09-27 14:44
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_PART_RELATION")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="物料关系表",description = "物料关系表")
+public class WmsPartRelation extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam(value = "物料名称")
+    private String partName;
+
+    @Column(name = "ASSOCIATE_CODE")
+    @ApiParam(value = "关联代码")
+    private String associateCode;
+
+    @Column(name = "ASSOCIATE_NAME_ADD")
+    @ApiParam(value = "关联名称")
+    private String associateNameAdd;
+
+    @Column(name = "ASSOCIATE_TYPE")
+    @ApiParam(value = "关联类型")
+    private Integer associateType;
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrinterConfigure.java

@@ -0,0 +1,59 @@
+package cn.estsh.i3plus.pojo.wms.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 : jessica.chen
+ * @CreateDate : 2019-09-26 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_PRINTER_CONFIGURE")
+@Api("打印机配置表")
+public class WmsPrinterConfigure extends BaseBean{
+
+    private static final long serialVersionUID = 1234639813072592779L;
+    @Column(name="PRINTER_NO")
+    @ApiParam("打印机编号")
+    private String printerNo;
+
+    @Column(name="PRINTER_NAME")
+    @ApiParam("打印机名称")
+    private String printerName;
+
+    @Column(name="IP")
+    @ApiParam("IP")
+    private String ip;
+
+    @Column(name="PORT")
+    @ApiParam("端口")
+    private Integer port;
+
+    @Column(name="OBJECT_DESCRIPTION")
+    @ApiParam(value ="描述")
+    private String objectDescription;
+
+    @Column(name="POSITION")
+    @ApiParam("位置")
+    private String position;
+
+    @Column(name="TYPE")
+    @ApiParam("类型")
+    private Integer type;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java

@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.wms.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 : jessica.chen
+ * @CreateDate : 2019-09-27 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_PRINTING_QUEUE")
+@Api("待打印队列表")
+public class WmsPrintingQueue extends BaseBean{
+
+    private static final long serialVersionUID = 1111639813072592779L;
+    @Column(name="PRINT_IDENTIFICATION")
+    @ApiParam("打印标识")
+    private String printIdentification;
+
+    @Column(name="PRINT_TYPE")
+    @ApiParam("打印类型")
+    private Integer printType;
+
+    @Column(name="PRINT_NO")
+    @ApiParam("打印机编号")
+    private String printNo;
+
+    @Column(name="PRINT_MUMBER")
+    @ApiParam("打印机张数")
+    private Integer printNumber;
+
+    @Column(name="TEMPLATE_NO")
+    @ApiParam("模板编号")
+    private String templateNo;
+
+    @Column(name="PRINT_STATUS")
+    @ApiParam("打印状态")
+    private Integer printStatus;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java

@@ -0,0 +1,75 @@
+package cn.estsh.i3plus.pojo.wms.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 : jimmy.zeng
+ * @CreateDate : 2019-09-27 16:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_SN_OPERATE_RECORD")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="条码操作记录表",description = "条码操作记录表")
+public class WmsSnOperateRecord extends BaseBean {
+
+    @Column(name = "SN")
+    @ApiParam(value = "条码")
+    private String sn;
+
+    @Column(name = "LINE_CODE")
+    @ApiParam(value = "产线代码")
+    private String lineCode;
+
+    @Column(name = "ZONE_NO")
+    @ApiParam(value = "存储区编号")
+    private String zoneNo;
+
+    @Column(name = "LOCATE_NO")
+    @ApiParam(value = "库位代码")
+    private String locateNo;
+
+    @Column(name = "QTY")
+    @ApiParam(value = "数量", example = "0")
+    private Double qty = 0d;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编号")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam(value = "物料名称")
+    private String partNameRdd;
+
+    @Column(name = "CUST_NO")
+    @ApiParam(value = "客户编码")
+    private String custNo;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编码")
+    public String vendorNo;
+
+    @Column(name = "SHIPPING_FLAG")
+    @ApiParam(value = "发往地")
+    private String shippingFlag;
+
+    @Column(name = "OPERATE_TYPE")
+    @ApiParam(value = "操作类型")
+    private Integer operateType;
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartRelationRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPartRelation;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 物料关系信息
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2019-09-27 15:18
+ * @Modify:
+ **/
+@Repository
+public interface WmsPartRelationRepository extends BaseRepository<WmsPartRelation, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPrinterConfigureRepository.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogData;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPrinterConfigure;
+
+/**
+ * @Description : 打印机配置
+ * @Reference   :
+ * @Author      : jessica.chen
+ * @Date        : 2019-09-26 12:03:00
+ * @Modify      :
+ **/
+public interface WmsPrinterConfigureRepository extends BaseRepository<WmsPrinterConfigure, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPrintingQueueRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.BasVendor;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPrintingQueue;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :待打印配置表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-09-27 14:49
+ * @Modify:
+ **/
+@Repository
+public interface WmsPrintingQueueRepository extends BaseRepository<WmsPrintingQueue, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSnOperateRecordRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsSnOperateRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 条码操作记录信息
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2019-09-27 17:07
+ * @Modify:
+ **/
+@Repository
+public interface WmsSnOperateRecordRepository extends BaseRepository<WmsSnOperateRecord, Long> {
+}