diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
index 3ba7285..8ef0841 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
@@ -131,4 +131,8 @@ public class WmsPOMaster extends BaseBean {
     @Transient
     @ApiParam("手机")
     private String vendorPhone;
+
+    @Transient
+    @ApiParam("前端信息")
+    private String message;
 }
diff --git 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
index e25c770..f2b2102 100644
--- 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
@@ -5,7 +5,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import net.bytebuddy.implementation.bind.annotation.Default;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -123,14 +122,6 @@ public class WmsPart extends BaseBean {
     @ApiParam(value = "默认入库库位")
     private String inLocateNo;
 
-    @Transient
-    @ApiParam("默认入库存储区")
-    private String inZoneNo;
-
-    @Transient
-    @ApiParam("默认入库仓库")
-    private String inWhNo;
-
     @Column(name = "PROD_CFG_TYPE_CODE")
     @ApiParam("项目代码")
     private String prodCfgTypeCode;
@@ -169,12 +160,4 @@ public class WmsPart extends BaseBean {
         this.min = minQty;
         this.qty = cqty;
     }
-
-    public WmsPart(String partNo, String vendorNo, String inLocateNo, String inZoneNo, String inWhNo) {
-        this.partNo = partNo;
-        this.vendorNo = vendorNo;
-        this.inLocateNo = inLocateNo;
-        this.inZoneNo = inZoneNo;
-        this.inWhNo = inWhNo;
-    }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsInterfaceDataMapperRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsInterfaceDataMapperRepository.java
new file mode 100644
index 0000000..4b3a5a8
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsInterfaceDataMapperRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.AmpJisRec;
+import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-06-28 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsInterfaceDataMapperRepository extends BaseRepository<WmsInterfaceDataMapper,Long> {
+}
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 15184c4..7803190 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
@@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.wms.bean.*;
+import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper;
 import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
 import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence;
 import com.alibaba.fastjson.JSONObject;
@@ -808,6 +809,12 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
         DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
         DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
+        if (wmsStockSn.getSnStatus() == null) {
+            DdlPreparedPack.getInPackArray(new Integer[]{
+                    WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue(),WmsEnumUtil.STOCK_SN_STATUS.PRE_INSTOCK.getValue(),
+                    WmsEnumUtil.STOCK_SN_STATUS.INSTOCKED.getValue(),WmsEnumUtil.STOCK_SN_STATUS.PICKED.getValue(),
+                    WmsEnumUtil.STOCK_SN_STATUS.COMMING.getValue()}, "snStatus", result);
+        }
         DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
 
         getStringBuilderPack(wmsStockSn, result);
@@ -973,6 +980,13 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result);
         DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getCreateUser(), "createUser", result);
+        DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getModifyUser(), "modifyUser", result);
+
+        DdlPreparedPack.timeBuilder(wmsMoveMaster.getCreateDateTimeStart(),
+                wmsMoveMaster.getCreateDateTimeEnd(),"createDatetime",result,true);
+        DdlPreparedPack.timeBuilder(wmsMoveMaster.getModifyDateTimeStart(),
+                wmsMoveMaster.getModifyDateTimeEnd(),"modifyDatetime",result,true);
         getStringBuilderPack(wmsMoveMaster, result);
 
         return result;
@@ -2102,11 +2116,30 @@ public class WmsHqlPack {
         //查询参数封装
         DdlPreparedPack.getInPackList(statusList,"asnStatus",result);
         DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRODUCT_INSTOCK_STATUS.CREATE.getValue(),"actionStatus",result);
-        DdlPreparedPack.getStringEqualPack(String.valueOf(WmsEnumUtil.ORDER_TYPE.AMP.getValue()),"asnType",result);
+        DdlPreparedPack.getNumEqualPack(WmsEnumUtil.ORDER_TYPE.AMP.getValue(),"asnType",result);
         DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
 
         return result;
     }
+
+    /**
+     * 接口映射分页查询条件
+     *
+     * @param wmsInterfaceDataMapper
+     * @return
+     */
+    public static DdlPackBean packHqlWmsInterfaceDataMapper(WmsInterfaceDataMapper wmsInterfaceDataMapper) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getSrcTableName(), "srcTableName", result);
+        DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getDestBeanName(), "destBeanName", result);
+        DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getBusiRoute(), "busiRoute", result);
+        DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getGroupName(), "groupName", result);
+
+        getStringBuilderPack(wmsInterfaceDataMapper, result);
+
+        return result;
+    }
 }