diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java
index bbb4564..9a1598e 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java
@@ -4,7 +4,6 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.PtlPcnEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.ptl.bean.*;
 import org.springframework.util.StringUtils;
@@ -228,10 +227,10 @@ public class PtlHqlPack {
     public static DdlPackBean packPtlAreaTask(PtlAreaTask ptlAreaTask) {
         DdlPackBean result = new DdlPackBean();
         //查询参数封装
-        DdlPreparedPack.getStringEqualPack(ptlAreaTask.getTaskNo(), "taskNo", result);
-        DdlPreparedPack.getStringEqualPack(ptlAreaTask.getPartNo(), "partNo", result);
-        if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaTask.getCreateDateTimeStart())
-                && org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaTask.getCreateDateTimeEnd())) {
+        DdlPreparedPack.getStringLikerPack(ptlAreaTask.getTaskNo(), "taskNo", result);
+        DdlPreparedPack.getStringLikerPack(ptlAreaTask.getPartNo(), "partNo", result);
+        if (!StringUtils.isEmpty(ptlAreaTask.getCreateDateTimeStart())
+                || !StringUtils.isEmpty(ptlAreaTask.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(ptlAreaTask.getCreateDateTimeStart(), ptlAreaTask.getCreateDateTimeEnd()
                     , "createDatetime", result, true);
         }
@@ -253,10 +252,10 @@ public class PtlHqlPack {
     public static DdlPackBean packPtlMainTask(PtlMainTask ptlMainTask) {
         DdlPackBean result = new DdlPackBean();
         //查询参数封装
-        DdlPreparedPack.getStringEqualPack(ptlMainTask.getTaskNo(), "taskNo", result);
-        DdlPreparedPack.getStringEqualPack(ptlMainTask.getPartNo(), "partNo", result);
-        if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlMainTask.getCreateDateTimeStart())
-                && org.apache.commons.lang3.StringUtils.isNotBlank(ptlMainTask.getCreateDateTimeEnd())) {
+        DdlPreparedPack.getStringLikerPack(ptlMainTask.getTaskNo(), "taskNo", result);
+        DdlPreparedPack.getStringLikerPack(ptlMainTask.getPartNo(), "partNo", result);
+        if (!StringUtils.isEmpty(ptlMainTask.getCreateDateTimeStart())
+                || !StringUtils.isEmpty(ptlMainTask.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(ptlMainTask.getCreateDateTimeStart(), ptlMainTask.getCreateDateTimeEnd()
                     , "createDatetime", result, true);
         }
@@ -276,15 +275,16 @@ public class PtlHqlPack {
     public static DdlPackBean packPtlAreaSectionTask(PtlAreaSectionTask ptlAreaSectionTask) {
         DdlPackBean result = new DdlPackBean();
         //查询参数封装
-        DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getAreaTaskNo(), "areaTaskNo", result);
-        DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getPartNo(), "partNo", result);
-        if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaSectionTask.getCreateDateTimeStart())
-                && org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaSectionTask.getCreateDateTimeEnd())) {
+        DdlPreparedPack.getStringLikerPack(ptlAreaSectionTask.getAreaTaskNo(), "areaTaskNo", result);
+        DdlPreparedPack.getStringLikerPack(ptlAreaSectionTask.getPartNo(), "partNo", result);
+        if (!StringUtils.isEmpty(ptlAreaSectionTask.getCreateDateTimeStart())
+                || !StringUtils.isEmpty(ptlAreaSectionTask.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(ptlAreaSectionTask.getCreateDateTimeStart(), ptlAreaSectionTask.getCreateDateTimeEnd()
                     , "createDatetime", result, true);
         }
         DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getAreaNo(), "areaNo", result);
         DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getSectionNo(), "sectionNo", result);
+        DdlPreparedPack.getNumEqualPack(ptlAreaSectionTask.getStatus(), "status", result);
         DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getOrganizeCode(), "organizeCode", result);
         DdlPreparedPack.getNumEqualPack(ptlAreaSectionTask.getIsValid(), "isValid", result);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result);
diff --git 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
index 33453b8..8b79c72 100644
--- 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
@@ -311,4 +311,14 @@ public class WmsDocMovementDetails extends BaseBean {
         this.orderNo = orderNo;
     }
 
+    public WmsDocMovementDetails (String orderNo,String partNo,Double qty, Double pickQty, int itemStatus, String createDatetime, String modifyDatetime) {
+        this.orderNo = orderNo;
+        this.partNo = partNo;
+        this.qty = qty;
+        this.pickQty = pickQty;
+        this.itemStatus = itemStatus;
+        this.createDatetime = createDatetime;
+        this.modifyDatetime = modifyDatetime;
+    }
+
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java
index 929b274..f64bf33 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java
@@ -65,8 +65,10 @@ public class WmsFurniture extends BaseBean {
     public WmsFurniture() {
     }
 
-    public WmsFurniture(String whNo, String zoneNo, String typeCode, String furnitureNo,
+    public WmsFurniture(Long id,String organizeCode, String whNo, String zoneNo, String typeCode, String furnitureNo,
                         Integer isSaveGoods, String position, Integer storey, Integer fntCol) {
+        this.id = id;
+        this.organizeCode = organizeCode;
         this.whNo = whNo;
         this.zoneNo = zoneNo;
         this.typeCode = typeCode;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
index a5b6221..ee6babb 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
@@ -178,7 +178,7 @@ public class WmsLocate extends BaseBean {
 
     @Transient
     @ApiParam(value = "移动频次")
-    private Integer frequency;
+    private Long frequency;
 
     @Transient
     @ApiParam(value = "库龄")
@@ -197,7 +197,8 @@ public class WmsLocate extends BaseBean {
         this.partQty=partQty;
         this.locateNo=locateNo;
     }
-    public WmsLocate(String locateNo,Integer frequency,String organizeCode,
+    //3D仓库-库位移动频率热力图
+    public WmsLocate(String locateNo,Long frequency,String organizeCode,
                      String whNo,String zoneNo,String furnitureNo,
                      Integer x,Integer y,Integer z){
         this.locateNo=locateNo;
@@ -210,6 +211,7 @@ public class WmsLocate extends BaseBean {
         this.y=y;
         this.z=z;
     }
+    //3D仓库-库龄热力图
     public WmsLocate(String locateNo,String age,String organizeCode,
                      String whNo,String zoneNo,String furnitureNo,
                      Integer x,Integer y,Integer z){
@@ -244,8 +246,8 @@ public class WmsLocate extends BaseBean {
         return this.locateType== null ? 0 : this.locateType.intValue();
     }
 
-    public Integer getFrequencyVal() {
-        return this.frequency == null ? 0 : this.frequency.intValue();
+    public Long getFrequencyVal() {
+        return this.frequency == null ? 0 : this.frequency.longValue();
     }
 
     public Integer getLcLengthVal() {
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 abff614..551d6d6 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
@@ -545,7 +545,7 @@ public class WmsHqlPack {
             DdlPreparedPack.getInPack(StringUtils.join(new ArrayList<String>(Arrays.asList(wmsLocate.getZoneNo().split(","))), ","), "zoneNo", result);
         }
         if (wmsLocate.getLocateNoArr() != null) {
-            DdlPreparedPack.getInPack(StringUtils.join(wmsLocate.getLocateNoArr()), "", result);
+            DdlPreparedPack.getInPack(StringUtils.join(wmsLocate.getLocateNoArr()), "locateNo", result);
         }
 
         // DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result);