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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoOutputColumn.java

@@ -34,6 +34,9 @@ public @interface AnnoOutputColumn {
 
     public boolean hidden() default false;
 
+    // 是否必需
+    boolean required() default true;
+
     // 敬请发挥
     public enum FORMAT{
         STRING("STRING","全部显示"),                    // String 类型

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

@@ -83,7 +83,6 @@ public abstract class BaseBean implements Serializable {
 
     @Column(name="CREATE_DATE_TIME",updatable = false)
     @ApiParam(value = "创建日期")
-    @AnnoOutputColumn(hidden = true)
     public String createDatetime;
 
     @Column(name="MODIFY_USER")
@@ -93,7 +92,6 @@ public abstract class BaseBean implements Serializable {
 
     @Column(name="MODIFY_DATE_TIME")
     @ApiParam(value = "修改日期")
-    @AnnoOutputColumn(hidden = true)
     public String modifyDatetime;
 
     @Transient

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

@@ -910,9 +910,10 @@ public class CommonEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CONTENT_TYPE {
         FORM("x-www-form-urlencoded", "表单"),
-        FILE(" multipart/form-data", "文件"),
+        FILE("multipart/form-data", "文件"),
-        JSON(" application/json", "JSON"),
+        JSON("application/json", "JSON"),
-        XML(" application/xml ", "XML");
+        NONE("default", "默认不需要设置Content-Type"),
+        XML("application/xml", "XML");
 
         private String value;
         private String description;

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

@@ -12,6 +12,43 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class MesEnumUtil {
 
     /**
+     * mes-pcn定时任务状态
+     *
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_PCN_TASK_STATUS {
+
+        OPEN(1, "开启"),
+        CLOSE(2, "关闭");
+
+        private int value;
+        private String description;
+
+        MES_PCN_TASK_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * mes工步类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SoftSwitchEnumUtil.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 : 软适配 枚举接口
@@ -18,7 +19,10 @@ public class SoftSwitchEnumUtil {
     public enum CASE_TYPE{
         SOCKET(1,"SOCKET"),
         RESTFUL(2,"RESTFUL"),
-        DATASOURCE(3,"数据源");
+        DATASOURCE(3,"数据源"),
+        WEBSERVICE(4,"WebService"),
+        MQ(5,"消息队列"),
+        WebSocket(6,"WebSocket");
 
         private int value;
         private String description;
@@ -150,5 +154,293 @@ public class SoftSwitchEnumUtil {
         }
     }
 
-    //keyTypeId
+    /**
+     * 数据库连接方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DATA_SOURCE_TYPE {
+        SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null),
+        SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017","com.microsoft.sqlserver.jdbc.SQLServerDriver",1433,"dbo"),
+        SOURCE_ORACLE(300, "Oracle", "Oralce 12C","oracle.jdbc.driver.OracleDriver",1521,null),
+        SOURCE_POSTGRE_SQL(400, "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 SoftSwitchEnumUtil.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 SoftSwitchEnumUtil.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;
+        }
+    }
+
+    /**
+     * 参数值类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PARAM_VALUE_TYPE{
+        NUM(1,"数字"),
+        STRING(2,"字符串"),
+        BOOLEAN(3,"布尔"),
+        MAP(4,"字典"),
+        LIST(5,"列表");
+
+        private int value;
+        private String description;
+
+        PARAM_VALUE_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 PARAM_TYPE{
+        OUT_PARAM(1,"出参"),
+        IN_PARAM(2,"入参"),
+        REQUEST_HEADER(3,"请求头");
+
+        private int value;
+        private String description;
+
+        PARAM_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 SUIT_MODE{
+        ACTIVE(1,"主动"),
+        PASSIVE(2,"被动");
+
+        private int value;
+        private String description;
+
+        SUIT_MODE(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 SUIT_METHOD{
+        ACTIVE(1,"主动适配"),
+        SCHEDULE(2,"定时调度");
+
+        private int value;
+        private String description;
+
+        SUIT_METHOD(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -1320,7 +1320,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALD_EXECUTE_STATUS {
-        NORMAL(10, "创建"),
+        CREATE(10, "创建"),
         PROCESSING(20, "处理中"),
         COMPLETED(30, "已完成");
         private int value;
@@ -2759,7 +2759,7 @@ public class WmsEnumUtil {
     public enum STOCK_LEVEL_STATUS {
         LOW("LOW", "低于最低库存"),
         HIGH("HIGH", "高于最高库存"),
-        NORMAL("NORMAL", "安全库存");
+        NORMAL("CREATE", "安全库存");
 
         private String value;
         private String description;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -14,6 +14,7 @@ import org.springframework.data.jpa.repository.support.SimpleJpaRepository;
 import javax.persistence.*;
 import java.io.Serializable;
 import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -1190,8 +1191,15 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
             //属性值过滤，避免null值
             if(initParam){
-                for(Field checkField : clazz.getFields()){
+                for (Field checkField : clazz.getFields()) {
-                    if(checkField.get(item) == null){
+                    if (!Modifier.isFinal(checkField.getModifiers()) && checkField.get(item) == null) {
+                        // 未赋值的属性，进行初始化赋值
+                        fieldSetInitParam(item, checkField);
+                    }
+                }
+                for (Field checkField : clazz.getDeclaredFields()) {
+                    checkField.setAccessible(true);
+                    if (!Modifier.isFinal(checkField.getModifiers()) && checkField.get(item) == null) {
                         // 未赋值的属性，进行初始化赋值
                         fieldSetInitParam(item, checkField);
                     }

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

@@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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;
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description : 账号离线登陆表
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-09-01 11:02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PCN_SYS_USER_OFFLINE")
+@Api(value="账号离线登陆表",description = "账号离线登陆表。")
+public class MesPcnSysUserOffline extends BaseBean {
+
+    @Column(name = "USER_ID")
+    @ApiParam(value = "人员ID", example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long userId;
+
+    @Column(name = "USER_NAME")
+    @ApiParam(value = "用户名称", access = "账号名称")
+    private String userName;
+
+    @Column(name = "LOGIN_NAME")
+    @ApiParam(value = "登陆名称", access = "登陆名称")
+    private String loginName;
+
+    @Column(name="ORGANIZE_ID")
+    @ApiParam(value ="部门ID" , example ="-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long organizeId;
+
+    @Column(name="ORGANIZE_NAME")
+    @ApiParam(value ="部门名称" , access ="部门名称")
+    private String organizeName;
+
+}

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

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

@@ -513,12 +513,23 @@ public class MesHqlPack {
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
         return packBean;
     }
+    public static DdlPackBean getMesEventByEventName(MesEvent mesEvent) {
+        DdlPackBean packBean = getAllBaseData(mesEvent.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(mesEvent.getEventName(), "eventName", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
+        return packBean;
+    }
 
     public static DdlPackBean getMesActionByActionCode(MesAction mesAction, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, organizeCode);
         DdlPreparedPack.getStringEqualPack(mesAction.getActionCode(), "actionCode", packBean);
         return packBean;
     }
+    public static DdlPackBean getMesActionByActionName(MesAction mesAction, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, organizeCode);
+        DdlPreparedPack.getStringEqualPack(mesAction.getActionName(), "actionName", packBean);
+        return packBean;
+    }
 
     public static DdlPackBean getMesActionExcludeById(MesAction mesAction) {
         DdlPackBean packBean = getAllBaseData(mesAction.getOrganizeCode());
@@ -554,14 +565,18 @@ public class MesHqlPack {
         DdlPreparedPack.getStringRightLikerPack(mesMethod.getMethodCode(), "methodCode", packBean);
         DdlPreparedPack.getStringLikerPack(mesMethod.getMethodName(), "methodName", packBean);
         DdlPreparedPack.getStringRightLikerPack(mesMethod.getCallClass(), "callClass", packBean);
-        DdlPreparedPack.getStringEqualPack(mesMethod.getMethodType() + "", "methodType", packBean);
 
         return packBean;
     }
 
     public static DdlPackBean getMesMethodByMethodCode(MesMethod mesMethod) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesMethod, mesMethod.getOrganizeCode());
-            DdlPreparedPack.getStringEqualPack(mesMethod.getMethodCode(), "methodCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesMethod.getMethodCode(), "methodCode", packBean);
+        return packBean;
+    }
+    public static DdlPackBean getMesMethodByMethodName(MesMethod mesMethod) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesMethod, mesMethod.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(mesMethod.getMethodName(), "methodName", packBean);
         return packBean;
     }
 
@@ -810,13 +825,8 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesKpData(MesKpData kpData, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(kpData, organizeCode);
-        if (StringUtils.isNotEmpty(kpData.getPartNo())) {
+        DdlPreparedPack.getStringLikerPack(kpData.getPartNo(), "partNo", packBean);
-            DdlPreparedPack.getStringLikerPack(kpData.getKeyDataCode(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(kpData.getKeyDataCode(), "keyDataCode", packBean);
-        }
-        if (StringUtils.isNotEmpty(kpData.getKeyDataCode())) {
-            DdlPreparedPack.getStringLikerPack(kpData.getKeyDataCode(), "keyDataCode", packBean);
-        }
-
         return packBean;
     }
 
@@ -1160,4 +1170,21 @@ public class MesHqlPack {
         packBean.setOrderByStr(mesPcnTask.orderBy());
         return packBean;
     }
+
+    /**
+     * 条码生成规则校验同一机构下条码规则唯一性
+     * @param numberRule
+     * @param id
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesNumberRuleCheck(String numberRule, Long id, String organizeCode) {
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(numberRule, "numberRule", packBean);
+        if (null != id) {
+            DdlPreparedPack.getNumNOEqualPack(id, "id", packBean);
+        }
+        return packBean;
+    }
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.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;
@@ -57,38 +58,47 @@ public class SysMenu extends BaseBean {
 
     @Column(name="PARENT_NAME_RDD")
     @ApiParam(value ="父级功能名称" , access ="父级功能名称")
+    @AnnoOutputColumn(required = false)
     private String parentNameRdd;
 
     @Column(name="MENU_CLASS_PATH")
     @ApiParam(value ="资源class path" , access ="资源class path")
+    @AnnoOutputColumn(required = false)
     private String menuClassPath;
 
     @Column(name="MENU_GRADE")
     @ApiParam(value ="资源等级", example = "1")
+    @AnnoOutputColumn(required = false)
     private String menuGrade;
 
     @Column(name="MENU_SORT")
     @ApiParam(value ="资源排序", example = "0")
+    @AnnoOutputColumn(required = false)
     private Integer menuSort;
 
     @Column(name="MENU_URL")
     @ApiParam(value ="资源 url" , access ="资源 url")
+    @AnnoOutputColumn(required = false)
     private String menuUrl;
 
     @Column(name="MENU_CSS")
     @ApiParam(value ="资源css" , access ="资源css")
+    @AnnoOutputColumn(required = false)
     private String menuCss;
 
     @Column(name="MENU_ICON")
     @ApiParam(value ="资源icon" , access ="资源icon")
+    @AnnoOutputColumn(required = false)
     private String menuIcon;
 
     @Column(name="MENU_DESCRIPTION")
     @ApiParam(value ="资源描述" , access ="配置描述")
+    @AnnoOutputColumn(required = false)
     private String menuDescription;
 
     @Column(name="MENU_STATUS")
     @ApiParam(value ="功能状态" , example ="1" , access ="功能状态（1.正常，2.禁用）",defaultValue="1")
+    @AnnoOutputColumn(required = false)
     private Integer menuStatus;
 
     @Transient

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java

@@ -134,9 +134,9 @@ public class SysTaskPlan extends BaseBean {
     private String noticeChannel;
 
     public int getTaskPlanStatusVal() {
-        if(taskPlanStatus != null){
+        if(taskPlanStatus == null){
-            return taskPlanStatus.intValue();
+            return -1;
         }
-        return taskPlanStatus;
+        return taskPlanStatus.intValue();
     }
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -453,6 +453,7 @@ public class CoreHqlPack {
 
         // hql拼接
         HqlPack.getStringLikerPack(sysTaskPlan.getName(),"name",result);
+        HqlPack.getStringLikerPack(sysTaskPlan.getGroupName(),"groupName",result);
         HqlPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(),"taskPlanStatus",result);
         HqlPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(),"taskCycleId",result);
         HqlPack.getStringEqualPack(sysTaskPlan.getOrganizeCode(), "organizeCode", result);

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

@@ -44,7 +44,7 @@ public class BsDataSource extends BaseBean {
     private Integer dataSourceTypeId;
 
     @Column(name = "DATA_SOURCE_HOST")
-    @ApiParam(value = "数据源主机")
+    @ApiParam(value = "数据源ip地址")
     private String dataSourceHost;
 
     @Column(name = "DATA_SOURCE_PORT")
@@ -59,8 +59,12 @@ public class BsDataSource extends BaseBean {
     @ApiParam(value = "密码")
     private String dataSourcePassword;
 
+    @Column(name = "DATA_SOURCE_STATUS")
+    @ApiParam(value = "数据源状态")
+    private String dataSourceStatus;
+
     @Column(name = "DATA_SOURCE_DESCRIPTION")
-    @ApiParam(value = "数据源用户描述")
+    @ApiParam(value = "数据源描述")
     private String dataSourceDescription;
 
 }

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

@@ -34,25 +34,26 @@ public class BsDataSourceSuitCaseTable extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long suitCaseId;
 
-    @Column(name = "TABLE_NAME")
+    @Column(name = "OPERATE_NAME")
-    @ApiParam(value = "数据库表名")
+    @ApiParam(value = "操作名称")
-    private String tableName;
+    private String operateName;
 
-    @Column(name = "QUERY_SQL")
+    @Column(name = "OPERATE_TYPE_ID")
-    @ApiParam(value = "查询sql")
+    @ApiParam(value = "操作类型")
-    private String querySql;
+    private Integer operateTypeId;
 
-    @Column(name = "AFTER_QUERY_SQL")
+    @Column(name = "EXECUTE_SQL")
-    @ApiParam(value = "查询后操作sql")
+    @ApiParam(value = "执行sql")
-    private String afterQuerySql;
+    private String executeSql;
 
-    @Column(name = "INSERT_SQL")
+    @Column(name = "OPERATE_SORT")
-    @ApiParam(value = "插入sql")
+    @ApiParam(value = "操作顺序")
-    private String insertSql;
+    private Integer operateSort;
+
+    @Column(name = "IS_RETURN")
+    @ApiParam(value = "是否有返回")
+    private String isReturn;
 
-    @Column(name = "AFTER_INSERT_SQL")
-    @ApiParam(value = "插入后执行sql")
-    private String afterInsertSql;
 
 }
 

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

@@ -33,8 +33,5 @@ public class BsSocketSuitCase extends BaseBean {
     @ApiParam(value = "socket类型（枚举）")
     private Integer socketTypeId;
 
-    @Column(name = "SOCKET_MODE_ID")
-    @ApiParam(value = "socket模式(枚举,服务端，客户端)")
-    private Integer socketModeId;
 }
 

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

@@ -41,6 +41,14 @@ public class BsSslKeyParam extends BaseBean {
     @ApiParam(value = "参数名称")
     private String paramName;
 
+    @Column(name = "PARENT_PARAM_NAME")
+    @ApiParam(value = "上级参数名称")
+    private String parentParamName;
+
+    @Column(name = "PARAM_VALUE_TYPE_ID")
+    @ApiParam(value = "参数值类型(枚举)")
+    private String paramValueTypeId;
+
     @Column(name = "PARAM_VALUE")
     @ApiParam(value = "参数值")
     private String paramValue;

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

@@ -57,6 +57,10 @@ public class BsSuitCase extends BaseBean {
     @ApiParam(value = "适配器代码")
     private String suitCaseCode;
 
+    @Column(name = "SUIT_MODE_ID")
+    @ApiParam(value = "适配模式(枚举,主动，被动)")
+    private Integer suitModeId;
+
     @Column(name = "SUIT_CASE_HOST")
     @ApiParam(value = "适配主机")
     private String suitCaseHost;

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

@@ -56,7 +56,7 @@ public class BsSuitRecord extends BaseBean {
     private Long suitCaseDetailId;
 
     @Column(name = "SUIT_METHOD_ID")
-    @ApiParam(value = "适配方式id枚举")
+    @ApiParam(value = "适配方式id枚举（定时适配，主动适配）")
     private Integer suitMethodId;
 
     @Column(name = "SUIT_METHOD_NAME_RDD")

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

@@ -69,5 +69,9 @@ public class BsSuitSchedule extends BaseBean {
     @ApiParam(value = "最后一次执行时间")
     private String lastExecuteDateTime;
 
+    @Column(name = "status")
+    @ApiParam(value = "定时适配任务状态")
+    private Integer status;
+
 }
 

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java

@@ -4,7 +4,6 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.softswitch.bean.*;
-import org.apache.commons.lang3.StringUtils;
 
 /**
  * @Description :
@@ -83,11 +82,11 @@ public class SoftSwitchHqlPack {
     public static DdlPackBean packHqlBsSuitCaseParam(BsSuitCase bsSuitCase){
         DdlPackBean ddlPackBean = new DdlPackBean();
 
-//        DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseName(),"suitCaseName",ddlPackBean);
-//        DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitTypeName(),"suitTypeName",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
-//        DdlPreparedPack.getNumEqualPack(bsSuitCase.getParamTypeId(), "paramTypeId", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSuitCase.getSuitTypeId(), "suitTypeId", ddlPackBean);
-//        DdlPreparedPack.getNumEqualPack(bsSuitCase.getSuitCaseId(), "suitCaseId", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitTypeName(),"suitTypeName",ddlPackBean);
-//        DdlPreparedPack.getStringEqualPack(bsSuitCase.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSuitCase.getCaseTypeId(), "caseTypeId", ddlPackBean);
 
         ddlPackBean.setOrderByStr(bsSuitCase.orderBy());
 
@@ -151,7 +150,6 @@ public class SoftSwitchHqlPack {
         DdlPackBean ddlPackBean = new DdlPackBean();
 
         DdlPreparedPack.getStringLikerPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean);
-        DdlPreparedPack.getStringLikerPack(bsSuitSchedule.getScheduleGroupName(),"scheduleGroupName",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getSuitCaseId(),"suitCaseId",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitSchedule.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getTaskCycleId(),"taskCycleId",ddlPackBean);
@@ -247,7 +245,7 @@ public class SoftSwitchHqlPack {
         DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceName(), "dataSourceName", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsDataSource.getDataSourceTypeId(), "dataSourceTypeId", ddlPackBean);
-        DdlPreparedPack.getNumEqualPack(bsDataSource.getIsValid(), "isValid", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsDataSource.getDataSourceStatus(), "dataSourceStatus", ddlPackBean);
 
         ddlPackBean.setOrderByStr(bsDataSource.orderBy());
 

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

@@ -28,102 +28,99 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_ACTION_LOG")
+@Table(name = "WMS_ACTION_LOG")
-@Api(value="作业记录表")
+@Api(value = "作业记录表")
 public class WmsActionLog extends BaseBean {
 
     private static final long serialVersionUID = 8664373854844368861L;
-    @Column(name="TASK_NO")
+    @Column(name = "TASK_NO")
     @ApiParam(value = "作业任务编号", example = "1")
     @JsonSerialize(using = ToStringSerializer.class)
     public String taskNo;
 
-    @Column(name="TRANS_TYPE_CODE")
+    @Column(name = "TRANS_TYPE_CODE")
     @ApiParam(value = "交易类型编号")
     public String transTypeCode;
 
-    @Column(name="MOVE_NO")
+    @Transient
+    @Column(name = "MOVE_NO")
     @ApiParam(value = "移动单单号")
     public String moveNo;
 
-    @Column(name="AG_ID")
+    @Column(name = "AG_ID")
     @ApiParam(value = "作业流程编号", example = "1")
     @JsonSerialize(using = ToStringSerializer.class)
     public Long agId;
 
     //get单独处理
-    public Long getAgId() {
+    public long getAgIdVal() {
-        if(agId != null) {
+        return agId == null ? 0 : agId.longValue();
-            return agId.longValue();
-        }else{
-            return agId;
-        }
     }
 
     @Column(name = "AL_NAME_RDD")
     @ApiParam(value = "流程名称")
     public String agNameRdd;
 
-    @Column(name="ACTION_USER_NAME")
+    @Column(name = "ACTION_USER_NAME")
     @ApiParam(value = "作业人员")
     public String actionUserName;
 
-    @Column(name="FIX_NO")
+    @Column(name = "FIX_NO")
     @ApiParam(value = "设备编号")
     public String fixNo;
 
-    @Column(name="START_TIME")
+    @Column(name = "START_TIME")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "开始作业时间")
     public String startTime;
 
-    @Column(name="END_TIME")
+    @Column(name = "END_TIME")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "结束作业时间")
     public String endTime;
 
     @Transient
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="开始作业时间查询用，查询起始日期",example = "2018-01-01 01:00:00")
+    @ApiParam(value = "开始作业时间查询用，查询起始日期", example = "2018-01-01 01:00:00")
     public String startTimeStart;
 
     @Transient
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="开始作业时间查询用，查询结束日期",example = "2018-12-31 23:59:59")
+    @ApiParam(value = "开始作业时间查询用，查询结束日期", example = "2018-12-31 23:59:59")
     public String startTimeEnd;
 
     @Transient
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="结束作业时间查询用，查询起始日期",example = "2018-01-01 01:00:00")
+    @ApiParam(value = "结束作业时间查询用，查询起始日期", example = "2018-01-01 01:00:00")
     public String endTimeStart;
 
     @Transient
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="结束作业时间查询用，查询结束日期",example = "2018-12-31 23:59:59")
+    @ApiParam(value = "结束作业时间查询用，查询结束日期", example = "2018-12-31 23:59:59")
     public String endTimeEnd;
 
     // 状态:1=创建,10=处理中,20=已完成
-    @Column(name="ACTION_STATUS")
+    @Column(name = "ACTION_STATUS")
     @ApiParam(value = "作业状态", example = "1")
     public Integer actionStatus;
 
-    @Column(name="TOTAL_STEP")
+    @Column(name = "TOTAL_STEP")
     @ApiParam(value = "总步数", example = "1")
     public Integer totalStep;
 
-    @Column(name="CURRENT_STEP")
+    @Column(name = "CURRENT_STEP")
     @ApiParam(value = "当前步骤", example = "1")
     public Integer currentStep;
 
-    @Column(name="INIT_AM_ID")
+    @Column(name = "INIT_AM_ID")
     @ApiParam(value = "初始化组件编号", example = "0")
     public Long initAmId;
 
-    @Column(name="DETAILS_AM_ID")
+    @Column(name = "DETAILS_AM_ID")
     @ApiParam(value = "明细处理组件编号", example = "0")
     public Long detailsAmId;
 
-    @Column(name="END_AM_ID")
+    @Column(name = "END_AM_ID")
     @ApiParam(value = "结束组件编号", example = "0")
     public Long endAmId;
 

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

@@ -36,9 +36,9 @@ public class WmsActionLogDetails extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     public Long alId;
 
-    @Column(name = "AL_NAME_RDD")
+    @Column(name = "AG_ID")
-    @ApiParam(value = "流程名称")
+    @ApiParam(value = "流程ID")
-    public String agNameRdd;
+    public Long agId;
 
     @Column(name = "SEQ")
     @ApiParam(value = "序号", example = "1")
@@ -113,6 +113,9 @@ public class WmsActionLogDetails extends BaseBean {
     @ApiParam(value = "作业流程明细ID", example = "1")
     public Long agdId;
 
+    @Column(name="MOVE_NO")
+    @ApiParam(value = "移动单单号")
+    public String moveNo;
     public Long getAsId() {
         if (asId != null) {
             return asId.longValue();

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

@@ -1,6 +1,9 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import com.alibaba.fastjson.annotation.JSONField;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -104,6 +107,7 @@ public class WmsMoveDetails extends BaseBean {
      */
     @Column(name="ITEM_STATUS")
     @ApiParam(value = "状态", example = "0")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
     public Integer itemStatus;
 
     @Column(name="REF_ITEM")
@@ -150,20 +154,35 @@ public class WmsMoveDetails extends BaseBean {
     private Integer busiTypeCode;
 
     @Transient
+    @ApiParam("生产线")
     private String workCenterCode;
 
     @Transient
-    private String fPartNo;
+    @ApiParam("父物料编码")
+    private String fpartNo;
 
     @Transient
-    private String fPartName;
+    @ApiParam("父物料名称")
+    private String fpartName;
 
     @Transient
+    @ApiParam("数量")
     private Double qty;
 
     @Transient
+    @ApiParam("创建时间")
     private String createDateTime;
 
+   /* @JSONField(name="fPartNo")
+    public String getfPartNo() {
+        return fPartNo;
+    }
+
+    @JSONField(name="fPartName")
+    public String getfPartName() {
+        return fPartName;
+    }*/
+
     public WmsMoveDetails(){}
 
     public WmsMoveDetails(String partNo, Long waitingCounts ,Long finishedCounts){
@@ -195,8 +214,8 @@ public class WmsMoveDetails extends BaseBean {
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
         this.workCenterCode = workCenterCode;
-        this.fPartNo = fPartNo;
+        this.fpartNo = fPartNo;
-        this.fPartName = fPartName;
+        this.fpartName = fPartName;
         this.unit = unit;
         this.qty = qty;
         this.createDateTime = createDateTime;

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -40,6 +42,7 @@ public class WmsMoveMaster extends BaseBean {
      */
     @Column(name = "ORDER_STATUS")
     @ApiParam(value = "状态", example = "0")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
     public Integer orderStatus;
 
     @Column(name = "REMARK")
@@ -65,6 +68,7 @@ public class WmsMoveMaster extends BaseBean {
 
     @Column(name = "BUSI_TYPE_CODE")
     @ApiParam(value = "业务类型编码")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
     private Integer busiTypeCode;
 
     @Column(name = "REF_ORDER_NO")
@@ -77,6 +81,7 @@ public class WmsMoveMaster extends BaseBean {
 
     @Transient
     @ApiParam("状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
     private Integer itemStatus;
 
     @Transient

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -66,6 +68,7 @@ public class WmsMoveSn extends BaseBean {
      */
     @Column(name="ITEM_STATUS")
     @ApiParam(value = "状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
     public Integer itemStatus;
 
     @Column(name="REMARK")
@@ -129,18 +132,22 @@ public class WmsMoveSn extends BaseBean {
 
     @Column(name="SRC_QC_STATUS")
     @ApiParam(value = "源质量状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description")
     public Integer srcQcStatus;
 
     @Column(name="SRC_SN_STATUS")
     @ApiParam(value = "源条码状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
     public Integer srcSnStatus;
 
     @Column(name="DEST_QC_STATUS")
     @ApiParam(value = "目的质量状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description")
     public Integer descQcStatus;
 
     @Column(name="DEST_SN_STATUS")
     @ApiParam(value = "目的条码状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
     public Integer destSnStatus;
 
     @Column(name="DATE_CODE")

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

@@ -92,7 +92,7 @@ public class WmsPart extends BaseBean {
 
     @ColumnDefault("2")
     @Column(name = "IQC")
-    @ApiParam(value = "收货检验否", example = "1")
+    @ApiParam(value = "是否免检", example = "1")
     private Integer iqc;
 
     @Column(name = "MIN")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -2272,7 +2272,7 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlWmsActionLogByActionLog(WmsActionLog actionLog) {
         DdlPackBean packBean = new DdlPackBean();
         DdlPreparedPack.timeBuilder(actionLog.getCreateDatetime(), "createDatetime", packBean, false, false);
-        DdlPreparedPack.getStringEqualPack(actionLog.getMoveNo(), "moveNo", packBean);
+//        DdlPreparedPack.getStringEqualPack(actionLog.getMoveNo(), "moveNo", packBean);
         DdlPreparedPack.getStringEqualPack(actionLog.getTransTypeCode(), "transTypeCode", packBean);
         DdlPreparedPack.getStringEqualPack(actionLog.getFixNo(), "fixNo", packBean);
         DdlPreparedPack.getNumEqualPack(actionLog.getAgId(), "agId", packBean);