diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index 1d1ebfe..65e65db 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@@ -269,4 +269,192 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * MesQueueOrder实体对应的status值  队列主表状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_ORDER_STATUS{
+
+        NORMAL(10,"正常"),
+        ONLINE(20,"已上线"),
+        OFFLINE(30,"已下线"),
+        CLOSE(40,"已关闭"),;
+
+        private int value;
+        private String description;
+
+        QUEUE_ORDER_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val ) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * MesQueueOrderDetail实体对应的status值  队列详情状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_ORDER_DETAIL_STATUS{
+
+        NORMAL(10,"正常"),
+        CLOSE(20,"关闭");
+
+        private int value;
+        private String description;
+
+        QUEUE_ORDER_DETAIL_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val ) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * MesProduceSn实体对应的snStatus值  条码表条码状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRODUCE_SN_STATUS{
+
+        CREATE(10,"创建"),
+        PROCESS(20,"加工"),
+        OFFLINE(30,"上线"),
+        INSTOCKED(40,"入库"),
+        SHIPING(50,"发运"),
+        CLOSE(90,"关闭"),;
+
+        private int value;
+        private String description;
+
+        PRODUCE_SN_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val ) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * MesProduceSn实体对应的printStatus值  条码表条码打印状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRODUCE_SN_PRINT_STATUS{
+
+        CREATE(10,"创建"),
+        ONLINE(20,"上线打印"),
+        OFFLINE(30,"下线打印");
+
+        private int value;
+        private String description;
+
+        PRODUCE_SN_PRINT_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val ) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * MesProduceSn实体对应的qcStatus值  条码表条码质量状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRODUCE_SN_QC_STATUS{
+
+        QUALIFIED(10,"合格"),
+        DEFECTED(20,"不合格"),
+        SCRAPED(30,"报废");
+
+        private int value;
+        private String description;
+
+        PRODUCE_SN_QC_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val ) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }
diff --git 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
index ac084cf..6a618b3 100644
--- 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
@@ -694,13 +694,15 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum IS_GENERAL_TASK {
-        CREATE(10, "创建"), INIT(20, "初始化"), IS_GENERAL(30, "已生成"), NO_GENERAL(40, "不生成");
+        CREATE(10, "CREATE", "创建"), INIT(20, "INIT", "初始化"), IS_GENERAL(30, "IS_GENERAL", "已生成"), NO_GENERAL(40, "NO_GENERAL", "不生成");
 
         private int value;
+        private String code;
         private String description;
 
-        IS_GENERAL_TASK(int value, String description) {
+        IS_GENERAL_TASK(int value, String code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
@@ -712,6 +714,10 @@ public class WmsEnumUtil {
             return description;
         }
 
+        public String getCode() {
+            return code;
+        }
+
         public static String valueOf(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -721,6 +727,16 @@ public class WmsEnumUtil {
             }
             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;
+        }
     }
 
 
@@ -1760,8 +1776,8 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum DATA_STATUS {
-        YES(1, "是", "fa fa-success cell-fa fa-check"),
-        NO(2, "否", "fa fa-disabled cell-fa fa-times-circle");
+        YES(1, "TRUE", "fa fa-success cell-fa fa-check"),
+        NO(2, "FALSE", "fa fa-disabled cell-fa fa-times-circle");
 
         private int value;
         private String description;
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java
index 375466a..5e67b40 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java
@@ -46,4 +46,8 @@ public class BfIntercept extends BaseBean {
     @Column(name="INTERCEPT_DESCRIPTION")
     @ApiParam(value ="拦截器描述")
     private String interceptDescription;
+
+    @Column(name="INTERCEPT_STATUS")
+    @ApiParam(value ="拦截器状态")
+    private Integer interceptStatus;
 }
diff --git 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
index 804c605..176e57e 100644
--- 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.getNumEqualPack(bfIntercept.getInterceptStatus(), "interceptStatus", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bfIntercept.getIsDeleted(), "isDeleted", ddlPackBean);
         ddlPackBean.setOrderByStr(bfIntercept.orderBy());
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java
new file mode 100644
index 0000000..bd3711b
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java
@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :mes系统业务动作
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_CUST_PROD_LINE")
+@Api("客户产线代码")
+public class MesCustProdLine extends BaseBean {
+    @Column(name="CUST_PROD_LINE_CODE")
+    @ApiParam("客户产线代码")
+    private String custProdLineCode;
+
+    @Column(name="CUST_PROD_LINE_NAME")
+    @ApiParam("客户产线名称")
+    private String custProdLineName;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java
index e02cf88..b017d0b 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java
@@ -31,9 +31,9 @@ public class MesPlanOrder extends BaseBean {
     @ApiParam("生产计划单号")
     private String orderNo;
 
-    @Column(name="ORDER_TYPE")
+    @Column(name="PO_TYPE")
     @ApiParam("计划类型")
-    private Integer orderType;
+    private Integer planType;
 
     @Column(name="PROD_CFG_CODE")
     @ApiParam("产品配置代码")
@@ -96,6 +96,6 @@ public class MesPlanOrder extends BaseBean {
     }
 
     public int getOrderTypeVal() {
-        return this.orderType == null ? 0 : this.orderType;
+        return this.planType == null ? 0 : this.planType;
     }
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java
new file mode 100644
index 0000000..ccb818d
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java
@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :mes系统业务动作
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-04-19
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_SHIFT")
+@Api("班次信息")
+public class MesShift extends BaseBean {
+    @Column(name="SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name="SHIFT_NAME")
+    @ApiParam("班次名称")
+    private String shiftName;
+
+    @Column(name="START_TIME")
+    @ApiParam("开班时间")
+    private String startTime;
+
+    @Column(name="WORK_TIMES")
+    @ApiParam("作业时长")
+    private String workTimes;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustProdLineRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustProdLineRepository.java
new file mode 100644
index 0000000..b8c4290
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustProdLineRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustProdLine;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-19-11:15
+ * @Modify:
+ **/
+@Repository
+public interface MesCustProdLineRepository  extends BaseRepository<MesCustProdLine, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftRepository.java
new file mode 100644
index 0000000..401874f
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesShift;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-19-13:53
+ * @Modify:
+ **/
+@Repository
+public interface MesShiftRepository extends BaseRepository<MesShift, Long> {
+}
diff --git 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
index 1c75712..271275b 100644
--- 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
@@ -21,23 +21,23 @@ import javax.persistence.Table;
  **/
 @Data
 @Entity
-@Table(name="WMS_LOCATE_PART")
+@Table(name = "WMS_LOCATE_PART")
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Api(value="库位物料表",description = "库位物料表")
-public class WmsLocatePart extends BaseBean{
+@Api(value = "库位物料表", description = "库位物料表")
+public class WmsLocatePart extends BaseBean {
 
-    @Column(name="LOCATE_NO")
-    @ApiParam(value ="库位代码")
+    @Column(name = "LOCATE_NO")
+    @ApiParam(value = "库位代码")
     private String locateNo;
 
-    @Column(name="PART_NO")
-    @ApiParam(value ="物料编码")
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编码")
     private String partNo;
 
-    @Column(name="PART_NAME_RDD")
-    @ApiParam(value ="物料名称")
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam(value = "物料名称")
     private String partNameRdd;
 
     @Column(name = "PULL_QTY")
@@ -56,7 +56,7 @@ public class WmsLocatePart extends BaseBean{
     @ApiParam(value = "是否生成领料单", example = "2")
     private Integer isGeneratePicklist;
 
-    public Double  getMin() {
+    public Double getMin() {
         return this.min == null ? 0 : this.min;
     }
 
diff --git 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
index a1803cd..b6a45ce 100644
--- 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
@@ -33,6 +33,7 @@ public class WmsHqlPack {
 
     /**
      * 封装公用查询参数
+     *
      * @param bean   实体对象
      * @param hqlStr 查询语句
      * @return 封装完成的查询语句
@@ -136,7 +137,6 @@ public class WmsHqlPack {
      */
     public static DdlPackBean packWmsDocMovementMaster(WmsDocMovementMaster wmsDocMovementMaster) {
         DdlPackBean packBean = new DdlPackBean();
-//        StringBuffer result = new StringBuffer();
 
         //查询参数封装
         DdlPreparedPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean);
@@ -272,62 +272,6 @@ public class WmsHqlPack {
     }
 
     /**
-     * 库位物料信息 分页查询
-     *
-     * @param wmsLocatePart
-     * @return
-     */
-    public static String packHqlWmsLocatePart(WmsLocatePart wmsLocatePart) {
-        StringBuffer result = new StringBuffer();
-
-        //查询参数封装
-        HqlPack.getStringLikerPack(wmsLocatePart.getLocateNo(), "locateNo", result);
-        HqlPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result);
-        HqlPack.getStringLikerPack(wmsLocatePart.getPartNameRdd(), "partNameRdd", result);
-
-        getStringBuilderPack(wmsLocatePart, result);
-
-        return result.toString();
-    }
-
-    /**
-     * 库位信息 分页查询
-     *
-     * @param wmsLocate
-     * @return
-     */
-    public static DdlPackBean packHqlWmsLocates(WmsLocate wmsLocate) {
-        //查询参数封装
-        DdlPackBean result = new DdlPackBean();
-
-        //查询参数封装
-        DdlPreparedPack.getStringEqualPack(wmsLocate.getLocateNo(), "locateNo", result);
-        DdlPreparedPack.getStringEqualPack(wmsLocate.getLocateName(), "locateName", result);
-        DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result);
-        DdlPreparedPack.getStringEqualPack(wmsLocate.getWhNo(), "whNo", result);
-        DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result);
-        DdlPreparedPack.getNumEqualPack(wmsLocate.getStatus(), "status", result);
-
-        getStringBuilderPack(wmsLocate, result);
-
-        return result;
-    }
-
-    /**
-     * 根据类型查询库位分页
-     *
-     * @param wmsLocate
-     * @return
-     */
-    public static String packHqlWmsLocatesByType(WmsLocate wmsLocate) {
-        StringBuffer result = new StringBuffer();
-        //查询参数封装
-        HqlPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result);
-        getStringBuilderPack(wmsLocate, result);
-        return result.toString();
-    }
-
-    /**
      * 交易类型信息 分页查询
      *
      * @param wmsTransType
@@ -365,23 +309,6 @@ public class WmsHqlPack {
         return result.toString();
     }
 
-    /**
-     * 仓库分页查询条件
-     *
-     * @param wareHouse
-     * @return
-     */
-    public static String packHqlWareHouse(WareHouse wareHouse) {
-        StringBuffer result = new StringBuffer();
-
-        HqlPack.getStringLikerPack(wareHouse.getAddress(), "address", result);
-        HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result);
-        HqlPack.getStringLikerPack(wareHouse.getName(), "name", result);
-
-        getStringBuilderPack(wareHouse, result);
-
-        return result.toString();
-    }
 
     /**
      * 供应商分页查询
@@ -424,6 +351,24 @@ public class WmsHqlPack {
     }
 
     /**
+     * 仓库分页查询条件
+     *
+     * @param wareHouse
+     * @return
+     */
+    public static String packHqlWareHouse(WareHouse wareHouse) {
+        StringBuffer result = new StringBuffer();
+
+        HqlPack.getStringLikerPack(wareHouse.getAddress(), "address", result);
+        HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result);
+        HqlPack.getStringLikerPack(wareHouse.getName(), "name", result);
+
+        getStringBuilderPack(wareHouse, result);
+
+        return result.toString();
+    }
+
+    /**
      * 仓库唯一性校验查询条件【用于添加和修改】
      *
      * @param wareHouse
@@ -442,6 +387,85 @@ public class WmsHqlPack {
     }
 
     /**
+     * 存储区信息 查询条件封装
+     *
+     * @param wmsZones
+     * @return
+     */
+    public static String packHqlWmsZones(WmsZones wmsZones) {
+        StringBuffer result = new StringBuffer();
+
+        //仓库代码
+        HqlPack.getStringEqualPack(wmsZones.getWhNo(), "whNo", result);
+        //库存地代码
+        HqlPack.getStringLikerPack(wmsZones.getAreaNo(), "areaNo", result);
+        //存储区代码
+        HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result);
+        //存储区名称
+        HqlPack.getStringLikerPack(wmsZones.getZoneName(), "zoneName", result);
+
+        getStringBuilderPack(wmsZones, result);
+
+        return result.toString();
+    }
+
+    /**
+     * 库位信息 分页查询
+     *
+     * @param wmsLocate
+     * @return
+     */
+    public static DdlPackBean packHqlWmsLocates(WmsLocate wmsLocate) {
+        //查询参数封装
+        DdlPackBean result = new DdlPackBean();
+
+        //查询参数封装
+        DdlPreparedPack.getStringEqualPack(wmsLocate.getLocateNo(), "locateNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsLocate.getLocateName(), "locateName", result);
+        DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result);
+        DdlPreparedPack.getStringEqualPack(wmsLocate.getWhNo(), "whNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result);
+        DdlPreparedPack.getNumEqualPack(wmsLocate.getStatus(), "status", result);
+
+        getStringBuilderPack(wmsLocate, result);
+
+        return result;
+    }
+
+    /**
+     * 根据类型查询库位分页
+     *
+     * @param wmsLocate
+     * @return
+     */
+    public static String packHqlWmsLocatesByType(WmsLocate wmsLocate) {
+        StringBuffer result = new StringBuffer();
+        //查询参数封装
+        HqlPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result);
+        getStringBuilderPack(wmsLocate, result);
+        return result.toString();
+    }
+
+    /**
+     * 库位物料信息 分页查询
+     *
+     * @param wmsLocatePart
+     * @return
+     */
+    public static String packHqlWmsLocatePart(WmsLocatePart wmsLocatePart) {
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装
+        HqlPack.getStringLikerPack(wmsLocatePart.getLocateNo(), "locateNo", result);
+        HqlPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result);
+        HqlPack.getStringLikerPack(wmsLocatePart.getPartNameRdd(), "partNameRdd", result);
+
+        getStringBuilderPack(wmsLocatePart, result);
+
+        return result.toString();
+    }
+
+    /**
      * 供应商唯一性校验查询条件【用于添加和修改】
      *
      * @param basVendor
@@ -502,28 +526,6 @@ public class WmsHqlPack {
         return result.toString();
     }
 
-    /**
-     * 存储区信息 查询条件封装
-     *
-     * @param wmsZones
-     * @return
-     */
-    public static String packHqlWmsZones(WmsZones wmsZones) {
-        StringBuffer result = new StringBuffer();
-
-        //仓库代码
-        HqlPack.getStringLikerPack(wmsZones.getWhNo(), "whNo", result);
-        //库存地代码
-        HqlPack.getStringLikerPack(wmsZones.getAreaNo(), "areaNo", result);
-        //存储区代码
-        HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result);
-        //存储区名称
-        HqlPack.getStringLikerPack(wmsZones.getZoneName(), "zoneName", result);
-
-        getStringBuilderPack(wmsZones, result);
-
-        return result.toString();
-    }
 
     /**
      * 客户信息 查询条件封装
@@ -1083,8 +1085,8 @@ public class WmsHqlPack {
         HqlPack.getNotInPack(String.join(",", WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue() + "",
                 WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue() + ""), "snStatus", result);
         //单号
-        HqlPack.getStringLeftLikerPack(wmsStockSn.getSn(),"sn", result);
-        HqlPack.getStringEqualPack(wmsStockSn.getDateCode(),"dateCode",result);
+        HqlPack.getStringLeftLikerPack(wmsStockSn.getSn(), "sn", result);
+        HqlPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
         getStringBuilderPack(wmsStockSn, result);
 
         return result.toString();
@@ -1272,6 +1274,7 @@ public class WmsHqlPack {
 
     /**
      * 作业流程分页查询
+     *
      * @return
      */
     public static DdlPackBean packHqlWmsActionGroup(WmsActionGroup wmsActionGroup) {
@@ -1289,6 +1292,7 @@ public class WmsHqlPack {
 
     /**
      * 作业流程明细分页查询
+     *
      * @return
      */
     public static DdlPackBean packHqlWmsActionGroupDetails(WmsActionGroupDetails wmsActionGroupDetails) {
@@ -1621,6 +1625,7 @@ public class WmsHqlPack {
 
     /**
      * 查询脚本持久化 查询条件封装
+     *
      * @return
      */
     public static DdlPackBean packEngineScriptPersistence(EngineScriptPersistence scriptPersistence) {