diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java
index dc12e39..275709a 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java
@@ -34,9 +34,9 @@ public class BsParamAdapter extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long suitCaseId;
 
-    @Column(name = "SUIT_CASE_NAME")
+    @Column(name = "SUIT_CASE_NAME_RDD")
     @ApiParam(value = "适配套件名称")
-    private String suitCaseName;
+    private String suitCaseNameRdd;
 
     @Column(name = "SUIT_CASE_CODE")
     @ApiParam(value = "适配套件代码")
diff --git 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
index ccea28f..96b25e9 100644
--- 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
@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.softswitch.sqlpack;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsParamAdapter;
 import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase;
 import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam;
 import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase;
@@ -110,4 +111,38 @@ public class SoftSwitchHqlPack {
         return ddlPackBean;
     }
 
+    /**
+     * 数据适配转换规则查询条件封装
+     * @param bsParamAdapter 数据适配转换规则
+     * @return
+     */
+    public static DdlPackBean packHqlBsParamAdapter(BsParamAdapter bsParamAdapter){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(),"suitCaseId",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(bsParamAdapter.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsParamAdapter.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsParamAdapter.getSuitParamNameRdd(), "suitParamNameRdd", ddlPackBean);
+
+        ddlPackBean.setOrderByStr(bsParamAdapter.orderBy());
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 数据适配装换规则唯一校验
+     * @param bsParamAdapter 数据适配转换规则
+     * @return
+     */
+    public static DdlPackBean packHqlCheckBsParamAdapterOnly(BsParamAdapter bsParamAdapter){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(bsParamAdapter.getId(), "id", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(), "suitCaseId", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(bsParamAdapter.getSuitCaseCode(), "suitCaseCode", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitParamId(), "suitParamId", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingMovement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingMovement.java
new file mode 100644
index 0000000..2b345d4
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingMovement.java
@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+* @Description : 领料单模板
+* @Reference :
+* @author: amy.liu
+* @date: 2019/8/19 17:10
+* @Modify:
+*/
+
+@Data
+@Api(value="领料单模板",description = "领料单模板")
+public class WmsPickingMovement extends BaseBean {
+
+    private static final long serialVersionUID = 2167743108452607620L;
+
+    @ApiParam(value = "领料单号")
+    @AnnoOutputColumn
+    private String orderNo;
+
+    @ApiParam(value = "物料编码")
+    @AnnoOutputColumn
+    private String partNo;
+
+    @ApiParam(value = "领料数量")
+    @AnnoOutputColumn
+    private Double qty;
+
+    @ApiParam(value = "源存储区")
+    @AnnoOutputColumn
+    private String srcZoneNo;
+
+    @ApiParam(value = "目标存储区")
+    @AnnoOutputColumn
+    private String destZoneNo;
+
+    @ApiParam(value = "目标库位")
+    @AnnoOutputColumn
+    private String destLocateNo;
+
+    @ApiParam(value = "工厂")
+    @AnnoOutputColumn
+    private String factory;
+}
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 c9fc769..7fddd88 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
@@ -172,6 +172,24 @@ public class WmsHqlPack {
     }
 
     /**
+     * 移库单号集合查询条件封装
+     * @param orderNoList
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean packWmsDocMovementMasterByOrderNos(List<String> orderNoList,String organizeCode) {
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getInPack(orderNoList, "orderNo", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);
+
+        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
+
+        return packBean;
+    }
+
+
+    /**
      * PO订单主表信息 分页查询
      *
      * @param wmsPOMaster