添加MES_检验单和MES_检验单明细的实体和枚举

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.base.annotation;
 
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 
 import java.lang.annotation.*;
 
@@ -12,7 +12,7 @@ import java.lang.annotation.*;
 @Target({ElementType.FIELD, ElementType.TYPE})
 public @interface DynamicField {
     // Web前端字段数据类型
-    WmsEnumUtil.FIELD_TYPE webFieldType();
+    CommonEnumUtil.FIELD_TYPE webFieldType();
     // 条件表达式:>,<,>=等
     String conditionExpre() default "=";
     // 条件连接符:and/or
@@ -35,14 +35,16 @@ public @interface DynamicField {
     int isShow() default 1;
     // 是否跳过本字段扫描 0-不跳过，1-跳过
     int isSkip() default 0;
-    // 下拉枚举名称
-    String entityName() default "";
     // 下拉列表显示列名称,多个列名需要根据逗号分隔
     String listColumnName() default "";
     // 下拉搜索列名称,多个列名需要根据逗号分隔
     String searchColumnName() default "";
     // 回显列名
     String explicitColumnName() default "";
-    // 下拉框规则
-    WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE selectRule() default WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_ENUM;
+    // 是否多选:1-多选，默认2-单选
+    int isMultiple() default 2;
+    // 数据来源
+    String dataSrc() default "";
+    // 取值方式
+    CommonEnumUtil.DYNAMIC_FIELD_GET_WAY getValWay() default CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.ENUM;
 }

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

@@ -41,7 +41,7 @@ public abstract class BaseBean implements Serializable {
     @ApiParam(value = "主键",example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     public Long id;
 
     //get单独处理
@@ -65,7 +65,7 @@ public abstract class BaseBean implements Serializable {
     @Column(name="ORGANIZE_CODE", nullable = false)
     @ApiParam(value ="组织代码")
 //    @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT,isQuery = 2, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isQuery = 2, isRequire = 2)
     public String organizeCode;
 
     @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false)
@@ -82,52 +82,52 @@ public abstract class BaseBean implements Serializable {
     @Column(name="CREATE_USER",updatable = false)
     @ApiParam(value = "创建用户")
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
+            dataSrc = "/impp/operate/sys-user/query-user-by-pager",
+            searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName")
     public String createUser;
 
     @Indexed(direction = IndexDirection.DESCENDING)
     @Column(name="CREATE_DATE_TIME",updatable = false)
     @ApiParam(value = "创建日期")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
     public String createDatetime;
 
     @Column(name="MODIFY_USER")
     @ApiParam(value = "修改人")
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
+            dataSrc = "/impp/operate/sys-user/query-user-by-pager",
+            searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName")
     public String modifyUser;
 
     @Column(name="MODIFY_DATE_TIME")
     @ApiParam(value = "修改日期")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
     public String modifyDatetime;
 
     @Transient
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="创建日期查询用，查询起始日期",example = "2018-01-01 01:00:00")
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1)
     public String createDateTimeStart;
 
     @Transient
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1)
     public String createDateTimeEnd;
 
     @Transient
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="修改日期查询用，查询起始日期",example = "2018-01-01 01:00:00")
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1)
     public String modifyDateTimeStart;
 
     @Transient
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "修改日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1)
     public String modifyDateTimeEnd;
 
     @Transient

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

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @Description : hql脚本封装类
@@ -141,6 +142,24 @@ public class DdlPackBean {
     }
 
     /**
+     * 添加查询条件-处理多个属性
+     * @param hql
+     * @param hqlMap
+     */
+    public void addColumnQuery(String hql,HashMap<String,Object> hqlMap){
+        if(hqlPreparedMap == null){
+            hqlPreparedMap = new HashMap<>();
+        }
+        if(hqlMap != null && !hqlMap.isEmpty()) {
+            hqlPreparedMap.putAll(hqlMap);
+        }
+
+        whereAppend.append(hql);
+    }
+
+
+
+    /**
      * 需要查询属性的数量
      * @return
      */

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

