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

5 years ago · 9ab0d784dd
parent 73f647e3b4 2a80a4c720
commit 9ab0d784dd
56 changed files with 1334 additions and 70 deletions
--- a/modules/i3plus-pojo-andon/pom.xml
+++ b/modules/i3plus-pojo-andon/pom.xml
@ -50,7 +50,7 @@
        </profile>
    </profiles>
    <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
    </build>

 </project>
--- a/modules/i3plus-pojo-aps/pom.xml
+++ b/modules/i3plus-pojo-aps/pom.xml
@ -54,7 +54,7 @@
        </profile>
    </profiles>
    <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
    </build>

 </project>
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/pom.xml
@ -71,7 +71,7 @@
        </profile>
    </profiles>
    <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
    </build>


--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@ -713,7 +713,8 @@ public class WmsEnumUtil {
        KT_PICK_RC(480, "KT_PICK_RC", "坤泰拣货"),
        PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"),
        UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"),
-        TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料");
+        TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"),
+        EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动");

        private int value;
        private String code;
@ -4512,7 +4513,9 @@ public class WmsEnumUtil {
        SAFETY_STOCK_PULL(10, "安全库存拉动"),
        ELECTRONIC_KANBAN_PULL(20, "电子看板拉动"),
        LINE_PULL(30, "巡线拉动"),
-        PLANNED_PULL(40, "计划拉动");
+        PLANNED_PULL(40, "计划拉动"),
+        ANDON_PULL(50, "安灯拉动"),
+        EXTERNAL_PULL(60, "手工拉动");

        private int value;
        private String description;
@ -4551,6 +4554,53 @@ public class WmsEnumUtil {
    }

    /**
+     * 尾数计算方式
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TAIL_QTY_MODE {
+        NONE(1, "不处理"),
+        ORIGIN_NUMBER(10, "原数值"),
+        UP_ROUND(20, "向上取整"),
+        DOWN_ROUND(30, "向下取整");
+
+        private int value;
+        private String description;
+
+        TAIL_QTY_MODE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static TAIL_QTY_MODE 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)
@ -5301,4 +5351,378 @@ public class WmsEnumUtil {
            return tmp;
        }
    }
+
+    /**
+     *  波次合并规则
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WAVE_MERGE_RULE {
+        IS_SAME_CUSTOMER("同客户", "isSameCustomer", 2, 10),
+        IS_SAME_WAREHOUSE("同仓库", "isSameWareHouse", 1, 10),
+        IS_SAME_PRIORITY("同优先级", "isSamePriority", 1, 10),
+        IS_SAME_SRC_ZONE("同来源存储区", "isSameSrcZone", 2, 10),
+        IS_SAME_DEST_ZONE("同目标存储区", "isSameDestZone", 2, 10),
+        IS_SAME_PART("同物料", "isSamePart", 2, 10),
+        IS_SAME_PART_GROUP("同物料组", "isSamePartGroup", 2, 10),
+        IS_SAME_DELIVERY_TIME("同发货时间", "isSameDeliveryTime", 2, 10),
+        IS_SAME_BUSI_TYPE("同业务类型", "isSameBusiType", 1, 10),
+        IS_SAME_ORDER_STATUS("同单据状态", "isSameOrderStatus", 1, 10),
+        IS_CROSS_AREA("允许跨区", "isCrossArea", 2, 10),
+        IS_COLLECTION("物料整箱归集", "isCollection", 2, 10);
+
+        private String chName;
+
+        private String enName;
+
+        private int waveMergeType;
+
+        private int value;
+
+        WAVE_MERGE_RULE(String chName, String enName, int value, int waveMergeType) {
+            this.chName = chName;
+            this.enName = enName;
+            this.value = value;
+            this.waveMergeType = waveMergeType;
+        }
+
+        public String getChName() {
+            return chName;
+        }
+
+        public String getEnName() {
+            return enName;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public int getWaveMergeType() {
+            return waveMergeType;
+        }
+    }
+
+    /**
+     *  波次合并规则
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WAVE_MERGE_RANGE {
+        CUST_NO("客户代码", "custNo", "cn.estsh.i3plus.pojo.wms.bean.BasCustomer",
+                "custNo, custName", "custNo, custName", "custNo", 20),
+        WAREHOUSE_CODE("仓库代码", "srcWhNo", "cn.estsh.i3plus.pojo.wms.bean.WareHouse",
+                "code, name", "code, name", "code", 20),
+        PRIORITY("优先级", "priority", "PRIORITY_NEW", "",
+                "", "", 20),
+        SRC_ZONE_NO("来源存储区代码", "srcZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones",
+                "zoneNo, zoneName", "zoneNo", "zoneNo", 20),
+        DEST_ZONE_NO("目标存储区代码", "destZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones",
+                "zoneNo, zoneName", "zoneNo", "zoneNo", 20),
+        PART_NO("物料号", "partNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
+                "partNo, partName", "partNo", "partNo", 20),
+        PART_GROUP_NO("物料组代码", "partGroupNo", "", "",
+                "", "", 20),
+        BUSI_TYPE("业务类型", "busiType", "OUT_MOVEMENT_BUSI_TYPE", "",
+                "", "", 20),
+        ORDER_STATUS("单据状态", "orderStatus", "MASTER_ORDER_STATUS", "",
+                "", "", 20);
+
+        // 中文名称
+        String chName;
+        // 英文名称
+        String enName;
+        // 下拉枚举名称
+        String entityName;
+        // 下拉列表显示列名称,多个列名需要根据逗号分隔
+        String listColumnName;
+        // 下拉搜索列名称,多个列名需要根据逗号分隔
+        String searchColumnName;
+        // 回显列名
+        String explicitColumnName;
+        // 合并操作类型
+        private int waveMergeType;
+
+        WAVE_MERGE_RANGE(String chName, String enName, String entityName, String listColumnName,
+                         String searchColumnName, String explicitColumnName, int waveMergeType) {
+            this.chName = chName;
+            this.enName = enName;
+            this.entityName = entityName;
+            this.listColumnName = listColumnName;
+            this.searchColumnName = searchColumnName;
+            this.explicitColumnName = explicitColumnName;
+            this.waveMergeType = waveMergeType;
+        }
+
+        public String getChName() {
+            return chName;
+        }
+
+        public String getEnName() {
+            return enName;
+        }
+
+        public String getEntityName() {
+            return entityName;
+        }
+
+        public String getListColumnName() {
+            return listColumnName;
+        }
+
+        public String getSearchColumnName() {
+            return searchColumnName;
+        }
+
+        public String getExplicitColumnName() {
+            return explicitColumnName;
+        }
+
+        public int getWaveMergeType() {
+            return waveMergeType;
+        }
+    }
+
+    /**
+     *  插件类型 10-合并规则，20-合并范围
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WAVE_MERGE_TYPE {
+        WAVE_MERGE_RULE(10, "WAVE_MERGE_RULE", "合并规则"),
+        WAVE_MERGE_RANGE(20, "WAVE_MERGE_RANGE", "合并范围");
+
+        private int value;
+        private String code;
+        private String description;
+
+        WAVE_MERGE_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static WAVE_MERGE_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;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 存储区-补货方式
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ZONE_PULL_WAY {
+        JOB_CYCLE(10, "JOB周期"),
+        FIXED_CYCLE(20, "固定周期");
+
+        private int value;
+        private String description;
+
+        ZONE_PULL_WAY(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static ZONE_PULL_WAY codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 拉动任务-任务类型
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PULL_TASK_TYPE {
+        NORMAL_PULL(10, "普通拉动"),
+        GROUP_PULL(20, "组合拉动");
+
+        private int value;
+        private String description;
+
+        PULL_TASK_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static PULL_TASK_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 DOCK_ORDER_STATUS {
+        WAIT_SEND(10, "待送货"),
+        ARRIVED(20, "已到达"),
+        RECEIVED(30, "已收货"),
+        CANCELED(40, "已取消");
+
+        private int value;
+        private String description;
+
+        DOCK_ORDER_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static DOCK_ORDER_STATUS 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 DOCK_APPOINTMENT_STATUS {
+        WAIT_SEND(10, "待送货"),
+        HAS_SENDED(20, "已送达"),
+        RECEIVING(30, "收货中"),
+        COMPLETED(40, "已完成"),
+        OVERTIME(50, "供货超时");
+
+        private int value;
+        private String description;
+
+        DOCK_APPOINTMENT_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static DOCK_APPOINTMENT_STATUS 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;
+        }
+    }
 }
--- a/modules/i3plus-pojo-form/pom.xml
+++ b/modules/i3plus-pojo-form/pom.xml
@ -51,6 +51,6 @@
        </profile>
    </profiles>
    <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
    </build>
 </project>
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java
@ -179,6 +179,7 @@ public final class FormHqlPack {

        DdlPreparedPack.getStringLikerPack(bfIntercept.getInterceptName(), "interceptName", ddlPackBean);
        DdlPreparedPack.getNumEqualPack(bfIntercept.getExecuteMode(), "executeMode", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bfIntercept.getExecuteContent(),"executeContent",ddlPackBean);
        DdlPreparedPack.getNumEqualPack(bfIntercept.getInterceptStatus(), "interceptStatus", ddlPackBean);
        DdlPreparedPack.getNumEqualPack(bfIntercept.getIsDeleted(), "isDeleted", ddlPackBean);
        ddlPackBean.setOrderByStr(bfIntercept.orderBy());
@ -324,6 +325,9 @@ public final class FormHqlPack {
        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();

        DdlPreparedPack.getStringLikerPack(source.getSourceHost(), "sourceHost", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(source.getSourceName(), "sourceName", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(source.getSourceCode(), "sourceCode", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(source.getSourceDataBaseName(), "sourceDataBaseName", ddlPackBean);
        DdlPreparedPack.getNumEqualPack(source.getSourceType(), "sourceType", ddlPackBean);
        DdlPreparedPack.getNumEqualPack(source.getSourceStatus(), "sourceStatus", ddlPackBean);

@ -383,4 +387,33 @@ public final class FormHqlPack {
        return ddlPackBean;
    }

+    /**
+     * 数据对象查询条件拼接
+     * @param bfDataObject
+     * @return
+     */
+    public static DdlPackBean packHqlBfDataObject(BfDataObject bfDataObject){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(bfDataObject.getObjectName(), "objectName", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bfDataObject.getObjectClassName(), "objectClassName", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+
+    /**
+     * 数据对象查询条件拼接
+     * @param bfCascade
+     * @return
+     */
+    public static DdlPackBean packHqlBfCascade(BfCascade bfCascade){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeName(), "objectName", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeDescription(), "objectClassName", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
 }
--- a/modules/i3plus-pojo-hardswitch/pom.xml
+++ b/modules/i3plus-pojo-hardswitch/pom.xml
@ -44,7 +44,7 @@
        </profile>
    </profiles>
    <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
    </build>

 </project>
--- a/modules/i3plus-pojo-jobflow/pom.xml
+++ b/modules/i3plus-pojo-jobflow/pom.xml
@ -44,7 +44,7 @@
        </profile>
    </profiles>
    <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
    </build>

 </project>
--- a/modules/i3plus-pojo-lac/pom.xml
+++ b/modules/i3plus-pojo-lac/pom.xml
@ -50,7 +50,7 @@
        </profile>
    </profiles>
    <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
    </build>

 </project>
--- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java
@ -73,6 +73,7 @@ public class LacHqlPack {
        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();

        DdlPreparedPack.getStringEqualPack(bean.getTemplateCode(), "templateCode", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(bean.getTemplateName(), "templateName", ddlPackBean);

        return ddlPackBean;
    }
@ -163,6 +164,10 @@ public class LacHqlPack {
    public static DdlPackBean packHqlLacCommandStackRecord(LacCommandStackRecord bean) {
        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();

+        DdlPreparedPack.getNumEqualPack(bean.getStackStatus(), "stackStatus", ddlPackBean);
+        DdlPreparedPack.timeBuilder(bean.getStackStartTime(), "stackStartTime", ddlPackBean,false, true);
+
+
        return ddlPackBean;
    }

@ -190,4 +195,14 @@ public class LacHqlPack {
        DdlPreparedPack.getNumNOEqualPack(lacTaskCheck.getId(),"id",ddlPackBean);
        return ddlPackBean;
    }
+
+    public static DdlPackBean packHqlLacSuitCase(LacSuitCase bean) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bean);
+
+        DdlPreparedPack.getStringLikerPack(bean.getSutiCaseNameRdd(),"sutiCaseNameRdd",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bean.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getSutiType(),"id",ddlPackBean);
+
+        return ddlPackBean;
+    }
 }
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/pom.xml
@ -50,7 +50,7 @@
        </profile>
    </profiles>
    <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
    </build>

 </project>
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/modules/i3plus-pojo-mes/pom.xml
@ -50,7 +50,7 @@
        </profile>
    </profiles>
    <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
    </build>

 </project>
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java
@ -24,12 +24,31 @@ public class ButtonDynamicModel {
    @ApiParam("按钮代码")
    private String buttonCode;

-    @ApiParam("调用类")
-    private String callClass;
+    @ApiParam("回调界面方法")
+    private String windowModuleBack;

-    public ButtonDynamicModel(Long id, String buttonName, String buttonCode) {
+    @ApiParam("界面编号")
+    private String windowNo;
+
+    @ApiParam("参数代码")
+    private String paramCode;
+
+    @ApiParam("参数值")
+    private String paramValue;
+
+
+    public ButtonDynamicModel(Long id, String buttonCode, String buttonName){
        this.id = id;
+        this.buttonCode = buttonCode;
        this.buttonName = buttonName;
+    }
+
+    public ButtonDynamicModel(Long id, String buttonCode, String windowNo, String windowModuleBack, String paramCode, String paramValue){
+        this.id = id;
        this.buttonCode = buttonCode;
+        this.windowNo = windowNo;
+        this.windowModuleBack = windowModuleBack;
+        this.paramCode = paramCode;
+        this.paramValue = paramValue;
    }
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java
@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.mes.annotation.ElasticSearch;
 import cn.estsh.i3plus.pojo.mes.annotation.Json4Es;
+//import com.sun.tools.javac.util.List;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.Data;
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/pom.xml
@ -91,7 +91,7 @@
        </profile>
    </profiles>
    <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
    </build>

 </project>
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/modules/i3plus-pojo-platform/pom.xml
@ -50,7 +50,7 @@
        </profile>
    </profiles>
    <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
    </build>

 </project>
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
@ -306,18 +306,19 @@ public class CoreHqlPack {
     * @param config
     * @return
     */
-    public static String packHqlSysConfig(SysConfig config) {
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean   packHqlSysConfig(SysConfig config) {
+        DdlPackBean result = DdlPackBean.getDdlPackBean();

        // hql拼接
-        HqlPack.getStringLikerPack(config.getName(),"name",result);
-        HqlPack.getStringLikerPack(config.getConfigCode(),"configCode",result);
-        HqlPack.getNumEqualPack(config.getConfigType(),"configType",result);
+        DdlPreparedPack.getStringLikerPack(config.getName(),"name",result);
+        DdlPreparedPack.getStringLikerPack(config.getConfigCode(),"configCode",result);
+        DdlPreparedPack.getNumEqualPack(config.getConfigType(),"configType",result);
+        DdlPreparedPack.getNumEqualPack(config.getConfigGroup(), "configGroup", result);

        // 添加默认排序
-        HqlPack.getOrderDefault(config);
+        DdlPreparedPack.getOrderDefault(config);

-        return result.toString();
+        return result;
    }

    /**
@ -338,6 +339,7 @@ public class CoreHqlPack {
        }
        DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result);
        DdlPreparedPack.getStringLikerPack(dictionary.getParentCodeRdd(), "parentCodeRdd", result);
+        DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result);

        // 添加默认排序
        DdlPreparedPack.getOrderDefault(dictionary);
@ -407,7 +409,7 @@ public class CoreHqlPack {
        DdlPreparedPack.getNumEqualPack(message.getIsUrgent(), "isUrgent", ddlPackBean);
        DdlPreparedPack.getNumEqualPack(message.getMessageSoftType(), "messageSoftType", ddlPackBean);

-        ddlPackBean.setOrderByStr(message.orderBy());
+        DdlPreparedPack.getOrderDefault(message);

        return  ddlPackBean;
    }
@ -417,19 +419,21 @@ public class CoreHqlPack {
     * @param file
     * @return
     */
-    public static String packHqlSysFile(SysFile file) {
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packHqlSysFile(SysFile file) {
+        DdlPackBean result = DdlPackBean.getDdlPackBean();

        // hql拼接
-        HqlPack.getStringLikerPack(file.getFileOriginalName(),"fileOriginalName",result);
-        HqlPack.getNumEqualPack(file.getFileTypeId(),"fileTypeId",result);
-        HqlPack.getStringLikerPack(file.getCreateUser(),"createUser",result);
-        HqlPack.timeBuilder(file.getCreateDatetime(),"createDatetime",result,false,false);
+        DdlPreparedPack.getStringLikerPack(file.getFileOriginalName(), "fileOriginalName", result);
+        DdlPreparedPack.getNumEqualPack(file.getFileTypeId(), "fileTypeId", result);
+        DdlPreparedPack.getStringLikerPack(file.getCreateUser(), "createUser", result);
+        DdlPreparedPack.getNumEqualPack(file.getFileSoftType(), "fileSoftType", result);
+        DdlPreparedPack.getStringLikerPack(file.getFileCode(), "fileCode", result);
+        DdlPreparedPack.timeBuilder(file.getCreateDatetime(), "createDatetime", result, false, false);

        // 添加默认排序
-        HqlPack.getOrderDefault(file);
+        DdlPreparedPack.getOrderDefault(file);

-        return  result.toString();
+        return  result;
    }

    /**
@ -455,20 +459,22 @@ public class CoreHqlPack {
     * @param sysTaskPlan
     * @return
     */
-    public static String packHqlSysTaskPlan(SysTaskPlan sysTaskPlan){
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packHqlSysTaskPlan(SysTaskPlan sysTaskPlan){
+        DdlPackBean result = DdlPackBean.getDdlPackBean();

        // hql拼接
-        HqlPack.getStringLikerPack(sysTaskPlan.getName(),"name",result);
-        HqlPack.getStringLikerPack(sysTaskPlan.getGroupName(),"groupName",result);
-        HqlPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(),"taskPlanStatus",result);
-        HqlPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(),"taskCycleId",result);
-        HqlPack.getStringEqualPack(sysTaskPlan.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getStringLikerPack(sysTaskPlan.getName(),"name",result);
+        DdlPreparedPack.getStringLikerPack(sysTaskPlan.getGroupName(),"groupName",result);
+        DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(),"taskPlanStatus",result);
+        DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(),"taskCycleId",result);
+        DdlPreparedPack.getStringEqualPack(sysTaskPlan.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskSoftTypeRdd(), "taskSoftTypeRdd", result);
+        DdlPreparedPack.timeBuilder(sysTaskPlan.getLastRunDateTime(), "lastRunDateTime", result, false, true);

        // 添加默认排序
-        HqlPack.getOrderDefault(sysTaskPlan);
+        DdlPreparedPack.getOrderDefault(sysTaskPlan);

-        return  result.toString();
+        return  result;
    }

    /**
@ -738,18 +744,23 @@ public class CoreHqlPack {
     * @param orderNoRule
     * @return
     */
-    public static String packHqlSysOrderNoRule(SysOrderNoRule orderNoRule){
-        StringBuffer result =  new StringBuffer();
+    public static DdlPackBean packHqlSysOrderNoRule(SysOrderNoRule orderNoRule){
+        DdlPackBean result = DdlPackBean.getDdlPackBean();

-        HqlPack.getStringLikerPack(orderNoRule.getName(),"name",result);
-        HqlPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result);
-        HqlPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(),"orderNoRuleStatus",result);
-        HqlPack.getNumEqualPack(orderNoRule.getOrganizeCode(),"organizeCode",result);
+        DdlPreparedPack.getStringLikerPack(orderNoRule.getName(),"name",result);
+        DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result);
+        DdlPreparedPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(),"orderNoRuleStatus",result);
+        DdlPreparedPack.getNumEqualPack(orderNoRule.getOrganizeCode(),"organizeCode",result);
+        DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result);
+        DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNo(),"orderNo",result);
+        if (orderNoRule.getSerialNo() != null) {
+            DdlPreparedPack.getStringLikerPack(String.valueOf(orderNoRule.getSerialNo()), "orderNoRuleCode", result);
+        }

        // 添加默认排序
-        HqlPack.getOrderDefault(orderNoRule);
+        DdlPreparedPack.getOrderDefault(orderNoRule);

-        return result.toString();
+        return result;
    }

    /**
@ -779,13 +790,18 @@ public class CoreHqlPack {
     * @param sysTask
     * @return
     */
-    public static String packHqlSysTask(SysTask sysTask){
-        StringBuffer result =  new StringBuffer();
+    public static DdlPackBean packHqlSysTask(SysTask sysTask){
+        DdlPackBean result =  DdlPackBean.getDdlPackBean();

-        HqlPack.getStringLikerPack(sysTask.getName(),"name",result);
-        HqlPack.getStringEqualPack(sysTask.getOrganizeCode(),"organizeCode",result);
+        DdlPreparedPack.getStringLikerPack(sysTask.getName(),"name",result);
+        DdlPreparedPack.getStringEqualPack(sysTask.getOrganizeCode(),"organizeCode",result);
+        DdlPreparedPack.getNumEqualPack(sysTask.getTaskSoftType(),"taskSoftType",result);
+        DdlPreparedPack.getStringLikerPack(sysTask.getTaskPackage(),"taskPackage",result);
+        DdlPreparedPack.getStringLikerPack(sysTask.getTaskClass(),"taskClass",result);

-        return result.toString();
+        DdlPreparedPack.getOrderDefault(sysTask);
+
+        return result;
    }

    public static String packHqlSysLocaleLanguageExistDefaultByIds(Long[] ids){
--- a/modules/i3plus-pojo-ptl/pom.xml
+++ b/modules/i3plus-pojo-ptl/pom.xml
@ -50,6 +50,6 @@
        </profile>
    </profiles>
    <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
    </build>
 </project>
--- a/modules/i3plus-pojo-report/pom.xml
+++ b/modules/i3plus-pojo-report/pom.xml
@ -51,6 +51,6 @@
        </profile>
    </profiles>
    <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
    </build>
 </project>
--- a/modules/i3plus-pojo-softswitch/pom.xml
+++ b/modules/i3plus-pojo-softswitch/pom.xml
@ -51,6 +51,6 @@
        </profile>
    </profiles>
    <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
    </build>
 </project>
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java
@ -68,11 +68,13 @@ public class BsSuitDataDetail extends BaseBean {
    @ApiParam(value = "获取报文时间")
    private String getDateTime;

+    // 移动至记录数据表
    @Lob
    @Column(name = "ORGIN_DATA")
    @ApiParam(value = "原始报文数据")
    private String orginData;

+    // 移动至记录数据表
    @Lob
    @Column(name = "TRANS_DATA")
    @ApiParam(value = "转换后的报文数据")
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java
@ -90,6 +90,7 @@ public class BsSuitRecord extends BaseBean {
    @ApiParam(value = "认证结果")
    private Integer suitSslKeyResult;

+    // 移动至记录数据表
    @Column(name = "SUIT_SSL_KEY_RESULT_MESSAGE")
    @ApiParam(value = "认证信息")
    private String suitSslKeyResultMessage;
@ -111,6 +112,7 @@ public class BsSuitRecord extends BaseBean {
    @JsonSerialize(using = ToStringSerializer.class)
    private Long executeTime;

+    // 移动至记录数据表
    @Lob
    @Column(name = "SUIT_MESSAGE")
    @ApiParam(value = "适配信息")
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java
@ -44,6 +44,7 @@ public class BsSuitRequestRecord extends BaseBean {
    @ApiParam(value = "请求来源(枚举)")
    private Integer requestSource;

+    // 移动至记录数据表
    @Lob
    @Column(name = "REQUEST_ORGIN_PARAM")
    @ApiParam(value = "请求原始参数")
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
@ -325,6 +325,8 @@ public class SoftSwitchHqlPack {
        DdlPreparedPack.getNumEqualPack(bsSuitRecord.getProcessState(),"processState",ddlPackBean);
        DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean);
        DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitResult(),"suitResult",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSuitRecord.getProcessState(), "processState", ddlPackBean);
        DdlPreparedPack.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true);
        DdlPreparedPack.timeBuilder(bsSuitRecord.getSuitStartTime(), "suitStartTime", ddlPackBean, false, true);

@ -343,6 +345,7 @@ public class SoftSwitchHqlPack {
        DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getSuitCaseId(),"suitCaseId",ddlPackBean);
        DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);
        DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getCaseTypeId(), "caseTypeId", ddlPackBean);
        DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getProcessState(),"processState",ddlPackBean);
        DdlPreparedPack.timeBuilder(bsSuitDataDetail.getGetDateTime(), "getDateTime", ddlPackBean, false, true);
        DdlPreparedPack.timeBuilder(bsSuitDataDetail.getProcessTime(), "processTime", ddlPackBean, false, true);
--- a/modules/i3plus-pojo-sweb/pom.xml
+++ b/modules/i3plus-pojo-sweb/pom.xml
@ -50,7 +50,7 @@
        </profile>
    </profiles>
    <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
    </build>

 </project>
--- a/modules/i3plus-pojo-wms/pom.xml
+++ b/modules/i3plus-pojo-wms/pom.xml
@ -54,7 +54,7 @@
        </profile>
    </profiles>
    <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
    </build>

 </project>
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java
@ -89,6 +89,10 @@ public class BasVendor extends BaseBean{
    @Column(name = "VENDOR_TYPE")
    private Integer vendorType;

+    @Column(name = "MAP_LOCATION")
+    @ApiParam("经纬度")
+    private String mapLocation;
+
    public BasVendor() {
    }

--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java
@ -52,6 +52,10 @@ public class MesPpDetails extends BaseBean{
    @ApiParam(value = "工单数量", example = "0")
    public Double qty;

+    @Column(name="PART_GROUP_NO")
+    @ApiParam("零件组号")
+    public String partGroupNo;
+
    public Integer getItem() {
        return item == null ? 0 : this.item.intValue();
    }
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java
@ -58,6 +58,10 @@ public class MesPpMaster extends BaseBean{
    @ApiParam(value = "单据状态", example = "0")
    private Integer orderStatus = 0;

+    @Column(name="SEQ")
+    @ApiParam(value = "排序号", example = "0")
+    private Integer seq = 0;
+
    public Integer getOrderStatus() {
        return orderStatus == null ? 0 : this.orderStatus.intValue();
    }
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java
@ -68,6 +68,10 @@ public class WareHouse extends BaseBean {
    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
    private Double baseUnit;

+    @Column(name = "MAP_LOCATION")
+    @ApiParam("经纬度")
+    private String mapLocation;
+
    @Transient
    @ApiParam(value = "存储区列表")
    private List<WmsZones> zoneList;
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java
@ -48,5 +48,10 @@ public class WmsBusiType extends BaseBean {
    @ApiParam("移动类型")
    public Integer moveType;

-
+    /**
+     * 是否启用波次计划 10-是，20-否
+     */
+    @Column(name = "IS_ENABLE_WAVE")
+    @ApiParam("是否启用波次计划")
+    public Integer isEnableWave;
 }
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java
@ -61,4 +61,8 @@ public class WmsCar extends BaseBean {
    @Transient
    @ApiParam(value = "供应商名称")
    private String vendorNameRdd;
+
+    @Column(name = "MAP_LOCATION")
+    @ApiParam("经纬度")
+    private String mapLocation;
 }
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
@ -140,6 +140,11 @@ public class WmsDocMovementDetails extends BaseBean {
    @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;
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java
@ -0,0 +1,51 @@
+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.Table;
+
+/**
+ * @Description : 道口
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-03-29
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_DOCK")
+@Api("道口预约信息")
+public class WmsDock extends BaseBean {
+    @Column(name="DOCK_CODE")
+    @ApiParam("道口代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String dockCode;
+
+    @Column(name="DOCK_ADDRESS")
+    @ApiParam("道口发运地址")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String dockAddress;
+
+    @Column(name="DOCK_DESC")
+    @ApiParam("道口发运地址描述")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String dockDesc;
+
+    @Column(name="DOCK_TYPE")
+    @ApiParam("道口类型")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String dockType;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java
@ -0,0 +1,72 @@
+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.Table;
+
+/**
+ * @Description : 道口预约信息
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-03-29
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_DOCK_ORDER_INFO")
+@Api("道口预约信息")
+public class WmsDockOrderInfo extends BaseBean {
+
+    @Column(name="DOCK_CODE")
+    @ApiParam("道口代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String dockCode;
+
+    @Column(name="ORDER_DATE")
+    @ApiParam("预约日期")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME)
+    private String orderDate;
+
+    @Column(name="WINDOW_TIME")
+    @ApiParam("窗口时间")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME)
+    private String windowTime;
+
+    @Column(name="ORDER_STATUS")
+    @ApiParam("预约状态")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "DOCK_ORDER_STATUS")
+    private Integer orderStatus;
+
+    @Column(name="SUPPLIER_CODE")
+    @ApiParam("供应商编码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String supplierCode;
+
+    @Column(name="CAR_NO")
+    @ApiParam("车辆编号")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String carNo;
+
+    @Column(name="DRIVER_NAME")
+    @ApiParam("驾驶员")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String driverName;
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单据号")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String orderNo;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java
@ -0,0 +1,42 @@
+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.Table;
+
+/**
+ * @Description : 道口窗口时间
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-03-29
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_DOCK_WINDOW_TIME")
+@Api("道口窗口时间")
+public class WmsDockWindowTime extends BaseBean {
+
+    @Column(name="DOCK_CODE")
+    @ApiParam("道口代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String dockCode;
+
+    @Column(name="WINDOW_TIME")
+    @ApiParam("窗口时间")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME)
+    private String windowTime;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java
@ -62,6 +62,10 @@ public class WmsLocatePart extends BaseBean {
    @ApiParam(value = "安全库存", example = "0")
    private Double safetyStock;

+    @Column(name = "MOQ", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "起订量", example = "0")
+    private Double moq;
+
    @Transient
    @ApiParam("库位类型")
    private Integer locateType;
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
@ -244,6 +244,11 @@ public class WmsPart extends BaseBean {
    @ApiParam(value = "拉动方式")
    private String pullWay;

+    @Column(name = "TAIL_QTY_MODE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TAIL_QTY_MODE")
+    @ApiParam(value = "尾数计算方式", example = "1")
+    private Integer tailQtyMode;
+
    @Column(name = "CYCLE_RQUEST_PERIOD")
    @ApiParam(value = "循环补货周期", example = "0")
    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java
@ -0,0 +1,51 @@
+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 拉动规则实体
+ * @Author Jason
+ * @Date 2020-03-20
+ * @ModifyDate 2020-03-20
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_PULL_RULE")
+@Api("拉动规则")
+public class WmsPullRule extends BaseBean {
+    @Column(name = "PULL_WAY")
+    @ApiParam(value = "拉动类型", example = "10")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PULL_WAY_STATUS")
+    private Integer pullWay;
+
+    @Column(name = "CONTAIN_UNFINISH_ORDER")
+    @ApiParam(value = "考虑未完成的移库单", example = "0")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE")
+    private Integer containUnfinishOrder;
+
+    @Column(name = "CONTAIN_EXIST_PERIOD")
+    @ApiParam(value = "考虑现有库存", example = "0")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE")
+    private Integer containExistStock;
+
+    @Column(name = "TAIL_QTY_MODE")
+    @ApiParam(value = "尾数计算方式", example = "0")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TAIL_QTY_MODE")
+    private Integer tailQtyMode;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java
@ -110,6 +110,10 @@ public class WmsPullTaskDetails extends BaseBean{
    @ApiParam(value = "明细状态", example = "0")
    private Integer orderStatus = 0;

+    @Column(name="PART_GROUP_NO")
+    @ApiParam("零件组号")
+    public String partGroupNo;
+
    public Integer getOrderStatus() {
        return orderStatus == null ? 0 : this.orderStatus.intValue();
    }
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java
@ -62,6 +62,14 @@ public class WmsPullTaskMaster extends BaseBean{
    @ApiParam(value = "是否暂停", example = "0")
    private Integer isSuspend = 2;

+    @Column(name="PULL_TASK_TYPE")
+    @ApiParam(value = "拉动任务类型", example = "10")
+    private Integer pullTaskType;
+
+    @Column(name="SEQ")
+    @ApiParam(value = "排序号", example = "0")
+    private Integer seq;
+
    public Integer getOrderStatus() {
        return orderStatus == null ? 0 : this.orderStatus.intValue();
    }
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRule.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRule.java
@ -0,0 +1,109 @@
+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;
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description : 波次规则数据
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-03-25 10:10
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_WAVE_RULE")
+@Api(value = "波次规则数据表")
+public class WmsWaveRule extends BaseBean {
+
+    private static final long serialVersionUID = 8664373854844368961L;
+
+    @Column(name = "RULE_CODE")
+    @ApiParam(value = "波次规则代码")
+    public String ruleCode;
+
+    @Column(name = "RULE_DESC")
+    @ApiParam(value = "波次规则描述")
+    public String ruleDesc;
+
+    /**
+     *  分配规则 2-不分配(默认) 1-分配到责任区
+     */
+    @Column(name = "ALLOCATE_RULE")
+    @ApiParam(value = "分配规则", example = "1")
+    public Integer allocateRule;
+
+    @Column(name = "EXTEND_SQL")
+    @ApiParam(value = "扩展脚本")
+    public String extendSql;
+
+    @Column(name = "START_EFFECT_DATE")
+    @ApiParam(value = "开始生效时间")
+    public String startEffectDate;
+
+    @Column(name = "END_EFFECT_DATE")
+    @ApiParam(value = "结束生效时间")
+    public String endEffectDate;
+
+    @Column(name = "SORT_CONDITIONS")
+    @ApiParam(value = "单据排序条件")
+    public String sortConditions;
+
+    @Column(name = "ORDER_CONTROL_TIME")
+    @ApiParam(value = "单据控制时间")
+    public String orderControlTime;
+
+    @Column(name = "FIXED_ORDER_QTY")
+    @ApiParam(value = "固定单据数量", example = "0")
+    public Integer fixedOrderQty;
+
+    @Column(name = "FIXED_PART_QTY")
+    @ApiParam(value = "固定物料箱数", example = "0")
+    public Integer fixedPartQty;
+
+    @Column(name = "WAVE_QTY")
+    @ApiParam(value = "波次数量", example = "0")
+    public Integer waveQty;
+
+    @Column(name = "ORDER_MAX_QTY")
+    @ApiParam(value = "最大单据数量", example = "0")
+    public Integer orderMaxQty;
+
+    @Column(name = "PART_MAX_QTY")
+    @ApiParam(value = "最大物料数量", example = "0")
+    public Double partMaxQty;
+
+    @Column(name = "ORDER_TIMEOUT_TIME")
+    @ApiParam(value = "单据等待时间", example = "0")
+    public Integer orderTimeOutTime;
+
+    @Column(name = "NEXT_WAVE_TIME")
+    @ApiParam(value = "下次波次时间")
+    public String nextWaveTime;
+
+    @Column(name = "IS_CROSS_AREA")
+    @ApiParam(value = "允许跨区", example = "0")
+    public Integer isCrossArea;
+
+    @Column(name = "IS_COLLECTION")
+    @ApiParam(value = "允许整箱归集")
+    public Integer isCollection;
+
+    @Transient
+    @ApiParam(value = "波次规则明细信息")
+    private List<WmsWaveRuleDetails> waveRuleDetailsList;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRuleDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRuleDetails.java
@ -0,0 +1,56 @@
+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 : siliter.yuan
+ * @CreateDate : 2020-03-25 10:10
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_WAVE_RULE_DETAILS")
+@Api(value = "波次规则明细数据表")
+public class WmsWaveRuleDetails extends BaseBean {
+
+    private static final long serialVersionUID = 8664373954844368961L;
+
+    @Column(name = "RULE_ID")
+    @ApiParam(value = "波次规则编号", example = "0")
+    public Long ruleId;
+
+    @Column(name = "FIELD_CH_NAME")
+    @ApiParam(value = "字段中文名称")
+    public String fieldChName;
+
+    @Column(name = "FIELD_EN_NAME")
+    @ApiParam(value = "字段英文名称")
+    public String fieldEnName;
+
+    @Column(name = "MERGE_OPERATOR_TYPE")
+    @ApiParam(value = "合并操作类型", example = "0")
+    public Integer mergeOperatorType;
+
+    @Column(name = "FILED_VALUE")
+    @ApiParam(value = "字段值")
+    public String fieldValue;
+
+    public Long getRuleId() {
+        return ruleId == null ? 0L : ruleId.longValue();
+    }
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java
@ -117,6 +117,21 @@ public class WmsZones extends BaseBean {
    @ApiParam(value = "三维位置")
    private String position;

+    @Column(name = "ZONE_PULL_WAY")
+    @ApiParam(value = "补货方式", example = "10")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "ZONE_PULL_WAY")
+    private Integer zonePullWay;
+
+    @Column(name = "PULL_CYCLE")
+    @ApiParam(value = "固定拉动周期", example = "0")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    private Integer pullCycle;
+
+    @Column(name = "LAST_PULL_TIME")
+    @ApiParam(value = "上次拉动时间")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
+    private String lastPullTime;
+
    @Transient
    @ApiParam(value = "子存储区列表")
    private List<WmsZones> childList;
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/DockDashboardModel.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/DockDashboardModel.java
@ -0,0 +1,32 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @description 道口看板数据模型
+ * @author jason.niu
+ * @date 2020/03/31
+ */
+@Data
+@Api("道口看板数据模型")
+public class DockDashboardModel {
+    @ApiParam("预约时间")
+    private String orderDate;
+
+    @ApiParam("预约状态")
+    private Integer appointmentStatus;
+
+    @ApiParam("供应商编码")
+    private String supplierCode;
+
+    @ApiParam("单号")
+    private String orderNo;
+
+    @ApiParam("车牌号")
+    private String carNo;
+
+    @ApiParam("驾驶员")
+    private String driverName;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java
@ -0,0 +1,90 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import org.hibernate.annotations.ColumnDefault;
+
+/**
+ * @Description : 移库单数据模型Model
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-03-26 11:18
+ * @Modify:
+ **/
+@Data
+@AllArgsConstructor
+@Api("移库单数据模型")
+public class WmsDocMovementModel {
+
+    @ApiParam("订单号")
+    private String orderNo;
+
+    @ApiParam(value = "业务类型", example = "1")
+    private Integer busiType;
+
+    @ApiParam("客户代码")
+    private String custNo;
+
+    @ApiParam("来源仓库代码")
+    private String srcWhNo;
+
+    @ApiParam("来源存储区代码")
+    private String srcZoneNo;
+
+    @ApiParam("目标仓库代码")
+    private String destWhNo;
+
+    @ApiParam("目标存储区代码")
+    private String destZoneNo;
+
+    @ApiParam("物料组代码")
+    private String partGroupNo;
+
+    @ApiParam("订单状态")
+    private String orderStatus;
+
+    @ApiParam(value = "优先级", example = "1")
+    public Integer priority;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ColumnDefault("0")
+    @ApiParam(value = "已拣货数量", example = "1")
+    private Double pickQty;
+
+    @ColumnDefault("0")
+    @ApiParam(value = "已出库数量", example = "1")
+    private Double outQty;
+
+    @ColumnDefault("0")
+    @ApiParam(value = "已移库数量", example = "1")
+    private Double moveQty;
+
+    @ColumnDefault("0")
+    @ApiParam(value = "需求数量", example = "0")
+    public Double qty;
+
+    @ApiParam("源单行号")
+    public String srcItem;
+
+    @ApiParam(value = "源单号")
+    private String srcNo;
+
+    @ApiParam("物料号")
+    private String partNameRdd;
+
+    @ApiParam("单位")
+    private String unit;
+
+    @ApiParam(value = "标准包装", example = "1")
+    private Double snp;
+
+    @ApiParam(value = "一步法/两步法")
+    private Integer isSingleStep;
+
+    @ApiParam(value = "创建时间")
+    private String createDateTime;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPullOrderModel.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPullOrderModel.java
@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @description 外部拉动数据结构
+ * @author jason.niu
+ * @date 2020/03/25
+ */
+@Data
+@Api("外部拉动单模型")
+public class WmsPullOrderModel {
+
+    @ApiParam("工厂代码")
+    private String organizeCode;
+
+    @ApiParam("产线")
+    private String lineNo;
+
+    @ApiParam("仓库代码")
+    public String WhNo;
+
+    @ApiParam("存储区代码")
+    public String ZoneNo;
+
+    @ApiParam("目标库位代码")
+    public String destLocateNo;
+
+    @ApiParam("库位")
+    private String locateNo;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    public String partName;
+
+    @ApiParam("源仓库代码")
+    public String srcWhNo;
+
+    @ApiParam("源存储区代码")
+    public String srcZoneNo;
+
+    @ApiParam("数量")
+    private Double qty;
+
+    @ApiParam("单位")
+    public String unit;
+
+    @ApiParam("批次")
+    public String lotNo;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockOrderInfoRepository.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockOrderInfoRepository.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.WmsDockOrderInfo;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :道口预约信息
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-03-29
+ * @Modify:
+ **/
+@Repository
+public interface WmsDockOrderInfoRepository extends BaseRepository<WmsDockOrderInfo, Long> {
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockRepository.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockRepository.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.WmsDock;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :道口
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-03-30
+ * @Modify:
+ **/
+@Repository
+public interface WmsDockRepository extends BaseRepository<WmsDock, Long> {
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockWindowTimeRepository.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockWindowTimeRepository.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.WmsDockWindowTime;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :道口窗口时间
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-03-29
+ * @Modify:
+ **/
+@Repository
+public interface WmsDockWindowTimeRepository extends BaseRepository<WmsDockWindowTime, Long> {
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullRuleRepository.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullRuleRepository.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.WmsPullRule;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :拉动规则Repository的方法接口
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-03-23 15:38
+ * @Modify:
+ **/
+@Repository
+public interface WmsPullRuleRepository extends BaseRepository<WmsPullRule, Long> {
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWaveRuleDetailsRepository.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWaveRuleDetailsRepository.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.WmsWaveRuleDetails;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-03-25 11:29
+ * @Modify:
+ **/
+@Repository
+public interface WmsWaveRuleDetailsRepository extends BaseRepository<WmsWaveRuleDetails, Long> {
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWaveRuleRepository.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWaveRuleRepository.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.WmsWaveRule;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-03-25 11:29
+ * @Modify:
+ **/
+@Repository
+public interface WmsWaveRuleRepository extends BaseRepository<WmsWaveRule, Long> {
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@ -559,6 +559,22 @@ public class WmsHqlPack {
    }

    /**
+     * 拉动规则  分页查询
+     * @param rule
+     * @return
+     */
+    public static DdlPackBean packHqlWmsPullRule(WmsPullRule rule) {
+        //查询参数封装
+        DdlPackBean result = new DdlPackBean();
+
+        //查询参数封装
+        DdlPreparedPack.getNumEqualPack(rule.getPullWay(), "pullWay", result);
+
+        getStringBuilderPack(rule, result);
+        return result;
+    }
+
+    /**
     * 根据类型查询库位分页
     *
     * @param wmsLocate
@ -2877,4 +2893,18 @@ public class WmsHqlPack {
        return result;
    }

+    /**
+     * 插件信息分页查询条件
+     * @param rule
+     * @return
+     */
+    public static DdlPackBean packHqlWmsWaveRule(WmsWaveRule rule) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(rule.getRuleCode(), "ruleCode", result);
+        DdlPreparedPack.getStringBiggerPack(rule.getStartEffectDate(), "startEffectDate", result);
+        DdlPreparedPack.getStringSmallerPack(rule.getEndEffectDate(), "endEffectDate", result);
+        getStringBuilderPack(rule, result);
+        return result;
+    }
+
 }
--- a/modules/i3plus-pojo-workflow/pom.xml
+++ b/modules/i3plus-pojo-workflow/pom.xml
@ -14,7 +14,6 @@
    <packaging>jar</packaging>
    <version>1.0-${profileActive}-SNAPSHOT</version>

-
    <profiles>
        <profile>
            <id>dev</id>
@ -45,7 +44,7 @@
        </profile>
    </profiles>
    <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
    </build>

 </project>
--- a/pom.xml
+++ b/pom.xml
@ -77,23 +77,23 @@
        <dependencies>

            <dependency>
-                <groupId>i3plus.platform</groupId>
-                <artifactId>i3plus-platform-common</artifactId>
+                <groupId>i3plus.pojo</groupId>
+                <artifactId>i3plus-pojo-base</artifactId>
                <version>${project.version}</version>
            </dependency>

+
            <dependency>
-                <groupId>i3plus.pojo</groupId>
-                <artifactId>i3plus-pojo-model</artifactId>
+                <groupId>i3plus.platform</groupId>
+                <artifactId>i3plus-platform-common</artifactId>
                <version>${project.version}</version>
            </dependency>

            <dependency>
                <groupId>i3plus.pojo</groupId>
-                <artifactId>i3plus-pojo-base</artifactId>
+                <artifactId>i3plus-pojo-model</artifactId>
                <version>${project.version}</version>
            </dependency>
-
            <dependency>
                <groupId>i3plus.pojo</groupId>
                <artifactId>i3plus-pojo-mes</artifactId>
@ -251,7 +251,7 @@
        </profile>
    </profiles>
    <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
    </build>

 </project>