Merge branch 'test'

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

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.andon.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -47,6 +48,7 @@ public class AndonManageQueue extends BaseBean {
 
     @Column(name = "ALARM_CODE")
     @ApiParam(value = "安灯类型")
+    @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
     private String alarmCode;
 
     @Column(name = "ACTION_CODE")

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/common/XStreamFactory.java

@@ -60,7 +60,7 @@ public class XStreamFactory {
             }
         });
 
-        xStream.setMode(XStream.NO_REFERENCES);
+//        xStream.setMode(XStream.NO_REFERENCES);
         xStream.autodetectAnnotations(true);
 
         return xStream;

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

@@ -0,0 +1,519 @@
+package cn.estsh.i3plus.pojo.base.enumutil;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * @Description : 软适配 枚举接口
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-08-13 9:34
+ * @Modify:
+ **/
+public class BlockSoftSwitchEnumUtil {
+
+    /**
+     * 套件类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CASE_TYPE{
+        SOCKET(10,"SOCKET"),
+        RESTFUL(20,"RESTFUL"),
+        DATASOURCE(30,"数据源"),
+        WEBSERVICE(40,"WebService"),
+        MQ(50,"消息队列"),
+        WebSocket(60,"WebSocket");
+
+        private int value;
+        private String description;
+
+        CASE_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 REQUEST_SOURCE{
+        ACTIVE(1,"主动请求"),
+        SCHEDULE(2,"定时调度"),
+        RABBITMQ(3,"MQ 调用");
+
+        private int value;
+        private String description;
+
+        REQUEST_SOURCE(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 VERIFICATION_METHOD{
+        LOGIN(1,"登录");
+
+        private int value;
+        private String description;
+
+        VERIFICATION_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;
+        }
+    }
+
+    /**
+     * 认证类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum KEY_TYPE{
+        ACCOUNT_PASSWORD(1,"账号密码");
+
+        private int value;
+        private String description;
+
+        KEY_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 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 BlockSoftSwitchEnumUtil.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 BlockSoftSwitchEnumUtil.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(10,"数字"),
+        STRING(20,"字符串"),
+        BOOLEAN(30,"布尔"),
+        MAP(40,"字典"),
+        LIST(50,"列表");
+
+        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;
+        }
+    }
+
+    /**
+     * 数据库操作方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DATABASE_OPERATE_TYPE{
+        READ(1,"读取"),
+        WRITE(2,"写入");
+
+        private int value;
+        private String description;
+
+        DATABASE_OPERATE_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_SERVER_WEB_SERVICE{
+        ACTIVE(40001,"serverWebServiceHello","hello"),
+        SCHEDULE(40002,"serverWebServiceSendEmail","邮件测试");
+
+        private int value;
+        private String description;
+        private String clazzName;
+
+        SUIT_SERVER_WEB_SERVICE(int value, String clazzName,String description) {
+            this.value = value;
+            this.clazzName = clazzName;
+            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/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,81 @@ 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)
+    public enum MES_STEP_TYPE {
+
+        COMMON_STEP("10", "公用工步"),
+        JIT_STEP("20", "JIT工步"),
+        WORK_ORDER_STEP("30", "工单工步"),
+        BACK_STEP("40", "后台工步");
+
+        private String value;
+        private String description;
+
+        MES_STEP_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 (values()[i].value.equals(val) ) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * mes工作单元参数类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -236,16 +311,18 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PLAN_ORDER_STATUS {
 
-        CREATE(10, "创建"),
+        CREATE(10, "CREATED", "创建"),
-        DE_COMPOSE_ING(20, "分解中"),
+        DE_COMPOSE_ING(20, "DE_COMPOSE_ING", "分解中"),
-        DE_COMPOSE_ED(30, "分解完成"),
+        DE_COMPOSE_ED(30, "DE_COMPOSE_ED", "分解完成"),
-        CLOSE(40, "关闭");
+        CLOSE(40, "CLOSE", "关闭");
 
         private int value;
+        private String code;
         private String description;
 
-        PLAN_ORDER_STATUS(int value, String description) {
+        PLAN_ORDER_STATUS(int value, String code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
@@ -253,6 +330,10 @@ public class MesEnumUtil {
             return value;
         }
 
+        public String getCode() {
+            return code;
+        }
+
         public String getDescription() {
             return description;
         }
@@ -689,6 +770,7 @@ public class MesEnumUtil {
         STEP_LIST("stepList", "工步列表"),
         STEP_CONTENT("stepContent", "工步内容"),
         MODULE_CONTENT("moduleContent", "组件内容"),
+        CUSTOM_COMPONENT("customComponent", "定制内容"),
         TASK_COMPLETE("taskComplete", "整个扫描完成");
 
         private String value;
@@ -726,6 +808,7 @@ public class MesEnumUtil {
         TABLE("table", "表格"),
         TEXT("text", "正常文本"),
         EXP_TEXT("exp_text", "异常文本"),
+        FILE("file", "定制内容文件"),
         IMAGE("image", "图片"),
         BUTTON("button", "按钮");
 
@@ -800,15 +883,17 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STEP_PARAM_TYPE {
 
-        QUALIFIED(10, "数字"),
+        QUALIFIED(10,"number", "数字"),
-        DEFECTED(20, "字符串"),
+        DEFECTED(20, "text","字符串"),
-        SCRAPED(30, "可选值");
+        SCRAPED(30,"select", "可选值");
 
         private int value;
+        private String code;
         private String description;
 
-        STEP_PARAM_TYPE(int value, String description) {
+        STEP_PARAM_TYPE(int value,String code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
@@ -816,6 +901,8 @@ public class MesEnumUtil {
             return value;
         }
 
+        public String getCode(){return code;}
+
         public String getDescription() {
             return description;
         }
@@ -904,7 +991,7 @@ public class MesEnumUtil {
     public enum CONFIG_TYPE {
 
         FASTDFS_SAVE_PATH(10, "savePath"),
-        NGINX_IP(20,"nginxIp");
+        NGINX_IP(20, "nginxIp");
 
         private int value;
         private String description;
@@ -976,6 +1063,7 @@ public class MesEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum COMPANY_TYPE {
+        RULECODE("ruleCode","规则编码"),
         PREFIX("prefix", "前缀"),
         PART_NO("partNo", "物料号"),
         CUST_PART_NO("custPartNo", "客户物料号"),

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

@@ -1,154 +0,0 @@
-package cn.estsh.i3plus.pojo.base.enumutil;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-/**
- * @Description : 软适配 枚举接口
- * @Reference :
- * @Author : yunhao
- * @CreateDate : 2019-08-13 9:34
- * @Modify:
- **/
-public class SoftSwitchEnumUtil {
-
-    /**
-     * 套件类型
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum CASE_TYPE{
-        SOCKET(1,"SOCKET"),
-        RESTFUL(2,"RESTFUL"),
-        DATASOURCE(3,"数据源");
-
-        private int value;
-        private String description;
-
-        CASE_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 REQUEST_SOURCE{
-        ACTIVE(1,"主动请求"),
-        SCHEDULE(2,"定时调度");
-
-        private int value;
-        private String description;
-
-        REQUEST_SOURCE(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 VERIFICATION_METHOD{
-        LOGIN(1,"登录");
-
-        private int value;
-        private String description;
-
-        VERIFICATION_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;
-        }
-    }
-
-    /**
-     * 认证类型
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum KEY_TYPE{
-        ACCOUNT_PASSWORD(1,"账号密码");
-
-        private int value;
-        private String description;
-
-        KEY_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;
-        }
-    }
-
-    //keyTypeId
-}

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.base.enumutil;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.StringUtils;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -227,6 +228,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
     /**
@@ -513,6 +518,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
     /**
@@ -586,6 +595,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
 
@@ -764,7 +777,7 @@ public class WmsEnumUtil {
                 return null;
             } else {
                 for (int i = 0; i < values().length; i++) {
-                    if (values()[i].value == value) {
+                    if (StringUtils.equalsIgnoreCase(values()[i].value,value)) {
                         return values()[i];
                     }
                 }
@@ -860,6 +873,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
 
@@ -903,6 +920,10 @@ public class WmsEnumUtil {
             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++) {
@@ -953,6 +974,10 @@ public class WmsEnumUtil {
             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++) {
@@ -1012,6 +1037,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
     /**
@@ -1057,6 +1086,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
     /**
@@ -1095,6 +1128,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
     /**
@@ -1166,6 +1203,46 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
+     * 库存移动单明细状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MOVE_ORDER_DETAILS_STATUS {
+        CREATE(10, "创建"),
+        BE_HANDLE(20, "待处理"),
+        FINISH(30, "已处理");
+
+        private int value;
+        private String description;
+
+        MOVE_ORDER_DETAILS_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;
+        }
     }
 
 
@@ -1204,6 +1281,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
     /**
@@ -1284,7 +1365,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;
@@ -1489,6 +1570,7 @@ public class WmsEnumUtil {
         public String getDescription() {
             return description;
         }
+
     }
 
     /**
@@ -2623,6 +2705,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
 
@@ -2723,7 +2809,7 @@ public class WmsEnumUtil {
     public enum STOCK_LEVEL_STATUS {
         LOW("LOW", "低于最低库存"),
         HIGH("HIGH", "高于最高库存"),
-        NORMAL("NORMAL", "安全库存");
+        NORMAL("CREATE", "安全库存");
 
         private String value;
         private String description;
@@ -2908,6 +2994,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
     /**
@@ -3012,6 +3102,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
     /**
@@ -3230,6 +3324,10 @@ public class WmsEnumUtil {
             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++) {

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-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -54,6 +54,29 @@ public class DdlPreparedPack {
     /**
      * 封装日期
      *
+     * @param startDate      开始日期
+     * @param endDate        结束日期
+     * @param columnName     列名
+     * @param isLeftContain  左闭？
+     * @param isRightContain 右闭？
+     * @param packBean       HQL对象
+     */
+    public static void timeBuilder(String startDate, String endDate, String columnName, boolean isLeftContain, boolean isRightContain, DdlPackBean packBean) {
+        if (isLeftContain) {
+            packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, startDate.trim());
+        } else {
+            packBean.addColumnQuery(columnName, " and model." + columnName + " > :m_" + columnName, startDate.trim());
+        }
+        if (isRightContain) {
+            packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, endDate.trim());
+        } else {
+            packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " < :m_s_" + columnName, endDate.trim());
+        }
+    }
+
+    /**
+     * 封装日期
+     *
      * @param date       开始日期和结束日期，以逗号分隔（分为开始时间和结束时间）
      * @param columnName HQL里对应的时间字段
      * @param packBean   封装的HQL
@@ -348,6 +371,18 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 封装String对象成大于不等于语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getStringBiggerNotEqualPack(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null && !StringUtils.isEmpty(String.valueOf(data))) {
+            packBean.addColumnQuery(columnName, " and model." + columnName + " > :m_" + columnName, data);
+        }
+    }
+
+    /**
      * 封装String对象成小于语句
      *
      * @param columnName 列名
@@ -416,7 +451,7 @@ public class DdlPreparedPack {
      * @param packBean
      */
     public static void getOrInPack(String data, String columnName, DdlPackBean packBean) {
-        if (data != null && data.trim().length() > 0) {
+        if (data != null) {
             packBean.addColumnQuery(columnName," or model." + columnName + " in (:m_" + columnName + ")", data);
         }
     }
@@ -506,8 +541,8 @@ public class DdlPreparedPack {
      * @param columnName
      * @param packBean
      */
-    public static void getNotInPack(String data, String columnName, DdlPackBean packBean) {
+    public static void getNotInPack(Object data, String columnName, DdlPackBean packBean) {
-        if (data != null && data.trim().length() > 0) {
+        if (data != null) {
             packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data);
         }
     }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java

@@ -79,6 +79,10 @@ public class BfElement extends BaseBean {
     @ApiParam(value = "是否删除")
     private Integer isObjectDel;
 
+    @Column(name = "IS_OBJECT_EXPORT")
+    @ApiParam(value = "是否导出")
+    private Integer isObjectExport;
+
     @Column(name="ELEMENT_SORT_ATTR_ID")
     @ApiParam(value ="默认排序属性")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java

@@ -136,7 +136,7 @@ public class BfElementProperty extends BaseBean {
     @AnnoOutputColumn(hidden = true)
     private BfDataObjectProperty objectProperty;
 
-    public Object getFormValue() {
+//    public Object getFormValue() {
-        return propertyFormValue;
+//        return propertyFormValue == null ? propertyDefaultValue : propertyFormValue;
-    }
+//    }
 }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java

@@ -341,6 +341,8 @@ public final class FormHqlPack {
 
         DdlPreparedPack.getNegativeNumEqualPack(bfMenu.getId(), "parentId", result);
         DdlPreparedPack.getNumEqualPack(
+                CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
+        DdlPreparedPack.getNumEqualPack(
                 CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
 
         // 按顺序字段进行排序

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

@@ -41,7 +41,7 @@ public class MesPcn extends BaseBean {
 
     @Column(name="WORK_CENTER_CODE")
     @ApiParam("工作中心")
-    private String workCentreCode;
+    private String workCenterCode;
 
     @Column(name="PCN_VERSION")
     @ApiParam("PCN版本")

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

@@ -53,11 +53,11 @@ public class MesPcnSyncCfg extends BaseBean {
     @ApiParam(value ="同步时间")
     private String syncTime;
 
-    @Column(name="SYNC_PATTERN")//2、新增  1、修改
+    @Column(name="SYNC_PATTERN")//2.新增  1.修改
     @ApiParam("同步方式")
     private Integer syncPattern;
 
-    @Column(name="SYNC_TYPE")//1\pcn获取mes数据   2、pcn推送数据至mes
+    @Column(name="SYNC_TYPE")//1.pcn获取mes数据   2.pcn推送数据至mes
     @ApiParam("同步类型")
     private Integer syncType;
 
@@ -66,6 +66,10 @@ public class MesPcnSyncCfg extends BaseBean {
     @ApiParam(value ="上一同步时间")
     private String lastSyncTime;
 
+    @Column(name="EXTRACT_GAP")
+    @ApiParam(value="从数据库抽取的最大值 目前为分钟为限制")
+    private Integer extractGap;
+
     public int getSyncFrequencyVal() {
         return this.syncFrequency == null ? 0 : this.syncFrequency;
     }

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

@@ -0,0 +1,61 @@
+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_CODE")
+    @ApiParam(value = "用户编号", access = "用户编号")
+    private String userCode;
+
+    @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/bean/MesPcnTask.java

@@ -77,15 +77,12 @@ public class MesPcnTask extends BaseBean {
     @ApiParam("任务周期描述")
     private String taskCycleDescription;
 
-    @Column(name="TASK_STATUS")
+    @Column(name="TASK_PARAM")
-    @ApiParam("任务状态")
+    @ApiParam("任务参数")
-    private Integer taskStatus;
+    private String taskParam;
 
     public int getTaskTypeVal() {
         return this.taskType == null ? 0 : this.taskType;
     }
 
-    public int getTaskStatusVal() {
-        return this.taskStatus == null ? 0 : this.taskStatus;
-    }
 }

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.beans.Transient;
 import java.util.List;
 
 /**
@@ -19,4 +20,22 @@ import java.util.List;
 public class StepPrintSnModel extends MesProduceSn {
     @ApiParam("打印描述")
     private String printDesc;
+
+    @ApiParam("条码")
+    private String barCode;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("批次号")
+    private String batchNo;
+
+    @ApiParam("客户物料号")
+    private String boxQty;
+
+    @ApiParam("订单号")
+    private String orderNo;
+
+    @ApiParam("生产日期")
+    private String productionTime;
 }

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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.pcn.bean.MesConfig;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate;
 import org.apache.commons.lang3.StringUtils;
 
 /**
@@ -48,4 +49,18 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 根据打印模板的模板代码查询模板信息
+     * @param organizeCode
+     * @param mesLabelTemplate
+     * @return
+     */
+    public static DdlPackBean getLabelTemplate(String organizeCode, MesLabelTemplate mesLabelTemplate) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean();
+        DdlPreparedPack.getStringEqualPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean);
+        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
+        return packBean;
+    }
+
 }

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

@@ -83,4 +83,8 @@ public class MesESOP extends BaseBean {
     @ApiParam("FILE_TYPE_NAME")
     private String fileTypeName;
 
+    @Column(name="SYNC_TAG")
+    @ApiParam("SYNC_TAG")
+    private Integer syncTag=0;
+
 }

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

@@ -41,7 +41,7 @@ public class MesPcn extends BaseBean {
 
     @Column(name="WORK_CENTER_CODE")
     @ApiParam("工作中心")
-    private String workCentreCode;
+    private String workCenterCode;
 
     @Column(name="PCN_VERSION")
     @ApiParam("PCN版本")

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

@@ -66,6 +66,11 @@ public class MesPcnSyncCfg extends BaseBean {
     @ApiParam(value ="上一同步时间")
     private String lastSyncTime;
 
+
+    @Column(name="EXTRACT_GAP")
+    @ApiParam(value="从数据库抽取的最大值 目前为分钟为限制")
+    private Integer extractGap;
+
     public int getSyncFrequencyVal() {
         return this.syncFrequency == null ? 0 : this.syncFrequency;
     }

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

@@ -77,15 +77,12 @@ public class MesPcnTask extends BaseBean {
     @ApiParam("任务周期描述")
     private String taskCycleDescription;
 
-    @Column(name="TASK_STATUS")
+    @Column(name="TASK_PARAM")
-    @ApiParam("任务状态")
+    @ApiParam("任务参数")
-    private Integer taskStatus;
+    private String taskParam;
 
     public int getTaskTypeVal() {
         return this.taskType == null ? 0 : this.taskType;
     }
 
-    public int getTaskStatusVal() {
-        return this.taskStatus == null ? 0 : this.taskStatus;
-    }
 }

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

@@ -22,7 +22,7 @@ import javax.persistence.Column;
 @NoArgsConstructor
 @AllArgsConstructor
 @Api("生成条码模型")
-public class GenSerialNoModel extends BaseBean {
+public class GenSerialNoModel  {
 
     @ApiParam("规则代码")
     private String ruleCode;
@@ -43,7 +43,7 @@ public class GenSerialNoModel extends BaseBean {
     private String prodLocation;
 
     @ApiParam("前缀")
-    private Integer prefix;
+    private String prefix;
 
     @ApiParam("编码规则")
     private String numberRule;
@@ -67,4 +67,8 @@ public class GenSerialNoModel extends BaseBean {
     private String currentNumber;
 
 
+    public GenSerialNoModel(String ruleCode){
+        this.ruleCode=ruleCode;
+    }
+
 }

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

@@ -31,6 +31,9 @@ public class MesActionMethodModel implements Serializable {
     @ApiParam("函数代码")
     private String methodCode;
 
+    @ApiParam("函数代码")
+    private String methodName;
+
     @ApiParam("序号")
     private Integer seq;
 

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

@@ -265,13 +265,8 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesWorkCenter(MesWorkCenter mesWorkCenter, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCenter, organizeCode);
-        if (StringUtils.isNotEmpty(mesWorkCenter.getWorkCenterCode())) {
         DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
-        }
-        if (StringUtils.isNotEmpty(mesWorkCenter.getAreaCode())) {
         DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean);
-        }
-
         return packBean;
     }
 
@@ -454,7 +449,7 @@ public class MesHqlPack {
      * @return
      */
     public static DdlPackBean getMesESOPExcludeById(MesESOP mesESOP, String org) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(org);
+        DdlPackBean packBean = getAllBaseData(org);
         DdlPreparedPack.getStringEqualPack(mesESOP.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getStringEqualPack(mesESOP.getRouteCode(), "routeCode", packBean);
         DdlPreparedPack.getStringEqualPack(mesESOP.getProcessCode(), "processCode", packBean);
@@ -482,20 +477,21 @@ public class MesHqlPack {
      * 事件分页获取封装
      *
      * @param mesEvent
-     * @param organizeCode
+     * @param
      * @return
      */
-    public static DdlPackBean getMesEvent(MesEvent mesEvent, String organizeCode) {
+    public static DdlPackBean getMesEvent(MesEvent mesEvent) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesEvent, organizeCode);
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesEvent, mesEvent.getOrganizeCode());
-        if (StringUtils.isNotEmpty(mesEvent.getButtonCode())) {
         DdlPreparedPack.getStringLikerPack(mesEvent.getButtonCode(), "buttonCode", packBean);
-        }
-        if (StringUtils.isNotEmpty(mesEvent.getEventCode())) {
         DdlPreparedPack.getStringLikerPack(mesEvent.getEventCode(), "eventCode", packBean);
-        }
-        if (StringUtils.isNotEmpty(mesEvent.getEventName())) {
         DdlPreparedPack.getStringLikerPack(mesEvent.getEventName(), "eventName", packBean);
+        return packBean;
     }
+
+    public static DdlPackBean getMesEventExcludeById(MesEvent mesEvent) {
+        DdlPackBean packBean = getAllBaseData(mesEvent.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(mesEvent.getEventCode(), "eventCode", packBean);
+        DdlPreparedPack.getNumNOEqualPack(mesEvent.getId(), "id", packBean);
         return packBean;
     }
 
@@ -506,40 +502,49 @@ public class MesHqlPack {
         return packBean;
     }
 
-    public static DdlPackBean getMesEventByEventCode(String eventCode, String org) {
+    public static DdlPackBean getMesEventByEventCode(MesEvent mesEvent) {
-        DdlPackBean packBean = new DdlPackBean();
+        DdlPackBean packBean = getAllBaseData(mesEvent.getOrganizeCode());
-        DdlPreparedPack.getStringEqualPack(org, "organizeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesEvent.getEventCode(), "eventCode", packBean);
-        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
-        DdlPreparedPack.getStringEqualPack(eventCode, "eventCode", 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 = new DdlPackBean();
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, organizeCode);
-        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
-        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
         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());
+        DdlPreparedPack.getStringEqualPack(mesAction.getActionCode(), "actionCode", packBean);
+        DdlPreparedPack.getNumNOEqualPack(mesAction.getId(), "id", packBean);
+        return packBean;
+    }
 
     /**
      * 动作分页获取封装
      *
      * @param mesAction
-     * @param organizeCode
      * @return
      */
-    public static DdlPackBean getMesAction(MesAction mesAction, String organizeCode) {
+    public static DdlPackBean getMesAction(MesAction mesAction) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, organizeCode);
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction.getOrganizeCode());
-        if (StringUtils.isNotEmpty(mesAction.getActionCode())) {
         DdlPreparedPack.getStringRightLikerPack(mesAction.getActionCode(), "actionCode", packBean);
-        }
-
-        if (StringUtils.isNotEmpty(mesAction.getActionName())) {
         DdlPreparedPack.getStringLikerPack(mesAction.getActionName(), "actionName", packBean);
-        }
-
         DdlPreparedPack.getNumEqualPack(mesAction.getActionType(), "actionType", packBean);
 
         return packBean;
@@ -549,49 +554,39 @@ public class MesHqlPack {
      * 函数分页获取封装
      *
      * @param mesMethod
-     * @param organizeCode
      * @return
      */
-    public static DdlPackBean getMesMethod(MesMethod mesMethod, String organizeCode) {
+    public static DdlPackBean getMesMethod(MesMethod mesMethod) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesMethod, organizeCode);
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesMethod, mesMethod.getOrganizeCode());
-        if (StringUtils.isNotEmpty(mesMethod.getMethodCode())) {
         DdlPreparedPack.getStringRightLikerPack(mesMethod.getMethodCode(), "methodCode", packBean);
-        }
-        if (StringUtils.isNotEmpty(mesMethod.getMethodName())) {
         DdlPreparedPack.getStringLikerPack(mesMethod.getMethodName(), "methodName", packBean);
-        }
-        if (StringUtils.isNotEmpty(mesMethod.getCallClass())) {
         DdlPreparedPack.getStringRightLikerPack(mesMethod.getCallClass(), "callClass", packBean);
-        }
+
-        if (mesMethod.getMethodType() != null && StringUtils.isNotEmpty(mesMethod.getMethodType() + "")) {
-            DdlPreparedPack.getStringEqualPack(mesMethod.getMethodType() + "", "methodType", packBean);
-        }
         return packBean;
     }
 
-    public static DdlPackBean getMesMethodByMethodCode(MesMethod mesMethod, String organizeCode) {
+    public static DdlPackBean getMesMethodByMethodCode(MesMethod mesMethod) {
-        DdlPackBean packBean = new DdlPackBean();
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesMethod, mesMethod.getOrganizeCode());
-        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
-        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", 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;
+    }
+
     /**
      * 事件动作分页获取封装
      *
      * @param mesActionMethod
-     * @param organizeCode
      * @return
      */
-    public static DdlPackBean getMesActionMethod(MesActionMethod mesActionMethod, String organizeCode) {
+    public static DdlPackBean getMesActionMethod(MesActionMethod mesActionMethod) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesActionMethod, organizeCode);
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesActionMethod, mesActionMethod.getOrganizeCode());
-        if (StringUtils.isNotEmpty(mesActionMethod.getActionCode())) {
         DdlPreparedPack.getStringLikerPack(mesActionMethod.getActionCode(), "actionCode", packBean);
-        }
-        if (StringUtils.isNotEmpty(mesActionMethod.getMethodCode())) {
         DdlPreparedPack.getStringLikerPack(mesActionMethod.getMethodCode(), "methodCode", packBean);
-        }
         return packBean;
     }
 
@@ -827,13 +822,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);
-        }
-        if (StringUtils.isNotEmpty(kpData.getKeyDataCode())) {
         DdlPreparedPack.getStringLikerPack(kpData.getKeyDataCode(), "keyDataCode", packBean);
-        }
-
         return packBean;
     }
 
@@ -863,7 +853,7 @@ public class MesHqlPack {
      */
 
     public static DdlPackBean getMesProdCfgExcludeById(MesProdRouteCfg mesProdRouteCfg, String org) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(org);
+        DdlPackBean packBean = getAllBaseData(org);
         DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getRouteCode(), "routeCode", packBean);
         DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getWorkCenterCode(), "workCenterCode", packBean);
@@ -1136,6 +1126,7 @@ public class MesHqlPack {
 
     /**
      * Mes条码生成规则
+     *
      * @param numberRule
      * @param organizeCode
      * @return
@@ -1161,23 +1152,34 @@ public class MesHqlPack {
 
     /**
      * mes-pcn定时任务清单
+     *
      * @param mesPcnTask
      * @param organizeCode
      * @return
      */
     public static DdlPackBean getMesPcnTask(MesPcnTask mesPcnTask, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesPcnTask, organizeCode);
-        if (StringUtils.isNotEmpty(mesPcnTask.getTaskCode())) {
         DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean);
-        }
-        if (StringUtils.isNotEmpty(mesPcnTask.getTaskName())) {
         DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean);
-        }
-        if (null != mesPcnTask.getTaskStatus()) {
-            DdlPreparedPack.getNumEqualPack(mesPcnTask.getTaskStatus(), "taskStatus", packBean);
-        }
         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-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java

@@ -0,0 +1,32 @@
+package cn.estsh.i3plus.pojo.model.softswitch;
+
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSocketSuitCase;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSource;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 适配器model
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-09-04 15:30
+ * @Modify:
+ **/
+@Data
+public class BsSuitCaseModel {
+
+    @ApiParam(value = "适配器")
+    private BsSuitCase bsSuitCase;
+
+    @ApiParam(value = "数据源适配套件")
+    private BsSuitCaseDataSource bsDataSourceSuitCase;
+
+    @ApiParam(value = "socket适配套件")
+    private BsSocketSuitCase bsSocketSuitCase;
+
+    @ApiParam(value = "Web Service 适配套件")
+    private BsSuitCaseWebService webService;
+
+}

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

@@ -1,26 +1,26 @@
-package cn.estsh.i3plus.pojo.model.softswitch;
+//package cn.estsh.i3plus.pojo.model.softswitch;
-
+//
-import java.util.List;
+//import java.util.List;
-import java.util.Map;
+//import java.util.Map;
-
+//
-/**
+///**
- * @Description : 数据模型转换对象
+// * @Description : 数据模型转换对象
- * @Reference :
+// * @Reference :
- * @Author : alwaysfrin
+// * @Author : alwaysfrin
- * @CreateDate : 2019-04-29 11:11
+// * @CreateDate : 2019-04-29 11:11
- * @Modify:
+// * @Modify:
- **/
+// **/
-public class DataSwitchModel {
+//public class DataSwitchModel {
-
+//
-    private String stringVal;
+//    private String stringVal;
-
+//
-    private Long longVal;
+//    private Long longVal;
-
+//
-    private Double doubleVal;
+//    private Double doubleVal;
-
+//
-    private List<?> listVal;
+//    private List<?> listVal;
-
+//
-    private Map<String,?> mapVal;
+//    private Map<String,?> mapVal;
-
+//
-    private Object[] arrayVal;
+//    private Object[] arrayVal;
-}
+//}

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

@@ -1,50 +1,50 @@
-package cn.estsh.i3plus.pojo.model.softswitch;
+//package cn.estsh.i3plus.pojo.model.softswitch;
-
+//
-import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
+//import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
-import com.thoughtworks.xstream.annotations.XStreamAlias;
+//import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+//import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
+//import com.thoughtworks.xstream.annotations.XStreamImplicit;
-import lombok.Data;
+//import lombok.Data;
-
+//
-import java.util.List;
+//import java.util.List;
-import java.util.Map;
+//import java.util.Map;
-
+//
-/**
+///**
- * @Description :
+// * @Description :
- * @Reference :
+// * @Reference :
- * @Author : wei.peng
+// * @Author : wei.peng
- * @CreateDate : 19-7-25 下午3:31
+// * @CreateDate : 19-7-25 下午3:31
- * @Modify:
+// * @Modify:
- **/
+// **/
-@Data
+//@Data
-@XStreamAlias("auth")
+//@XStreamAlias("auth")
-public class PojoAuth{
+//public class PojoAuth{
-
+//
-    @XStreamAsAttribute
+//    @XStreamAsAttribute
-    private Long id;
+//    private Long id;
-    @XStreamAsAttribute
+//    @XStreamAsAttribute
-    private Integer authType;
+//    private Integer authType;
-
+//
-    @XStreamImplicit
+//    @XStreamImplicit
-    private List<Prop> params;
+//    private List<Prop> params;
-
+//
-    private String authPath;
+//    private String authPath;
-    private String userName ="登录名称";
+//    private String userName ="登录名称";
-    private String password ="登录名称";
+//    private String password ="登录名称";
-    private String languageCode ="登录名称";
+//    private String languageCode ="登录名称";
-
+//
-    // 认证令牌
+//    // 认证令牌
-    private String token;
+//    private String token;
-//    // 认证令牌集合(复杂认证令牌)
+////    // 认证令牌集合(复杂认证令牌)
-//    private List<Prop> tokenList;
+////    private List<Prop> tokenList;
-    // 原始认证数据
+//    // 原始认证数据
-    @XStreamCDATA
+//    @XStreamCDATA
-    private String result;
+//    private String result;
-
+//
-    public PojoAuth(Long id, Integer authType,String authPath, List<Prop> params) {
+//    public PojoAuth(Long id, Integer authType,String authPath, List<Prop> params) {
-        this.id = id;
+//        this.id = id;
-        this.authType = authType;
+//        this.authType = authType;
-        this.authPath = authPath;
+//        this.authPath = authPath;
-        this.params = params;
+//        this.params = params;
-    }
+//    }
-}
+//}

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

@@ -1,28 +1,28 @@
-package cn.estsh.i3plus.pojo.model.softswitch;
+//package cn.estsh.i3plus.pojo.model.softswitch;
-
+//
-import com.thoughtworks.xstream.annotations.XStreamAlias;
+//import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+//import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import lombok.Data;
+//import lombok.Data;
-
+//
-/**
+///**
- * @Description :
+// * @Description :
- * @Reference :
+// * @Reference :
- * @Author : wei.peng
+// * @Author : wei.peng
- * @CreateDate : 19-7-25 下午5:18
+// * @CreateDate : 19-7-25 下午5:18
- * @Modify:
+// * @Modify:
- **/
+// **/
-@Data
+//@Data
-@XStreamAlias("prop")
+//@XStreamAlias("prop")
-public class Prop {
+//public class Prop {
-
+//
-    @XStreamAsAttribute
+//    @XStreamAsAttribute
-    private Long id;
+//    private Long id;
-    private String paramName;
+//    private String paramName;
-    private String paramValue;
+//    private String paramValue;
-
+//
-    public Prop(Long id, String paramName, String paramValue) {
+//    public Prop(Long id, String paramName, String paramValue) {
-        this.id = id;
+//        this.id = id;
-        this.paramName = paramName;
+//        this.paramName = paramName;
-        this.paramValue = paramValue;
+//        this.paramValue = paramValue;
-    }
+//    }
-}
+//}

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

@@ -1,33 +1,33 @@
-package cn.estsh.i3plus.pojo.model.softswitch;
+//package cn.estsh.i3plus.pojo.model.softswitch;
-
+//
-import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
+//import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
-import com.thoughtworks.xstream.annotations.XStreamAlias;
+//import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+//import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import lombok.Data;
+//import lombok.Data;
-
+//
-/**
+///**
- * @Description :
+// * @Description :
- * @Reference :
+// * @Reference :
- * @Author : wei.peng
+// * @Author : wei.peng
- * @CreateDate : 19-7-25 下午3:31
+// * @CreateDate : 19-7-25 下午3:31
- * @Modify:
+// * @Modify:
- **/
+// **/
-@Data
+//@Data
-@XStreamAlias("request")
+//@XStreamAlias("request")
-public class Request{
+//public class Request{
-
+//
-    @XStreamAsAttribute
+//    @XStreamAsAttribute
-    private Long id;
+//    private Long id;
-    @XStreamAsAttribute
+//    @XStreamAsAttribute
-    private Integer requestType;
+//    private Integer requestType;
-    private String requestPath;
+//    private String requestPath;
-
+//
-    @XStreamCDATA
+//    @XStreamCDATA
-    private String result;
+//    private String result;
-
+//
-    public Request(Long id, Integer requestType,String requestPath) {
+//    public Request(Long id, Integer requestType,String requestPath) {
-        this.id = id;
+//        this.id = id;
-        this.requestType = requestType;
+//        this.requestType = requestType;
-        this.requestPath = requestPath;
+//        this.requestPath = requestPath;
-    }
+//    }
-}
+//}

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

@@ -86,15 +86,19 @@ public class SuitCoreModel {
     private String suitResultMessage;
 
     /**
-     *
      * @param requestSource 请求来源
      * @param sslKey        适配认证对象
      * @param bsSuitCase    适配器信息
      */
-    public SuitCoreModel(Integer requestSource,BsSslKey sslKey, BsSuitCase bsSuitCase) {
+    public SuitCoreModel(Integer requestSource, BsSslKey sslKey, BsSuitCase bsSuitCase){
+        this(requestSource,sslKey,  bsSuitCase,null);
+    }
+
+    public SuitCoreModel(Integer requestSource,BsSslKey sslKey, BsSuitCase bsSuitCase,Object bsSuitCaseDetail) {
         this.sslKey = sslKey;
         this.bsSuitCase = bsSuitCase;
         this.requestSource = requestSource;
+        this.bsSuitCaseDetail = bsSuitCaseDetail;
 
         // 设置套件类型
         this.caseType = bsSuitCase.getCaseTypeId();

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

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.model.softswitch;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 19-9-5 下午7:30
+ * @Modify:
+ **/
+@Data
+@XStreamAlias("model")
+public class SuitServerModel {
+
+    // 执行方法命令
+    private String action;
+    // 执行类型固定类型(SoftSwitchEnumUtil.CASE_TYPE)
+    private Integer caseType;
+    /* 认证使用 以后使用 */
+    private String token;
+    // 传输单对象
+    private Object obj;
+    // 传输集合
+    private List list;
+    // 传输键值对
+    private Map<String,Object> map;
+    // 传输 JSON 数据
+    private String json;
+
+}

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

@@ -46,9 +46,9 @@ public class WmsMessageStyleModel implements Serializable {
         this.message = message;
         if (actQty == 0) {//未处理
             this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue();
-        } else if (actQty > 0) {
+        } else if (transQty > actQty) {//处理中
             this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue();
-        } else if (actQty == transQty) {
+        } else if (actQty == transQty) {//处理完成
             this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue();
         }
     }

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 Integer 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/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

@@ -49,14 +49,22 @@ public class BsSuitCase extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long suitTypeId;
 
-    @Column(name = "SUIT_TYPE_NAME")
+    @Column(name = "SUIT_TYPE_NAME_RDD")
     @ApiParam(value = "适配类型名称")
-    private String suitTypeName;
+    private String suitTypeNameRdd;
 
     @Column(name = "SUIT_CASE_CODE")
     @ApiParam(value = "适配器代码")
     private String suitCaseCode;
 
+    @Column(name = "SUIT_MODE_ID")
+    @ApiParam(value = "适配模式(枚举,主动，被动)")
+    private Integer suitModeId;
+
+    @Column(name = "SUIT_SERVER_ACTION_ID")
+    @ApiParam(value = "Server 适配命令")
+    private Integer suitServerActionId;
+
     @Column(name = "SUIT_CASE_HOST")
     @ApiParam(value = "适配主机")
     private String suitCaseHost;
@@ -103,7 +111,15 @@ public class BsSuitCase extends BaseBean {
     private Integer suitCaseStatus;
 
     @Transient
+    @ApiParam(value = "适配器套件明细")
+    private  Object bsSuitCaseDetail;
+
+    @Transient
     @ApiParam(value = "适配器参数")
-    List<BsSuitCaseParam> bsSuitCaseParamList;
+    private List<BsSuitCaseParam> bsSuitCaseParamList;
+
+    @Transient
+    @ApiParam(value = "参数转换")
+    private List<BsParamAdapter> bsParamAdapterList;
 }
 

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

@@ -12,6 +12,8 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description : 数据库套件
@@ -25,9 +27,9 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "BS_DATA_SOURCE_SUIT_CASE")
+@Table(name = "BS_SUIT_CASE_DATA_SOURCE")
 @Api(value = "数据库套件", description = "数据库套件")
-public class BsDataSourceSuitCase extends BaseBean {
+public class BsSuitCaseDataSource extends BaseBean {
 
     @Column(name = "SUIT_CASE_ID")
     @ApiParam(value = "套件id")
@@ -46,5 +48,12 @@ public class BsDataSourceSuitCase extends BaseBean {
     @ApiParam(value = "数据源名称")
     private String dataSourceNameRdd;
 
+    @Transient
+    @ApiParam(value = "数据源")
+    private BsDataSource bsDataSource;
+
+    @Transient
+    @ApiParam(value = "数据库操作")
+    private List<BsSuitCaseDataSourceTable> bsDataSourceSuitCaseTableList;
 }
 

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

@@ -25,34 +25,49 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "BS_DATA_SOURCE_SUIT_CASE_TABLE")
+@Table(name = "BS_SUIT_CASE_DATA_SOURCE_TABLE")
 @Api(value = "数据库表操作", description = "数据库表操作")
-public class BsDataSourceSuitCaseTable extends BaseBean {
+public class BsSuitCaseDataSourceTable extends BaseBean {
 
     @Column(name = "SUIT_CASE_ID")
     @ApiParam(value = "套件id")
     @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")
+    public int getOperateTypeIdVal(){
-    @ApiParam(value = "查询后操作sql")
+        if(operateTypeId == null){
-    private String afterQuerySql;
+            return -1;
+        }
+        return operateTypeId.intValue();
+    }
 
-    @Column(name = "INSERT_SQL")
+    @Column(name = "EXECUTE_SQL")
-    @ApiParam(value = "插入sql")
+    @ApiParam(value = "执行sql")
-    private String insertSql;
+    private String executeSql;
+
+    @Column(name = "OPERATE_SORT")
+    @ApiParam(value = "操作顺序")
+    private Integer operateSort;
+
+    @Column(name = "IS_RETURN")
+    @ApiParam(value = "是否有返回")
+    private Integer isReturn;
+
+    public int getIsReturnVal(){
+        if(isReturn == null){
+            return -1;
+        }
+        return isReturn.intValue();
+    }
 
-    @Column(name = "AFTER_INSERT_SQL")
-    @ApiParam(value = "插入后执行sql")
-    private String afterInsertSql;
 
 }
 

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

@@ -0,0 +1,46 @@
+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 :   WebService 适配套件
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 2019/9/9 上午11:09
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "BS_SUIT_CASE_WEB_SERVICE")
+@Api(value = "WebService", description = "WebService 适配套件")
+public class BsSuitCaseWebService extends BaseBean {
+
+    @Column(name = "SUIT_CASE_ID")
+    @ApiParam(value = "套件id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long suitCaseId;
+
+    @Column(name = "SERVICE_TAG_NAME")
+    @ApiParam(value = "Service Tag Name(包名称)")
+    private String serviceTagName;
+
+    @Column(name = "SERVICE_FUNCTION_NAME")
+    @ApiParam(value = "Service Function Name(方法名称)")
+    private String serviceFunctionName;
+
+}

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/repository/BsDataSourceSuitCaseRepository.java

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.softswitch.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSourceSuitCase;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSource;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  */
 @Repository
-public interface BsDataSourceSuitCaseRepository extends BaseRepository<BsDataSourceSuitCase,Long> {
+public interface BsDataSourceSuitCaseRepository extends BaseRepository<BsSuitCaseDataSource,Long> {
 
 }
 

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

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.softswitch.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSourceSuitCaseTable;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSourceTable;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  */
 @Repository
-public interface BsDataSourceSuitCaseTableRepository extends BaseRepository<BsDataSourceSuitCaseTable,Long> {
+public interface BsDataSourceSuitCaseTableRepository extends BaseRepository<BsSuitCaseDataSourceTable,Long> {
 
 }
 

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.softswitch.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 2019/9/9 上午11:41
+ * @Modify:
+ **/
+public interface BsSuitCaseWebServiceRepository extends BaseRepository<BsSuitCaseWebService,Long> {
+}

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 :
@@ -48,7 +47,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBsSuitCaseParam(BsSuitCaseParam bsSuitCaseParam){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getStringLikerPack(bsSuitCaseParam.getParamName(),"paramName",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getParamTypeId(), "paramTypeId", ddlPackBean);
@@ -66,7 +65,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlCheckBsSuitCaseParamOnly(BsSuitCaseParam bsSuitCaseParam){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumNOEqualPack(bsSuitCaseParam.getId(),"id",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getSuitCaseId(), "suitCaseId", ddlPackBean);
@@ -81,13 +80,13 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBsSuitCaseParam(BsSuitCase bsSuitCase){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
-//        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.getSuitTypeNameRdd(),"suitTypeNameRdd",ddlPackBean);
-//        DdlPreparedPack.getStringEqualPack(bsSuitCase.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSuitCase.getCaseTypeId(), "caseTypeId", ddlPackBean);
 
         ddlPackBean.setOrderByStr(bsSuitCase.orderBy());
 
@@ -100,7 +99,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlCheckBsSuitCaseOnly(BsSuitCase bsSuitCase){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumNOEqualPack(bsSuitCase.getId(),"id",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitCase.getSuitCaseCode(), "suitCaseCode", ddlPackBean);
@@ -114,7 +113,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBsParamAdapter(BsParamAdapter bsParamAdapter){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(),"suitCaseId",ddlPackBean);
         DdlPreparedPack.getStringEqualPack(bsParamAdapter.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
@@ -132,7 +131,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlCheckBsParamAdapterOnly(BsParamAdapter bsParamAdapter){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsParamAdapter.getId(), "id", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(), "suitCaseId", ddlPackBean);
@@ -148,10 +147,9 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBsSuitSchedule(BsSuitSchedule bsSuitSchedule){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         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);
@@ -167,7 +165,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlCheckBsSuitScheduleOnly(BsSuitSchedule bsSuitSchedule){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getId(),"id",ddlPackBean);
         DdlPreparedPack.getStringEqualPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean);
@@ -182,7 +180,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBsSslKey(BsSslKey bsSslKey){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(),"keyName",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSslKey.getKeyTypeId(),"keyTypeId",ddlPackBean);
@@ -198,7 +196,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlCheckBsSslKeyOnly(BsSslKey bsSslKey){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsSslKey.getId(),"id",ddlPackBean);
         DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(), "keyName", ddlPackBean);
@@ -212,7 +210,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBsSslKeyParam(BsSslKeyParam bsSslKeyParam){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsSslKeyParam.getSslKeyId(), "sslKeyId", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSslKeyParam.getParamName(), "paramName", ddlPackBean);
@@ -228,7 +226,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlCheckBsSslKeyParamOnly(BsSslKeyParam bsSslKeyParam){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsSslKeyParam.getSslKeyId(), "sslKeyId", ddlPackBean);
         DdlPreparedPack.getStringEqualPack(bsSslKeyParam.getParamName(), "paramName", ddlPackBean);
@@ -242,12 +240,12 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBsDataSource(BsDataSource bsDataSource){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         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());
 
@@ -260,7 +258,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlCheckBsDataSourceOnly(BsDataSource bsDataSource){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsDataSource.getId(), "id", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean);
@@ -268,4 +266,14 @@ public class SoftSwitchHqlPack {
         return ddlPackBean;
     }
 
+    /**
+     * WebService 唯一校验
+     * @param webService
+     * @return
+     */
+    public static DdlPackBean packHqlCheckWebService(BsSuitCaseWebService webService){
+        DdlPackBean result = DdlPackBean.getDdlPackBean();
+
+        return result;
+    }
 }

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

@@ -77,6 +77,14 @@ public class BasVendor extends BaseBean{
     @ApiParam("手机")
     private String vendorPhone;
 
+    @Column(name = "KILOBIT")
+    @ApiParam("千位符号")
+    private String kilobit;
+
+    @Column(name = "DECIMALS")
+    @ApiParam("小数位符号")
+    private String decimals;
+
     public BasVendor() {
     }
 

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

@@ -122,4 +122,74 @@ public class WmsASNMaster extends BaseBean {
     @Transient
     @ApiParam("手机")
     private String vendorPhone;
+
+    @Transient
+    @ApiParam("物料代码")
+    private String partNo;
+
+    @Transient
+    @ApiParam("物料名称")
+    private String partNoNameRdd;
+
+    @Transient
+    @ApiParam("收货数量")
+    private Double sumRecQty;
+
+    @Transient
+    @ApiParam("需求数量")
+    private Double sumQty;
+
+    @Transient
+    @ApiParam("计划日期")
+    private String planDate;
+
+    @Transient
+    @ApiParam("计划日期开始")
+    private String planDateStart;
+
+    @Transient
+    @ApiParam("计划日期结束")
+    private String planDateEnd;
+
+    @Transient
+    @ApiParam("计划时间")
+    private String planTime;
+
+    @Transient
+    @ApiParam("差异数量")
+    private Double diffQty;
+
+    @Transient
+    @ApiParam("单据类型") // PO/ASN
+    private String orderType;
+
+    @Transient
+    @ApiParam("收货状态")
+    private String recStatus;
+
+    @Transient
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
+    public  WmsASNMaster(){}
+
+    public  WmsASNMaster(String orderNo,Integer asnStatus,String vendorNo,String partNo,String partNoNameRdd,
+                                       Double sumQty,Double sumRecQty,String planDate,String planTime,Double diffQty,String orderType,
+                                       String recStatus){
+
+        this.orderNo = orderNo;
+        this.asnStatus = asnStatus;
+        this.vendorNo = vendorNo;
+        this.partNo = partNo;
+        this.partNoNameRdd = partNoNameRdd;
+        this.sumQty = sumQty;
+        this.sumRecQty = sumRecQty;
+        this.planDate = planDate;
+        this.planTime = planTime;
+        this.diffQty = diffQty;
+        this.orderType = orderType;
+        this.recStatus = recStatus;
+    }
+
+
 }

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/WmsCSFactTrans.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;
@@ -78,6 +80,7 @@ public class WmsCSFactTrans 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")
@@ -112,6 +115,10 @@ public class WmsCSFactTrans extends BaseBean {
     @ApiParam(value = "物料数量", example = "1")
     public Double sumPartQty;
 
+    @Transient
+    @ApiParam("存储区编号组")
+    public String[] zoneNos;
+
     public WmsCSFactTrans(){}
 
     public Integer getIsScopeVal() {

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.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;
@@ -78,6 +80,7 @@ public class WmsCSOrderDetails extends BaseBean {
      */
     @Column(name = "QC_STATUS")
     @ApiParam(value = "质检状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description")
     public Integer qcStatus;
 
     /**
@@ -87,6 +90,7 @@ public class WmsCSOrderDetails extends BaseBean {
      */
     @Column(name = "SN_STATUS")
     @ApiParam(value = "条码状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
     public Integer snStatus;
 
     /**
@@ -94,6 +98,7 @@ public class WmsCSOrderDetails extends BaseBean {
      */
     @Column(name = "TRANS_STATUS")
     @ApiParam(value = "处理状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.CS_TRANS_STATUS.class,refForeignKey = "value",value = "description")
     public Integer transStatus;
 
     @Transient
@@ -116,11 +121,16 @@ public class WmsCSOrderDetails extends BaseBean {
     @ApiParam("源单位")
     public String srcUnit;
 
+    @Transient
+    @ApiParam("存储区编号")
+    public String[] zoneNos;
+
     /**
      * 差异类型：10：盘平，20：盘亏，30盘赢
      */
     @Transient
     @ApiParam("差异类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class,refForeignKey = "value",value = "description")
     public Integer differenceType;
 
     public Double getQty() {

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.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;
@@ -41,10 +43,12 @@ public class WmsCSOrderMaster extends BaseBean {
      */
     @Column(name = "ORDER_TYPE")
     @ApiParam(value = "单据类型", example = "10")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ORDER_TYPE.class,refForeignKey = "value",value = "description")
     public Integer orderType;
 
     @Column(name = "ORDER_STATUS")
     @ApiParam(value = "状态 (10-创建 20-开启盘点  30-盘点中  40-盘点完成  50-已解冻 60-已关闭)", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ORDER_STATUS.class,refForeignKey = "value",value = "description")
     public Integer orderStatus;
 
     @Column(name = "ACTION_PERSENT")
@@ -57,14 +61,17 @@ public class WmsCSOrderMaster extends BaseBean {
 
     @Column(name = "IS_INVENTORY")
     @ApiParam(value = "是否允许清点", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
     public Integer isInventory;
 
     @Column(name = "IS_TASK")
     @ApiParam(value = "是否生产任务", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description")
     public Integer isTask;
 
     @Column(name = "IS_PART")
     @ApiParam(value = "是否散件")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
     public Integer isPart;
 
     @Column(name = "YEAR")
@@ -73,6 +80,7 @@ public class WmsCSOrderMaster extends BaseBean {
 
     @Column(name = "IS_SYNC_ERP")
     @ApiParam("是否同步ERP: 1=已同步，2=未同步")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_ERP_SYNC_FLAG.class,refForeignKey = "value",value = "description")
     public Integer isSyncErp;
 
     @Transient

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 盘点范围信息
@@ -57,6 +58,10 @@ public class WmsCSRange extends BaseBean {
     @ApiParam("单位")
     public String unit;
 
+    @Transient
+    @ApiParam("存储区编号")
+    public String[] zoneNos;
+
     public WmsCSRange(){}
 
     public WmsCSRange(String zoneNo,String partNo,String partNameRdd){

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.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;
@@ -102,6 +104,7 @@ public class WmsDocMovementDetails extends BaseBean {
      */
     @Column(name = "ITEM_STATUS")
     @ApiParam(value = "状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description")
     private Integer itemStatus;
 
     /**
@@ -109,6 +112,7 @@ public class WmsDocMovementDetails extends BaseBean {
      */
     @Column(name = "IS_FREE")
     @ApiParam(value = "是否免费", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
     public Integer isFree;
 
     @Column(name = "REMARK")
@@ -185,10 +189,12 @@ public class WmsDocMovementDetails extends BaseBean {
 
     @Transient
     @ApiParam("任务状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description")
     private Integer isTask;
 
     @Transient
     @ApiParam("主表单据状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description")
     private Integer orderMasterStatus;
 
     public String getRecommondLot() {
@@ -218,6 +224,7 @@ public class WmsDocMovementDetails extends BaseBean {
 
     @Transient
     @ApiParam("业务类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
     public Integer busiType;
 
     @Column(name = "IS_SN")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.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;
@@ -43,6 +45,7 @@ public class WmsDocMovementMaster extends BaseBean {
      */
     @Column(name = "MOVE_TYPE")
     @ApiParam("移动类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_MOVE_TYPE.class,refForeignKey = "value",value = "description")
     public Integer moveType;
     /**
      * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发,
@@ -51,6 +54,7 @@ public class WmsDocMovementMaster extends BaseBean {
      */
     @Column(name = "BUSI_TYPE")
     @ApiParam("业务类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
     public Integer busiType;
 
     /**
@@ -59,6 +63,7 @@ public class WmsDocMovementMaster extends BaseBean {
      */
     @Column(name = "ORDER_STATUS")
     @ApiParam(value = "状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description")
     public Integer orderStatus;
 
     @Column(name = "CUST_NO")
@@ -90,6 +95,7 @@ public class WmsDocMovementMaster extends BaseBean {
 
     @Column(name = "IS_TASK")
     @ApiParam(value = "是否生产任务", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description")
     public Integer isTask;
 
     @Column(name = "PRIORITY")
@@ -117,6 +123,7 @@ public class WmsDocMovementMaster extends BaseBean {
 
     @Column(name = "IS_PART")
     @ApiParam(value = "是否散件", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
     private Integer isPart;
 
     @Column(name = "SRC_WH_NO")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.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;
@@ -65,6 +67,7 @@ public class WmsDocMovementSn extends BaseBean {
      */
     @Column(name="SN_STATUS")
     @ApiParam(value = "操作状态", example = "10")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
     public Integer snStatus;
 
     @Column(name="SN")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.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;
@@ -104,6 +106,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")
@@ -147,8 +150,43 @@ public class WmsMoveDetails extends BaseBean {
 
     @Transient
     @ApiParam("业务类型编码")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
     private Integer busiTypeCode;
 
+    @Transient
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @Transient
+    @ApiParam("父物料编码")
+    private String fpartNo;
+
+    @Transient
+    @ApiParam("父物料名称")
+    private String fpartName;
+
+    @Transient
+    @ApiParam("数量")
+    private Double qty;
+
+    @Transient
+    @ApiParam("创建时间")
+    private String createDateTime;
+
+    @Version
+    @Column(name = "LOCK_VERSION")
+    @ApiParam(value = "乐观锁", example = "1")
+    public  Integer lockVersion;
+   /* @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){
@@ -174,11 +212,27 @@ public class WmsMoveDetails extends BaseBean {
         return finishedCounts == null ? 0L : this.finishedCounts;
     }
 
+    public WmsMoveDetails (String organizeCode,String partNo,String partNameRdd,String workCenterCode,String fPartNo,String fPartName,String unit,Double qty,
+                            String createDateTime,String sn,String srcZoneNo){
+        this.organizeCode = organizeCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.workCenterCode = workCenterCode;
+        this.fpartNo = fPartNo;
+        this.fpartName = fPartName;
+        this.unit = unit;
+        this.qty = qty;
+        this.createDateTime = createDateTime;
+        this.sn = sn;
+        this.srcZoneNo = srcZoneNo;
+
+    }
+
     public WmsMoveDetails(String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,String transTypeCode
             ,String transTypeName,Integer itemStatus,String unit,String srcWhNo,String destWhNo,
                           String srcZoneNo,String destZoneNo,String srcLocateNo, String destLocateNo,
                           Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo,Integer busiTypeCode,
-                          String createUser,String createDatetime){
+                          String createUser,String createDatetime,String modifyUser,String modifyDatetime){
         this.organizeCode = organizeCode;
         this.partNo = partNo;
         this.orderNo = orderNo;
@@ -202,5 +256,7 @@ public class WmsMoveDetails extends BaseBean {
         this.busiTypeCode = busiTypeCode;
         this.createUser = createUser;
         this.createDatetime = createDatetime;
+        this.modifyDatetime =modifyDatetime;
+        this.modifyUser =modifyUser;
     }
 }

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
@@ -139,10 +144,39 @@ public class WmsMoveMaster extends BaseBean {
     @ApiParam(value = "设备编号")
     public String fixId;
 
+    @Version
+    @Column(name = "LOCK_VERSION")
+    @ApiParam(value = "乐观锁", example = "1")
+    public  Integer lockVersion;
+
     public WmsMoveMaster(){};
 
+    public WmsMoveMaster(String orderNo, Integer orderStatus,  String transTypeCode, String errorMessage,
+                         Integer isUrgent,String carNo, Integer busiTypeCode, String refOrderNo, String refSrc,String partNo, Integer itemStatus,String remark,
+                         String organizeCode,String createDatetime,String createUser,String modifyDatetime,String modifyUser,String fixId) {
+        this.orderNo = orderNo;
+        this.orderStatus = orderStatus;
+        this.remark = remark;
+        this.isUrgent=isUrgent;
+        this.transTypeCode = transTypeCode;
+        this.errorMessage = errorMessage;
+        this.busiTypeCode = busiTypeCode;
+        this.partNo = partNo;
+        this.itemStatus = itemStatus;
+        this.refOrderNo = refOrderNo;
+        this.carNo = carNo;
+        this.refSrc = refSrc;
+        this.organizeCode =organizeCode;
+        this.createDatetime= createDatetime;
+        this.createUser = createUser;
+        this.modifyDatetime =modifyDatetime;
+        this.modifyUser =modifyUser;
+        this.fixId = fixId;
+    }
+
     public WmsMoveMaster(Long id,String orderNo,String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus,
-                         String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId,Integer busiTypeCode,String refSrc) {
+                         String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId,Integer busiTypeCode,String refSrc,
+                        String createDatetime,String createUser,String modifyUser,String modifyDatetime) {
         this.id = id;
         this.orderNo = orderNo;
         this.organizeCode = organizeCode;
@@ -161,5 +195,9 @@ public class WmsMoveMaster extends BaseBean {
         this.fixId = fixId;
         this.busiTypeCode = busiTypeCode;
         this.refSrc = refSrc;
+        this.createDatetime= createDatetime;
+        this.createUser = createUser;
+        this.modifyUser =modifyUser;
+        this.modifyDatetime =modifyDatetime;
     }
 }

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;
@@ -23,7 +25,7 @@ import javax.persistence.*;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_MOVE_SN", indexes = {
+@Table(name = "WMS_MOVE_SN", indexes = {
         @Index(columnList = "PART_NO"),
         @Index(columnList = "ORDER_NO"),
         @Index(columnList = "SN"),
@@ -33,79 +35,80 @@ import javax.persistence.*;
 public class WmsMoveSn extends BaseBean {
 
     private static final long serialVersionUID = 1490715681910614399L;
-    @Column(name="ORDER_NO")
+    @Column(name = "ORDER_NO")
     @ApiParam("单号")
     public String orderNo;
 
-    @Column(name="ITEM")
+    @Column(name = "ITEM")
     @ApiParam("行号")
     public Integer item;
 
-    @Column(name="PART_NO")
+    @Column(name = "PART_NO")
     @ApiParam("物料编码")
     public String partNo;
 
-    @Column(name="PART_NAME_RDD")
+    @Column(name = "PART_NAME_RDD")
     @ApiParam("物料名称")
     public String partNameRdd;
 
-    @Column(name="UNIT")
+    @Column(name = "UNIT")
     @ApiParam(value = "单位")
     public String unit;
 
-    @Column(name="SN")
+    @Column(name = "SN")
     @ApiParam("条码")
     public String sn;
 
-    @Column(name="CSN")
+    @Column(name = "CSN")
     @ApiParam("客户条码")
     public String csn;
 
     /**
      * 状态:1=创建,10=待处理,20=已处理
      */
-    @Column(name="ITEM_STATUS")
+    @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")
+    @Column(name = "REMARK")
     @ApiParam("备注")
     public String remark;
 
-    @Column(name="LOT_NO")
+    @Column(name = "LOT_NO")
     @ApiParam("批次编号")
     public String lotNo;
 
-    @Column(name="PACKAGE_NO")
+    @Column(name = "PACKAGE_NO")
     @ApiParam("容器编号")
     public String packAgeNo;
 
-    @Column(name="SRC_QTY")
+    @Column(name = "SRC_QTY")
     @ColumnDefault("0")
     @ApiParam(value = "源数量", example = "0")
     public Double srcQty;
 
-    @Column(name="SRC_WH_NO")
+    @Column(name = "SRC_WH_NO")
     @ApiParam("源仓库代码")
     public String srcWhNo;
 
-    @Column(name="SRC_ZONE_NO")
+    @Column(name = "SRC_ZONE_NO")
     @ApiParam("源存储区代码")
     public String srcZoneNo;
 
-    @Column(name="SRC_LOCATE_NO")
+    @Column(name = "SRC_LOCATE_NO")
     @ApiParam("源库位代码")
     public String srcLocateNo;
 
-    @Column(name="DEST_WH_NO")
+    @Column(name = "DEST_WH_NO")
     @ApiParam("目标仓库代码")
     public String destWhNo;
 
-    @Column(name="DEST_ZONE_NO")
+    @Column(name = "DEST_ZONE_NO")
     @ApiParam("目标存储区代码")
     public String destZoneNo;
 
-    @Column(name="DEST_LOCATE_NO")
+    @Column(name = "DEST_LOCATE_NO")
     @ApiParam("目标库位代码")
     public String destLocateNo;
 
@@ -117,49 +120,53 @@ public class WmsMoveSn extends BaseBean {
     @Transient
     private Long finishedCounts;
 
-    @Column(name="DEST_QTY")
+    @Column(name = "DEST_QTY")
     @ColumnDefault("0")
     @ApiParam(value = "目标数量", example = "0")
     public Double destQty;
 
-    @Column(name="QTY")
+    @Column(name = "QTY")
     @ColumnDefault("0")
     @ApiParam(value = "数量", example = "0")
     public Double qty;
 
-    @Column(name="SRC_QC_STATUS")
+    @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")
+    @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")
+    @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")
+    @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")
+    @Column(name = "DATE_CODE")
     @ApiParam("生产日期")
     public String dateCode;
 
-    @Column(name="FIX_LOT_NO")
+    @Column(name = "FIX_LOT_NO")
     @ApiParam("特殊批次")
     public String fixLotNo;
 
-    @Column(name="VENDOR_NO")
+    @Column(name = "VENDOR_NO")
     @ApiParam("供应商编号")
     private String vendorNo;
 
     @Transient
     @ApiParam("业务类型编码")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
     private Integer busiTypeCode;
 
-
     @Transient
     @ApiParam(value = "交易类型代码")
     private String transTypeCode;
@@ -176,9 +183,15 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam("交易类型名称")
     private String transTypeName;
 
-    public WmsMoveSn(){}
+    @Version
+    @Column(name = "LOCK_VERSION")
+    @ApiParam(value = "乐观锁", example = "1")
+    public  Integer lockVersion;
+
+    public WmsMoveSn() {
+    }
 
-    public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){
+    public WmsMoveSn(String partNo, Long finishedCounts, Long waitingCounts) {
         this.partNo = partNo;
         this.waitingCounts = waitingCounts;
         this.finishedCounts = finishedCounts;
@@ -192,7 +205,7 @@ public class WmsMoveSn extends BaseBean {
         return finishedCounts == null ? 0L : this.finishedCounts;
     }
 
-    public WmsMoveSn(String partNo, String partNameRdd, Double destQty,Integer busiTypeCode,  String transTypeCode, String refSrc) {
+    public WmsMoveSn(String partNo, String partNameRdd, Double destQty, Integer busiTypeCode, String transTypeCode, String refSrc) {
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
         this.destQty = destQty;
@@ -200,43 +213,47 @@ public class WmsMoveSn extends BaseBean {
         this.transTypeCode = transTypeCode;
         this.refSrc = refSrc;
     }
-    public WmsMoveSn(String partNo, String partNameRdd, Double destQty,String transTypeCode, String refSrc) {
+
+    public WmsMoveSn(String partNo, String partNameRdd, Double destQty, String transTypeCode, String refSrc) {
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
         this.destQty = destQty;
         this.transTypeCode = transTypeCode;
         this.refSrc = refSrc;
     }
-    public  WmsMoveSn( String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,
+
-            String transTypeCode,String transTypeName,Integer itemStatus,String unit, String srcLocateNo,String destLocateNo,Double srcQty,Double destQty,Integer srcQcStatus,Integer descQcStatus,Integer srcSnStatus,
+    public WmsMoveSn(String organizeCode, String orderNo, Integer item, String partNo, String partNameRdd,
-            Integer destSnStatus, String lotNo,String dateCode,String refSrc,String destZoneNo,String destWhNo,Integer busiTypeCode,String sn,
+                     String transTypeCode, String transTypeName, Integer itemStatus, String unit, String srcLocateNo, String destLocateNo, Double srcQty, Double destQty, Integer srcQcStatus, Integer descQcStatus, Integer srcSnStatus,
-            String createUser,String createDatetime){
+                     Integer destSnStatus, String lotNo, String dateCode, String refSrc, String destZoneNo, String destWhNo, Integer busiTypeCode, String sn,
-            this.organizeCode=organizeCode;
+                     String createUser, String createDatetime, String modifyDatetime, String modifyUser) {
-            this.orderNo=orderNo;
+        this.organizeCode = organizeCode;
-            this.item=item;
+        this.orderNo = orderNo;
-            this.partNo=partNo;
+        this.item = item;
-            this.partNameRdd=partNameRdd;
+        this.partNo = partNo;
-            this.transTypeCode=transTypeCode;
+        this.partNameRdd = partNameRdd;
-            this.transTypeName=transTypeName;
+        this.transTypeCode = transTypeCode;
-            this.itemStatus=itemStatus;
+        this.transTypeName = transTypeName;
-            this.unit=unit;
+        this.itemStatus = itemStatus;
-            this.srcLocateNo=srcLocateNo;
+        this.unit = unit;
-            this.destLocateNo=destLocateNo;
+        this.srcLocateNo = srcLocateNo;
-            this.srcQty=srcQty;
+        this.destLocateNo = destLocateNo;
-            this.srcQty=srcQty;
+        this.srcQty = srcQty;
-            this.destQty=destQty;
+        this.srcQty = srcQty;
-            this.srcQcStatus=srcQcStatus;
+        this.destQty = destQty;
-            this.descQcStatus=descQcStatus;
+        this.srcQcStatus = srcQcStatus;
-            this.srcSnStatus=srcSnStatus;
+        this.descQcStatus = descQcStatus;
-            this.destSnStatus=destSnStatus;
+        this.srcSnStatus = srcSnStatus;
-            this.lotNo=lotNo;
+        this.destSnStatus = destSnStatus;
-            this.dateCode=dateCode;
+        this.lotNo = lotNo;
+        this.dateCode = dateCode;
         this.refSrc = refSrc;
         this.destZoneNo = destZoneNo;
-            this.destWhNo =destWhNo;
+        this.destWhNo = destWhNo;
         this.busiTypeCode = busiTypeCode;
         this.sn = sn;
         this.createUser = createUser;
         this.createDatetime = createDatetime;
-}
+        this.modifyDatetime = modifyDatetime;
+        this.modifyUser = modifyUser;
+    }
 }

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

@@ -156,7 +156,22 @@ public class WmsPOMasterDetails extends BaseBean {
     @ApiParam("差异")
     private Double difference;
 
+    @Transient
+    @ApiParam("集装箱号")
+    private String containerNo;
+
     public Double getSnpVal() {
         return snp;
     }
+
+    public WmsPOMasterDetails(){}
+
+    public WmsPOMasterDetails(String orderNo,String containerNo,String partNo,Integer item,String organizeCode,String erpAreaNo){
+        this.orderNo = orderNo;
+        this.containerNo = containerNo;
+        this.partNo = partNo;
+        this.item = item;
+        this.organizeCode = organizeCode;
+        this.erpAreaNo = erpAreaNo;
+    }
 }

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/bean/WmsQCMaster.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 WmsQCMaster extends BaseBean {
      */
     @Column(name = "ORDER_TYPE")
     @ApiParam(value = "业务类型", example = "0")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.QC_INFO_TYPE.class,refForeignKey = "value",value = "description")
     public Integer orderType;
 
     /**
@@ -47,6 +50,7 @@ public class WmsQCMaster extends BaseBean {
      */
     @Column(name = "ORDER_STATUS")
     @ApiParam(value = "状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description")
     public Integer orderStatus;
 
     @Column(name = "REMARK")
@@ -83,9 +87,11 @@ public class WmsQCMaster extends BaseBean {
 
     @Column(name = "IS_TASK")
     @ApiParam(value = "是否生产任务", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description")
     public Integer isTask;
 
     @Column(name="IS_PART")
     @ApiParam(value = "是否散件", example = "2")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
     public Integer isPart;
 }

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

@@ -13,6 +13,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description : 产品发运信息
@@ -26,94 +27,99 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_DOC_SHIPPING")
+@Table(name = "WMS_DOC_SHIPPING")
 @Api("产品发运信息")
 public class WmsShipping extends BaseBean {
 
     private static final long serialVersionUID = 5760351204320621363L;
-    @Column(name="ORDER_NO")
+    @Column(name = "ORDER_NO")
     @ApiParam("发运单号")
     public String orderNo;
 
-    @Column(name="PART_NO")
+    @Column(name = "PART_NO")
     @ApiParam("物料编码")
     public String partNo;
 
-    @Column(name="PART_NAME_RDD")
+    @Column(name = "PART_NAME_RDD")
     @ApiParam("物料名称")
     public String partNameRdd;
 
-    @Column(name="QTY")
+    @Column(name = "QTY")
     @ColumnDefault("0")
     @ApiParam(value = "需求数量", example = "0")
     public Double qty;
 
-    @Column(name="UNIT")
+    @Column(name = "UNIT")
     @ApiParam("单位")
     public String unit;
 
-    @Column(name="SN")
+    @Column(name = "SN")
     @ApiParam("条码")
     public String sn;
 
     /**
      * 状态:10=新建,20=已处理,30=处理出错
      */
-    @Column(name="ORDER_STATUS")
+    @Column(name = "ORDER_STATUS")
     @ApiParam(value = "状态", example = "10")
     public Integer orderStatus;
 
-    @Column(name="REMARK")
+    @Transient
+    @ApiParam(value = "状态")
+    public List<Integer> orderStatusList;
+
+    @Column(name = "REMARK")
     @ApiParam("备注")
     public String remark;
 
-    @Column(name="SRC")
+    @Column(name = "SRC")
     @ApiParam("单据来源")
     public String src;
 
-    @Column(name="CUST_NO")
+    @Column(name = "CUST_NO")
     @ApiParam("客户编码")
     public String custNo;
 
-    @Column(name="SHIPPING_FLAG")
+    @Column(name = "SHIPPING_FLAG")
     @ApiParam("特殊发货标志")
     public String shippingFlag;
 
-    @Column(name="SHIPPING_TIME")
+    @Column(name = "SHIPPING_TIME")
     @ApiParam("发运时间")
     public String shippingTime;
 
     @Transient
-    @ApiParam(value ="客户简称")
+    @ApiParam(value = "客户简称")
     private String custName;
 
     @Transient
     @ApiParam(value = "发往地简称")
     private String flagName;
 
-    @Column(name="AREA_NO")
+    @Column(name = "AREA_NO")
     @ApiParam("ERP库存地")
     public String areaNo;
 
-    @Column(name="CAR_NO")
+    @Column(name = "CAR_NO")
     @ApiParam("车号")
     public String carNo;
 
-    @Column(name="ERROR_MESSAGE")
+    @Column(name = "ERROR_MESSAGE")
     @ApiParam("错误信息")
     public String errorMessage;
 
-    @Column(name="IS_LOCK")
+    @Column(name = "IS_LOCK")
-    @ApiParam("是否锁定 是否锁定：1=锁定 2=未锁定" )
+    @ApiParam("是否锁定 是否锁定：1=锁定 2=未锁定")
     public Integer isLock;
 
-    @Column(name="ERP_SYNC_FLAG")
+    @Column(name = "ERP_SYNC_FLAG")
-    @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败" )
+    @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败")
     public Integer erpSyncFlag;
 
-    public WmsShipping(){}
+    public WmsShipping() {
+    }
 
-    public WmsShipping(Long id,Double qty, String carNo, String partNo, String partNameRdd, String custNo, String unit,String areaNo) {
+    public WmsShipping(Long id, Double qty, String carNo, String partNo, String partNameRdd, String custNo, String unit, String areaNo) {
         this.id = id;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.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;
@@ -116,18 +118,21 @@ public class WmsStockSn extends BaseBean {
      */
     @Column(name = "QC_STATUS")
     @ApiParam(value = "质检状态", example = "0")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description")
     private Integer qcStatus;
     /**
      * 条码状态：1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途
      */
     @Column(name = "SN_STATUS")
     @ApiParam(value = "条码状态", example = "0")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
     private Integer snStatus;
     /**
      * 1:已打印；2：未打印
      */
     @Column(name = "PRINTED")
     @ApiParam(value = "是否打印", example = "0")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
     private Integer printed;
 
     @Column(name = "PDATE")
@@ -155,6 +160,7 @@ public class WmsStockSn extends BaseBean {
 
     @Column(name = "SN_TYPE")
     @ApiParam(value = "条码类型", example = "10")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class,refForeignKey = "value",value = "description")
     private Integer snType = 10;
 
     @ApiParam(value = "仓库名称")

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

@@ -95,6 +95,11 @@ public class WmsZones extends BaseBean {
         this.zoneNo = zoneNo;
     }
 
+    public WmsZones(String zoneNo,String areaNo){
+        this.zoneNo = zoneNo;
+        this.areaNo = areaNo;
+    }
+
     public WmsZones(){}
 
 }

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

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.wms.bean.iotio;
+
+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-09 11:14
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="SWEB_PROCUREMENT_PLAN_ORDER")
+@Api("开口合同主表")
+public class SwebProcurementPlanOrder extends BaseBean {
+
+    private static final long serialVersionUID = -4332932784803175933L;
+    @Column(name = "ORDER_NO")
+    @ApiParam(value = "合同号")
+    private String orderNo;
+
+    @Column(name = "VENDOR_CODE")
+    @ApiParam(value = "物料名称")
+    private String vendorCode;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam(value = "物料名称")
+    private String vendorName;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料名称")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam(value = "物料名称")
+    private String partName;
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SwebProcurementPlanOrderRepository.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.iotio.SwebProcurementPlanOrder;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-09-09 14:49
+ * @Modify:
+ **/
+@Repository
+public interface SwebProcurementPlanOrderRepository extends BaseRepository<SwebProcurementPlanOrder, Long> {
+}

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

@@ -45,19 +45,18 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
 
         DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", hqlStr);
-        if(StringUtils.isNotBlank(bean.getCreateDateTimeStart())&&StringUtils.isNotBlank(bean.getCreateDateTimeEnd())){
+        if (StringUtils.isNotBlank(bean.getCreateDateTimeStart()) && StringUtils.isNotBlank(bean.getCreateDateTimeEnd())) {
-            DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd(),"createDatetime",hqlStr,true);
+            DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true);
         }
 
         return hqlStr;
     }
 
     /**
-     *
      * @param wmsFix
      * @return
      */
-    public static DdlPackBean packHqlWmsFix(WmsFix wmsFix){
+    public static DdlPackBean packHqlWmsFix(WmsFix wmsFix) {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
@@ -77,9 +76,10 @@ public class WmsHqlPack {
 
     /**
      * 单位换算 分页查询
+     *
      * @return
      */
-    public static DdlPackBean packHqlWmsUnitConvertByPager(WmsUnitConvert wmsUnitConvert){
+    public static DdlPackBean packHqlWmsUnitConvertByPager(WmsUnitConvert wmsUnitConvert) {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
@@ -175,11 +175,12 @@ public class WmsHqlPack {
 
     /**
      * 移库单号集合查询条件封装
+     *
      * @param orderNoList
      * @param organizeCode
      * @return
      */
-    public static DdlPackBean packWmsDocMovementMasterByOrderNos(List<String> orderNoList,String organizeCode) {
+    public static DdlPackBean packWmsDocMovementMasterByOrderNos(List<String> orderNoList, String organizeCode) {
         DdlPackBean packBean = new DdlPackBean();
         DdlPreparedPack.getInPack(orderNoList, "orderNo", packBean);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
@@ -616,6 +617,8 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsShipping.getSn(), "sn", result);
         //发运状态
         DdlPreparedPack.getNumEqualPack(wmsShipping.getOrderStatus(), "orderStatus", result);
+        //发运状态集合
+        DdlPreparedPack.getInPackList(wmsShipping.getOrderStatusList(), "orderStatus", result);
         //特殊发货标志
         DdlPreparedPack.getStringEqualPack(wmsShipping.getShippingFlag(), "shippingFlag", result);
         //单据来源
@@ -1305,6 +1308,10 @@ public class WmsHqlPack {
 
         //查询参数封装
         DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getLocateNo(), "locateNo", result);
+        DdlPreparedPack.getInPackArray(wmsCSOrderDetails.getZoneNos(), "zoneNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getSn(), "sn", result);
 
         getStringBuilderPack(wmsCSOrderDetails, result);
 
@@ -1323,6 +1330,9 @@ public class WmsHqlPack {
         //查询参数封装
         DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getLocateNo(), "locateNo", result);
+        DdlPreparedPack.getInPackArray(wmsCSFactTrans.getZoneNos(), "zoneNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getSn(), "sn", result);
 
         getStringBuilderPack(wmsCSFactTrans, result);
 
@@ -2063,11 +2073,11 @@ public class WmsHqlPack {
 
         DdlPreparedPack.getStringEqualPack(wmsCSRange.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSRange.getPartNo(), "partNo", result);
-        DdlPreparedPack.getNumEqualPack(wmsCSRange.getLocateNo(), "locateNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsCSRange.getLocateNo(), "locateNo", result);
-        DdlPreparedPack.getStringLikerPack(wmsCSRange.getZoneNo(), "zoneNo", result);
+        DdlPreparedPack.getInPackArray(wmsCSRange.getZoneNos(), "zoneNo", result);
 
         DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{
-                DdlPreparedPack.getOrderColConvertType("item",CommonEnumUtil.BASIS_TYPE.INT.getValue())}, result);
+                DdlPreparedPack.getOrderColConvertType("item", CommonEnumUtil.BASIS_TYPE.INT.getValue())}, result);
         getStringBuilderPack(wmsCSRange, result);
 
         return result;
@@ -2240,19 +2250,19 @@ public class WmsHqlPack {
 
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result);
         // 库位不为空
-        DdlPreparedPack.getStringNotNullPack( "locateNo", result);
+        DdlPreparedPack.getStringNotNullPack("locateNo", result);
-        DdlPreparedPack.getStringNoEqualPack("","locateNo", result);
+        DdlPreparedPack.getStringNoEqualPack("", "locateNo", result);
         // 排除创建及出库状态条码
-        if(wmsStockSn.getSnStatus() != null){
+        if (wmsStockSn.getSnStatus() != null) {
             DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
         }
-        DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue(),"snStatus",result);
+        DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue(), "snStatus", result);
-        DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.OUT_STOCK.getValue(),"snStatus",result);
+        DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.OUT_STOCK.getValue(), "snStatus", result);
 
-        DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(),"snType",result);
+        DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result);
 
         //数量大于0
-        DdlPreparedPack.getNumberBiggerPack(0,"qty",result);
+        DdlPreparedPack.getNumberBiggerPack(0, "qty", result);
         DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
@@ -2272,7 +2282,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);
@@ -2282,13 +2292,13 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(actionLog.getIsValid(), "isValid", packBean);
         DdlPreparedPack.getNumEqualPack(actionLog.getIsDeleted(), "isDeleted", packBean);
 
-        if((actionLog.getStartTimeStart() != null&&actionLog.getStartTimeStart() !="")
+        if ((actionLog.getStartTimeStart() != null && actionLog.getStartTimeStart() != "")
-                || (actionLog.getStartTimeEnd() != null&&actionLog.getStartTimeEnd() != "")){
+                || (actionLog.getStartTimeEnd() != null && actionLog.getStartTimeEnd() != "")) {
             DdlPreparedPack.timeBuilder(actionLog.getStartTimeStart(), actionLog.getStartTimeEnd(), "startTime", packBean, true);
         }
 
-        if((actionLog.getEndTimeStart() != null&&actionLog.getEndTimeStart() != "")
+        if ((actionLog.getEndTimeStart() != null && actionLog.getEndTimeStart() != "")
-                || (actionLog.getEndTimeEnd() != null&&actionLog.getEndTimeEnd() != "")){
+                || (actionLog.getEndTimeEnd() != null && actionLog.getEndTimeEnd() != "")) {
             DdlPreparedPack.timeBuilder(actionLog.getEndTimeStart(), actionLog.getEndTimeEnd(), "endTime", packBean, true);
         }
 
@@ -2332,9 +2342,10 @@ public class WmsHqlPack {
 
     /**
      * 单位换算 分页查询
+     *
      * @return
      */
-    public static DdlPackBean packHqlWmsStockInitializeByPager(WmsStockInitialize wmsStockInitialize){
+    public static DdlPackBean packHqlWmsStockInitializeByPager(WmsStockInitialize wmsStockInitialize) {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装