@@ -2175,4 +2175,112 @@ public class CommonEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * PC自定义搜索-字段类型
+     * 10-文本，20-数字，30-下拉框，40，时间，50-开窗
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FIELD_TYPE {
+        TEXT(10, "text"), NUMBER(20, "number"),
+        SELECT(30, "select"), DATETIME(40, "datetime"),
+        LIST(50, "list");
+
+        private int value;
+        private String description;
+
+        FIELD_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static FIELD_TYPE codeOf(Integer value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * PC自定义搜索-取值方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DYNAMIC_FIELD_GET_WAY {
+        ENUM(10, "SINGLE_OBJ", "枚举"),
+        OBJ(20, "MULTIPLE_OBJ", "对象"),
+        URL(30, "SINGLE_OBJ", "接口");
+
+        private int value;
+        private String code;
+        private String description;
+
+        DYNAMIC_FIELD_GET_WAY(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static DYNAMIC_FIELD_GET_WAY codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -11,6 +11,59 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  **/
 
 public class MesEnumUtil {
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum HQL_EXPRESSION {
+        GT(">",">","大于"),
+        LT("<","<","小于"),
+        EQ("=","=","等于"),
+        NEQ("!=","!=","不等于"),
+        GTE(">=",">=","大于等于"),
+        LTE("<=","<=","小于等于"),
+        LIKE("like","like","LIKE"),
+        IN("in","in","包含");
+
+        private String value;
+        private String code;
+        private String description;
+
+        HQL_EXPRESSION(String value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOfDesc(String val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    return values()[i].description;
+                }
+            }
+            return null;
+        }
+
+        public static HQL_EXPRESSION codeOf(String value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(value)) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+    }
+
     /**
      * 作业程序组件类型
      */
@@ -430,6 +483,9 @@ public class MesEnumUtil {
 
         NEVER(-1, "不过期"),
         ONE_HOUR(3600, "一小时"),
+        HALF_HOUR(1800, "半小时"),
+        ONE_QUARTER(900, "一刻钟"),
+        TEN_MIN(300, "十分钟"),
         ONE_MIN(60, "一分钟");
 
         private int value;
@@ -644,7 +700,10 @@ public class MesEnumUtil {
         SCRAP("SCRAP", "报废原因"),
         QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"),
         WC_CHECK("WC_CHECK", "开线检查项"),
-        BOARD("BOARD", "看板类型");
+        BOARD("BOARD", "看板类型"),
+        EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"),
+        EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"),
+        EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象");
 
         private String value;
         private String description;
@@ -5019,7 +5078,8 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum BOARD_TYPE {
         BOARD_CAPACITY_JIT("BOARD_CAPACITY_JIT", "产能监控看板(JIT)"),
-        BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)");
+        BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"),
+        BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE");
 
         private String code;
         private String description;
@@ -5175,6 +5235,329 @@ public class MesEnumUtil {
         }
     }
 
+
+    /**
+     * 	运算对象属性 运算类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OPERATE_TYPE {
+        OEE(10, "OEE"),
+        MTBF(20, "MTBF平均故障间隔"),
+        MTTR(30, "MTTR平均修理时间");
+
+        private int value;
+        private String description;
+
+        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 ATTRIBUTE_TYPE {
+        STANDARD_ATTRIBUTE(10, "标准属性"),
+        CUSTOM_ATTRIBUTE(20, "自定义属性");
+
+        private int value;
+        private String description;
+
+        ATTRIBUTE_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 VALUE_TYPE {
+        MANUAL_ASSIGNMENT("10", "手工赋值"),
+        SPEL_EXPRESSION("20", "spel表达式"),
+        FUNCTION_ASSIGNMENT("30", "函数赋值"),
+        JOB_ASSIGNMENT("40", "job赋值");
+
+        private String value;
+        private String description;
+
+        VALUE_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static VALUE_TYPE getByValue(String value) {
+            for (VALUE_TYPE valueType : values()) {
+                if (valueType.getValue().equals(value)) {
+                    return valueType;
+                }
+            }
+            return null;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * 	运算对象 对象代码
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OBJECT_CODE {
+        ORGANIZE_OEE("10", "工厂OEE"),
+        WORK_CENTER_OEE("20", "产线OEE"),
+        WORK_CELL_CEE("30", "工位OEE"),
+        EQU_OEE("40", "设备OEE");
+
+        private String value;
+        private String description;
+
+        OBJECT_CODE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static OBJECT_CODE getByValue(String value) {
+            for (OBJECT_CODE objectCode : values()) {
+                if (objectCode.getValue().equals(value)) {
+                    return objectCode;
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 	脚本类型（组件、表单、报表、JOB、其他）
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SCRIPT_TYPE {
+        ASSEMBLY(10, "组件"),
+        FORM(20, "表单"),
+        REPORT_FORM(30, "报表"),
+        JOB(40, "JOB"),
+        OTHER(50, "其他");
+
+        private int value;
+        private String description;
+
+        SCRIPT_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;
+        }
+    }
+
+    /**
+     * 	语言类型（Groovy、Python、JavaScript、Scala、Ruby）
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SCRIPT_LANGUAGE {
+        GROOVY(10, "Groovy"),
+        PYTHON(20, "Python"),
+        JAVA_SCRIPT(30, "JavaScript"),
+        SCALA(40, "Scala"),
+        RUBY(50, "Ruby");
+
+        private int value;
+        private String description;
+
+        SCRIPT_LANGUAGE(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 OPERATE_OBJECT_CODE {
+        ORGANIZE_OEE_HOUR("ORGANIZE_OEE_HOUR", "工厂OEE(小时)"),
+        ORGANIZE_OEE_DAY("ORGANIZE_OEE_DAY", "工厂OEE(天)"),
+        WORK_CENTER_OEE_DAY("WORK_CENTER_OEE_DAY", "产线OEE(天)"),
+        EQU_OEE_DAY("EQU_OEE_DAY", "设备OEE(天)");
+
+        private String value;
+        private String description;
+
+        OPERATE_OBJECT_CODE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static OPERATE_OBJECT_CODE getByValue(String value) {
+            for (OPERATE_OBJECT_CODE objectCode : values()) {
+                if (objectCode.getValue().equals(value)) {
+                    return objectCode;
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 	oee 运算状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OEE_STATUS {
+        STAY_OPERATE(10, "待运算"),
+        ALREADY_OPERATE(20, "已运算");
+
+        private int value;
+        private String description;
+
+        OEE_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_检验单 状态
      */

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

@@ -3277,7 +3277,7 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SHIPPING_ACTUAL_STATUS {
         CREATE(10, "创建"),
-        CANCEL(20, "已发运");
+        SHIPPED(20, "已发运");
 
         private int value;
         private String description;
@@ -3338,7 +3338,7 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum FSM_STATE_TYPE {
         BEGIN(10, "begin", "开始状态点"),
-        END(20, "end", "结束状态点");
+        END(40, "end", "结束状态点");
 
         private int value;
         private String code;

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

@@ -139,6 +139,7 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
         public static String valueOfDescription(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -715,8 +716,8 @@ public class WmsEnumUtil {
         PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"),
         UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"),
         TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"),
-        EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动");
-
+        EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"),
+        LOADING_ORDER(530, "LOADING_ORDER", "装车单");
         private int value;
         private String code;
         private String description;
@@ -2244,7 +2245,8 @@ public class WmsEnumUtil {
         MATERIAL(40, "MATERIAL", "物料对象"),
         TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象"),
         BUSI_TYPE(60, "BUSI_TYPE", "业务类型对象"),
-        BUSI_OPERATION_TYPE(70, "BUSI_OPERATION_TYPE", "业务操作对象");
+        BUSI_OPERATION_TYPE(70, "BUSI_OPERATION_TYPE", "业务操作对象"),
+        BH_CHECK_TYPE(80, "BH_CHECK_TYPE", "检测大类对象");
 
         private String code;
         private String description;
@@ -2989,6 +2991,7 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
         public static String valueOfDescription(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -3176,6 +3179,7 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
         public static int descOf(String desc) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {
@@ -3189,7 +3193,10 @@ public class WmsEnumUtil {
         public static String valueOfDescription(int val) {
             return valueOf(val);
         }
-        public static int descriptionOfValue(String desc) {return descOf(desc);}
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
 
     }
 
@@ -4199,7 +4206,8 @@ public class WmsEnumUtil {
         }
     }
 
-    /**分类
+    /**
+     * 分类
      * 物流规则 处理单位
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -4363,7 +4371,7 @@ public class WmsEnumUtil {
 
 
     /**
-     * 日志推送至MQ的处理类型
+     * 规格层级
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SPEC_LEVEL {
@@ -4935,51 +4943,6 @@ public class WmsEnumUtil {
     }
 
     /**
-     * WEB页面字段类型
-     * 10-文本类型，20-数字类型，30-下拉框类型，40，时间类型，50-开窗查询类型
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum FIELD_TYPE {
-        TEXT(10, "text"), NUMBER(20, "number"),
-        SELECT(30, "select"), DATETIME(40, "datetime"),
-        LIST(50, "list");
-
-        private int value;
-        private String description;
-
-        FIELD_TYPE(int value, String description) {
-            this.value = value;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public static String valueOfDescription(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-        public static FIELD_TYPE codeOf(Integer value) {
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value==value) {
-                    return values()[i];
-                }
-            }
-            return null;
-        }
-    }
-
-    /**
      * 推送类型单位
      * 默认为 10
      */
@@ -5053,6 +5016,7 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
         public static int descOf(String desc) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {
@@ -5066,7 +5030,10 @@ public class WmsEnumUtil {
         public static String valueOfDescription(int val) {
             return valueOf(val);
         }
-        public static int descriptionOfValue(String desc) {return descOf(desc);}
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
     }
 
     /**
@@ -5239,7 +5206,7 @@ public class WmsEnumUtil {
     }
 
     /**
-     *  插件类型 10-PDA插件，20-按钮增强插件，30-交易处理插件
+     * 插件类型 10-PDA插件，20-按钮增强插件，30-交易处理插件
      * 默认为 10
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -5301,70 +5268,7 @@ public class WmsEnumUtil {
     }
 
     /**
-     * 动态查询-下拉框规则
-     * 默认为 10
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum DYNAMIC_FIELD_SELECT_RULE {
-        SINGLE_ENUM(10, "SINGLE_ENUM", "单选枚举"),
-        MULTIPLE_ENUM(20, "MULTIPLE_ENUM", "多选枚举"),
-        SINGLE_URL(30, "SINGLE_URL", "单选接口"),
-        MULTIPLE_URL(40, "MULTIPLE_URL", "多选接口");
-
-        private int value;
-        private String code;
-        private String description;
-
-        DYNAMIC_FIELD_SELECT_RULE(int value, String code, String description) {
-            this.value = value;
-            this.code = code;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public String getCode() {
-            return code;
-        }
-
-        public static DYNAMIC_FIELD_SELECT_RULE codeOf(int value) {
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == value) {
-                    return values()[i];
-                }
-            }
-            return null;
-        }
-
-        public static String valueOf(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-
-        public static int descOf(String desc) {
-            int tmp = 1;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].description.equals(desc)) {
-                    tmp = values()[i].value;
-                }
-            }
-            return tmp;
-        }
-    }
-
-    /**
-     *  波次合并规则
+     * 波次合并规则
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WAVE_MERGE_RULE {
@@ -5448,7 +5352,7 @@ public class WmsEnumUtil {
     }
 
     /**
-     *  波次合并规则
+     * 波次合并规则
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WAVE_MERGE_RANGE {
@@ -5563,7 +5467,7 @@ public class WmsEnumUtil {
     }
 
     /**
-     *  插件类型 10-合并规则，20-合并范围
+     * 插件类型 10-合并规则，20-合并范围
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WAVE_MERGE_TYPE {
@@ -5806,7 +5710,7 @@ public class WmsEnumUtil {
             return null;
         }
 
-        public static String valueOfDescription ( int val){
+        public static String valueOfDescription(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
@@ -5822,7 +5726,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QAD_DOC_TYPE {
-        TYPE_S(10, "s","s"), TYPE_D(20, "d","d");
+        TYPE_S(10, "s", "s"), TYPE_D(20, "d", "d");
 
         private int value;
         private String code;
@@ -5832,7 +5736,7 @@ public class WmsEnumUtil {
             return code;
         }
 
-        QAD_DOC_TYPE(int value,String code,  String description) {
+        QAD_DOC_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -5898,6 +5802,7 @@ public class WmsEnumUtil {
             }
             return null;
         }
+
         public static String valueOfDescription(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -6383,7 +6288,7 @@ public class WmsEnumUtil {
         private String code;
         private String description;
 
-        PURCHASE_PLAN_HISTORY_STATUS(int value, String code,String description) {
+        PURCHASE_PLAN_HISTORY_STATUS(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -6611,4 +6516,60 @@ public class WmsEnumUtil {
         }
     }
 
+
+    /**
+     * 返修、挑选状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BOM_TYPE {
+        INIT(10, "PART", "物料"),
+        BE_HANDLE(20, "OUT", "委外"),
+        FINISH(30, "UTENSIL", "器具");
+
+        private int value;
+        private String code;
+        private String description;
+
+        BOM_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 }

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

@@ -93,4 +93,8 @@ public class IfPackageDetail extends BaseBean implements Serializable {
     @Column(name = "IF_CODE")
     @ApiParam("接口代码")
     private String ifCode;
+
+    @Column(name = "CT_NO")
+    @ApiParam("容器编号")
+    private String ctNo;
 }

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

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -93,6 +94,7 @@ public class IfDismantleRecord extends BaseBean implements Serializable {
 
     @Column(name = "ERROR_MESSAGE")
     @ApiParam("异常消息")
+    @Lob
     private String errorMessage;
 
     @Column(name = "ACTION_CODE")

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

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -84,6 +85,7 @@ public class IfPackageDetail extends BaseBean  implements Serializable {
 
     @Column(name = "ERROR_MESSAGE")
     @ApiParam("异常消息")
+    @Lob
     private String errorMessage;
 
     @Column(name = "ACTION_CODE")
@@ -93,4 +95,8 @@ public class IfPackageDetail extends BaseBean  implements Serializable {
     @Column(name = "IF_CODE")
     @ApiParam("接口代码")
     private String ifCode;
+
+    @Column(name = "CT_NO")
+    @ApiParam("容器编号")
+    private String ctNo;
 }

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

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -96,6 +97,7 @@ public class IfProductOffLine extends BaseBean  implements Serializable {
 
     @Column(name = "ERROR_MESSAGE")
     @ApiParam("异常消息")
+    @Lob
     private String errorMessage;
 
     @Column(name = "ACTION_CODE")

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -93,6 +94,7 @@ public class IfQueueShipping extends BaseBean implements Serializable {
 
 	@Column(name = "ERROR_MESSAGE")
 	@ApiParam("异常消息")
+	@Lob
 	private String errorMessage;
 
 	@Column(name = "ACTION_CODE")

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

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -75,6 +76,7 @@ public class IfRawPartData  extends BaseBean implements Serializable {
 
     @Column(name = "ERROR_MESSAGE")
     @ApiParam("异常消息")
+    @Lob
     private String errorMessage;
 
     @Column(name = "ACTION_CODE")

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -47,6 +48,7 @@ public class IfWmsPpm extends BaseBean implements Serializable {
 
     @Column(name = "ERROR_MESSAGE")
     @ApiParam("异常消息")
+    @Lob
     private String errorMessage;
 
     @Column(name = "ACTION_CODE")

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

@@ -0,0 +1,65 @@
+package cn.estsh.i3plus.pojo.mes.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.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description :数据权限
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-26
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_DATA_AUTH")
+@Api("数据权限")
+public class MesDataAuth extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -8665559475167190408L;
+    @Column(name = "ROLE_ID")
+    @ApiParam("角色编号")
+    private Long roleId;
+
+    @Column(name = "ROLE_NAME")
+    @ApiParam("角色名称")
+    private String roleName;
+
+    @Column(name = "DATA_OBJECT")
+    @ApiParam("数据对象")
+    private String dataObject;
+
+    @Column(name = "DATA_OBJECT_FULL_NAME")
+    @ApiParam("数据对象全称")
+    private String dataObjectFullName;
+
+    @Column(name = "DATA_OBJECT_NAME")
+    @ApiParam("数据对象名称")
+    private String dataObjectName;
+
+    @Column(name = "FILTER_RULE", columnDefinition = "TEXT")
+    @ApiParam("过滤规则")
+    private String filterRule;
+
+    public long getRoleIdVal() {
+        return this.roleId == null ? 0 : this.roleId.longValue();
+    }
+
+}

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

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/4/28 21:30
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EDI_DATA")
+@Api("EDI数据")
+public class MesEdiData extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 4671561947551462256L;
+
+    @Column(name = "HOST")
+    @ApiParam("edi电脑名")
+    private String host;
+
+    @Column(name = "DATA")
+    @ApiParam("数据")
+    private String data;
+
+    @Column(name = "CONFIG")
+    @ApiParam("edi配置")
+    private String config;
+}

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

@@ -0,0 +1,126 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/28 4:19 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_OEE")
+@Api("MES_OEE数据")
+public class MesOee extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -9163026983140909748L;
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("运算对象代码")
+    private String objectCode;
+
+    @Column(name = "STATUS")
+    @ApiParam("运算状态")
+    private Integer status;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "EQU_CODE")
+    @ApiParam("设备代码")
+    private String equCode;
+
+    @Column(name = "OEE_DATE")
+    @ApiParam("日期")
+    private String oeeDate;
+
+    @Column(name = "SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name = "START_TIME")
+    @ApiParam("开始时段")
+    private String startTime;
+
+    @Column(name = "END_TIME")
+    @ApiParam("结束时段")
+    private String endTime;
+
+    @Column(name = "TOTAL_RUN_TIME")
+    @ApiParam("总生产时间")
+    private String totalRunTime;
+
+    @Column(name = "TOTAL_STOP_TIME")
+    @ApiParam("总停机时间")
+    private String totalStopTime;
+
+    @Column(name = "TOTAL_QTY")
+    @ApiParam("总生产数")
+    private Integer totalQty;
+
+    @Column(name = "QUALIFIED_QTY")
+    @ApiParam("一次合格数")
+    private Integer qualifiedQty;
+
+    @Column(name = "PLAN_TAKT")
+    @ApiParam("计划节拍")
+    private Integer planTakt;
+
+    @Column(name = "ACTUAL_TAKT")
+    @ApiParam("实际节拍")
+    private Integer actualTakt;
+
+    @Column(name = "TIME_RATE")
+    @ApiParam("时间开动率")
+    private String timeRate;
+
+    @Column(name = "TAKT_RATE")
+    @ApiParam("性能开动率")
+    private String taktRate;
+
+    @Column(name = "QUALIFIED_RATE")
+    @ApiParam("良品率")
+    private String qualifiedRate;
+
+    @Column(name = "OEE")
+    @ApiParam("OEE")
+    private String oee;
+
+    @Column(name = "BUSI_DATA")
+    @ApiParam("自定义数据")
+    private String busiData;
+
+    @Transient
+    @ApiParam("开始日期")
+    private String oeeDateStart;
+
+    @Transient
+    @ApiParam("结束日期")
+    private String oeeDateEnd;
+
+    @Transient
+    @ApiParam("自定义数据map")
+    private List<MesOperateObjectAttribute> operateObjectAttributes;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.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;
 import java.io.Serializable;
 
 /**

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

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/28 4:04 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_OPERATE_OBJECT")
+@Api("MES_运算对象")
+public class MesOperateObject extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 7829216855303543146L;
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name = "OBJECT_NAME")
+    @ApiParam("对象名称")
+    private String objectName;
+
+    @Column(name = "OPERATE_TYPE")
+    @ApiParam("运算类型")
+    private Integer operateType;
+
+}

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

@@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/28 4:08 下午
+ * @Modify:MES_OPERATE_OBJECT_CFG
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_OPERATE_OBJECT_ATTRIBUTE")
+@Api("MES_运算对象属性")
+public class MesOperateObjectAttribute extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3916105499867386686L;
+
+    @Column(name = "ATTRIBUTE_CODE")
+    @ApiParam("属性代码")
+    private String attributeCode;
+
+    @Column(name = "ATTRIBUTE_NAME")
+    @ApiParam("属性名称")
+    private String attributeName;
+
+    @Column(name = "ATTRIBUTE_TYPE")
+    @ApiParam("属性类型")
+    private Integer attributeType;
+
+    @Column(name = "OPERATE_TYPE")
+    @ApiParam("运算类型")
+    private Integer operateType;
+
+    @Transient
+    @ApiParam("属性值")
+    private String attributeValue;
+
+    @Transient
+    @ApiParam("是否自定义属性")
+    private boolean customAttribute = false;
+}

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

@@ -0,0 +1,69 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/28 4:12 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_OPERATE_OBJECT_CFG")
+@Api("MES_运算对象属性配置")
+public class MesOperateObjectCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -8066603810736365082L;
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name = "ATTRIBUTE_CODE")
+    @ApiParam("属性代码")
+    private String attributeCode;
+
+    @Column(name = "VALUE_TYPE")
+    @ApiParam("赋值类型")
+    private String valueType;
+
+    @Column(name = "METHOD_CODE")
+    @ApiParam("函数方法")
+    private String methodCode;
+
+    @Column(name = "JOB_ID")
+    @ApiParam("job编号")
+    private String jobId;
+
+    @Column(name = "SPEL_CONTENT")
+    @ApiParam("spel表达式")
+    private String spelContent;
+
+    @Column(name = "SEQ")
+    @ApiParam("运算顺序")
+    private Integer seq;
+
+    @Transient
+    @ApiParam("属性名称")
+    private String attributeName;
+
+    @Transient
+    @ApiParam("属性类型")
+    private Integer attributeType;
+}

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

@@ -61,8 +61,8 @@ public class MesPatternJis extends BaseBean implements Serializable {
     private Integer patternType;
 
     @Lob
-    @Column(name = "RULE")
-    @ApiParam("规则")
-    private String rule;
+    @Column(name = "MATCH_RULE")
+    @ApiParam("匹配规则")
+    private String matchRule;
 
 }

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

@@ -41,6 +41,10 @@ public class MesProdPack extends BaseBean implements Serializable {
     @ApiParam("包装规格")
     private String packSpec;
 
+    @Column(name = "PROCESS_LABEL_TEMPLATE")
+    @ApiParam("过程标签模板")
+    private String processLabelTemplate;
+
     @Column(name = "PROD_LABEL_TEMPLATE")
     @ApiParam("产品标签模板")
     private String prodLabelTemplate;

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

@@ -91,6 +91,10 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
     @Transient
     private List<MesQcCheckStandard> childQcList;
 
+    @Transient
+    @ApiParam("备注")
+    private String memo;
+
     public MesQcCheckStandard() {
     }
 

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

@@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/28 4:58 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_SCRIPT_PERSISTENCE")
+@Api("动态脚本")
+public class MesScriptPersistence extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1941422535481564572L;
+
+    @Column(name = "SCRIPT_NO")
+    @ApiParam("脚本编号")
+    private String scriptNo;
+
+    @Column(name = "SCRIPT_NAME")
+    @ApiParam("脚本名称")
+    private String scriptName;
+
+    @Column(name = "SCRIPT_REMARK")
+    @ApiParam("脚本描述")
+    private String scriptRemark;
+
+    @Column(name = "SCRIPT_TYPE")
+    @ApiParam("脚本类型")
+    private Integer scriptType;
+
+    @Column(name = "LANGUAGE_TYPE")
+    @ApiParam("语言类型")
+    private Integer languageType;
+
+    @Column(name = "SCRIPT_CONTENT")
+    @ApiParam("脚本内容")
+    private String scriptContent;
+}

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

@@ -260,6 +260,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("计划类型")
     private Integer planType;
 
+    @Transient
+    @ApiParam(value = "完成按钮编号")
+    public String comButtonCode;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model;
 import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquDetail;
 import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquStatus;
 import cn.estsh.i3plus.pojo.mes.bean.MesBoardShiftSectionCapacity;
+import cn.estsh.i3plus.pojo.mes.bean.MesOee;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -48,4 +49,7 @@ public class BoardModel {
 
     @ApiParam("看板设备明细")
     private List<MesBoardEquDetail> boardEquDetailList;
+
+    @ApiParam("oee")
+    private List<MesOee> oeeList;
 }

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

@@ -43,6 +43,13 @@ public class ButtonDynamicModel {
         this.buttonName = buttonName;
     }
 
+
+    public ButtonDynamicModel(String buttonCode, String buttonName, String paramCode){
+        this.buttonCode = buttonCode;
+        this.buttonName = buttonName;
+        this.paramCode = paramCode;
+    }
+
     public ButtonDynamicModel(Long id, String buttonCode, String windowNo, String windowModuleBack, String paramCode, String paramValue){
         this.id = id;
         this.buttonCode = buttonCode;

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

@@ -0,0 +1,181 @@
+//package cn.estsh.i3plus.pojo.mes.model;
+//
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiParam;
+//import lombok.AllArgsConstructor;
+//import lombok.Data;
+//import lombok.NoArgsConstructor;
+//import org.apache.poi.ss.usermodel.CellStyle;
+//import org.springframework.util.StringUtils;
+//
+//import java.io.Serializable;
+//import java.math.BigDecimal;
+//
+///**
+// * @Author: wangjie
+// * @CreateDate: 2019/8/21 9:19 AM
+// * @Description:
+// **/
+//@Data
+//@NoArgsConstructor
+//@AllArgsConstructor
+//@Api("EXCEL参数model")
+//public class ExcelDataParamModel<T> implements Serializable {
+//
+//    public ExcelDataParamModel(Class<T> clazz){
+//        this.clazz = clazz;
+//    }
+//
+//    @ApiParam("获取相对应的类，用来映射数据,如果不设置此值，那么整个数据将会用String[]作为数据，不再通过映射拿取数据")
+//    private Class<T> clazz;
+//
+//    @ApiParam("对应类的映射字段名，String类型")
+//    private String[] strField;
+//
+//    @ApiParam("对应类的标题，需要一一对应")
+//    private String[] titleStr;
+//
+//    @ApiParam("大标题")
+//    private String title;
+//
+//    @ApiParam("文件名，如果传入的ExcelDataParamModel是一个List的时候，以sheetNo = 1为文件名，如果sheetNo为空，则默认随机")
+//    private String fileName;
+//
+//    @ApiParam("后缀")
+//    private String sufix;
+//
+//    @ApiParam("大标题样式")
+//    private CellStyle bigTitleCellStyle;
+//
+//    @ApiParam("标题样式")
+//    private CellStyle titleCellStyle;
+//
+//    @ApiParam("数据样式")
+//    private CellStyle cellStyle;
+//
+//    @ApiParam("sheet名")
+//    private String sheetName;
+//
+//    @ApiParam("每个格子的宽度")
+//    private BigDecimal[] cellWidth;
+//
+//    @ApiParam("如果传入的ExcelDataParamModel是List的时候，默认以sheetNo排序")
+//    private Integer sheetNo;
+//
+//    @ApiParam("导出数据转换器")
+//    private QueryDataInterface queryDataInterface;
+//
+//    public Class<T> getClazz() {
+//        return clazz;
+//    }
+//
+//    public String[] getStrField() {
+//        return strField;
+//    }
+//
+//    public String[] getTitleStr() {
+//        return titleStr;
+//    }
+//
+//    public String getTitle() {
+//        if(StringUtils.isEmpty(this.title)){
+//            return "无效的标题";
+//        }else{
+//            return title;
+//        }
+//    }
+//
+//    public String getFileName() {
+//        if(StringUtils.isEmpty(this.fileName)){
+//            return "未命名";
+//        }else{
+//            return this.fileName;
+//        }
+//    }
+//
+//    public CellStyle getBigTitleCellStyle() {
+//        return bigTitleCellStyle;
+//    }
+//
+//    public CellStyle getTitleCellStyle() {
+//        return titleCellStyle;
+//    }
+//
+//    public CellStyle getCellStyle() {
+//        return cellStyle;
+//    }
+//
+//    public String getSheetName() {
+//        return sheetName;
+//    }
+//
+//    public Integer getSheetNo() {
+//        return sheetNo;
+//    }
+//
+//    public BigDecimal[] getCellWidth() {
+//        return cellWidth;
+//    }
+//
+//    public String getSufix() {
+//        return sufix;
+//    }
+//
+//    public QueryDataInterface getQueryDataInterface() {
+//        return queryDataInterface;
+//    }
+//
+//    public void setClazz(Class<T> clazz) {
+//        this.clazz = clazz;
+//    }
+//
+//    public void setStrField(String[] strField) {
+//        this.strField = strField;
+//    }
+//
+//    public void setTitleStr(String[] titleStr) {
+//        this.titleStr = titleStr;
+//    }
+//
+//    public void setTitle(String title) {
+//        this.title = title;
+//    }
+//
+//    public void setFileName(String fileName) {
+//        this.fileName = fileName;
+//    }
+//
+//    public void setSufix(String sufix) {
+//        this.sufix = sufix;
+//    }
+//
+//    public void setBigTitleCellStyle(CellStyle bigTitleCellStyle) {
+//        this.bigTitleCellStyle = bigTitleCellStyle;
+//    }
+//
+//    public void setTitleCellStyle(CellStyle titleCellStyle) {
+//        this.titleCellStyle = titleCellStyle;
+//    }
+//
+//    public void setCellStyle(CellStyle cellStyle) {
+//        this.cellStyle = cellStyle;
+//    }
+//
+//    public void setSheetName(String sheetName) {
+//        this.sheetName = sheetName;
+//    }
+//
+//    public void setCellWidth(BigDecimal[] cellWidth) {
+//        this.cellWidth = cellWidth;
+//    }
+//
+//
+//    public void setSheetNo(Integer sheetNo) {
+//        this.sheetNo = sheetNo;
+//    }
+//
+//    public void setQueryDataInterface(QueryDataInterface queryDataInterface) {
+//        this.queryDataInterface = queryDataInterface;
+//    }
+//
+//}

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

@@ -0,0 +1,11 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FilterGroup {
+    private String andOr;
+    private List<FilterRules> groups;
+}

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

@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import lombok.Data;
+
+@Data
+public class FilterRule {
+    private String field;
+    private String op;
+    private String value;
+}

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

@@ -0,0 +1,11 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FilterRules {
+    private String andOr;
+    private List<FilterRule> rules;
+}

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

@@ -97,6 +97,9 @@ public class MesEquipmentModel implements Serializable {
     @ApiParam("连接类型")
     private String connectTypeName;
 
+    @ApiParam("作业校验模式")
+    private Integer checkModel;
+
 
     public MesEquipmentModel() {
 
@@ -139,7 +142,7 @@ public class MesEquipmentModel implements Serializable {
     }
 
     //获取设备分页数据 queryMesEquipmentByPager
-    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, Integer checkModel) {
         this.id = id;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;
@@ -163,6 +166,7 @@ public class MesEquipmentModel implements Serializable {
         this.createDatetime = createDatetime;
         this.modifyUser = modifyUser;
         this.modifyDatetime = modifyDatetime;
+        this.checkModel = checkModel;
     }
 
 }

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

@@ -96,6 +96,9 @@ public class MesPlcModel implements Serializable {
     @ApiParam("OPCUA路径")
     private String opcUrl;
 
+    @ApiParam("PLC类型")
+    private Integer plcType;
+
     public MesPlcModel() {
 
     }
@@ -103,7 +106,7 @@ public class MesPlcModel implements Serializable {
     public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime,
                        String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel,
                        String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName,
-                       String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode, String opcUrl) {
+                       String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode, String opcUrl, Integer plcType) {
         this.id = id;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;
@@ -131,5 +134,6 @@ public class MesPlcModel implements Serializable {
         this.device = device;
         this.objectCode = objectCode;
         this.opcUrl = opcUrl;
+        this.plcType = plcType;
     }
 }

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

@@ -26,10 +26,10 @@ public class MesWorkOrderModel {
     @AnnoOutputColumn
     private String partNo;
 
-    //客户产线代码
+    //产线代码
     @ApiParam("ProductionLineID")
     @AnnoOutputColumn
-    private String custProdLineCode;
+    private String workCenterCode;
 
     //数量
     @ApiParam("DemandQty")

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

@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Transient;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/30 2:01 下午
+ * @Modify:
+ */
+@Data
+public class OperateObjectParamModel {
+
+    private String organizeCode;
+
+    @ApiParam("设备代码")
+    private String equCode;
+
+    @ApiParam("运算对象代码")
+    private String objectCode;
+
+    @ApiParam("日期")
+    private String oeeDate;
+
+    @ApiParam("开始时段")
+    private String startTime;
+
+    @Transient
+    @ApiParam("结束时段")
+    private String endTime;
+
+    @ApiParam("属性值")
+    private Integer attributeValue = 0;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+}

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

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description : PojoField模型
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2020-04-28
+ * @Modify:
+ * @Modify:
+ **/
+@Data
+public class PojoFieldModel implements Serializable {
+    private static final long serialVersionUID = 6761788924707802928L;
+
+    @ApiParam(value ="属性名")
+    private String fieldName;
+
+    @ApiParam(value ="属性类型")
+    private String fieldType;
+
+    @ApiParam(value ="属性描述")
+    private String fieldDesc;
+
+    @ApiParam(value ="字段名称")
+    private String fieldColumnName;
+
+    @ApiParam(value = "数据来源")
+    private String dataSrc;
+
+    @ApiParam(value = "开窗列表显示列名称")
+    private String listColumnName;
+
+    @ApiParam(value = "开窗搜索列名称")
+    private String searchColumnName;
+
+    @ApiParam(value = "回显列名")
+    private String explicitColumnName;
+
+    @ApiParam(value = "下拉框规则")
+    private Integer selectRule;
+}

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

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description : Pojo模型
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2020-04-28
+ * @Modify:
+ **/
+@Data
+public class PojoModel implements Serializable {
+    private static final long serialVersionUID = -3617516560880011259L;
+    @ApiParam(value ="包名")
+    private String packageName;
+
+    @ApiParam(value ="POJO类名")
+    private String simpleName;
+
+    @ApiParam(value ="POJO类全名")
+    private String fullName;
+
+    @ApiParam(value ="表名称名")
+    private String tableName;
+
+    @ApiParam(value ="POJO类描述")
+    private String pojoDesc;
+
+    @ApiParam(value ="属性集合")
+    private List<PojoFieldModel> fieldList;
+}

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

@@ -42,9 +42,6 @@ public class ProdPlanBatchCompileModel {
     @ApiParam("班次")
     private String shiftCode;
 
-    @ApiParam("客户名称")
-    private String custCodeName;
-
     @ApiParam("客户代码")
     private String custCode;
 
@@ -75,4 +72,52 @@ public class ProdPlanBatchCompileModel {
     @ApiParam("计划类型名称")
     private String planTypeName;
 
+    @ApiParam("数量1")
+    private String qty1;
+
+    @ApiParam("完成数量1")
+    private String completeQty1;
+
+    @ApiParam("数量2")
+    private String qty2;
+
+    @ApiParam("完成数量2")
+    private String completeQty2;
+
+    @ApiParam("数量3")
+    private String qty3;
+
+    @ApiParam("完成数量3")
+    private String completeQty3;
+
+    @ApiParam("数量4")
+    private String qty4;
+
+    @ApiParam("完成数量4")
+    private String completeQty4;
+
+    @ApiParam("数量5")
+    private String qty5;
+
+    @ApiParam("完成数量5")
+    private String completeQty5;
+
+    @ApiParam("数量6")
+    private String qty6;
+
+    @ApiParam("完成数量6")
+    private String completeQty6;
+
+    @ApiParam("数量7")
+    private String qty7;
+
+    @ApiParam("完成数量7")
+    private String completeQty7;
+
+    @ApiParam("合计")
+    private String amountStr;
+
+    @ApiParam("完成合计")
+    private String completeAmountStr;
+
 }

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

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description: 条码打印模版model
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-08-27-13:24
+ * @Modify:
+ **/
+@Data
+@Api("条码打印模版model")
+public class SnPrintLabelTemplateModel {
+
+    @ApiParam("模版信息")
+    private MesLabelTemplate labelTemplate;
+
+    @ApiParam("工厂")
+    private String organizeCode;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @ApiParam("条码类型  10-过程条码，20-产品条码，30-包装条码")
+    private Integer snType;
+
+    @ApiParam("包装条码层级 1-第一层，2-第二层，3-第三层，4-第四层")
+    private Integer packLevel;
+
+    public SnPrintLabelTemplateModel() {
+    }
+
+    public SnPrintLabelTemplateModel(String organizeCode, String partNo, String custCode, Integer snType, Integer packLevel, MesLabelTemplate labelTemplate) {
+        this.organizeCode = organizeCode;
+        this.partNo = partNo;
+        this.custCode = custCode;
+        this.snType = snType;
+        this.packLevel = packLevel;
+        this.labelTemplate = labelTemplate;
+    }
+}

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

@@ -132,9 +132,6 @@ public class StationRequestBean implements Serializable {
     @ApiParam("客户工厂代码")
     private String customerFactoryCode;
 
-    @ApiParam("发运命令")
-    private String shippingCmd;
-
     @Override
     public String toString() {
         return "StationRequestBean{" +

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBom;
+import cn.estsh.i3plus.pojo.mes.bean.MesDataAuth;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesDataAuthRepository extends BaseRepository<MesDataAuth, Long> {
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesOee;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/28 5:04 下午
+ * @Modify:
+ */
+@Repository
+public interface MesOeeRepository extends BaseRepository<MesOee, Long> {
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesOperateObjectAttribute;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/28 5:05 下午
+ * @Modify:
+ */
+@Repository
+public interface MesOperateObjectAttributeRepository extends BaseRepository<MesOperateObjectAttribute, Long> {
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesOperateObjectCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/28 5:04 下午
+ * @Modify:
+ */
+@Repository
+public interface MesOperateObjectCfgRepository extends BaseRepository<MesOperateObjectCfg, Long> {
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesOperateObject;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/28 5:05 下午
+ * @Modify:
+ */
+@Repository
+public interface MesOperateObjectRepository extends BaseRepository<MesOperateObject, Long> {
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesScriptPersistence;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/28 5:03 下午
+ * @Modify:
+ */
+@Repository
+public interface MesScriptPersistenceRepository extends BaseRepository<MesScriptPersistence, Long> {
+}

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

@@ -2495,6 +2495,30 @@ public class MesHqlPack {
         return packBean;
     }
 
+    /**
+     * 散件产品组配置
+     *
+     * @param mesProdScatterDetail
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesScatterDetail(MesProdScatterDetail mesProdScatterDetail, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdScatterDetail, organizeCode);
+        if (!StringUtils.isEmpty(mesProdScatterDetail.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProdScatterDetail.getPartName())) {
+            DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getPartName(), "partName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProdScatterDetail.getProduceCtgyCode())) {
+            DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getProduceCtgyCode(), "produceCtgyCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProdScatterDetail.getSpCfgCode())) {
+            DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getSpCfgCode(), "spCfgCode", packBean);
+        }
+        return packBean;
+    }
+
     public static DdlPackBean getMesBoardEquDetail(MesBoardEquDetail mesBoardEquDetail) {
         DdlPackBean packBean = getAllBaseData(mesBoardEquDetail.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(mesBoardEquDetail.getBoardCode(), "boardCode", packBean);
@@ -2625,4 +2649,15 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    public static DdlPackBean getDataAuthCondition(MesDataAuth dataAuth, String organizeCode) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        if (!StringUtils.isEmpty(dataAuth.getDataObject())) {
+            DdlPreparedPack.getStringLikerPack(dataAuth.getDataObject(), "dataObject", packBean);
+        }
+        if (dataAuth.getRoleIdVal() > 0) {
+            DdlPreparedPack.getNumEqualPack(dataAuth.getRoleIdVal(), "roleId", packBean);
+        }
+        return packBean;
+    }
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.model.common;
 
 import lombok.Data;
-import java.util.LinkedHashMap;
 
 /**
  * @Description :

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

@@ -8,6 +8,10 @@ import com.thoughtworks.xstream.annotations.XStreamOmitField;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
 import java.util.List;
 import java.util.Map;
 
@@ -20,9 +24,12 @@ import java.util.Map;
  **/
 @Data
 @XStreamAlias("server")
+@XmlRootElement(name ="server")
+@XmlAccessorType(XmlAccessType.NONE)
 public class SuitServerModel {
 
     // 执行方法命令
+    @XmlElement
     @ApiParam(value = "适配器code")
     private String suitCaseCode;
     /* 认证使用 以后使用 */
@@ -31,6 +38,7 @@ public class SuitServerModel {
     // 请求ID
     private String requestId;
     // 传输单对象
+    @XmlElement(name = "data")
     private Object obj;
     // 传输集合
     private List list;
@@ -44,6 +52,7 @@ public class SuitServerModel {
      */
 //    @XStreamImplicit
     @XStreamCDATA
+    @XmlElement
     private String suitMessage;
 
     /**

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

@@ -20,6 +20,9 @@ public class BasBeanInfoModel implements Serializable {
 
     private static final long serialVersionUID = -6376845639646448495L;
 
+    @ApiParam(value = "系统名称")
+    public String systemName;
+
     @ApiParam(value = "实体名称")
     public String entityName;
 

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

@@ -53,6 +53,21 @@ public class CoreHqlPack {
         return result.toString();
     }
 
+
+    /**
+     * In 参数封装
+     * @param columnName
+     * @return
+     */
+    public static DdlPackBean packHqlInStr(String columnName, String[] params){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",ddlPackBean);
+        DdlPreparedPack.getInPack(params, columnName, ddlPackBean);
+        return ddlPackBean;
+    }
+
+
     /**
      * 资源查询
      * @param resource

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

@@ -31,6 +31,7 @@ import javax.persistence.Table;
 @Api(value = "长数据", description = "长数据")
 public class BsLongData extends BaseBean {
 
+    private static final long serialVersionUID = -329128754646765129L;
     @Column(name = "REF_ID")
     @ApiParam(value = "关联id")
     private Long refId;

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.softswitch.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -40,6 +42,7 @@ public class BsSuitCaseREST extends BaseBean {
     //CommonEnumUtil.HTTP_METHOD_TYPE
     @Column(name = "REQUEST_METHOD_ID")
     @ApiParam(value = "请求方式id")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.HTTP_METHOD_TYPE.class)
     private Integer requestMethodId;
 
     @Transient

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -31,33 +33,41 @@ public class BasCustomer extends BaseBean {
     private static final long serialVersionUID = -1980207700343546396L;
     @Column(name = "CUST_NO")
     @ApiParam(value = "客户编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String custNo;
 
     @Column(name = "CUST_NAME")
     @ApiParam(value = "客户简称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String custName;
 
     @Column(name = "CUST_DESC")
     @ApiParam(value = "客户全称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String custDesc;
 
     @Column(name = "CUST_ADDR")
     @ApiParam(value = "客户地址")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String custAddr;
 
     @Column(name = "CUST_OWNER")
     @ApiParam(value = "联系人")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String custOwner;
 
     @Column(name = "CUST_EMAIL")
     @ApiParam(value = "邮箱")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String custEmail;
 
     @Column(name = "CUST_TEL")
     @ApiParam(value = "电话号码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String custTel;
 
     @Column(name = "CUST_FAX")
     @ApiParam(value = "传真")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String custFax;
 }

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -31,66 +33,83 @@ public class BasVendor extends BaseBean{
     private static final long serialVersionUID = 9214639813072592779L;
     @Column(name="VENDOR_NO")
     @ApiParam("供应商编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String vendorNo;
 
     @Column(name="VENDOR_NAME")
     @ApiParam("供应商简称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String vendorName;
 
     @Column(name="VENDOR_DESC")
     @ApiParam("供应商全称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String vendorDesc;
 
+    @Column(name = "USER_NAME")
+    @ApiParam("用户名")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST,  getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
+            dataSrc = "/impp/operate/sys-user/query-user-by-pager",
+            searchColumnName = "userName",listColumnName = "userLoginName,userName", explicitColumnName = "userName")
+    private String userName;
+
     @Column(name="VENDOR_ADDR")
     @ApiParam("供应商地址")
     private String vendorAddr;
 
     @Column(name="VENDOR_OWNER")
     @ApiParam("联系人")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String vendorOwner;
 
     @Column(name="VENDOR_EMAIL")
     @ApiParam("邮箱")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String vendorEmail;
 
     @Column(name = "IS_ASN")
     @ApiParam(value = "是否发ASN", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
     private Integer isAsn;
 
-    @Column(name = "USER_NAME")
-    @ApiParam(value = "用户名")
-    private String userName;
-
     @Column(name = "PASSWORD")
     @ApiParam(value = "密码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String password;
 
     @Column(name = "VENDOR_CALL")
     @ApiParam("供应商电话")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String vendorCall;
 
     @Column(name = "VENDOR_FAX")
     @ApiParam("传真")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String vendorFax;
 
     @Column(name = "VENDOR_PHONE")
     @ApiParam("手机")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String vendorPhone;
 
     @Column(name = "KILOBIT")
     @ApiParam("千位符号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String kilobit;
 
     @Column(name = "DECIMALS")
     @ApiParam("小数位符号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String decimals;
 
-    //20-承运商
     @Column(name = "VENDOR_TYPE")
+    @ApiParam("供应商类型")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "VENDOR_TYPE")
     private Integer vendorType;
 
     @Column(name = "MAP_LOCATION")
     @ApiParam("经纬度")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String mapLocation;
 
     public BasVendor() {

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -32,34 +34,46 @@ public class MesPpMaster extends BaseBean{
 
     @Column(name="WROKORDER_NO")
     @ApiParam("工单号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String woekorderNo;
 
     @Column(name="PDLINE_NO")
     @ApiParam("产线代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter",
+            searchColumnName = "workCenterCode,workCenterName", listColumnName = "workCenterCode,workCenterName", explicitColumnName = "workCenterCode")
     private String pdlineNo;
 
     @Column(name="PLAN_PRODUCT_TIME")
     @ApiParam("生产日期")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
     private String planProductTime;
 
     @Column(name="SHIFT_NO")
     @ApiParam("班次代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST,  getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsShift",
+            searchColumnName = "shiftNo,shiftName", listColumnName = "shiftNo,shiftName", explicitColumnName = "shiftNo")
     private String shitNo;
 
     @Column(name="START_PRODUCT_TIME")
     @ApiParam("开始生产时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
     private String startProductTime;
 
     @Column(name="END_PRODUCT_TIME")
     @ApiParam("结束生产时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
     private String endProductTime;
 
     @Column(name="ORDER_STATUS")
     @ApiParam(value = "单据状态", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WORK_ORDER_MASTER_STATUS")
     private Integer orderStatus = 0;
 
     @Column(name="SEQ")
     @ApiParam(value = "排序号", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer seq = 0;
 
     public Integer getOrderStatus() {

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

@@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -41,7 +41,7 @@ public class QadBop  implements Serializable {
     @ApiParam(value = "主键",example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     public Long id;
 
     //get单独处理

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

@@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -40,7 +40,7 @@ public class QadItemPacking implements Serializable {
     @ApiParam(value = "主键",example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     public Long id;
 
     //get单独处理

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

@@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -13,12 +13,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import org.hibernate.annotations.GenericGenerator;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -45,7 +40,7 @@ public class SodDet implements Serializable {
     @ApiParam(value = "主键",example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     public Long id;
 
     //get单独处理

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -31,26 +33,40 @@ public class SwebProcurementPlanOrder extends BaseBean {
     private static final long serialVersionUID = -4332932784803175933L;
     @Column(name = "ORDER_NO")
     @ApiParam(value = "合同号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String orderNo;
 
     @Column(name = "VENDOR_CODE")
     @ApiParam(value = "供应商代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
+            searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo")
     private String vendorCode;
 
     @Column(name = "VENDOR_NAME")
     @ApiParam(value = "供应商名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
+            searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorName")
     private String vendorName;
 
     @Column(name = "PART_NO")
     @ApiParam(value = "物料编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
+            searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
     private String partNo;
 
     @Column(name = "PART_NAME")
     @ApiParam(value = "物料名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
+            searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName")
     private String partName;
 
     @Column(name = "CONSIGNMENT")
     @ApiParam(value = "是否寄售")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
     private Integer consignment=2;
 
 }

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

@@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -35,37 +35,37 @@ public class WareHouse extends BaseBean {
     private static final long serialVersionUID = 7914396535326597148L;
     @Column(name = "CODE")
     @ApiParam("仓库代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     public String code;
 
     @Column(name = "NAME")
     @ApiParam("仓库名称")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     public String name;
 
     @Column(name = "ADDRESS")
     @ApiParam("仓库地址")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     public String address;
 
     @Column(name = "WH_LENGTH")
     @ApiParam(value = "长(单位：全局设置参数中的基本单元)")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     private Integer whLength;
 
     @Column(name = "WH_WIDTH")
     @ApiParam(value = "宽(单位：全局设置参数中的基本单元)")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     private Integer whWidth;
 
     @Column(name = "WH_HEIGHT")
     @ApiParam(value = "高(单位：全局设置参数中的基本单元)")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     private Integer whHeight;
 
     @Column(name = "BASE_UNIT", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "基本单元（米）")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     private Double baseUnit;
 
     @Column(name = "MAP_LOCATION")

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -32,38 +34,63 @@ public class WmsAreaOwner extends BaseBean {
     private static final long serialVersionUID = -5772266802563087135L;
     @Column(name = "WH_NO")
     @ApiParam(value = "仓库代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2,  getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WareHouse",
+            searchColumnName = "code,name", listColumnName = "code,name", explicitColumnName = "code")
     private String whNo;
 
     @Column(name = "ZONE_NO")
     @ApiParam(value = "存储区编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2,  getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones",
+            searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo")
     private String zoneNo;
 
     @Column(name = "LOCATE_NO")
     @ApiParam(value = "库位编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
+            searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
     private String locateNo;
 
     @Column(name="PART_NO")
     @ApiParam("物料编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2,  getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
+            searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
     public String partNo;
 
     @Column(name="PART_NAME_RDD")
     @ApiParam("物料名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2,  getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
+            searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName")
     public String partNameRdd;
 
     @Column(name = "VENDOR_NO")
     @ApiParam(value = "供应商编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2,  getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
+            searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo")
     private String vendorNo;
 
     @Column(name = "OWNER_USER_NO")
     @ApiParam(value = "负责人")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST,  getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
+            dataSrc = "/impp/operate/sys-user/query-user-by-pager",
+            searchColumnName = "userName",listColumnName = "userLoginName,userName", explicitColumnName = "userName")
     private String ownerUserNo;
 
     @Column(name = "IS_PRE_ASSIGN")
     @ApiParam(value = "是否预分配人员")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
     private Integer isPreAssign;
 
     @Column(name="SHIFT_NO")
     @ApiParam("班次编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2,  getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsShift",
+            searchColumnName = "shiftNo,shiftName", listColumnName = "shiftNo,shiftName", explicitColumnName = "shiftNo")
     private String shiftNo;
 
     @Transient

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

@@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -32,21 +32,21 @@ public class WmsBhChildDetectionItem extends BaseBean {
 
     @Column(name = "CHECK_TYPE")
     @ApiParam("检测大类")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE")
     private Integer checkType;
 
     @Column(name = "ITEM_CHECK_CODE")
     @ApiParam("子检测项代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String itemCheckCode;
 
     @Column(name = "ITEM_CHECK_NAME")
     @ApiParam("子检测项名称")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String itemCheckName;
 
     @Column(name = "VALUE_TYPE")
     @ApiParam("值类型")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_VALUE_TYPE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE")
     private Integer valueType;
 }

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

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
@@ -37,61 +38,61 @@ public class WmsBom extends BaseBean {
     private static final long serialVersionUID = 5555657644784074446L;
     @Column(name = "PART_NO")
     @ApiParam(value = "父物料号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String partNo;
 
     @Column(name = "PART_NAME")
     @ApiParam(value = "父物料描述")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String partName;
 
     @Column(name = "UNIT")
     @ApiParam(value = "计量单位")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String unit;
 
     @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "数量")
     @ColumnDefault("0")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double qty;
 
     @Column(name = "ITEM_PART_NO")
     @ApiParam(value = "子物料号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String itemPartNo;
 
     @Column(name = "ITEM_PART_NAM")
     @ApiParam(value = "子料物料描述")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String itemPartNam;
 
     @Column(name = "ITEM_UNIT")
     @ApiParam(value = "子计量单位")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String itemUnit;
 
     @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "子用量")
     @ColumnDefault("0")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double itemQty;
 
     @Column(name = "BOM_NUM")
     @ApiParam(value = "BOM编号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String bomNum;
 
     @Column(name = "BOM_VERSION")
     @ApiParam(value = "BOM版本号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String bomVersion;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "有效起始日期", example = "2018-12-31 23:59:59")
     @AnnoOutputColumn(hidden = true)
     @Column(name = "EFF_START_TIME")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
     private String effStartTime;
 
 
@@ -99,19 +100,27 @@ public class WmsBom extends BaseBean {
     @ApiParam(value = "有效截止日期", example = "2018-12-31 23:59:59")
     @AnnoOutputColumn(hidden = true)
     @Column(name = "EFF_END_TIME")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
     private String effEndTime;
 
     @Column(name = "LOCATE_NO")
     @ApiParam(value = "线边库位代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String locateNo;
 
     @Column(name = "TERMINAL_NO")
     @ApiParam(value = "工位代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String terminalNo;
 
+
+    @Column(name = "BOM_TYPE")
+    @ApiParam(value = "BOM类型")
+    @ColumnDefault("10")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 1)
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BOM_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer bomType;
+
     @ApiParam(value = "目标存储区")
     @Transient
     public String destZoneNo;

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

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
@@ -35,61 +36,61 @@ import javax.persistence.Transient;
 public class WmsBomHistory extends BaseBean {
     @Column(name = "PART_NO")
     @ApiParam(value = "父物料号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String partNo;
 
     @Column(name = "PART_NAME")
     @ApiParam(value = "父物料描述")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String partName;
 
     @Column(name = "UNIT")
     @ApiParam(value = "计量单位")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String unit;
 
     @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "数量")
     @ColumnDefault("0")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double qty;
 
     @Column(name = "ITEM_PART_NO")
     @ApiParam(value = "子物料号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String itemPartNo;
 
     @Column(name = "ITEM_PART_NAM")
     @ApiParam(value = "子料物料描述")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String itemPartNam;
 
     @Column(name = "ITEM_UNIT")
     @ApiParam(value = "子计量单位")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String itemUnit;
 
     @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "子用量")
     @ColumnDefault("0")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double itemQty;
 
     @Column(name = "BOM_NUM")
     @ApiParam(value = "BOM编号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String bomNum;
 
     @Column(name = "BOM_VERSION")
     @ApiParam(value = "BOM版本号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String bomVersion;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "有效起始日期", example = "2018-12-31 23:59:59")
     @AnnoOutputColumn(hidden = true)
     @Column(name = "EFF_START_TIME")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
     private String effStartTime;
 
 
@@ -97,24 +98,31 @@ public class WmsBomHistory extends BaseBean {
     @ApiParam(value = "有效截止日期", example = "2018-12-31 23:59:59")
     @AnnoOutputColumn(hidden = true)
     @Column(name = "EFF_END_TIME")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
     private String effEndTime;
 
     @Column(name = "LOCATE_NO")
     @ApiParam(value = "线边库位代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String locateNo;
 
     @Column(name = "TERMINAL_NO")
     @ApiParam(value = "工位代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String terminalNo;
 
     @Column(name = "NEW_BOM_VERSION")
     @ApiParam(value = "工位代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String newBomVersion;
 
+    @Column(name = "BOM_TYPE")
+    @ApiParam(value = "BOM类型")
+    @ColumnDefault("10")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 1)
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BOM_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer bomType;
+
     @ApiParam(value = "目标存储区")
     @Transient
     public String destZoneNo;

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

@@ -1,7 +1,9 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -12,7 +14,6 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description : 车辆信息
@@ -26,43 +27,60 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_CAR")
+@Table(name = "WMS_CAR")
 @Api("车辆信息")
 public class WmsCar extends BaseBean {
 
-    @Column(name="CAR_NO")
-    @ApiParam(value ="车牌号")
+    @Column(name = "CAR_NO")
+    @ApiParam(value = "车牌号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String carNo;
 
-    @Column(name="CAR_DESC")
-    @ApiParam(value ="车辆描述")
+    @Column(name = "CAR_DESC")
+    @ApiParam(value = "车辆描述")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String carDesc;
 
-    @Column(name="MAX_CAPACITY")
-    @ApiParam(value ="载重量(KG)")
+    @Column(name = "MAX_CAPACITY")
+    @ApiParam(value = "载重量(KG)")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String maxCapacity;
 
-    @Column(name="DRIVER_NO")
-    @ApiParam(value ="默认驾驶员")
+    @Column(name = "DRIVER_NO")
+    @ApiParam(value = "默认驾驶员")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsTmsDriver",
+            searchColumnName = "driverNo,driverName", listColumnName = "driverNo,driverName", explicitColumnName = "driverNo")
     private String driverNo;
 
-    @Column(name="PHONE")
-    @ApiParam(value ="车主电话")
+    @Column(name = "PHONE")
+    @ApiParam(value = "车主电话")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String phone;
 
-    @Column(name="VENDOR_NO")
-    @ApiParam(value ="所属供应商")
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "所属供应商")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
+            searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo")
     private String vendorNo;
 
-    @Transient
-    @ApiParam("司机名称")
+    @Column(name = "DRIVER_NAME_RDD")
+    @ApiParam("驾驶员名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsTmsDriver",
+            searchColumnName = "driverNo,driverName", listColumnName = "driverNo,driverName", explicitColumnName = "driverName")
     private String driverNameRdd;
 
-    @Transient
+    @Column(name = "VENDOR_NAME_RDD")
     @ApiParam(value = "供应商名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
+            searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorName")
     private String vendorNameRdd;
 
     @Column(name = "MAP_LOCATION")
     @ApiParam("经纬度")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String mapLocation;
 }

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

@@ -1,20 +1,20 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.ColumnDefault;
 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;
 
 /**
  * @Description :容器类型
@@ -33,22 +33,27 @@ import javax.persistence.Transient;
 public class WmsContainerType extends BaseBean {
     private static final long serialVersionUID = 4849044986767609347L;
     @ApiParam(value = "容器类型代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String ctCode;
 
     @Column(name = "CT_NAME")
     @ApiParam(value = "容器类型名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String ctName;
 
     @Column(name = "USE_LIMIT")
     @ApiParam(value = "使用期限")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private Integer useLimit;
 
     @Column(name = "IS_RECYCLE")
     @ApiParam(value = "是否回收")
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
     private Integer isRecycle;
 
     @Column(name = "LIMIT_UOM")
     @ApiParam(value = "期限单位")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String limitUom;
 }

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

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -37,77 +38,86 @@ public class WmsCsStrategy extends BaseBean implements Serializable {
 
     @Column(name = "STRATEGY_NAME")
     @ApiParam(value = "策略名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String strategyName;
 
     @Column(name = "part_type")
     @ApiParam(value = "物料分类")
     @AnnoOutputColumn(refClass = WmsEnumUtil.PART_ABC.class, refForeignKey = "value", value = "description")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_ABC")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PART_ABC")
     private String partType;
 
     @Column(name = "STRATEGY_TYPE")
     @ApiParam(value = "策略分类", example = "0")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "CS_STRATEGY_TYPE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "CS_STRATEGY_TYPE")
     @AnnoOutputColumn(refClass = WmsEnumUtil.CS_STRATEGY_TYPE.class)
     private Integer strategyType;
 
     @Column(name = "CYCLE_RULE")
     @ApiParam(value = "循环规则")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String cycleRule;
 
     @Column(name = "START_DATE")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
     @ApiParam(value = "开始日期", example = "0")
     private String startDate;
 
     @Column(name = "END_DATE")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
     @ApiParam(value = "结束日期", example = "0")
     private String endDate;
 
     @Column(name = "NUM_MAX")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     @ApiParam(value = "明细数量上限")
     private Integer numMax;
 
     @Column(name = "COVERAGE_RATE")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     @ApiParam(value = "抽盘覆盖率")
     private Double coverageRate;
 
     @Column(name = "ZONE_NOS")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam(value = "存储区")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones",
+            searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo")
     private String zoneNos;
 
     @Column(name = "LOCATES")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam(value = "盘点库位")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
+            searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
     private String locates;
 
     @Column(name = "last_run_time")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
     @ApiParam(value = "上次运行时间")
     private String lastRunTime;
 
     @Column(name = "next_run_time")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
     @ApiParam(value = "下次运行时间")
     private String nextRunTime;
 
     @Column(name = "REMAKE")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     @ApiParam(value = "备注")
     private String remake;
 
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam(value = "已盘物料")
-    @Column(name="INVENTORY_MATERIAL")
+    @Column(name = "INVENTORY_MATERIAL")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
+            searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
     private String inventoryMaterial;
 
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam(value = "已盘库位")
-    @Column(name="INVENTORY_LOCATION")
-    private String   inventoryLocation;
+    @Column(name = "INVENTORY_LOCATION")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
+            searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
+    private String inventoryLocation;
 }

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

@@ -47,4 +47,14 @@ public class WmsCustWindow extends BaseBean {
     @Column(name = "DELAY_HOUR")
     @ApiParam(value = "容差")
     private Integer delayHour;
+
+    public WmsCustWindow(WmsCustWindow custWindow) {
+        this.custNo = custWindow.getCustNo();
+        this.custWindowTime = custWindow.getCustWindowTime();
+        this.weeks = custWindow.getWeeks();
+        this.delayHour = custWindow.getDelayHour();
+    }
+
+    public WmsCustWindow() {
+    }
 }

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -11,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description : 客户零件关系表
@@ -32,21 +33,34 @@ public class WmsCustomerPart extends BaseBean {
     private static final long serialVersionUID = 3903166651913139058L;
     @Column(name = "CUSTOMER_CODE")
     @ApiParam(value = "客户代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer",
+            searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custNo")
     private String customerCode;
 
     @Column(name = "PART_NO")
     @ApiParam(value = "物料号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
+            searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
     private String partNo;
 
     @Column(name = "CUSTOMER_PART_NO")
     @ApiParam(value = "客户零件号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String customerPartNo;
 
-    @Transient
+    @Column(name = "CUSTOMER_DESC")
     @ApiParam(value = "客户全称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer",
+            searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custDesc")
     private String custDesc;
 
-    @Transient
+    @Column(name = "PART_NAME")
     @ApiParam(value ="物料名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
+            searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName")
     private String partName;
 }

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

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
@@ -359,4 +358,10 @@ public class WmsDocMovementDetails extends BaseBean {
         this.modifyDatetime = modifyDatetime;
     }
 
+
+    public WmsDocMovementDetails(WmsPOMasterDetails poMasterDetails) {
+        this.orderNo = poMasterDetails.getOrderNo();
+        this.planDate = poMasterDetails.getPlanDate();
+        this.planTime = poMasterDetails.getPlanTime();
+    }
 }

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

@@ -217,4 +217,12 @@ public class WmsDocMovementMaster extends BaseBean {
     public int getBusiTypeVal() {
         return this.busiType == null ? 0 : this.busiType;
     }
+
+    public WmsDocMovementMaster(WmsPOMaster wmsPoMaster) {
+        this.orderNo = wmsPoMaster.getOrderNo();
+        this.vendorNo = wmsPoMaster.getVendorNo();
+    }
+
+    public WmsDocMovementMaster() {
+    }
 }

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

@@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 销售订单明细表
@@ -67,4 +68,8 @@ public class WmsDocSoDetails extends BaseBean {
     @ColumnDefault("0")
     @ApiParam(value = "需求数量", example = "0")
     public Double qty;
+
+    @Transient
+    @ApiParam(value = "客户编号")
+    private String custCode;
 }

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

@@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -31,21 +31,21 @@ import javax.persistence.Table;
 public class WmsDock extends BaseBean {
     @Column(name="DOCK_CODE")
     @ApiParam("道口代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String dockCode;
 
     @Column(name="DOCK_ADDRESS")
     @ApiParam("道口发运地址")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String dockAddress;
 
     @Column(name="DOCK_DESC")
     @ApiParam("道口发运地址描述")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String dockDesc;
 
     @Column(name="DOCK_TYPE")
     @ApiParam("道口类型")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "DOCK_TYPE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "DOCK_TYPE")
     private Integer dockType;
 }

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

@@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -33,45 +33,49 @@ public class WmsDockOrderInfo extends BaseBean {
 
     @Column(name="DOCK_CODE")
     @ApiParam("道口代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String dockCode;
 
     @Column(name="ORDER_DATE")
     @ApiParam("预约日期")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
     private String orderDate;
 
     @Column(name="WINDOW_TIME")
     @ApiParam("窗口时间")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
     private String windowTime;
 
     @Column(name="ORDER_STATUS")
     @ApiParam("预约状态")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "DOCK_ORDER_STATUS")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "DOCK_ORDER_STATUS")
     private Integer orderStatus;
 
     @Column(name="SUPPLIER_CODE")
     @ApiParam("供应商编码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String supplierCode;
 
     @Column(name="CAR_NO")
     @ApiParam("车辆编号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String carNo;
 
     @Column(name="DRIVER_NAME")
     @ApiParam("驾驶员")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String driverName;
 
     @Column(name="ORDER_NO")
     @ApiParam("单据号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String orderNo;
 
     @Transient
+    @ApiParam("驾驶员编码")
+    private String driverNo;
+
+    @Transient
     @ApiParam("库位代码")
     private Integer masterStatus;
 }

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

@@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -32,11 +32,11 @@ public class WmsDockWindowTime extends BaseBean {
 
     @Column(name="DOCK_CODE")
     @ApiParam("道口代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String dockCode;
 
     @Column(name="WINDOW_TIME")
     @ApiParam("窗口时间")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
     private String windowTime;
 }

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -33,32 +35,43 @@ public class WmsIbCheckPlan extends BaseBean{
     private static final long serialVersionUID = 3557978060450659460L;
     @Column(name="PART_NO")
     @ApiParam(value ="物料编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST,  getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
+            searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
     private String partNo;
 
     @Column(name="PART_NAME_RDD")
     @ApiParam(value ="物料名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST,  getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
+            searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName")
     private String partNameRdd;
 
     @Column(name="START_DATE")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiParam(value ="开始日期")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
     private String startDate;
 
     @Column(name="END_DATE")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiParam(value ="结束日期")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
     private String endDate;
 
     @Column(name="LOT_QTY")
     @ApiParam(value ="样本数量", example = "-1")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     private Integer lotQty;
 
     @Column(name="COUNTER")
     @ApiParam(value ="已收货件数", example = "-1")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer counter;
 
     @Column(name="CHECK_COUNTER")
     @ApiParam(value ="已抽点件数", example = "-1")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer checkCounter;
 
     @Transient

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

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -35,12 +36,12 @@ public class WmsLocate extends BaseBean {
     private static final long serialVersionUID = -8425904594036746967L;
     @Column(name = "LOCATE_NO")
     @ApiParam(value = "库位代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String locateNo;
 
     @Column(name = "LOCATE_NAME")
     @ApiParam(value = "库位名称")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String locateName;
 
     /**
@@ -49,104 +50,106 @@ public class WmsLocate extends BaseBean {
     @Column(name = "LOCATE_TYPE")
     @ApiParam(value = "库位类型")
     @AnnoOutputColumn(refClass = WmsEnumUtil.LOCATE_TYPE.class, refForeignKey = "value", value = "description")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "LOCATE_TYPE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "LOCATE_TYPE")
     private Integer locateType;
 
     @Column(name = "WH_NO")
     @ApiParam(value = "仓库代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2,entityName="cn.estsh.i3plus.pojo.wms.bean.WareHouse",
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WareHouse",
             searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code")
     private String whNo;
 
     @Column(name = "ZONE_NO")
     @ApiParam(value = "存储区代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2,entityName="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
             searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo")
     private String zoneNo;
 
     @Column(name = "FURNITURE_NO")
     @ApiParam(value = "家具代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String furnitureNo;
 
     @Column(name = "X")
     @ApiParam(value = "X", example = "-1")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer x;
 
     @Column(name = "Y")
     @ApiParam(value = "Y", example = "-1")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer y;
 
     @Column(name = "Z")
     @ApiParam(value = "Z", example = "-1")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer z;
 
     @Column(name = "LC_LENGTH")
     @ApiParam(value = "长")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer lcLength;
 
     @Column(name = "LC_WIDTH")
     @ApiParam(value = "宽")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer lcWidth;
 
     @Column(name = "LC_HEIGHT")
     @ApiParam(value = "高")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer lcHeight;
 
     @Column(name = "SEQ")
     @ApiParam(value = "序号", example = "-1")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer seq;
 
     @Column(name = "STATUS")
     @ApiParam(value = "库位状态", example = "-1")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, entityName = "LOCATE_STATUS")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, dataSrc = "LOCATE_STATUS")
     private Integer status;
 
     @Column(name = "MAX_PACKAGE_QTY")
     @ApiParam(value = "最大包装数量", example = "-1")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer maxPackageQty;
 
     @Column(name = "MAX_PART_QTY", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "最大零件数量", example = "-1")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double maxPartQty;
 
     @Column(name = "STOCK_UNIT")
     @ApiParam(value = "存放单位")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String stockUnit;
 
     @Column(name = "LINE_CODE")
     @ApiParam(value = "生产线")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String lineCode;
 
     @Column(name = "BOX_QTY")
     @ApiParam(value = "箱数", example = "-1")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer boxQty;
 
     @Column(name = "PART_QTY", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "零件数", example = "-1")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double partQty;
 
     @Column(name = "ENCRYPTION_NO")
     @ApiParam(value = "加密编码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String encryptionNo;
 
     @Column(name = "LAST_CS_TIME")
     @ApiParam(value = "末次盘点时间")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
     private String lastCsTime;
 
     @Column(name = "POSITION")

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -32,38 +34,53 @@ public class WmsLocatePart extends BaseBean {
     private static final long serialVersionUID = 9134745988014340144L;
     @Column(name = "LOCATE_NO")
     @ApiParam(value = "库位编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
+            searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
     private String locateNo;
 
     @Column(name = "PART_NO")
     @ApiParam(value = "物料代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST,  getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
+            searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
     private String partNo;
 
     @Column(name = "PART_NAME_RDD")
     @ApiParam(value = "物料名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2,  getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
+            searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName")
     private String partNameRdd;
 
     @Column(name = "PULL_QTY", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "拉动数量", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     private Double pullQty;
 
     @Column(name = "MAX", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "最大值", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     private Double max;
 
     @Column(name = "MIN", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "最小值", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     private Double min;
 
     @Column(name = "IS_GENERATE_PICKLIST")
     @ApiParam(value = "是否生成领料单", example = "2")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
     private Integer isGeneratePicklist;
 
     @Column(name = "SAFETY_STOCK", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "安全库存", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     private Double safetyStock;
 
     @Column(name = "MOQ", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "起订量", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double moq;
 
     @Transient

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

@@ -1,7 +1,9 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -37,41 +39,58 @@ public class WmsMoveDetails extends BaseBean {
     private static final long serialVersionUID = -5898637337319011710L;
     @Column(name = "ORDER_NO")
     @ApiParam("单号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     public String orderNo;
 
     @Column(name = "ITEM")
     @ApiParam(value = "行号", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     public Integer item;
 
     @Column(name = "PART_NO")
     @ApiParam("物料编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
+            searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
     public String partNo;
 
     @Column(name = "PART_NAME_RDD")
     @ApiParam("物料名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
+            searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName")
     public String partNameRdd;
 
     @Column(name = "VENDOR_NO")
     @ApiParam("供应商编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
+            searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo")
     public String vendorNo;
 
     @Column(name = "CUST_NO")
     @ApiParam("客户编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer",
+            searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custNo")
     public String custNo;
 
     @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "处理数量", example = "0")
     @ColumnDefault("0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     public Double transQty;
 
     @Column(name = "HANDLED_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "已处理数量", example = "0")
     @ColumnDefault("0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     public Double handledQty;
 
     @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "不合格处理数量", example = "0")
     @ColumnDefault("0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     public Double rejectQty;
 
     public Double getRejectQty() {
@@ -80,30 +99,49 @@ public class WmsMoveDetails extends BaseBean {
 
     @Column(name = "UNIT")
     @ApiParam("单位")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     public String unit;
 
     @Column(name = "SRC_WH_NO")
     @ApiParam("源仓库代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WareHouse",
+            searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code")
     public String srcWhNo;
 
     @Column(name = "SRC_ZONE_NO")
     @ApiParam("源存储区代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
+            searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo")
     public String srcZoneNo;
 
     @Column(name = "SRC_LOCATE_NO")
     @ApiParam("源库位代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
+            searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
     public String srcLocateNo;
 
     @Column(name = "DEST_WH_NO")
     @ApiParam("目标仓库代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WareHouse",
+            searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code")
     public String destWhNo;
 
     @Column(name = "DEST_ZONE_NO")
     @ApiParam("目标存储区代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
+            searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo")
     public String destZoneNo;
 
     @Column(name = "DEST_LOCATE_NO")
     @ApiParam("目标库位代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
+            searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
     public String destLocateNo;
 
     /**
@@ -112,10 +150,12 @@ public class WmsMoveDetails extends BaseBean {
     @Column(name = "ITEM_STATUS")
     @ApiParam(value = "状态", example = "0")
     @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "MOVE_ORDER_STATUS")
     public Integer itemStatus;
 
     @Column(name = "REF_ITEM")
     @ApiParam("关联单据行号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     public String refItem;
 
     /**
@@ -123,14 +163,17 @@ public class WmsMoveDetails extends BaseBean {
      */
     @Column(name = "REF_TYPE")
     @ApiParam("关联单据类型")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "LINK_ORDER_TYPE")
     public String refType;
 
     @Column(name = "REF_SRC")
     @ApiParam("关联单号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     public String refSrc;
 
     @Column(name = "GROUP_NO")
     @ApiParam("分组号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     public String groupNo;
 
     @ApiParam(value = "待出库数量", example = "0")
@@ -200,6 +243,7 @@ public class WmsMoveDetails extends BaseBean {
 
     @Column(name = "CONSIGNATION")
     @ApiParam("是否寄售 1-是 2-否")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
     private Integer consignation = 2;
 
     public Integer getIsSnapshot() {

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -11,14 +13,13 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
- * @Description :容器类型
+ * @Description :包装规格
  * @Reference :
- * @Author : 容器类型
+ * @Author :
  * @CreateDate : 2019-11-07 16:06
- * @Modify:
+ * @Modify:  2020-04-27 修改头部描述-dragon
  **/
 @Data
 @Entity
@@ -30,34 +31,45 @@ import javax.persistence.Transient;
 public class WmsPackageSpec extends BaseBean {
     private static final long serialVersionUID = 4849044986767609445L;
     @ApiParam(value = "包装规格代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String specCode;
 
     @Column(name = "SPEC_NAME")
     @ApiParam(value = "包装规格名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String specName;
 
     @Column(name = "QTY")
     @ApiParam(value = "包装数量")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     private Double qty;
 
     @Column(name = "PARENT_SPEC")
     @ApiParam(value = "上级规格")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
+            isRequire = 2, dataSrc = "/wms/wms-package-spec/query", listColumnName = "specName", explicitColumnName = "specCode")
     private String parentSpec;
 
     @Column(name = "SPEC_LEVEL")
     @ApiParam(value = "规格层级")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "SPEC_LEVEL")
     private Integer specLevel;
 
     @Column(name = "IS_MIXED")
     @ApiParam(value = "是否混包")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
     private Integer isMixed;
 
 
     @Column(name = "POCKET_TYPE")
     @ApiParam(value = "容器类型")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
+             dataSrc = "/wms/wms-container-type/query", listColumnName = "ctName", explicitColumnName = "ctCode")
     private String pocketType;
 
     @ApiParam(value = "上级规格名称")
-    @Transient
+    @Column(name = "PARENT_NAME")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
+            isRequire = 2, dataSrc = "/wms/wms-package-spec/query", listColumnName = "specName", explicitColumnName = "specName")
     private String parentName;
 }

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

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -32,237 +33,239 @@ import javax.persistence.*;
 @Api("物料表")
 public class WmsPart extends BaseBean {
     private static final long serialVersionUID = 4849044986767609346L;
+
     @Column(name = "PART_NO")
     @ApiParam(value = "物料编码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String partNo;
 
     @Column(name = "PART_NAME")
     @ApiParam(value = "物料名称")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String partName;
 
-    @Column(name = "PART_SPEC")
-    @ApiParam(value = "物料规格")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
-    private String partSpec;
+    @Column(name = "PART_TYPE_DESC")
+    @ApiParam(value = "物料类型描述")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String partTypeDesc;
 
     @Column(name = "PART_TYPE")
     @ApiParam(value = "物料类型")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "WMS_PART_TYPE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WMS_PART_TYPE")
     @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class)
     private String partType;
 
-    @Column(name = "PART_TYPE_DESC")
-    @ApiParam(value = "物料类型描述")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
-    private String partTypeDesc;
+    @Column(name = "STOCK_UNIT")
+    @ApiParam(value = "库存单位")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
+            isRequire = 2, dataSrc = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode")
+    private String stockUnit;
+
+    @Column(name = "IN_LOCATE_NO")
+    @ApiParam(value = "默认入库库位")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
+            searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
+    private String inLocateNo;
+
+    @Column(name = "SNP", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "标包", example = "1")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    private Double snp;
+
+    @ColumnDefault("2")
+    @Column(name = "IQC")
+    @ApiParam(value = "是否免检", example = "1")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
+    private Integer iqc;
+
+    @Column(name = "PART_SPEC")
+    @ApiParam(value = "物料规格")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partSpec;
 
     @Column(name = "GRAPHI_NO")
     @ApiParam(value = "图号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String graphiNo;
 
     @Column(name = "VERSION")
     @ApiParam(value = "版本")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String version;
 
     @Column(name = "COLOR")
     @ApiParam(value = "颜色")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String color;
 
-    @Column(name = "STOCK_UNIT")
-    @ApiParam(value = "库存单位")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL,
-            isRequire = 2, entityName = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode")
-    private String stockUnit;
-
     @Column(name = "ABC")
     @ApiParam(value = "分类")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String abc;
 
     @Column(name = "BUY_UNIT")
     @ApiParam(value = "采购单位")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL,
-            isRequire = 2, entityName = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
+            isRequire = 2, dataSrc = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode")
     private String buyUnit;
 
     @Column(name = "BU2SU", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "换算率1", example = "1")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double bu2su;
 
     @Column(name = "PRICE_UNIT")
     @ApiParam(value = "计价单位")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL,
-            isRequire = 2, entityName = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
+            isRequire = 2, dataSrc = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode")
     private String priceUnit;
 
     @Column(name = "PU2SU", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "换算率2", example = "1")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double pu2su;
 
-    @Column(name = "SNP", columnDefinition = "decimal(18,8)")
-    @ApiParam(value = "标包", example = "1")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
-    private Double snp;
-
-    @ColumnDefault("2")
-    @Column(name = "IQC")
-    @ApiParam(value = "是否免检", example = "1")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE")
-    private Integer iqc;
-
     @Column(name = "MIN", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "最低库存", example = "1")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double min;
 
     @Column(name = "MAX", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "最高库存", example = "1")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double max;
 
     @Column(name = "PART_GROUP")
     @ApiParam(value = "物料组")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL,
-            isRequire = 2, entityName = "/wms/wms-enum/dictionary/code?code=PART_GROUP_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
+            isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=PART_GROUP_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue")
     private String partGroup;
 
     @Column(name = "LOT_CHECK_RULE")
     @ApiParam(value = "批次校验规则")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL,
-            isRequire = 2, entityName = "/wms/wms-enum/dictionary/code?code=LOT_CHECK_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
+            isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=LOT_CHECK_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue")
     private String lotCheckRule;
 
     @Column(name = "SN_CONTROL")
     @ApiParam(value = "是否条码管理", example = "1")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
     private Integer snControl;
 
     @Column(name = "VENDOR_NO")
     @ApiParam(value = "供应商代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String vendorNo;
 
-    @Column(name = "IN_LOCATE_NO")
-    @ApiParam(value = "默认入库库位")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
-            searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
-    private String inLocateNo;
-
     @Column(name = "PROD_CFG_TYPE_CODE")
     @ApiParam("项目代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String prodCfgTypeCode;
 
     @Column(name = "PROD_CFG_TYPE_NAME")
     @ApiParam("项目名称")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String prodCfgTypeName;
 
     @Column(name = "OUT_CLOSE_FLAG")
     @ApiParam("項目结算标识")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String outCloseFlag = "2";
 
     @Column(name = "OUT_CLOSE_TYPE")
     @ApiParam("结算方式")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String outCloseType;
 
     @Column(name = "OUT_CLOSE_VENDOR")
     @ApiParam("结算供应商")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
             searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo")
     private String outCloseVendor;
 
     @Column(name = "QUALITY_DAYS")
     @ApiParam("保质期天数")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer qualityDays;
 
     @Column(name = "IS_REPORT_PARTNO")
     @ApiParam("是否报工零件")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
     private Integer isReportPartNo;
 
     @Column(name = "REPORT_LOCATE_NO")
     @ApiParam("报工库位")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String reportLocateNo;
 
     @Column(name = "REPORT_ZONE_NO")
     @ApiParam("报工存储区")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String reportZoneNo;
 
     @Column(name = "PRODUCT_LINES")
     @ApiParam("报工产线")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL,
-            isRequire = 2, entityName = "/wms/work-center/list", listColumnName = "workCenterName", explicitColumnName = "workCenterCode")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
+            isRequire = 2, dataSrc = "/wms/work-center/list", listColumnName = "workCenterName", explicitColumnName = "workCenterCode")
     private String productLines;
 
     @Column(name = "PROPORTION", columnDefinition = "decimal(10,5)")
     @ApiParam(value = "待质检比例", example = "1")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double proportion;
 
     @Column(name = "IS_VALUABLE", columnDefinition = "int default 2")
     @ApiParam(value = "是否贵重")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "IS_VALUABLE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "IS_VALUABLE")
     @AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description")
     private Integer isValuable;
 
     @Transient
     @ApiParam("总数量")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double qty;
 
     @Transient
     @ApiParam("库存水平")
     @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_LEVEL_STATUS.class, refForeignKey = "value", value = "description")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String stockLevelStatus;
 
     @Column(name = "verb_num")
     @ApiParam(value = "单次拆包数")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double verbNum;
 
     @Column(name = "IS_PROD_LOT")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
     @ApiParam(value = "是否录入生产批次", example = "1")
     private Integer isProdLot = 2;
 
     @Column(name = "PULL_WAY")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.MULTIPLE_ENUM,
-            isRequire = 2, entityName = "PULL_WAY_STATUS")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, isRequire = 2, dataSrc = "PULL_WAY_STATUS")
     @ApiParam(value = "拉动方式")
     private String pullWay;
 
     @Column(name = "TAIL_QTY_MODE")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TAIL_QTY_MODE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TAIL_QTY_MODE")
     @ApiParam(value = "尾数计算方式", example = "1")
     private Integer tailQtyMode;
 
     @Column(name = "CYCLE_RQUEST_PERIOD")
     @ApiParam(value = "循环补货周期", example = "0")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer cycleRquestPeriod = 0;
 
     @Column(name = "CYCLE_RQUEST_QTY")
     @ApiParam(value = "循环补货数量", example = "0")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double cycleRquestQty = 0d;
 
     @Column(name = "CURING_TIME")
     @ApiParam(value = "固化时间", example = "0")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double curingTime = 0d;
 
     public int getIqcVal() {

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

@@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -32,26 +32,26 @@ public class WmsPartCheckType extends BaseBean {
 
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("产线代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String workCenterCode;
 
     @Column(name = "PART_NO")
     @ApiParam("物料号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String partNo;
 
     @Column(name = "PART_NAME")
     @ApiParam("物料名称")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String partName;
 
     @Column(name = "CHECK_TYPE")
     @ApiParam("检测大类")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE")
     private Integer checkType;
 
     @Column(name = "SAMPLE_SIZE")
     @ApiParam("样本数")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer sampleSize;
 }

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

@@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -39,121 +39,121 @@ public class WmsPartExtend extends BaseBean {
 
     @Column(name = "IS_SETTLE")
     @ApiParam(value = "是否内部交易")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
     private Integer isSettle;
 
     @Column(name = "SETTLE_FACTORY_CODE")
     @ApiParam(value = "结算工厂")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String settleFactoryCode;
 
     @Column(name = "SETTLE_REC_ERP_WH")
     @ApiParam(value = "结算物料收货库存")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String settleRecErpWh;
 
     @Column(name = "VALUATION_CLASS")
     @ApiParam(value = "评估类")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String valuationClass;
 
     @Column(name = "VALUATION_CLASS_NAME")
     @ApiParam(value = "评估类描述")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String valuationClassName;
 
     @Column(name = "MC_CODE")
     @ApiParam(value = "MRP控制者")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String mcCode;
 
     @Column(name = "MC_NAME")
     @ApiParam(value = "MRP控制者名称")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String mcName;
 
     @Column(name = "IS_STEEL")
     @ApiParam(value = "是否为钢卷料")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_STEEL_TYPE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PART_STEEL_TYPE")
     private Integer isSteel;
 
     @Column(name = "IS_PACKAGE_MATERIAL")
     @ApiParam(value = "是否为包材")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
     private Integer isPackageMaterial;
 
     @Column(name = "RECEIVING_TYPE")
     @ApiParam(value = "收货类型")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String receivingType;
 
     @Column(name = "LOT_CONTROL")
     @ApiParam(value = "批次控制")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String lotControl;
 
     @Column(name = "RANGE_LOT")
     @ApiParam(value = "批次容差")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     private Integer rangeLot;
 
     @Column(name = "QUALITY_RATE")
     @ApiParam(value = "质检率")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     private Double qualityRate;
 
     @Column(name = "ROUTING")
     @ApiParam(value = "工艺")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String routing;
 
     @Column(name = "PO_PART_MULTIPLE")
     @ApiParam(value = "乘倍包装")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String poPartMultiple;
 
     @Column(name = "RANGE_QTY_RATE")
     @ApiParam(value = "数量容差")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     private Integer rangeQtyRate;
 
     @Column(name = "RANGE_INVENTORY")
     @ApiParam(value = "盘点容差")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     private Integer rangeInventory;
 
     @Column(name = "PROD_LINE")
     @ApiParam(value = "产品类")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String prodLine;
 
     @Column(name = "SUPPLY_TYPE")
     @ApiParam(value = "供货类型")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_SUPPLY_TYPE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PART_SUPPLY_TYPE")
     private Integer supplyType;
 
     @Column(name = "RECEIVING_MODE")
     @ApiParam(value = "收货方式")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_RECEIVING_METHOD")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PART_RECEIVING_METHOD")
     private Integer receivingMethod;
 
     @Column(name = "PRE_RECEIVING_DAY")
     @ApiParam(value = "预收货天数")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     private Integer preReceivingDay;
 
     @Column(name = "IS_WAY_CALCULATION")
     @ApiParam(value = "是否计算在途库存")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
     private Integer isWayCalculation;
 
     @Column(name = "IS_AUTO_PURCHASE")
     @ApiParam(value = "是否自动采购")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
     private Integer isAutoPurchase;
 
     @Column(name = "AUTO_PURCHASE_QTY")
     @ApiParam(value = "自动采购数量")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     private Integer autoPurchaseQty;
 }

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -31,9 +33,11 @@ public class WmsPartGroup extends BaseBean{
     private static final long serialVersionUID = 9214639813072864436L;
     @Column(name="PART_GROUP_NO")
     @ApiParam("物料组编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String partGroupNo;
 
     @Column(name="PART_GROUP_NAME")
     @ApiParam("物料组名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String partGroupName;
 }

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

@@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -32,46 +32,46 @@ public class WmsPartItemCheck extends BaseBean {
 
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("产线代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String workCenterCode;
 
     @Column(name = "PART_NO")
     @ApiParam("物料号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String partNo;
 
     @Column(name = "CHECK_TYPE")
     @ApiParam("检测大类")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE")
     private Integer checkType;
 
     @Column(name = "CHECK_ITEM_CODE")
     @ApiParam("子检测项代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String checkItemCode;
 
     @Column(name = "CHECK_ITEM_NAME")
     @ApiParam("子检测项名称")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String checkItemName;
 
     @Column(name = "VALUE_TYPE")
     @ApiParam("子检测箱值类型")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_VALUE_TYPE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE")
     private Integer valueType;
 
     @Column(name = "STANDARD")
     @ApiParam("标准值")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
-    private Double standard;
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    private Integer standard;
 
     @Column(name = "MAX")
     @ApiParam("最大值")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double max;
 
     @Column(name = "MIN")
     @ApiParam("最小值")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double min;
 }

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

@@ -1,8 +1,6 @@
 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;
@@ -16,11 +14,11 @@ import javax.persistence.Table;
 import javax.persistence.Transient;
 
 /**
- * @Description :容器类型
+ * @Description :物料包装关系
  * @Reference :
- * @Author : 容器类型
+ * @Author :
  * @CreateDate : 2019-11-07 16:06
- * @Modify:
+ * @Modify: 2020-04-27 修改头部描述-dragon
  **/
 @Data
 @Entity

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -31,10 +33,12 @@ public class WmsProdCfgType extends BaseBean {
     private static final long serialVersionUID = -131043081244530896L;
     @Column(name="PROD_CFG_TYPE_CODE")
     @ApiParam("项目代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     public String prodCfgTypeCode;
 
     @Column(name="PROD_CFG_TYPE_NAME")
     @ApiParam("项目名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     public String prodCfgTypeName;
 
 }

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

@@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -12,7 +12,6 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -31,21 +30,21 @@ import javax.persistence.Table;
 public class WmsPullRule extends BaseBean {
     @Column(name = "PULL_WAY")
     @ApiParam(value = "拉动类型", example = "10")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PULL_WAY_STATUS")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PULL_WAY_STATUS")
     private Integer pullWay;
 
     @Column(name = "CONTAIN_UNFINISH_ORDER")
     @ApiParam(value = "考虑未完成的移库单", example = "0")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
     private Integer containUnfinishOrder;
 
     @Column(name = "CONTAIN_EXIST_PERIOD")
     @ApiParam(value = "考虑现有库存", example = "0")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
     private Integer containExistStock;
 
     @Column(name = "TAIL_QTY_MODE")
     @ApiParam(value = "尾数计算方式", example = "0")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TAIL_QTY_MODE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TAIL_QTY_MODE")
     private Integer tailQtyMode;
 }

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -32,42 +34,56 @@ public class WmsPullTaskMaster extends BaseBean{
 
     @Column(name="WROKORDER_NO")
     @ApiParam("工单号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String woekorderNo;
 
     @Column(name="PDLINE_NO")
     @ApiParam("产线代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter",
+            searchColumnName = "workCenterCode,workCenterName", listColumnName = "workCenterCode,workCenterName", explicitColumnName = "workCenterCode")
     private String pdlineNo;
 
     @Column(name="PLAN_PRODUCT_TIME")
     @ApiParam("生产日期")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
     private String planProductTime;
 
     @Column(name="SHIFT_NO")
     @ApiParam("班次代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST,  getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsShift",
+            searchColumnName = "shiftNo,shiftName", listColumnName = "shiftNo,shiftName", explicitColumnName = "shiftNo")
     private String shitNo;
 
     @Column(name="START_PRODUCT_TIME")
     @ApiParam("开始生产时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
     private String startProductTime;
 
     @Column(name="END_PRODUCT_TIME")
     @ApiParam("结束生产时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
     private String endProductTime;
 
     @Column(name="ORDER_STATUS")
     @ApiParam(value = "单据状态", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PULL_TASK_MASTER_STATUS")
     private Integer orderStatus = 0;
 
     @Column(name="IS_SUSPEND")
     @ApiParam(value = "是否暂停", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
     private Integer isSuspend = 2;
 
     @Column(name="PULL_TASK_TYPE")
     @ApiParam(value = "拉动任务类型", example = "10")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PULL_TASK_TYPE")
     private Integer pullTaskType;
 
     @Column(name="SEQ")
     @ApiParam(value = "排序号", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     private Integer seq;
 
     public Integer getOrderStatus() {

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

@@ -1,7 +1,9 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -34,6 +36,7 @@ public class WmsQCMaster extends BaseBean {
     private static final long serialVersionUID = 2701710669030092148L;
     @Column(name = "ORDER_NO")
     @ApiParam("单号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     public String orderNo;
 
     /**
@@ -43,6 +46,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")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "QC_INFO_TYPE")
     public Integer orderType;
 
     /**
@@ -51,48 +55,67 @@ public class WmsQCMaster extends BaseBean {
     @Column(name = "ORDER_STATUS")
     @ApiParam(value = "状态", example = "1")
     @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "MASTER_ORDER_STATUS")
     public Integer orderStatus;
 
     @Column(name = "REMARK")
     @ApiParam("备注")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     public String remark;
 
     @Column(name = "CUST_NO")
     @ApiParam("客户编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer",
+            searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custNo")
     public String custNo;
 
     @Column(name = "VENDOR_NO")
     @ApiParam("供应商编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
+            searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo")
     public String vendorNo;
 
     @Column(name = "VERSION")
     @ApiParam(value = "版本", example = "1")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     public Integer version;
 
     @Column(name = "REF_TYPE")
     @ApiParam("关联单号类型")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "LINK_ORDER_TYPE")
     public String refType;
 
     @Column(name = "REF_SRC")
     @ApiParam("关联单号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     public String refSrc;
 
-    @Transient
+    @Column(name = "CUST_NAME")
     @ApiParam(value = "客户简称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer",
+            searchColumnName = "custNo,custName", listColumnName = "custNo,custName", explicitColumnName = "custNo")
     private String custName;
 
-    @Transient
-    @ApiParam(value = "供应商简称")
+    @Column(name = "VENDOR_DESC")
+    @ApiParam(value = "供应商全称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
+            searchColumnName = "vendorNo,VendorDesc", listColumnName = "vendorNo,VendorDesc", explicitColumnName = "vendorNo")
     private String VendorDesc;
 
     @Column(name = "IS_TASK")
     @ApiParam(value = "是否生产任务", example = "1")
     @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "IS_GENERAL_TASK")
     public Integer isTask;
 
     @Column(name = "IS_PART")
     @ApiParam(value = "是否散件", example = "2")
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
     public Integer isPart;
 
     @Transient

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -33,26 +35,32 @@ public class WmsRouting extends BaseBean {
     private static final long serialVersionUID = 7759454799191378612L;
     @Column(name = "ROUTING_CODE")
     @ApiParam(value = "线路代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String routingCode;
 
     @Column(name = "ROUTING_NAME")
     @ApiParam(value = "线路名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String routingName;
 
     @Column(name = "ROUTING_DESC")
     @ApiParam(value = "线路描述")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String routingDesc;
 
     @Column(name = "FOR_PROUCT_CLASS")
     @ApiParam(value = "适用产品分类")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT,  dataSrc = "TRUE_OR_FALSE")
     private Integer forProductClass;
 
     @Column(name = "FOR_WAREHOUSE")
     @ApiParam(value = "适用仓库", example ="1")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT,  dataSrc = "TRUE_OR_FALSE")
     private Integer forWareHouse;
 
     @Column(name = "FOR_PRODUCT")
     @ApiParam(value = "适用产品")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT,  dataSrc = "TRUE_OR_FALSE")
     private Integer forProduct;
 
 	@Transient

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -32,17 +34,21 @@ public class WmsShift extends BaseBean{
 
     @Column(name="SHIFT_NO")
     @ApiParam("班次编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String shiftNo;
 
     @Column(name="SHIFT_NAME")
     @ApiParam("班次名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String shiftName;
 
     @Column(name="START_TIME")
     @ApiParam("开始时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
     private String startTime;
 
     @Column(name="END_TIME")
     @ApiParam("结束时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
     private String endTime;
 }

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -32,45 +34,60 @@ public class WmsShippingFlag extends BaseBean {
 
     @Column(name = "CUST_NO")
     @ApiParam(value = "客户编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer",
+            searchColumnName = "custNo,custName", listColumnName = "custNo,custName", explicitColumnName = "custNo")
     private String custNo;
 
     @Column(name = "FLAG_NO")
     @ApiParam(value = "客户发往地编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String flagNo;
 
     @Column(name = "FLAG_NAME")
     @ApiParam(value = "客户发往地名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String flagName;
 
     @Column(name = "SHIPP_QTY")
     @ApiParam(value = "发运数量控制")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer shippQty;
 
     @Column(name = "FLAG_DESC")
     @ApiParam(value = "全称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String flagDesc;
 
     @Column(name = "FLAG_ADDR")
     @ApiParam(value = "客户发往地址")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String flagAddr;
 
     @Column(name = "FLAG_OWNER")
     @ApiParam(value = "联系人")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String flagOwner;
 
     @Column(name = "FLAG_EMAIL")
     @ApiParam(value = "邮箱")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String flagEmail;
 
     @Column(name = "FLAG_TEL")
     @ApiParam(value = "联系人电话")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String flagTel;
 
     @Column(name = "FLAG_FAX")
     @ApiParam(value = "传真")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String flagFax;
 
     @Column(name="TEMPLATE_NO")
     @ApiParam("模板编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST,  getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
+            dataSrc = "/wms/label/sys-label-template/cloud-query",
+            searchColumnName = "templateCode,templateName",listColumnName = "templateCode,templateName", explicitColumnName = "templateCode")
     private String templateNo;
 }

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

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -34,7 +35,7 @@ public class WmsSnOperateRecord extends BaseBean {
 
     @Column(name = "SN")
     @ApiParam(value = "条码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String sn;
 
     @Column(name = "LINE_CODE")
@@ -77,12 +78,12 @@ public class WmsSnOperateRecord extends BaseBean {
     @Column(name = "OPERATE_TYPE")
     @ApiParam(value = "操作类型")
     @AnnoOutputColumn(refClass = WmsEnumUtil.SN_OPERATE_TYPE.class, refForeignKey = "value", value = "description")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "SN_OPERATE_TYPE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "SN_OPERATE_TYPE")
     private Integer operateType;
 
 	@Column(name = "ref_sn")
 	@ApiParam(value = "关联二维码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String refSN;
 
 }

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

@@ -1,7 +1,9 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -12,11 +14,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.util.Date;
 import java.util.List;
 
@@ -52,75 +50,107 @@ public class WmsStockSn extends BaseBean {
     private static final long serialVersionUID = 4869307400585363697L;
     @Column(name = "WH_NO")
     @ApiParam(value = "仓库代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WareHouse",
+            searchColumnName = "code,name", listColumnName = "code,name", explicitColumnName = "code")
     private String whNo;
 
     @Column(name = "ZONE_NO")
     @ApiParam(value = "存储区编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones",
+            searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo")
     private String zoneNo;
 
     @Column(name = "LOCATE_NO")
     @ApiParam(value = "库位代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
+            searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
     private String locateNo;
 
     @Column(name = "PART_NO")
     @ApiParam(value = "物料编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
+            searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
     private String partNo;
 
     @Column(name = "PART_NAME_RDD")
     @ApiParam(value = "物料名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
+            searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName")
     private String partNameRdd;
 
     @Column(name = "LOT_NO", nullable = false)
     @ApiParam("收货批次")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     public String lotNo = "";
 
     @Column(name = "DATE_CODE", nullable = false)
     @ApiParam(value = "供应商批次")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     public String dateCode = "";
 
     @Column(name = "FIX_LOT_NO", nullable = false)
     @ApiParam(value = "特殊批次")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String fixLotNo = "";
 
     @Column(name = "QUALITY_DATE")
     @ApiParam("保质期")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String qualityDate;
 
     @Column(name = "LEFT_CODE", nullable = false)
     @ApiParam(value = "生产批次")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String leftCode = "";
 
     @Column(name = "VENDOR_NO")
     @ApiParam(value = "供应商编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
+            searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo")
     public String vendorNo;
 
     @Column(name = "CUST_NO")
     @ApiParam(value = "客户编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer",
+            searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custNo")
     private String custNo;
 
     @Column(name = "SHIPPING_FLAG")
     @ApiParam(value = "发往地")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String shippingFlag;
 
     @Column(name = "SN")
     @ApiParam(value = "条码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String sn;
 
     @Column(name = "SN_2D")
     @ApiParam(value = "二维码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String sn2d;
 
     @Column(name = "PACKAGE_NO")
     @ApiParam(value = "包装编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String packageNo;
 
     @Column(name = "UNIT")
     @ApiParam(value = "单位")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String unit;
 
     @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "数量", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double qty = 0d;
 
     /**
@@ -128,49 +158,58 @@ 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")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "STOCK_SN_QC_STATUS")
     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")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "STOCK_SN_STATUS")
     private Integer snStatus;
     /**
      * 1:已打印；2：未打印；3：退料生成条码
      */
     @Column(name = "PRINTED")
     @ApiParam(value = "是否打印", example = "0")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "PRINT_STATUS")
     private Integer printed;
 
     @Column(name = "PDATE")
     @ApiParam(value = "打印时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
     private Date pdate;
     /**
      * 1=ASN,10=PO,20=SO
      */
     @Column(name = "REF_TYPE")
     @ApiParam(value = "关联单据类型")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String refType;
 
     @Column(name = "REF_SRC")
     @ApiParam(value = "关联单号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String refSrc;
 
     @Column(name = "CUST_SN")
     @ApiParam(value = "客户条码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String custSn;
 
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam(value = "工作中心代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String workCenterCode;
 
     @Column(name = "SN_TYPE")
     @ApiParam(value = "条码类型", example = "10")
     @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WMS_STOCK_TYPE")
     private Integer snType = 10;
 
     @ApiParam(value = "仓库名称")
@@ -353,6 +392,14 @@ public class WmsStockSn extends BaseBean {
     @Transient
     private String requerimentCode;
 
+    @Transient
+    @ApiParam("大检测项类型")
+    public Integer checkType;
+
+    @Transient
+    @ApiParam("样本数")
+    private Integer sampleSize;
+
     public WmsStockSn() {
     }
 
@@ -395,8 +442,8 @@ public class WmsStockSn extends BaseBean {
     }
 
 
-    public WmsStockSn(Integer snStatus,String whNo,String locateNo,String partNo,String partNameRdd,String lotNo,Double qty){
-        this.snStatus=snStatus;
+    public WmsStockSn(Integer snStatus, String whNo, String locateNo, String partNo, String partNameRdd, String lotNo, Double qty) {
+        this.snStatus = snStatus;
         this.whNo = whNo;
         this.locateNo = locateNo;
         this.partNo = partNo;
@@ -405,7 +452,7 @@ public class WmsStockSn extends BaseBean {
         this.qty = qty;
     }
 
-    public WmsStockSn(Long id,String sn, String partNo, String partNameRdd, String unit, Integer snStatus,
+    public WmsStockSn(Long id, String sn, String partNo, String partNameRdd, String unit, Integer snStatus,
                       Integer qcStatus, Double qty, String locateNo, String zoneNo, String whNo, String lotNo,
                       String dateCode, String leftCode, String fixLotNo, String vendorNo, String vendorNameRdd,
                       String qualityDate, String custNo, String lotCheckRule, String sn2d,
@@ -439,17 +486,17 @@ public class WmsStockSn extends BaseBean {
         this.modifyUser = modifyUser;
     }
 
-    public WmsStockSn (String partNo, String packageNo,String locateNo,  String createDatetime, String modifyDatetime) {
+    public WmsStockSn(String partNo, String packageNo, String locateNo, String createDatetime, String modifyDatetime) {
         this.partNo = partNo;
-        this.packageNo =packageNo;
+        this.packageNo = packageNo;
         this.locateNo = locateNo;
-        this.createDatetime=createDatetime;
+        this.createDatetime = createDatetime;
         this.modifyDatetime = modifyDatetime;
     }
 
-    public WmsStockSn(Long id,String organizeCode,String sn, String partNo, String partNameRdd, String unit, Integer snStatus,
-                      String areaNo,String partSpec,Integer qcStatus, Double qty, Long boxQtys,
-                      String locateNo, String zoneNo, String whNo, String lotNo,String refSrc,
+    public WmsStockSn(Long id, String organizeCode, String sn, String partNo, String partNameRdd, String unit, Integer snStatus,
+                      String areaNo, String partSpec, Integer qcStatus, Double qty, Long boxQtys,
+                      String locateNo, String zoneNo, String whNo, String lotNo, String refSrc,
                       String dateCode, String packageNo, String createDatetime, String createUser,
                       String modifyDatetime, String modifyUser) {
         this.id = id;
@@ -477,9 +524,9 @@ public class WmsStockSn extends BaseBean {
         this.modifyUser = modifyUser;
     }
 
-    public WmsStockSn(Long id,String organizeCode,String sn, String partNo, String partNameRdd, String unit, Integer snStatus,
-                      String areaNo,Integer qcStatus, Double qty,
-                      String locateNo, String zoneNo, String whNo, String lotNo,String refSrc,
+    public WmsStockSn(Long id, String organizeCode, String sn, String partNo, String partNameRdd, String unit, Integer snStatus,
+                      String areaNo, Integer qcStatus, Double qty,
+                      String locateNo, String zoneNo, String whNo, String lotNo, String refSrc,
                       String dateCode, String packageNo, String createDatetime, String createUser,
                       String modifyDatetime, String modifyUser) {
         this.id = id;

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

@@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -35,21 +35,21 @@ public class WmsSubPart extends BaseBean {
 
     @Column(name = "PART_NO")
     @ApiParam(value = "物料编码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String partNo;
 
     @Column(name = "SUB_PART_NO")
     @ApiParam(value = "替代物料编码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String subPartNo;
 
     @Column(name = "PART_NAME")
     @ApiParam(value = "物料名称")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String partName;
 
     @Column(name = "SUB_PART_NAME")
     @ApiParam(value = "替代物料名称")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String subPartName;
 }

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -11,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
 
 /**
  * @Description : 工位表
@@ -32,13 +33,18 @@ public class WmsTerminal extends BaseBean{
     private static final long serialVersionUID = 9214639813072592713L;
     @Column(name="TERMINAL_NO")
     @ApiParam("工位代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String terminalNo;
 
     @Column(name="TERMINAL_NAME")
     @ApiParam("工位名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String terminalName;
 
     @Column(name="PDLINE_NO")
     @ApiParam("产线代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter",
+            searchColumnName = "workCenterCode,workCenterName", listColumnName = "workCenterCode,workCenterName", explicitColumnName = "workCenterCode")
     private String pdlineNo;
 }

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

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 检测结果明细表
@@ -64,4 +65,18 @@ public class WmsTestResultDetails extends BaseBean {
     @Column(name = "check_value")
     @ApiParam("检测值")
     public String checkValue;
+
+    @Transient
+    @ApiParam("已检测数")
+    private Long checkSize;
+
+    public WmsTestResultDetails() {
+    }
+
+    public WmsTestResultDetails(String partNo, Integer checkType, String bhCode, Long checkSize) {
+        this.partNo = partNo;
+        this.checkType = checkType;
+        this.bhCode = bhCode;
+        this.checkSize = checkSize;
+    }
 }