diff --git a/doc/设计文档/数据库设计/mes-wm.sql b/doc/设计文档/数据库设计/mes-wm.sql
index d2addf7..95ab201 100644
--- a/doc/设计文档/数据库设计/mes-wm.sql
+++ b/doc/设计文档/数据库设计/mes-wm.sql
@@ -1006,10 +1006,13 @@ drop table if exists wm_transfer;
 create table wm_transfer (
   transfer_id           bigint(20)      not null auto_increment     comment '转移单ID',
   transfer_code         varchar(64)     not null                    comment '转移单编号',
-  transfer_name         varchar(255)    not null                    comment '转移单名称',  
+  transfer_name         varchar(255)                                comment '转移单名称',  
+  transfer_type         varchar(64)     not null                    comment '转移单类型',
   destination           varchar(255)                                comment '目的地',
   carrier               varchar(64)                                 comment '承运商',
   booking_note          varchar(64)                                 comment '托运单号',
+  receiver              varchar(64)                                 comment '收货人',
+  receiver_nick         varchar(64)                                 comment '收货人名称',
   from_warehouse_id     bigint(20)                                  comment '移出仓库ID',
   from_warehouse_code   varchar(64)                                 comment '移出仓库编码',
   from_warehouse_name   varchar(255)                                comment '移出仓库名称',
diff --git a/doc/设计文档/数据库设计/数据库设计.xlsx b/doc/设计文档/数据库设计/数据库设计.xlsx
index 40b0a05..7459ffd 100644
Binary files a/doc/设计文档/数据库设计/数据库设计.xlsx and b/doc/设计文档/数据库设计/数据库设计.xlsx differ
diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmTransferController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmTransferController.java
index ecd76ae..c68de8a 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmTransferController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmTransferController.java
@@ -4,7 +4,11 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ktg.common.constant.UserConstants;
-import com.ktg.mes.wm.service.IWmTransferLineService;
+import com.ktg.common.utils.StringUtils;
+import com.ktg.mes.wm.domain.WmStorageArea;
+import com.ktg.mes.wm.domain.WmStorageLocation;
+import com.ktg.mes.wm.domain.WmWarehouse;
+import com.ktg.mes.wm.service.*;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -22,7 +26,6 @@ import com.ktg.common.core.controller.BaseController;
 import com.ktg.common.core.domain.AjaxResult;
 import com.ktg.common.enums.BusinessType;
 import com.ktg.mes.wm.domain.WmTransfer;
-import com.ktg.mes.wm.service.IWmTransferService;
 import com.ktg.common.utils.poi.ExcelUtil;
 import com.ktg.common.core.page.TableDataInfo;
 
@@ -42,6 +45,15 @@ public class WmTransferController extends BaseController
     @Autowired
     private IWmTransferLineService wmTransferLineService;
 
+    @Autowired
+    private IWmWarehouseService wmWarehouseService;
+
+    @Autowired
+    private IWmStorageLocationService wmStorageLocationService;
+
+    @Autowired
+    private IWmStorageAreaService wmStorageAreaService;
+
     /**
      * 查询转移单列表
      */
@@ -88,6 +100,18 @@ public class WmTransferController extends BaseController
         if(UserConstants.NOT_UNIQUE.equals(wmTransferService.checkUnique(wmTransfer))){
             return AjaxResult.error("转移单编号已存在");
         }
+        if(StringUtils.isNotNull(wmTransfer.getFromWarehouseId())){
+            WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmTransfer.getFromWarehouseId());
+            wmTransfer.setFromWarehouseCode(warehouse.getWarehouseCode());
+            wmTransfer.setFromWarehouseName(warehouse.getWarehouseName());
+        }
+        if(StringUtils.isNotNull(wmTransfer.getToWarehouseId())){
+            WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmTransfer.getToWarehouseId());
+            wmTransfer.setToWarehouseCode(warehouse.getWarehouseCode());
+            wmTransfer.setToWarehouseName(warehouse.getWarehouseName());
+        }
+
+
         return toAjax(wmTransferService.insertWmTransfer(wmTransfer));
     }
 
@@ -102,6 +126,16 @@ public class WmTransferController extends BaseController
         if(UserConstants.NOT_UNIQUE.equals(wmTransferService.checkUnique(wmTransfer))){
             return AjaxResult.error("转移单编号已存在");
         }
+        if(StringUtils.isNotNull(wmTransfer.getFromWarehouseId())){
+            WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmTransfer.getFromWarehouseId());
+            wmTransfer.setFromWarehouseCode(warehouse.getWarehouseCode());
+            wmTransfer.setFromWarehouseName(warehouse.getWarehouseName());
+        }
+        if(StringUtils.isNotNull(wmTransfer.getToWarehouseId())){
+            WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmTransfer.getToWarehouseId());
+            wmTransfer.setToWarehouseCode(warehouse.getWarehouseCode());
+            wmTransfer.setToWarehouseName(warehouse.getWarehouseName());
+        }
         return toAjax(wmTransferService.updateWmTransfer(wmTransfer));
     }