【冲突解决】

modules/i3plus-pojo-base/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>i3plus-pojo-base</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-DEV-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

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

@@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.base.bean;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import io.swagger.annotations.ApiParam;
-import lombok.Data;
 
 import java.util.List;
 import java.util.Map;
@@ -124,6 +123,23 @@ public class BaseResultBean<Obj> {
         return this;
     }
 
+    public static BaseResultBean success(String msg){
+        BaseResultBean rs =  new BaseResultBean(true);
+        rs.setMsg(msg);
+        return rs;
+    }
+
+    public static BaseResultBean success(){
+        BaseResultBean rs =  new BaseResultBean(true);
+        return rs;
+    }
+
+    public static BaseResultBean fail(String msg){
+        BaseResultBean rs =  new BaseResultBean(false,msg);
+        rs.setErrorMsg(msg);
+        return rs;
+    }
+
     public static BaseResultBean buildBaseResultBean(boolean success, String msg){
         BaseResultBean rs = new BaseResultBean();
         rs.success = success;
@@ -138,6 +154,33 @@ public class BaseResultBean<Obj> {
         return rs;
     }
 
+    public BaseResultBean() {
+    }
+
+    public BaseResultBean(boolean isSuccess) {
+        success = isSuccess;
+        if(success){
+            //国际化
+            code = ResourceEnumUtil.MESSAGE.SUCCESS.getCode();
+        }else{
+            code = ResourceEnumUtil.MESSAGE.FAIL.getCode();
+        }
+    }
+
+    public BaseResultBean(boolean success, List<Obj> resultList) {
+        this.success = success;
+        this.resultList = resultList;
+    }
+
+    public BaseResultBean(boolean success, Obj resultObject) {
+        this.success = success;
+        if(resultObject instanceof String){
+            this.msg = resultObject.toString();
+        }else{
+            this.resultObject = resultObject;
+        }
+    }
+
     @Override
     public String toString() {
         return "BaseResultBean{" +

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

@@ -847,7 +847,8 @@ public class CommonEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CLOUD_APP_STATUS {
         UP(1,"UP" ,"在线"),
-        DOWN(2, "DOWN","断线");
+        DOWN(2, "DOWN","断线"),
+        RESTRICTED(3,"RESTRICTED" ,"受限");
 
         private int value;
         private String code;
@@ -1961,4 +1962,172 @@ public class CommonEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * actuator env
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ACTUATOR_ENV_PATH {
+        PID(1,"PID" ,"PID"),
+        JAVA_VERSION(2, "java.version","jdk版本");
+
+        private int value;
+        private String path;
+        private String description;
+
+        private ACTUATOR_ENV_PATH(int value, String path, String description) {
+            this.value = value;
+            this.path = path;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getPath() {
+            return path;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfPath(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].path;
+                }
+            }
+            return tmp;
+        }
+
+        public static int pathOfValue(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].path.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String pathOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].path.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * actuator env
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ACTUATOR_METRICS_INFO {
+        UPTIME(1, "/process.uptime", "上线时间"),
+        PROCESS_CPU_USAGE(1, "/process.cpu.usage", "进程CPU使用率"),
+        CPU_COUNT(1, "/system.cpu.count", "CPU数量"),
+        SYSTEM_CPU_USAGE(1, "/system.cpu.usage", "系统CPU使用率"),
+        GC_PAUSE(1, "/jvm.gc.pause", "GC暂停"),
+        THREADS_LIVE(1, "/jvm.threads.live", "实时线程"),
+        THREADS_PEAK(1, "/jvm.threads.peak", "线程峰值"),
+        THREADS_DAEMON(1, "/jvm.threads.daemon", "守护线程"),
+
+        MEMORY_HEAP_MAX(1, "/jvm.memory.max", "area:heap", "堆内存最大空间"),
+        MEMORY_HEAP_USE(1, "/jvm.memory.used", "area:heap", "堆内存使用量"),
+        MEMORY_HEAP_SIZE(1, "/jvm.memory.committed", "area:heap", "堆内存大小"),
+
+        MEMORY_NON_HEAP_MAX(1, "/jvm.memory.max", "area:nonheap", "非堆内存最大空间"),
+        MEMORY_NON_HEAP_USE(1, "/jvm.memory.used", "area:nonheap", "非堆内存"),
+        MEMORY_NON_HEAP_METASPACE(1, "/jvm.memory.used", "area:nonheap,id:Metaspace", "非堆原空间"),
+        MEMORY_NON_HEAP_SIZE(1, "/jvm.memory.committed", "area:nonheap", "非堆大小");
+
+        private int value;
+        private String path;
+        private String tag;
+        private String description;
+
+        private ACTUATOR_METRICS_INFO(int value, String path, String description) {
+            this.value = value;
+            this.path = path;
+            this.description = description;
+        }
+
+        private ACTUATOR_METRICS_INFO(int value, String path, String tag,  String description) {
+            this.value = value;
+            this.path = path;
+            this.tag = tag;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getPath() {
+            return path;
+        }
+        public String getTag() {
+            return tag;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfPath(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].path;
+                }
+            }
+            return tmp;
+        }
+
+        public static int pathOfValue(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].path.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String pathOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].path.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -2460,6 +2460,7 @@ public class MesPcnEnumUtil {
     public enum STATION_BUSI_TYPE {
         MESSAGE("message", "返回信息"),
         STEP_LIST("stepList", "工步列表"),
+        STATE_LIST("stateList", "状态列表"),
         STEP_CONTENT("stepContent", "工步内容"),
         MODULE_CONTENT("moduleContent", "组件内容"),
         CUSTOM_COMPONENT("customComponent", "定制内容"),
@@ -3351,20 +3352,26 @@ public class MesPcnEnumUtil {
 
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STATION_REQUEST_BEAN_CMD {
-        JUMP_STATUS(10, "跳过状态点"),
-        FORCE_DO_SPEC_STATUS(20, "强制执行制定的状态点");
+        JUMP_STATE(10, "JUMP_STATE", "跳过状态点"),
+        FORCE_STATE(20, "FORCE_STATE", "强制执行制定的状态点");
 
         private int value;
+        private String code;
         private String description;
 
-        STATION_REQUEST_BEAN_CMD(int value, String description) {
+        STATION_REQUEST_BEAN_CMD(int value, String code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
         public int getValue() {
             return value;
         }
+        
+        public String getCode() {
+            return code;
+        }
 
         public String getDescription() {
             return description;
@@ -3453,4 +3460,73 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 状态机流程加载类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum LOAD_FSM_ROUTE_TYPE {
+
+        BY_PART("0", "通过物料号加载"),
+        BY_AUTO("1", "自动加载");
+
+        private String value;
+        private String description;
+
+        LOAD_FSM_ROUTE_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(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;
+        }
+    }
+
+    /**
+     * 组件状态类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STATUS_TYPE {
+        START(10, "START", "开始状态"),
+        EXECUTING(20, "EXECUTING", "执行中状态"),
+        TERMINATE(30, "TERMINATE", "中断状态"),
+        FINISH(40, "FINISH", "完成状态");
+
+        private int value;
+        private String code;
+        private String description;
+
+        STATUS_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }

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

@@ -5953,6 +5953,192 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 钢卷料类型
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PART_STEEL_TYPE {
+        NONE(10, "非钢卷料"),
+        NORMAL(20, "普通钢卷料"),
+        FINE(30, "精钢卷料");
+
+        private int value;
+        private String description;
+
+        PART_STEEL_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static PART_STEEL_TYPE 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;
+        }
+    }
+
+    /**
+     * 供货类型
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PART_SUPPLY_TYPE {
+        JIT(10, "JIT"),
+        NOT_JIT(20, "非JIT");
+
+        private int value;
+        private String description;
+
+        PART_SUPPLY_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static PART_SUPPLY_TYPE 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;
+        }
+    }
+
+    /**
+     * 收货方式
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PART_RECEIVING_METHOD {
+        STAND(10, "标准收货"),
+        PREPARE(20, "预收货");
+
+        private int value;
+        private String description;
+
+        PART_RECEIVING_METHOD(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static PART_RECEIVING_METHOD 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;
+        }
+    }
+
+    /**
+     * 星期
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WEEK_TYPE {
+        MONDAY(10, "星期一"),
+        TUESDAY(20, "星期二"),
+        WEDNESDAY(30, "星期三"),
+        THURSDAY(40, "星期四"),
+        FRIDAY(50, "星期五"),
+        SATURDAY(60, "星期六"),
+        SUNDAY(70, "星期七");
+
+        private int value;
+        private String description;
+
+        WEEK_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static WEEK_TYPE 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;
+        }
+    }
+
+    /**
      * 移库单移动类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.form.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -38,10 +40,12 @@ public class BfElementGrid extends BaseBean {
 
     @Column(name = "IS_LINE_SHOW_NUMBER")
     @ApiParam(value = "显示行号")
+    @AnnoOutputColumn(refClass = BlockFormEnumUtil.TABLE_ROW_NUMBER.class)
     private Integer isLineShowNumber;
 
     @Column(name = "IS_LINE_MULTIPLE")
     @ApiParam(value = "是否单选")
+    @AnnoOutputColumn(refClass = BlockFormEnumUtil.TABLE_ROW_PICK.class)
     private Integer isLineMultiple;
 
     @Column(name = "IS_OBJECT_FIND")

modules/i3plus-pojo-ics/pom.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>i3plus-pojo</artifactId>
+        <groupId>i3plus.pojo</groupId>
+        <version>1.0-DEV-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>i3plus-pojo-ics</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>i3plus.pojo</groupId>
+            <artifactId>i3plus-pojo-base</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsActuatorMetrics.java

@@ -0,0 +1,39 @@
+package cn.estsh.i3plus.pojo.ics.bean;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-04-10 16:56
+ * @Modify:
+ **/
+@Data
+public class IcsActuatorMetrics {
+
+    private String name;
+    private List<Measurements> measurements;
+    private List<AvailableTags> availableTags;
+
+    @Data
+    @NoArgsConstructor
+    public static class Measurements {
+
+        private String statistic;
+        private Object value;
+
+    }
+
+    @Data
+    @NoArgsConstructor
+    public static class AvailableTags {
+
+        private String tag;
+        private List<String> values;
+
+    }
+}

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsApplication.java

@@ -0,0 +1,72 @@
+package cn.estsh.i3plus.pojo.ics.bean;
+
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 应用信息
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-04-09 17:55
+ * @Modify:
+ **/
+@Data
+@ApiModel("应用信息")
+public class IcsApplication {
+
+    @ApiModelProperty("应用名称")
+    private String appName;
+
+    @ApiModelProperty("实例数量")
+    private Integer totalInstanceNum;
+
+    @ApiModelProperty("在线实例数量")
+    private Integer upInstanceNum;
+
+    public int getUpInstanceNumVal() {
+        return upInstanceNum == null ? 0 : upInstanceNum.intValue();
+    }
+
+
+    public void addUpInstanceNum() {
+        if (upInstanceNum == null) {
+            upInstanceNum = 0;
+        }
+        upInstanceNum++;
+    }
+
+    @ApiModelProperty("下线实例数量")
+    private Integer downInstanceNum;
+
+    public int getDownInstanceNumVal() {
+        return downInstanceNum == null ? 0 : downInstanceNum.intValue();
+    }
+
+    public void addDownInstanceNum() {
+        if (downInstanceNum == null) {
+            downInstanceNum = 0;
+        }
+        downInstanceNum++;
+    }
+
+    @ApiModelProperty("应用状态")
+    private Integer appStatus;
+
+    public String getAppStatusTxt(){
+        return appStatus == null ?"无": CommonEnumUtil.CLOUD_APP_STATUS.valueOfDescription(appStatus);
+    }
+
+    @ApiModelProperty("状态时间戳")
+    private Long statusTimeStamp;
+
+    @ApiModelProperty("状态时间")
+    private String statusTimeStampStr;
+
+    @ApiModelProperty("实例集合")
+    private List<IcsInstance> icsInstanceList;
+
+}

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstance.java

@@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.ics.bean;
+
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-04-09 18:02
+ * @Modify:
+ **/
+@Data
+@ApiModel("实例信息")
+public class IcsInstance {
+
+    @ApiModelProperty("实例id")
+    private String instanceId;
+
+    @ApiModelProperty("实例状态url")
+    private String instanceStatusUrl;
+
+    @ApiModelProperty("实例状态")
+    private Integer instanceStatus;
+
+    @ApiModelProperty("状态时间戳")
+    private Long statusTimeStamp;
+
+    @ApiModelProperty("状态时间")
+    private String statusTimeStampStr;
+
+    public String getInstanceStatusTxt(){
+        return instanceStatus == null ?"无": CommonEnumUtil.CLOUD_APP_STATUS.valueOfDescription(instanceStatus);
+    }
+}

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceDetail.java

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.ics.bean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description : 实例明细
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-04-10 16:52
+ * @Modify:
+ **/
+@Data
+@ApiModel("实例明细")
+public class IcsInstanceDetail {
+
+    @ApiModelProperty("pid")
+    private String pid;
+
+    @ApiModelProperty("正常运行时间")
+    private double uptime;
+
+    @ApiModelProperty("正常运行时间")
+    private String uptimeStr;
+
+    @ApiModelProperty("进程Cpu使用情况")
+    private double processCpuUsage;
+
+    @ApiModelProperty("系统Cpu使用情况")
+    private double systemCpuUsage;
+
+    @ApiModelProperty("CPU数量")
+    private int cpuNum;
+
+    @ApiModelProperty("gc计数")
+    private int gcCount;
+
+    @ApiModelProperty("gc总花费时间")
+    private double gcTotalTimeSpent;
+
+    @ApiModelProperty("gc花费的最长时间")
+    private double gcMaxTimeSpent;
+
+    @ApiModelProperty("监控网址")
+    private String monitorUrl;
+
+    @ApiModelProperty("ApiUrl")
+    private String apiUrl;
+
+    @ApiModelProperty("服务网址")
+    private String serviceUrl;
+
+}

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryHeap.java

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.ics.bean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description : 实例堆内存
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-04-10 16:57
+ * @Modify:
+ **/
+@Data
+@ApiModel("实例堆内存")
+public class IcsInstanceMemoryHeap {
+
+    @ApiModelProperty("堆使用的内存")
+    private double heapMemoryUsed;
+
+    @ApiModelProperty("堆内存大小")
+    private double heapMemorySize;
+
+    @ApiModelProperty("堆内存最大")
+    private double heapMemoryMax;
+
+}

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryNonHeap.java

@@ -0,0 +1,30 @@
+package cn.estsh.i3plus.pojo.ics.bean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description :实例堆非内存
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-04-10 16:57
+ * @Modify:
+ **/
+@Data
+@ApiModel("实例堆非内存")
+public class IcsInstanceMemoryNonHeap {
+
+    @ApiModelProperty("非堆内存元空间")
+    private double nonHeapMemoryMetaspace;
+
+    @ApiModelProperty("非堆内存使用")
+    private double nonHeapMemoryUsed;
+
+    @ApiModelProperty("非堆内存大小")
+    private double nonHeapMemorySize;
+
+    @ApiModelProperty("非堆内存最大")
+    private double nonHeapMemoryMax;
+
+}

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceThread.java

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.ics.bean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description : 实例线程信息
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-04-10 16:57
+ * @Modify:
+ **/
+@Data
+@ApiModel("实例线程信息")
+public class IcsInstanceThread {
+
+    @ApiModelProperty("实时线程")
+    private double threadLive;
+
+    @ApiModelProperty("守护线程")
+    private double threadDaemon;
+
+    @ApiModelProperty("线程峰值")
+    private double threadPeakLive;
+
+}

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsRegist.java

@@ -0,0 +1,68 @@
+package cn.estsh.i3plus.pojo.ics.bean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 注册中心信息
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-04-09 10:12
+ * @Modify:
+ **/
+@Data
+@ApiModel("注册中心")
+public class IcsRegist {
+
+    @ApiModelProperty("环境")
+    private String environment;
+
+    @ApiModelProperty("数据中心")
+    private String dataCenter;
+
+    @ApiModelProperty("集群信息")
+    private List<String> clusterInfo;
+
+    @ApiModelProperty("是否低于续订阈值")
+    private Integer isBelowRenewThresold;
+
+    @ApiModelProperty("启用自我保护模式")
+    private Integer selfPreservationModeEnabled;
+
+    @ApiModelProperty("注册中心启动时长")
+    private String upDateTime;
+
+    @ApiModelProperty("租约到期启用")
+    private Integer leaseExpirationEnabled;
+
+    @ApiModelProperty("实例IP")
+    private String instanceIp;
+
+    @ApiModelProperty("实例状态")
+    private String instanceStatus;
+
+    @ApiModelProperty("cpu数量")
+    private Integer cpuNum;
+
+    @ApiModelProperty("总可用内存")
+    private Integer totalAvailMemory;
+
+    @ApiModelProperty("当前的内存使用情况")
+    private Integer currentMemoryUsage;
+
+    @ApiModelProperty("应用数量")
+    private Integer appNum;
+
+    @ApiModelProperty("实例数量")
+    private Integer instanceNum;
+
+    @ApiModelProperty("下线实例数量")
+    private Integer downInstanceNum;
+
+    @ApiModelProperty("应用集合")
+    private List<IcsApplication> icsApplicationList;
+
+}

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

@@ -81,6 +81,11 @@ public class MesDefectRecord extends BaseBean implements Serializable {
     @ApiParam("备注")
     private String memo;
 
+//    @Column(name = "WORK_ORDER_NO")
+//    @ApiParam("工单号")
+//    private String workOrderNo;
+
+
     @Transient
     private List<MesDefect> mesDefectList;
 

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

@@ -96,6 +96,10 @@ public class MesDismantleRecord extends BaseBean implements Serializable {
     @ApiParam("关联批次")
     private String lotNo;
 
+//    @Column(name = "WORK_ORDER_NO")
+//    @ApiParam("工单号")
+//    private String workOrderNo;
+
     @Transient
     private String serialNumber;
 }

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

@@ -123,6 +123,7 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("条码类型 10=正常 20=首检件")
     private Integer snType;
 
+
     @Column(name = "TRAY_NO")
     @ApiParam("托盘号")
     private String trayNo;
@@ -164,6 +165,8 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("条码类型名称")
     private String snTypeName;
 
+
+
     public MesProduceSn() {
     }
 

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

@@ -33,6 +33,10 @@ public class MesStateMachineStatus extends BaseBean implements Serializable {
     @ApiParam("状态机代码")
     private String smCode;
 
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
     @Column(name = "STATUS_CODE")
     @ApiParam("状态代码")
     private String statusCode;

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

@@ -54,6 +54,10 @@ public class MesWcCheck extends BaseBean implements Serializable {
     @ApiParam("检查标准")
     private String standard;
 
+    @Column(name = "IS_NECESSARY")
+    @ApiParam("是否必检")
+    private Integer isNecessary;
+
     @Transient
     @ApiParam("检查类型名称")
     private String checkTypeName;

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

@@ -80,4 +80,8 @@ public class MesWcCheckRecord extends BaseBean implements Serializable {
     @ApiParam("总体结果")
     private Integer overAllResult;
 
+    @Column(name = "IS_NECESSARY")
+    @ApiParam("是否必检")
+    private Integer isNecessary;
+
 }

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

@@ -224,6 +224,18 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("批量打包开窗页面查询工单=1")
     private String pageType;
 
+    @Transient
+    @ApiParam("产品批次")
+    private String productBatch;
+
+    @Transient
+    @ApiParam("工单类型描述")
+    private String workOrderTypeDesc;
+
+    @Transient
+    @ApiParam("工单状态描述")
+    private String workOrderStatusDesc;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -52,4 +52,7 @@ public class ButtonComponentReqModel {
     @ApiParam("客户标识号")
     private String custFlagNo;
 
+    @ApiParam("用户信息")
+    private String userInfo;
+
 }

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

@@ -114,5 +114,5 @@ public class ImportBomExcelDataModel {
     private String keyPartType;
 
     @ApiParam("是否关键件")
-    private Integer isKeyPart;
+    private String isKeyPart;
 }

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

@@ -132,7 +132,7 @@ public class QcCheckDataModel {
     }
 
     public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, String partNo, String workCenterCode
-            , String workCellCode, String partName, String modifyUser, String modifyDatetime, String startTime, String endTime) {
+            , String workCellCode, String partName, String modifyUser, String modifyDatetime, String startTime, String endTime, String orderNo) {
         this.id = id;
         this.organizeCode = organizeCode;
         this.createUser = createUser;
@@ -145,6 +145,7 @@ public class QcCheckDataModel {
         this.modifyDatetime = modifyDatetime;
         this.startTime = startTime;
         this.endTime = endTime;
+        this.orderNo = orderNo;
     }
 
     public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, Integer checkType) {

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

@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesQcCheckData;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/4/9 18:00
+ * @desc
+ */
+@Data
+public class QcCheckDataResultModel {
+
+    @ApiParam("是否完成首检")
+    private Integer isFirstCheck;
+
+    @ApiParam("首检结果")
+    private List<MesQcCheckData> firstCheckResult;
+
+    @ApiParam("是否完成巡检")
+    private Integer isOnSiteCheck;
+
+    @ApiParam("巡检结果")
+    private List<MesQcCheckData> onSiteCheckResult;
+
+    @ApiParam("是否完成尾检")
+    private Integer isEndCheck;
+
+    @ApiParam("尾检结果")
+    private List<MesQcCheckData> endCheckResult;
+
+    public QcCheckDataResultModel() {
+    }
+
+    public QcCheckDataResultModel(Integer isFirstCheck, Integer isOnSiteCheck, Integer isEndCheck) {
+        this.isFirstCheck = isFirstCheck;
+        this.isOnSiteCheck = isOnSiteCheck;
+        this.isEndCheck = isEndCheck;
+    }
+}

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

@@ -0,0 +1,22 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/4/9 19:40
+ * @desc
+ */
+@Data
+public class ReworkResultModel {
+
+    @ApiParam("已维修数量")
+    private Integer alreadyRepairCount;
+
+    @ApiParam("未维修数量")
+    private Integer notRepairCount;
+
+    @ApiParam("拆解数量")
+    private Integer dismantleCount;
+}

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

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/3/13 17:55
+ * @desc
+ */
+@Data
+@NoArgsConstructor
+public class StateDispatchModel {
+
+    private String statesKey;
+
+    private String firstScanKey;
+
+    private String cellParamKey;
+
+    private String requestBeanKey;
+
+    private String moduleDataMapKey;
+
+    private String scanInfo;
+
+    public StateDispatchModel(String statesKey, String firstScanKey, String cellParamKey, String requestBeanKey, String moduleDataMapKey, String scanInfo) {
+        this.statesKey = statesKey;
+        this.firstScanKey = firstScanKey;
+        this.cellParamKey = cellParamKey;
+        this.requestBeanKey = requestBeanKey;
+        this.moduleDataMapKey = moduleDataMapKey;
+        this.scanInfo = scanInfo;
+    }
+}

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

@@ -0,0 +1,21 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/4/14 15:18
+ * @desc
+ */
+@Data
+@Deprecated
+public class StateModel {
+
+    private String stateCode;
+
+    private String stateName;
+
+    private String routeCode;
+
+    private String smCode;
+}

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

@@ -1,10 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 
-import cn.estsh.i3plus.pojo.mes.bean.MesRouteStatus;
 import cn.estsh.i3plus.pojo.mes.bean.MesStateMachineStatus;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -34,6 +31,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("物料号")
     private String partNo;
 
+    @ApiParam("生产类型")
+    private String pptCode;
+
     @ApiParam("组织代码")
     private String organizeCode;
 
@@ -84,6 +84,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("业务类型")
     private String busiType;
 
+    @ApiParam("界面类型")
+    private String interfaceType;
+
     @ApiParam("工位监听类型")
     private String monitorType;
 
@@ -105,6 +108,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("工步列表")
     private List<StepModel> stepList;
 
+    @ApiParam("工位参数")
+    private Map<String, String> wcpcMap;
+
     @ApiParam("生产主队列编号")
     private String orderNo;
 
@@ -126,6 +132,9 @@ 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/model/WcCheckModel.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
 import cn.estsh.i3plus.pojo.mes.bean.MesWcCheckRecord;
 import io.swagger.annotations.Api;
@@ -36,6 +37,9 @@ public class WcCheckModel {
     @ApiParam("是否通过")
     private Integer isPass;
 
+    @ApiParam("输入框是否可以重选")
+    private Integer isEnable;
+
     @ApiParam("开线信号")
     private Integer onlineSignal;
 
@@ -53,6 +57,7 @@ public class WcCheckModel {
 
     public WcCheckModel initialWcCheckModel() {
         WcCheckModel wcCheckModel = new WcCheckModel();
+        wcCheckModel.setIsEnable(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
         wcCheckModel.setOnlineSignal(MesPcnEnumUtil.ONLINE_SIGNAL.NON_CHECK.getValue());
         wcCheckModel.setIsPass(MesPcnEnumUtil.IS_WCCHECK_PASS.NON_PASS.getValue());
         onlineSignalEqu = new MesWcCheckRecord();

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfButtonOperateDataModel.java

@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.model.form;
+
+import cn.estsh.i3plus.pojo.form.bean.BfButton;
+import cn.estsh.i3plus.pojo.form.bean.BfElement;
+import cn.estsh.i3plus.pojo.form.bean.BfRefButtonMethod;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description : 按钮操作数据模型
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-04-13 19:45
+ * @Modify:
+ **/
+@Data
+@ApiModel("按钮操作数据模型")
+public class BfButtonOperateDataModel {
+
+    @ApiModelProperty("按钮id")
+    private Long buttonId;
+
+    @ApiModelProperty("元素id")
+    private Long elementId;
+
+    @ApiModelProperty("操作数据")
+    private List<Map<String,Object>> operateData;
+
+    @ApiModelProperty("按钮功能关系信息")
+    private BfRefButtonMethod bfRefButtonMethod;
+
+    @ApiModelProperty("元素信息")
+    private BfElement bfElement;
+
+    @ApiModelProperty("按钮信息")
+    private BfButton bfButton;
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java

@@ -22,10 +22,10 @@ import java.util.Map;
 @NoArgsConstructor
 public class FormOperateDataModel {
 
-    @ApiModelProperty("元素代码")
-    private Long refId;
+    @ApiModelProperty("关联标识")
+    private String refId;
 
-    @ApiModelProperty("元素名称")
+    @ApiModelProperty("关联名称")
     private String refName;
 
     @ApiModelProperty("操作来源")

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MissResourceModel.java

@@ -31,6 +31,10 @@ public class MissResourceModel implements Serializable {
     @ApiParam(value = "资源类型", example = "1", access = "使用枚举：CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE")
     private Integer resourceType;
 
+    public String getResourceTypeTxt(){
+        return resourceType == null ?"无": CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.valueOf(resourceType);
+    }
+
     @ApiParam(value = "语言编码", example = "浏览器语言编码")
     @AnnoOutputColumn
     private String languageCode;
@@ -47,6 +51,10 @@ public class MissResourceModel implements Serializable {
     @AnnoOutputColumn(refClass = CommonEnumUtil.MiSS_RESOURCE_SOURCE.class)
     private Integer resourceSource;
 
+    public String getResourceSourceTxt(){
+        return resourceSource == null ?"无": CommonEnumUtil.MiSS_RESOURCE_SOURCE.valueOfDescription(resourceSource);
+    }
+
     @ApiParam(value = "数据来源")
     @AnnoOutputColumn(refClass = CommonEnumUtil.IS_VAILD.class)
     private Integer isValid;

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

@@ -43,7 +43,6 @@ public class AmpJisRec extends BaseBean {
     public String partNameRdd;
 
     @Column(name = "QTY", columnDefinition = "decimal(18,8) default 0", nullable = false)
-    @ColumnDefault("0")
     @ApiParam(value = "数量", example = "0")
     public Double qty;
 

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

@@ -9,6 +9,7 @@ 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;
 
@@ -49,8 +50,9 @@ public class WmsBom extends BaseBean {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String unit;
 
-    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "数量")
+    @ColumnDefault("0")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double qty;
 
@@ -69,8 +71,9 @@ public class WmsBom extends BaseBean {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String itemUnit;
 
-    @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "子用量")
+    @ColumnDefault("0")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double itemQty;
 

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

@@ -5,6 +5,7 @@ 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;
 
@@ -40,8 +41,9 @@ public class WmsBomTotal extends BaseBean {
     @ApiParam("计量单位")
     private String UNIT;
 
-    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam("数量")
+    @ColumnDefault("0")
     private Double qty;
 
     @Column(name = "ITEM_PART_NO")
@@ -56,8 +58,9 @@ public class WmsBomTotal extends BaseBean {
     @ApiParam(value = "子计量单位")
     private String itemUnit;
 
-    @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "子用量")
+    @ColumnDefault("0")
     private Double itemQty;
 
     @Column(name = "BOM_NUM")

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

@@ -53,41 +53,51 @@ public class WmsCsStrategy extends BaseBean implements Serializable {
 
     @Column(name = "CYCLE_RULE")
     @ApiParam(value = "循环规则")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String cycleRule;
 
     @Column(name = "START_DATE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam(value = "开始日期", example = "0")
     private String startDate;
 
     @Column(name = "END_DATE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam(value = "结束日期", example = "0")
     private String endDate;
 
     @Column(name = "NUM_MAX")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam(value = "明细数量上限")
     private Integer numMax;
 
     @Column(name = "COVERAGE_RATE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam(value = "抽盘覆盖率")
     private Double coverageRate;
 
     @Column(name = "ZONE_NOS")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam(value = "存储区")
     private String zoneNos;
 
     @Column(name = "LOCATES")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam(value = "盘点库位")
     private String locates;
 
     @Column(name = "last_run_time")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam(value = "上次运行时间")
     private String lastRunTime;
 
     @Column(name = "next_run_time")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam(value = "下次运行时间")
     private String nextRunTime;
 
     @Column(name = "REMAKE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam(value = "备注")
     private String remake;
 }

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

@@ -0,0 +1,47 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+
+/**
+ * @Description : 客户窗口时间
+ * @Reference :
+ * @Author : jason
+ * @CreateDate : 2020-04-14
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_CUST_WINDOW")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="客户窗口时间",description = "客户窗口时间")
+public class WmsCustWindow extends BaseBean {
+
+    @Column(name = "CUST_NO")
+    @ApiParam(value = "客户编码")
+    private String custNo;
+
+    @Column(name = "CUST_WINDOW_TIME")
+    @ApiParam(value = "窗口时间")
+    private String custWindowTime;
+
+    @Column(name = "WEEKS")
+    @ApiParam(value = "星期")
+    private String weeks;
+
+    @Column(name = "DELAY_HOUR")
+    @ApiParam(value = "容差")
+    private Integer delayHour;
+}

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

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 客户物料发往地
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-04-11
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_CUSTOMER_PART_SHIPPING")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="客户物料发往地",description = "客户物料发往地")
+public class WmsCustomerPartShipping extends BaseBean {
+
+    @Column(name = "CUSTOMER_CODE")
+    @ApiParam(value = "客户代码")
+    private String customerCode;
+
+    @Column(name = "CUSTOMER_PART_NO")
+    @ApiParam(value = "客户零件号")
+    private String customerPartNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编码")
+    private String partNo;
+
+    @Column(name = "SHIPPING_FLAG")
+    @ApiParam(value = "发往地")
+    private String shippingFlag;
+}

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

@@ -7,6 +7,7 @@ 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;
 
@@ -58,16 +59,19 @@ public class WmsMoveDetails extends BaseBean {
     @ApiParam("客户编号")
     public String custNo;
 
-    @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "处理数量", example = "0")
+    @ColumnDefault("0")
     public Double transQty;
 
-    @Column(name = "HANDLED_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "HANDLED_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "已处理数量", example = "0")
+    @ColumnDefault("0")
     public Double handledQty;
 
-    @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "不合格处理数量", example = "0")
+    @ColumnDefault("0")
     public Double rejectQty;
 
     public Double getRejectQty() {

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

@@ -84,7 +84,7 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam("容器编号")
     public String packAgeNo;
 
-    @Column(name = "SRC_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "SRC_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "源数量", example = "0")
     public Double srcQty;
@@ -121,12 +121,12 @@ public class WmsMoveSn extends BaseBean {
     @Transient
     private Long finishedCounts;
 
-    @Column(name = "DEST_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "DEST_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "目标数量", example = "0")
     public Double destQty;
 
-    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "数量", example = "0")
     public Double qty;

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

@@ -6,6 +6,7 @@ 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;
 
@@ -89,12 +90,14 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam("客户编号")
     public String custNo;
 
-    @Column(name="TRANS_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name="TRANS_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "处理数量", example = "0")
+    @ColumnDefault("0")
     public Double transQty;
 
-    @Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "不合格处理数量", example = "0")
+    @ColumnDefault("0")
     public Double rejectQty;
 
     @Column(name="UNIT")
@@ -147,8 +150,9 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam("关联单位")
     public String refUnit;
 
-    @Column(name="REF_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name="REF_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam("关联数量")
+    @ColumnDefault("0")
     public Double refQty;
 
     @Column(name = "SRC_AREA_NO")

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

@@ -39,7 +39,7 @@ public class WmsPOMasterDetails extends BaseBean {
     @ApiParam("物料编码")
     private String partNo;
 
-    @Column(name = "BOX_QTY")
+    @Column(name = "BOX_QTY", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "箱数", example = "0")
     private Integer boxQty;
@@ -52,7 +52,7 @@ public class WmsPOMasterDetails extends BaseBean {
     @ApiParam("行号")
     private Integer item;
 
-    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "需求数量", example = "0")
     private Double qty;
@@ -69,28 +69,28 @@ public class WmsPOMasterDetails extends BaseBean {
     @ApiParam("订单号")
     private String orderNo;
 
-    @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "条码打印数量", example = "0")
     private Double printQty;
 
     //private Double getPrintQty(){ return this.printQty == null ? new Double(0) : this.printQty; }
 
-    @Column(name = "RC_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "RC_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "收货数量", example = "0")
     private Double rcQty = 0d;
 
     //private Double getRcQty(){ return this.rcQty == null ? new Double(0) : this.rcQty; }
 
-    @Column(name = "PASS_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "PASS_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "质检合格数量", example = "0")
     private Double passQty;
 
     //private Double getPassQty(){ return this.passQty == null ? new Double(0) : this.passQty; }
 
-    @Column(name = "NG_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "NG_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "质检不合格数量", example = "0")
     private Double ngQty;

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

@@ -5,6 +5,7 @@ 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;
 
@@ -41,12 +42,14 @@ public class WmsPackSn extends BaseBean {
     @ApiParam(value = "物料名称")
     private String partNameAdd;
 
-    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam("数量")
+    @ColumnDefault("0")
     private Double qty;
 
-    @Column(name = "SID", columnDefinition = "decimal(18,8)")
+    @Column(name = "SID", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam("SID")
+    @ColumnDefault("0")
     private Double sId;
 
     @Column(name = "COMMIT_DATE")

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

@@ -0,0 +1,159 @@
+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 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.Index;
+import javax.persistence.Table;
+
+/**
+ * @Description :物料扩展属性
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-04-07
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_PART_EXTEND", indexes = {
+        @Index(columnList = "ORGANIZE_CODE")
+})
+@Api("物料扩展属性表")
+public class WmsPartExtend extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编码")
+    private String partNo;
+
+    @Column(name = "IS_SETTLE")
+    @ApiParam(value = "是否内部交易")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE")
+    private Integer isSettle;
+
+    @Column(name = "SETTLE_FACTORY_CODE")
+    @ApiParam(value = "结算工厂")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String settleFactoryCode;
+
+    @Column(name = "SETTLE_REC_ERP_WH")
+    @ApiParam(value = "结算物料收货库存")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String settleRecErpWh;
+
+    @Column(name = "VALUATION_CLASS")
+    @ApiParam(value = "评估类")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String valuationClass;
+
+    @Column(name = "VALUATION_CLASS_NAME")
+    @ApiParam(value = "评估类描述")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String valuationClassName;
+
+    @Column(name = "MC_CODE")
+    @ApiParam(value = "MRP控制者")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String mcCode;
+
+    @Column(name = "MC_NAME")
+    @ApiParam(value = "MRP控制者名称")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String mcName;
+
+    @Column(name = "IS_STEEL")
+    @ApiParam(value = "是否为钢卷料")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_STEEL_TYPE")
+    private Integer isSteel;
+
+    @Column(name = "IS_PACKAGE_MATERIAL")
+    @ApiParam(value = "是否为包材")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE")
+    private Integer isPackageMaterial;
+
+    @Column(name = "RECEIVING_TYPE")
+    @ApiParam(value = "收货类型")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String receivingType;
+
+    @Column(name = "LOT_CONTROL")
+    @ApiParam(value = "批次控制")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String lotControl;
+
+    @Column(name = "RANGE_LOT")
+    @ApiParam(value = "批次容差")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
+    private Integer rangeLot;
+
+    @Column(name = "QUALITY_RATE")
+    @ApiParam(value = "质检率")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
+    private Double qualityRate;
+
+    @Column(name = "ROUTING")
+    @ApiParam(value = "工艺")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String routing;
+
+    @Column(name = "PO_PART_MULTIPLE")
+    @ApiParam(value = "乘倍包装")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String poPartMultiple;
+
+    @Column(name = "RANGE_QTY_RATE")
+    @ApiParam(value = "数量容差")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
+    private Integer rangeQtyRate;
+
+    @Column(name = "RANGE_INVENTORY")
+    @ApiParam(value = "盘点容差")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
+    private Integer rangeInventory;
+
+    @Column(name = "PROD_LINE")
+    @ApiParam(value = "产品类")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String prodLine;
+
+    @Column(name = "SUPPLY_TYPE")
+    @ApiParam(value = "供货类型")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_SUPPLY_TYPE")
+    private Integer supplyType;
+
+    @Column(name = "RECEIVING_MODE")
+    @ApiParam(value = "收货方式")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_RECEIVING_METHOD")
+    private Integer receivingMethod;
+
+    @Column(name = "PRE_RECEIVING_DAY")
+    @ApiParam(value = "预收货天数")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
+    private Integer preReceivingDay;
+
+    @Column(name = "IS_WAY_CALCULATION")
+    @ApiParam(value = "是否计算在途库存")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE")
+    private Integer isWayCalculation;
+
+    @Column(name = "IS_AUTO_PURCHASE")
+    @ApiParam(value = "是否自动采购")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE")
+    private Integer isAutoPurchase;
+
+    @Column(name = "AUTO_PURCHASE_QTY")
+    @ApiParam(value = "自动采购数量")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
+    private Integer autoPurchaseQty;
+}

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

@@ -6,6 +6,7 @@ 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;
 
@@ -46,8 +47,9 @@ public class WmsPickCount extends BaseBean {
     @ApiParam(value = "物料号")
     private String partNo;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", nullable = false)
     @ApiParam(value = "数量")
+    @ColumnDefault("0")
     private Double qty;
 
 }

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

@@ -51,7 +51,7 @@ public class WmsPoSn extends BaseBean {
     @ApiParam("物料名称")
     public String partNameRdd;
 
-    @Column(name="QTY", columnDefinition = "decimal(18,8)")
+    @Column(name="QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "数量", example = "0")
     public Double qty;
@@ -89,7 +89,7 @@ public class WmsPoSn extends BaseBean {
     @ApiParam("组条码")
     public String groupNo;
 
-    @Column(name="REC_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name="REC_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "收货数量", example = "0")
     public Double recQty;

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

@@ -5,6 +5,7 @@ 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;
 
@@ -46,8 +47,9 @@ public class WmsPullTaskDetails extends BaseBean{
     @ApiParam("库位代码")
     private String locateNo;
 
-    @Column(name="LOCATE_CAPACITY")
+    @Column(name="LOCATE_CAPACITY", nullable = false)
     @ApiParam(value = "库位容量", example = "0")
+    @ColumnDefault("0")
     private Integer locateCapacity = 0;
 
     @Column(name="PART_NO")
@@ -58,52 +60,63 @@ public class WmsPullTaskDetails extends BaseBean{
     @ApiParam("零件名称")
     private String partNameRdd;
 
-    @Column(name="PLAN_PACK_QTY")
+    @Column(name="PLAN_PACK_QTY", nullable = false)
     @ApiParam(value = "计划数量", example = "0d")
+    @ColumnDefault("0")
     private Double planPackQty = 0d;
 
-    @Column(name="PLAN_PACK_COUNT")
+    @Column(name="PLAN_PACK_COUNT", nullable = false)
     @ApiParam(value = "计划容器数", example = "0d")
+    @ColumnDefault("0")
     private Double planPackCount = 0d;
 
-    @Column(name="FIRST_BATCH_QTY")
+    @Column(name="FIRST_BATCH_QTY", nullable = false)
     @ApiParam(value = "首批批量", example = "0d")
+    @ColumnDefault("0")
     private Double firstBatchQty = 0d;
 
-    @Column(name="FIRST_PACK_COUNT")
+    @Column(name="FIRST_PACK_COUNT", nullable = false)
     @ApiParam(value = "首批容器数", example = "0d")
+    @ColumnDefault("0")
     private Double firstPackCount = 0d;
 
-    @Column(name="REQUEST_QTY")
+    @Column(name="REQUEST_QTY", nullable = false)
     @ApiParam(value = "补货批量", example = "0d")
+    @ColumnDefault("0")
     private Double requestQty = 0d;
 
-    @Column(name="REQUEST_PACK_COUNT")
+    @Column(name="REQUEST_PACK_COUNT", nullable = false)
     @ApiParam(value = "补货容器数", example = "0d")
+    @ColumnDefault("0")
     private Double requestPackCount = 0d;
 
-    @Column(name="REQUEST_LOT_NO")
+    @Column(name="REQUEST_LOT_NO", nullable = false)
     @ApiParam(value = "补货批次", example = "0d")
+    @ColumnDefault("0")
     private Double requestLotNo = 0d;
 
-    @Column(name="REQUEST_TOTAL_COUNT")
+    @Column(name="REQUEST_TOTAL_COUNT", nullable = false)
     @ApiParam(value = "补货累加次数", example = "0d")
+    @ColumnDefault("0")
     private Double requestTotalCount = 0d;
 
     @Column(name="LAST_REQUEST_TIME")
     @ApiParam("上一次补货时间")
     private String lastRequestTtime;
 
-    @Column(name="BOOT_QTY")
+    @Column(name="BOOT_QTY", nullable = false)
     @ApiParam(value = "尾箱批量", example = "0d")
+    @ColumnDefault("0")
     private Double bootQty = 0d;
 
-    @Column(name="BOOT_PACK_COUNT")
+    @Column(name="BOOT_PACK_COUNT", nullable = false)
     @ApiParam(value = "尾箱容器数", example = "0d")
+    @ColumnDefault("0")
     private Double bootPackCount = 0d;
 
-    @Column(name="BOOT_LOT_NO")
+    @Column(name="BOOT_LOT_NO", nullable = false)
     @ApiParam(value = "尾箱批次", example = "0d")
+    @ColumnDefault("0")
     private Double bootLotNo = 0d;
 
     @Column(name="ORDER_STATUS")

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

@@ -42,7 +42,7 @@ public class WmsQCDetails extends BaseBean {
     @ApiParam("行号")
     public String item;
 
-    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "需求数量", example = "0")
     public Double qty;
@@ -67,17 +67,17 @@ public class WmsQCDetails extends BaseBean {
     public String remark;
 
 
-    @Column(name = "FACT_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "FACT_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "实检数量", example = "0")
     public Double factQty;
 
-    @Column(name = "PASS_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "PASS_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "合格数量", example = "0")
     public Double passQty;
 
-    @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "不合格数量", example = "0")
     public Double rejectQty;

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

@@ -6,6 +6,7 @@ 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;
 
@@ -49,12 +50,14 @@ public class WmsQCTrans extends BaseBean {
     @ApiParam("备注")
     public String remark;
 
-    @Column(name="PASS_QTY")
+    @Column(name="PASS_QTY", nullable = false)
     @ApiParam("合格数量")
+    @ColumnDefault("0")
     public double passQty;
 
-    @Column(name="REJECT_QTY")
+    @Column(name="REJECT_QTY", nullable = false)
     @ApiParam("不合格数量")
+    @ColumnDefault("0")
     public double rejectQty;
 
     @Column(name="UNIT")

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

@@ -5,6 +5,7 @@ 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;
 
@@ -36,20 +37,24 @@ public class WmsRoutingDetail extends BaseBean {
     @ApiParam(value = "作业步骤")
     private String opStep;
 
-    @Column(name = "OK_SEQ")
+    @Column(name = "OK_SEQ", nullable = false)
     @ApiParam(value = "成功跳转序号", example = "1")
+    @ColumnDefault("0")
     private Integer okSeq;
 
-    @Column(name = "NG_SEQ")
+    @Column(name = "NG_SEQ", nullable = false)
     @ApiParam(value = "失败跳转序号", example = "1")
+    @ColumnDefault("0")
     private Integer ngSeq;
 
-    @Column(name = "SEQ")
+    @Column(name = "SEQ", nullable = false)
     @ApiParam(value = "序号", example = "1")
+    @ColumnDefault("0")
     private Integer seq;
 
-    @Column(name = "PARENT_SEQ")
+    @Column(name = "PARENT_SEQ", nullable = false)
     @ApiParam(value = "上级步骤序号", example = "1")
+    @ColumnDefault("0")
     private Integer parentSeq;
 
 }

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

@@ -5,6 +5,7 @@ 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;
 
@@ -36,7 +37,8 @@ public class WmsRoutingMaster extends BaseBean {
     @ApiParam(value = "路线名称")
     private String routingName;
 
-    @Column(name = "SEQ")
+    @Column(name = "SEQ", nullable = false)
     @ApiParam(value = "序号", example = "1")
+    @ColumnDefault("0")
     private Integer seq;
 }

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

@@ -44,7 +44,7 @@ public class WmsShipping extends BaseBean {
     @ApiParam("物料名称")
     public String partNameRdd;
 
-    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "需求数量", example = "0")
     public Double qty;

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

@@ -8,6 +8,7 @@ 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;
 
@@ -48,8 +49,9 @@ public class WmsSnOperateRecord extends BaseBean {
     @ApiParam(value = "库位代码")
     private String locateNo;
 
-    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "数量", example = "0")
+    @ColumnDefault("0")
     private Double qty = 0d;
 
     @Column(name = "PART_NO")

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

@@ -6,6 +6,7 @@ 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;
 
@@ -60,12 +61,13 @@ public class WmsStockInitialize extends BaseBean {
     @AnnoOutputColumn
     private String unit;
 
-    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "可用数量", example = "0")
+    @ColumnDefault("0")
     @AnnoOutputColumn
     private Double qty = 0d;
 
-    @Column(name = "SNP", columnDefinition = "decimal(18,8)")
+    @Column(name = "SNP", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "标准包装", example = "1")
     @AnnoOutputColumn
     private Double snp;

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

@@ -79,39 +79,39 @@ public class WmsStockQuan extends BaseBean {
     private WmsLocate wmsLocate;
 
 
-    @Column(name = "QTY", columnDefinition = "decimal(18,8) default 0")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8) default 0", nullable = false)
     @ApiParam(value = "可用数量")
     public Double qty;
 
-    @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8) default 0")
+    @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false)
     @ApiParam(value = "不合格数量")
     private Double failQty;
 
-    @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8) default 0")
+    @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false)
     @ApiParam(value = "隔离数量")
     private Double holdQty;
 
-    @Column(name = "QC_QTY", columnDefinition = "decimal(18,8) default 0")
+    @Column(name = "QC_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false)
     @ApiParam(value = "质检中数量")
     private Double qcQty;
 
-    @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8) default 0")
+    @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false)
     @ApiParam(value = "待入库数量")
     private Double rinQty;
 
-    @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8) default 0")
+    @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false)
     @ApiParam(value = "冻结数量")
     private Double freezeQty;
 
-    @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8) default 0")
+    @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false)
     @ApiParam(value = "寄售数量")
     private Double consignQty;
 
-    @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8) default 0")
+    @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false)
     @ApiParam(value = "锁定数量")
     private Double lockQty;
 
-    @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8) default 0")
+    @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false)
     @ApiParam(value = "报废数量")
     private Double scrapQty;
 

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

@@ -7,6 +7,7 @@ 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 org.springframework.format.annotation.DateTimeFormat;
@@ -113,7 +114,8 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "单位")
     private String unit;
 
-    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
+    @ColumnDefault("0")
     @ApiParam(value = "数量", example = "0")
     private Double qty = 0d;
 

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

@@ -0,0 +1,55 @@
+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 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.Index;
+import javax.persistence.Table;
+
+/**
+ * @Description :替代料
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2018-11-07 16:06
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_SUB_PART", indexes = {
+        @Index(columnList = "ORGANIZE_CODE")
+})
+@Api("替代料")
+public class WmsSubPart extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String partNo;
+
+    @Column(name = "SUB_PART_NO")
+    @ApiParam(value = "替代物料编码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String subPartNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam(value = "物料名称")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String partName;
+
+    @Column(name = "SUB_PART_NAME")
+    @ApiParam(value = "替代物料名称")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String subPartName;
+}

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

@@ -61,12 +61,12 @@ public class WmsTaskDetails extends BaseBean {
     @ApiParam(value = "供应商编号")
     private String vendorNo;
 
-    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "需求数量", example = "1")
     private Double qty;
 
-    @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "处理数量", example = "1")
     private Double transQty;

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

@@ -5,6 +5,7 @@ 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;
 
@@ -47,6 +48,7 @@ public class WmsTaskSrc extends BaseBean {
 
     @Column(name = "IS_SN")
     @ApiParam("是否有条码")
+    @ColumnDefault("0")
     public Integer isSn;
 
     @Column(name = "TRANS_CODE")
@@ -55,5 +57,6 @@ public class WmsTaskSrc extends BaseBean {
 
     @Column(name = "IS_ONE_STEP")
     @ApiParam("是否一步法")
+    @ColumnDefault("0")
     public Integer isOneStep;
 }

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

@@ -116,4 +116,28 @@ public class WmsTmsShippingExt extends BaseBean {
     @Transient
     @ApiParam("打印模板列表")
     private List<WmsTmsShipModel> shipModels;
+
+    //需求仓库-目的仓库
+    @Column(name="DESC_WAREHOUSE")
+    @ApiParam("目的仓库")
+    private String descWarehouse;
+
+    //承运商-物流供应商
+    @Column(name="LOGISTICS_VENDOR_NO")
+    @ApiParam("物流供应商")
+    private String logisticsVendorNo;
+
+    //运输方式-单据运输方式（维护内容）
+    @Column(name="DOCUMENT_TRANSPORT_METHOD")
+    @ApiParam("单据运输方式")
+    private Integer documentTransportMethod;
+
+    //是否不良品调拨—调拨单录入字段
+    @Column(name="DEFECTIVE_ALLOCATION")
+    @ApiParam("调拨单录入字段")
+    private String defectiveAllocation;
+
+//    @Transient
+//    @ApiParam("打印模板列表")
+//    private String defectiveAllocation;
 }

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

@@ -0,0 +1,304 @@
+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;
+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;
+import javax.persistence.Version;
+
+/**
+ * @Description : 车辆信息明细
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2019-12-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_TMS_SHIPPING_EXT_DETAIL")
+@Api("装车单信息明细")
+public class WmsTmsShippingExtDetail extends BaseBean {
+	private static final long serialVersionUID = -4800308354250386102L;
+
+	@Column(name="MOVE_NO")
+	@ApiParam("装车单")
+	public String moveNo;
+
+	@Column(name = "PART_NO")
+	@ApiParam("物料编码")
+	public String partNo;
+
+	@Column(name = "PART_NAME_RDD")
+	@ApiParam("物料名称")
+	public String partNameRdd;
+
+	@Column(name = "ITEM")
+	@ApiParam("行号")
+	public String item;
+
+	@Column(name = "QTY", columnDefinition = "decimal(18,8)")
+	@ColumnDefault("0")
+	@ApiParam(value = "需求数量", example = "0")
+	public Double qty;
+
+	@Column(name = "UNIT")
+	@ApiParam("单位")
+	public String unit;
+
+	@Column(name = "ORDER_NO")
+	@ApiParam("订单号")
+	public String orderNo;
+
+	@Column(name = "SRC_WH_NO")
+	@ApiParam("源仓库代码")
+	public String srcWhNo;
+
+	@Column(name = "SRC_ZONE_NO")
+	@ApiParam("源存储区代码")
+	public String srcZoneNo;
+
+	@Column(name = "SRC_LOCATE_NO")
+	@ApiParam("源库位代码")
+	public String srcLocateNo;
+
+	@Column(name = "DEST_WH_NO")
+	@ApiParam("目标仓库代码")
+	public String destWhNo;
+
+	@Column(name = "DEST_ZONE_NO")
+	@ApiParam("目标存储区代码")
+	public String destZoneNo;
+
+	@Column(name = "DEST_LOCATE_NO")
+	@ApiParam("目标库位代码")
+	public String destLocateNo;
+
+	@Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)")
+	@ColumnDefault("0")
+	@ApiParam(value = "条码打印数量", example = "1")
+	private Double printQty;
+
+	@Column(name = "PLAN_DATE")
+	@ApiParam(value = "计划日期")
+	private String planDate;
+
+	@Column(name = "PLAN_TIME")
+	@ApiParam(value = "计划时间")
+	private String planTime;
+
+	@Column(name = "SRC_NO")
+	@ApiParam(value = "源单号")
+	private String srcNo;
+	/**
+	 * 状态:N=正常,C=行取消
+	 */
+	@Column(name = "ITEM_STATUS")
+	@ApiParam(value = "状态", example = "1")
+	@AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description")
+	private Integer itemStatus;
+
+	/**
+	 * 是否免费:0=计费,1=免费
+	 */
+	@Column(name = "IS_FREE")
+	@ApiParam(value = "是否免费", example = "1")
+	@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+	public Integer isFree;
+
+	@Column(name = "REMARK")
+	@ApiParam(value = "操作原因")
+	private String remark;
+
+	@Column(name = "PICK_QTY", columnDefinition = "decimal(18,8)")
+	@ColumnDefault("0")
+	@ApiParam(value = "已拣货数量", example = "1")
+	private Double pickQty;
+
+	@Column(name = "OUT_QTY", columnDefinition = "decimal(18,8)")
+	@ColumnDefault("0")
+	@ApiParam(value = "已出库数量", example = "1")
+	private Double outQty;
+
+	@Column(name = "REC_QTY", columnDefinition = "decimal(18,8)")
+	@ColumnDefault("0")
+	@ApiParam(value = "已收货数量", example = "1")
+	private Double recQty;
+
+	@Column(name = "MOVE_QTY", columnDefinition = "decimal(18,8)")
+	@ColumnDefault("0")
+	@ApiParam(value = "已移库数量", example = "1")
+	private Double moveQty;
+
+	@Column(name = "TASK_GENERATE_QTY", columnDefinition = "decimal(18,8)")
+	@ColumnDefault("0")
+	@ApiParam(value = "任务生成数量", example = "1")
+	private Double taskGenerateQty;
+
+	@Column(name = "SRC_AREA_NO")
+	@ApiParam("源库存地代码")
+	public String srcAreaNo;
+
+	@Column(name = "DEST_AREA_NO")
+	@ApiParam("目的库存地代码")
+	public String destAreaNo;
+
+	@Column(name = "LOT_NO")
+	@ApiParam("批次")
+	public String lotNo;
+
+	@Column(name="SRC_ITEM", columnDefinition="varchar(50) default ''",nullable=false)
+	@ApiParam("源单行号")
+	public String srcItem;
+
+	@Column(name = "CUST_ORDER_NO")
+	@ApiParam("客户订单号")
+	public String custOrderNo;
+
+	@Column(name = "ASSIGN_DATE_CODE")
+	@ApiParam(value = "指定生产日期")
+	private String assignDateCode;
+
+	@Transient
+	@ApiParam("实际批次")
+	private String actualLot;
+
+	@Transient
+	@ApiParam("实际数量")
+	private Double actualQty;
+
+	@Transient
+	@ApiParam("推荐批次")
+	private String recommondLot;
+
+	@Transient
+	@ApiParam("推荐库位")
+	private String recommondLocateNo;
+
+	@Transient
+	@ApiParam("前端表格编辑使用")
+	private Boolean isSet = false;
+
+	@Transient
+	@ApiParam("生产日期")
+	public String dateCode;
+
+	@ApiParam(value = "散件移库输入移库数量")
+	@Transient
+	public Double inputMoveQty;
+
+	@Transient
+	@ApiParam(value = "标准包装", example = "1")
+	private Double snp;
+
+	@Transient
+	@ApiParam(value = "条码总数量", example = "1")
+	private Double detailsSnCount;
+
+	@Transient
+	@ApiParam(value = "余数", example = "1")
+	private Double restQty;
+
+	@Transient
+	@ApiParam("任务状态")
+	@AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description")
+	private Integer isTask;
+
+	@Transient
+	@ApiParam("主表单据状态")
+	@AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
+	private Integer orderMasterStatus;
+
+	@Transient
+	@ApiParam("打印状态")
+	@AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description")
+	private Integer printStatus;
+
+	@Transient
+	@ApiParam("优先级")
+	private Integer priority;
+
+	@Transient
+	@ApiParam(value = "汇总需求数量", example = "0")
+	public Double sumQty;
+
+	@Transient
+	@ApiParam(value = "汇总拣货数量", example = "0")
+	public Double sumPickQty;
+
+	@Transient
+	@ApiParam("执行状态")
+	@AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_EXECUTE_STATUS.class, refForeignKey = "value", value = "description")
+	private Integer executeStatus;
+
+	@Version
+	@Column(name = "LOCK_VERSION")
+	@ApiParam(value = "乐观锁", example = "1")
+	public transient Integer lockVersion;
+
+	@Transient
+	@ApiParam("移动类型")
+	public Integer moveType;
+
+	@Transient
+	@ApiParam("业务类型")
+	@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
+	public Integer busiType;
+
+	@Column(name = "IS_SN")
+	@ApiParam(value = "条码生成状态", example = "20")
+	public Integer isSn;
+
+
+	public WmsTmsShippingExtDetail () {
+
+	}
+
+
+	public String getRecommondLot() {
+		return recommondLot == null ? "无" : this.recommondLot;
+	}
+
+	public Double getQty() {
+		return qty == null ? 0D : this.qty.doubleValue();
+	}
+
+	public Double getOutQty() {
+		return outQty == null ? 0D : this.outQty.doubleValue();
+	}
+
+	public Double getPickQty() {
+		return pickQty == null ? 0D : this.pickQty.doubleValue();
+	}
+
+	public Double getActualQty() {
+		return actualQty == null ? 0D : this.actualQty.doubleValue();
+	}
+
+	public Double getRecQty() {
+		return recQty == null ? 0D : this.recQty.doubleValue();
+	}
+
+	public Integer getIsTaskVal() {
+		return isTask == null ? 0 : this.isTask.intValue();
+	}
+
+	public Integer getOrderMasterStatus() {
+		return orderMasterStatus == null ? 0 : this.orderMasterStatus.intValue();
+	}
+
+}

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

@@ -0,0 +1,148 @@
+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;
+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 : 车辆信息明细
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2019-12-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_TMS_SHIPPING_EXT_SN")
+@Api("装车单条码明细")
+public class WmsTmsShippingExtSn extends BaseBean {
+
+    private static final long serialVersionUID = 5704546384179442907L;
+
+    @Column(name="MOVE_NO")
+    @ApiParam("装车单")
+    public String moveNo;
+
+    @Column(name="ORDER_NO")
+    @ApiParam("订单号")
+    public String orderNo;
+
+    @Column(name="ITEM")
+    @ApiParam("行号")
+    public String item;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Column(name="QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "数量", example = "0")
+    public Double qty;
+
+
+    @Column(name="UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    /**
+     * 状态：操作状态  itemStatus
+     */
+    @Column(name="SN_STATUS")
+    @ApiParam(value = "操作状态", example = "10")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_SN_STATUS.class,refForeignKey = "value",value = "description")
+    public Integer snStatus;
+
+    @Column(name="SN")
+    @ApiParam("条码")
+    public String sn;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编码")
+    public String vendorNo;
+
+    @Column(name = "SN_TYPE")
+    @ApiParam(value = "条码类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer snType;
+
+    @Transient
+    @ApiParam("前端表格编辑使用")
+    private Boolean isSet = false;
+
+    @Transient
+    @ApiParam("目标库位代码")
+    public String destLocateNo;
+
+    @Transient
+    @ApiParam("源库位代码")
+    public String srcLocateNo;
+
+    @Transient
+    @ApiParam("生产日期")
+    public String dateCode;
+
+    @ApiParam(value = "散件移库输入移库数量")
+    @Transient
+    public Double inputMoveQty;
+
+    @Transient
+    @ApiParam("计划交货日期")
+    private String planDate;
+
+    @Transient
+    @ApiParam("计划交货时间")
+    private String planTime;
+
+    @Transient
+    @ApiParam("ERP库存地")
+    private String erpWhNo;
+
+    @Transient
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
+    public Integer itemStatus;
+
+    @Transient
+    @ApiParam("客户零件号")
+    private String customerPartNo;
+
+    @Transient
+    @ApiParam("父层级packcode对应的可回用零件号")
+    private String parentReturnPart;
+
+
+    @Transient
+    @ApiParam("打印模板")
+    private String templateNo;
+
+    @Transient
+    @ApiParam("剩余箱数量")
+    private Long countBox;
+
+    public WmsTmsShippingExtSn(){}
+
+    public WmsTmsShippingExtSn(Long countBox,String partNo) {
+        this.countBox = countBox;
+        this.partNo = partNo;
+    }
+}

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

@@ -58,7 +58,7 @@ public class WmsTrans extends BaseBean{
     @ApiParam(value ="交易状态",example = "1")
     private Integer transStatus;
 
-    @Column(name="QTY", columnDefinition = "decimal(18,8)")
+    @Column(name="QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value ="需求数")
     private Double qty;

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

@@ -98,47 +98,47 @@ public class WmsTransQuan extends BaseBean {
     @ApiParam(value = "错误信息")
     private String errorMessage;
 
-    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "可用数量", example = "0")
     public Double qty;
 
-    @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "不合格数量", example = "0")
     private Double failQty;
 
-    @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "隔离数量", example = "0")
     private Double holdQty;
 
-    @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "质检中数量", example = "0")
     private Double qcQty;
 
-    @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "待入库数量", example = "0")
     private Double rinQty;
 
-    @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "冻结数量", example = "0")
     private Double freezeQty;
 
-    @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "寄售数量", example = "0")
     private Double consignQty;
 
-    @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "锁定数量", example = "0")
     private Double lockQty;
 
-    @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "报废数量", example = "0")
     private Double scrapQty;

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

@@ -58,7 +58,7 @@ public class WmsTransRcd extends BaseBean{
     @ApiParam(value ="交易状态",example = "1")
     private Integer transStatus;
 
-    @Column(name="QTY", columnDefinition = "decimal(18,8)")
+    @Column(name="QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value ="需求数")
     private Double qty;

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

@@ -66,12 +66,12 @@ public class WmsTransSn extends BaseBean {
     @ApiParam("事务代码")
     public String transCode;
 
-    @Column(name="QTY", columnDefinition = "decimal(18,8)")
+    @Column(name="QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "交易数量", example = "0")
     public Double qty;
 
-    @Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "不合格交易数量", example = "0")
     public Double rejectQty;

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

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 供应商计划员
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-04-11
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_VENDOR_PLANNER")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="供应商计划员",description = "供应商计划员")
+public class WmsVendorPlanner extends BaseBean {
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编号")
+    private String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam(value = "供应商名称")
+    private String vendorName;
+
+    @Column(name = "PLANNER_NAME")
+    @ApiParam(value = "计划员")
+    private String plannerName;
+}

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

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 供应商父子关系
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-04-11
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_VENDOR_RELATION")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="供应商父子关系",description = "供应商父子关系")
+public class WmsVendorRelation extends BaseBean {
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编号")
+    private String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam(value = "供应商名称")
+    private String vendorName;
+
+    @Column(name = "SUB_VENDOR_CODE")
+    @ApiParam(value = "子供应商编号")
+    private String subVendorNo;
+
+    @Column(name = "SUB_VENDOR_NAME")
+    @ApiParam(value = "子供应商名称")
+    private String subVendorName;
+}

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

@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 供应商窗口时间
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-04-11
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_VENDOR_WINDOW")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="供应商窗口时间",description = "供应商窗口时间")
+public class WmsVendorWindow extends BaseBean {
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编号")
+    private String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam(value = "供应商名称")
+    private String vendorName;
+
+    @Column(name = "WINDOW_TIME")
+    @ApiParam(value = "窗口时间")
+    private String windowTime;
+
+    @Column(name = "DELAY_HOUR")
+    @ApiParam(value = "容差")
+    private Integer delayHour;
+
+    @Column(name = "WEEK_DAY")
+    @ApiParam(value = "星期")
+    private String weekDay;
+}

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

@@ -5,6 +5,7 @@ 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;
 
@@ -67,28 +68,34 @@ public class WmsWaveRule extends BaseBean {
     @ApiParam(value = "单据控制时间")
     public String orderControlTime;
 
-    @Column(name = "FIXED_ORDER_QTY")
+    @Column(name = "FIXED_ORDER_QTY", nullable = false)
     @ApiParam(value = "固定单据数量", example = "0")
+    @ColumnDefault("0")
     public Integer fixedOrderQty;
 
-    @Column(name = "FIXED_PART_QTY")
+    @Column(name = "FIXED_PART_QTY", nullable = false)
     @ApiParam(value = "固定物料箱数", example = "0")
+    @ColumnDefault("0")
     public Integer fixedPartQty;
 
-    @Column(name = "WAVE_QTY")
+    @Column(name = "WAVE_QTY", nullable = false)
     @ApiParam(value = "波次数量", example = "0")
+    @ColumnDefault("0")
     public Integer waveQty;
 
-    @Column(name = "ORDER_MAX_QTY")
+    @Column(name = "ORDER_MAX_QTY", nullable = false)
     @ApiParam(value = "最大单据数量", example = "0")
+    @ColumnDefault("0")
     public Integer orderMaxQty;
 
-    @Column(name = "PART_MAX_QTY")
+    @Column(name = "PART_MAX_QTY", nullable = false)
     @ApiParam(value = "最大物料数量", example = "0")
+    @ColumnDefault("0")
     public Double partMaxQty;
 
-    @Column(name = "ORDER_TIMEOUT_TIME")
+    @Column(name = "ORDER_TIMEOUT_TIME", nullable = false)
     @ApiParam(value = "单据等待时间", example = "0")
+    @ColumnDefault("0")
     public Integer orderTimeOutTime;
 
     @Column(name = "NEXT_WAVE_TIME")

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

@@ -5,6 +5,7 @@ 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;
 
@@ -46,12 +47,14 @@ public class WmsListElement extends BaseBean {
     @ApiParam(value = "序列号:字段标题排序使用默认0（不排序）")
     private Integer seq;
 
-    @Column(name = "IS_REQUIRE")
+    @Column(name = "IS_REQUIRE", nullable = false)
+    @ColumnDefault("2")
     @ApiParam(value = "是否必选:默认1-必选，2-非必选")
     private Integer isRequire;
 
-    @Column(name = "WIDTH", columnDefinition = "decimal(18,8)")
+    @Column(name = "WIDTH", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "宽度", example = "0")
+    @ColumnDefault("0")
     private Double width;
 
     @Column(name = "SORT")

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

@@ -7,6 +7,7 @@ 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;
 
@@ -63,16 +64,18 @@ public class WmsMoveDetailsSnapshot extends BaseBean {
     @ApiParam("客户编号")
     public String custNo;
 
-    @Column(name="TRANS_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name="TRANS_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "处理数量", example = "0")
+    @ColumnDefault("0")
     public Double transQty;
 
     public Double getTransQty(){
         return this.transQty == null ? 0 : this.transQty.doubleValue();
     }
 
-    @Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "不合格处理数量", example = "0")
+    @ColumnDefault("0")
     public Double rejectQty;
 
     public Double getRejectQty(){

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

@@ -87,47 +87,47 @@ public class WmsStockQuanSnapshot extends BaseBean {
     private WmsLocate wmsLocate;
 
 
-    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "可用数量", example = "0")
     public Double qty;
 
-    @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "不合格数量", example = "0")
     private Double failQty;
 
-    @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "隔离数量", example = "0")
     private Double holdQty;
 
-    @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "质检中数量", example = "0")
     private Double qcQty;
 
-    @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "待入库数量", example = "0")
     private Double rinQty;
 
-    @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "冻结数量", example = "0")
     private Double freezeQty;
 
-    @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "寄售数量", example = "0")
     private Double consignQty;
 
-    @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "锁定数量", example = "0")
     private Double lockQty;
 
-    @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "报废数量", example = "0")
     private Double scrapQty;

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

@@ -7,6 +7,7 @@ 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 org.springframework.format.annotation.DateTimeFormat;
@@ -116,8 +117,9 @@ public class WmsStockSnSnapshot extends BaseBean {
     @ApiParam(value = "单位")
     private String unit;
 
-    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "数量", example = "0")
+    @ColumnDefault("0")
     private Double qty = 0d;
 
     /**

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java

@@ -0,0 +1,23 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description :装车单入参
+ * @Reference :
+ * @Author : gcj
+ * @CreateDate : 2019-12-07 16:06
+ * @Modify:
+ **/
+@Api("装车单批量入参")
+@Data
+public class WmsTmsShipBacthDto extends BaseDto implements Serializable {
+    @ApiParam("装车单集合")
+      private  List<WmsTmsShipDto> wmsTmsShipDtoList=new ArrayList<>();
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtDeatilModel.java

@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+
+/**
+ * @Description :装车单打印输出model
+ * @Reference :
+ * @Author :QianHuaSheng
+ * @CreateDate : 2020-04-10 3:21 下午
+ * @Modify:
+ **/
+@Data
+@Api("静态盘点查询输出model")
+public class WmsTmsShippingExtDeatilModel {
+
+	@ApiParam(value ="零件号")
+	private String partNo;
+
+	@Column(name="PART_NAME_RDD")
+	@ApiParam(value ="零件名称")
+	private String partNameRdd;
+
+	@ApiParam("需求数量")
+	private Double qty;
+
+	@ApiParam("发运数量")
+	private Double shippQty;
+
+	@ApiParam("箱数")
+	private Integer boxQty;
+
+	@ApiParam("标准包装")
+	private Double snp;
+
+	@ApiParam("收货数量")
+	private String receivedQuantity="";
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java

@@ -0,0 +1,133 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import cn.estsh.i3plus.pojo.wms.bean.WmsTmsShippingExt;
+import cn.estsh.i3plus.pojo.wms.dto.WmsTmsShipModel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description :装车单打印输出model
+ * @Reference :
+ * @Author :QianHuaSheng
+ * @CreateDate : 2020-04-10 3:21 下午
+ * @Modify:
+ **/
+@Data
+@Api("静态盘点查询输出model")
+public class WmsTmsShippingExtModel {
+
+	@ApiParam(value = "移库单号")
+	private String moveNo="";
+
+	@ApiParam(value = "到货地点")
+	private String destination="";
+
+	@ApiParam(value = "接收人")
+	private String recUser="";
+
+	@ApiParam(value = "接收人电话")
+	private String recPhone="";
+
+	@ApiParam(value = "道口")
+	private String dockNo="";
+
+	@ApiParam(value = "承运商编号")
+	private String vendorNo="";
+
+	@ApiParam(value = "承运商名称RDD")
+	private String vendorName="";
+
+	@ApiParam(value = "驾驶员编号")
+	private String driverNo="";
+
+	@ApiParam(value = "驾驶员名称RDD")
+	private String driverName="";
+
+	@ApiParam(value = "驾驶员联系方式RDD")
+	private String phone="";
+
+	@ApiParam(value = "单据状态")
+	private Integer orderStatus=0;
+
+	@ApiParam(value = "客户名称RDD")
+	private String custName="";
+
+	@ApiParam(value = "客户编号RDD")
+	private String custNo="";
+
+	@ApiParam(value = "车牌号RDD")
+	private String carNo="";
+
+	@ApiParam(value = "计划发车时间")
+	private String deliveryTime="";
+
+	@ApiParam(value = "要求到货时间")
+	private String arrivelTime="";
+
+	@ApiParam(value = " 申请部门")
+	private String depart="";
+
+	@ApiParam("物料编码")
+	private String partNo="";
+
+	@ApiParam("关联单号")
+	private String refOrderNo="";
+
+	@ApiParam("回执单地址")
+	private String pathUrl="";
+
+	@ApiParam("打印模板列表")
+	private List<WmsTmsShipModel> shipModels=new ArrayList<>();
+
+	//需求仓库-目的仓库
+	@ApiParam("目的仓库")
+	private String descWarehouse="";
+
+	//承运商-物流供应商
+	@ApiParam("物流供应商")
+	private String logisticsVendorNo="";
+
+	//运输方式-单据运输方式（维护内容）
+	@ApiParam("单据运输方式")
+	private Integer documentTransportMethod=0;
+
+	//是否不良品调拨—调拨单录入字段
+	@ApiParam("调拨单录入字段")
+	private String defectiveAllocation="";
+
+	@ApiParam("发运时间")
+	private String shippingTime="";
+
+	@ApiParam("发运人")
+	private String shippingUser="";
+
+	@ApiParam("下单日期")
+	private String orderDate="";
+
+	@ApiParam("模板编号")
+	private String templateNo="";
+
+	//装车单明细已物料区分
+	@ApiParam("各个物料详情")
+	private List<WmsTmsShippingExtDeatilModel> tmsShippingExtDeatilModels = new ArrayList<>();
+
+	public WmsTmsShippingExtModel() {
+
+	}
+
+	public WmsTmsShippingExtModel(WmsTmsShippingExt wmsTmsShippingExt) {
+		this.moveNo = wmsTmsShippingExt.getMoveNo();
+		this.descWarehouse=wmsTmsShippingExt.getDescWarehouse();
+		this.vendorName=wmsTmsShippingExt.getVendorName();
+		this.documentTransportMethod=wmsTmsShippingExt.getDocumentTransportMethod();
+		this.shippingTime=wmsTmsShippingExt.getCreateDatetime();
+		this.shippingUser=wmsTmsShippingExt.getCreateUser();
+		this.defectiveAllocation=wmsTmsShippingExt.getDefectiveAllocation();
+		this.refOrderNo=wmsTmsShippingExt.getRefOrderNo();
+		this.orderDate=wmsTmsShippingExt.getCreateDatetime();
+	}
+}

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTmsShippingExtDetail;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description : 装车单明细
+* @Reference :
+* @author: qianhuasheng
+* @date: 2019/9/19 14:22
+* @Modify:
+*/
+
+@Repository
+public interface IWmsTmsShippingExtDetailRepository extends BaseRepository<WmsTmsShippingExtDetail,Long> {
+}

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTmsShippingExtSn;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description : 装车单条码明细
+* @Reference :
+* @author: qianhuasheng
+* @date: 2019/9/19 14:22
+* @Modify:
+*/
+
+@Repository
+public interface IWmsTmsShippingExtSnRepository extends BaseRepository<WmsTmsShippingExtSn,Long> {
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsCustWindow;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 客户窗口时间
+ * @Reference :
+ * @Author : jason
+ * @CreateDate : 2020-04-14
+ * @Modify:
+ **/
+@Repository
+public interface WmsCustWindowRepository extends BaseRepository<WmsCustWindow, Long> {
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsCustomerPartShipping;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 客户物料发往地
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-04-11
+ * @Modify:
+ **/
+@Repository
+public interface WmsCustomerPartShippingRepository extends BaseRepository<WmsCustomerPartShipping, Long> {
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPartExtend;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-04-09
+ * @Modify:
+ **/
+@Repository
+public interface WmsPartExtendRepository extends BaseRepository<WmsPartExtend, Long> {
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsSubPart;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 替代料
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-04-14
+ * @Modify:
+ **/
+@Repository
+public interface WmsSubPartRepository extends BaseRepository<WmsSubPart, Long> {
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsVendorPlanner;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 供应商计划员
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-04-11
+ * @Modify:
+ **/
+@Repository
+public interface WmsVendorPlannerRepository extends BaseRepository<WmsVendorPlanner, Long> {
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsVendorRelation;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 供应商父子关系
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-04-11
+ * @Modify:
+ **/
+@Repository
+public interface WmsVendorRelationRepository extends BaseRepository<WmsVendorRelation, Long> {
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsVendorWindow;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 供应商窗口时间
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-04-11
+ * @Modify:
+ **/
+@Repository
+public interface WmsVendorWindowRepository extends BaseRepository<WmsVendorWindow, Long> {
+}

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

@@ -18,7 +18,11 @@ import com.alibaba.fastjson.JSONObject;
 import com.google.common.base.Strings;
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -2243,6 +2247,111 @@ public class WmsHqlPack {
     }
 
     /**
+     * 物料扩展属性
+     *
+     * @param partExtend
+     * @return
+     */
+    public static DdlPackBean packHqlWmsPartExtendByPart(WmsPartExtend partExtend) {
+
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(partExtend.getPartNo(), "partNo", packBean);
+        getStringBuilderPack(partExtend, packBean);
+
+        return packBean;
+    }
+
+    /**
+     * 替代料 条件封装
+     *
+     * @param subPart
+     * @return
+     */
+    public static DdlPackBean packHqlWmsSubPartByPart(WmsSubPart subPart) {
+
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(subPart.getPartNo(), "partNo", packBean);
+        getStringBuilderPack(subPart, packBean);
+
+        return packBean;
+    }
+
+    /**
+     * 供应商窗口时间 条件封装
+     *
+     * @param vendorWindow
+     * @return
+     */
+    public static DdlPackBean packHqlWmsVendorWindow(WmsVendorWindow vendorWindow) {
+
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(vendorWindow.getVendorNo(), "vendorNo", packBean);
+        getStringBuilderPack(vendorWindow, packBean);
+
+        return packBean;
+    }
+
+    /**
+     * 供应商窗口时间 条件封装
+     *
+     * @param custWindow
+     * @return
+     */
+    public static DdlPackBean packHqlWmsCustWindow(WmsCustWindow custWindow) {
+
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(custWindow.getCustNo(), "custNo", packBean);
+        getStringBuilderPack(custWindow, packBean);
+
+        return packBean;
+    }
+
+    /**
+     * 客户物料发往地 条件封装
+     *
+     * @param shipping
+     * @return
+     */
+    public static DdlPackBean packHqlWmsCustomerPartShipping(WmsCustomerPartShipping shipping) {
+
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(shipping.getCustomerCode(), "customerCode", packBean);
+        getStringBuilderPack(shipping, packBean);
+
+        return packBean;
+    }
+
+    /**
+     * 供应商父子关系 条件封装
+     *
+     * @param vendorPlanner
+     * @return
+     */
+    public static DdlPackBean packHqlWmsVendorPlanner(WmsVendorPlanner vendorPlanner) {
+
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(vendorPlanner.getVendorNo(), "vendorNo", packBean);
+        getStringBuilderPack(vendorPlanner, packBean);
+
+        return packBean;
+    }
+
+    /**
+     * 供应商父子关系 条件封装
+     *
+     * @param vendorRelation
+     * @return
+     */
+    public static DdlPackBean packHqlWmsVendorRelation(WmsVendorRelation vendorRelation) {
+
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(vendorRelation.getVendorNo(), "vendorNo", packBean);
+        getStringBuilderPack(vendorRelation, packBean);
+
+        return packBean;
+    }
+
+    /**
      * 单位定义
      *
      * @param wmsUnit
@@ -2923,6 +3032,20 @@ public class WmsHqlPack {
     }
 
     /**
+     * 获取 DdlPackBean(三个基础)
+     *
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean packHqlWms(String organizeCode) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+        return result;
+    }
+
+    /**
      * SO订单主表信息 分页查询
      *
      * @param wmsDocSoMaster

pom.xml

@@ -34,6 +34,7 @@
         <module>modules/i3plus-pojo-aps</module>
         <module>modules/i3plus-pojo-lac</module>
         <module>modules/i3plus-pojo-ptl</module>
+        <module>modules/i3plus-pojo-ics</module>
     </modules>
 
     <dependencies>
@@ -58,7 +59,20 @@
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
             <version>2.9.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.swagger</groupId>
+                    <artifactId>swagger-models</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.5.21</version>
+        </dependency>
+
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>

sonar-project.properties

@@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 # defaults to project key
 sonar.projectName=i3plus-pojo
 # defaults to 'not provided'
-sonar.projectVersion=1.0-TEST-SNAPSHOT
+sonar.projectVersion=1.0-DEV-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./