diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductSalseController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductSalseController.java
index 90df839..5efe72e 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductSalseController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductSalseController.java
@@ -2,6 +2,13 @@ package com.ktg.mes.wm.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ktg.common.constant.UserConstants;
+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.web.bind.annotation.GetMapping;
@@ -17,7 +24,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.WmProductSalse;
-import com.ktg.mes.wm.service.IWmProductSalseService;
 import com.ktg.common.utils.poi.ExcelUtil;
 import com.ktg.common.core.page.TableDataInfo;
 
@@ -34,6 +40,18 @@ public class WmProductSalseController extends BaseController
     @Autowired
     private IWmProductSalseService wmProductSalseService;
 
+    @Autowired
+    private IWmWarehouseService wmWarehouseService;
+
+    @Autowired
+    private IWmStorageLocationService wmStorageLocationService;
+
+    @Autowired
+    private IWmStorageAreaService wmStorageAreaService;
+
+    @Autowired
+    private IStorageCoreService storageCoreService;
+
     /**
      * 查询销售出库单列表
      */
@@ -77,6 +95,24 @@ public class WmProductSalseController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody WmProductSalse wmProductSalse)
     {
+        if(UserConstants.NOT_UNIQUE.equals(wmProductSalseService.checkUnique(wmProductSalse))){
+            return AjaxResult.error("出库单编号已存在！");
+        }
+        if(StringUtils.isNotNull(wmProductSalse.getWarehouseId())){
+            WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmProductSalse.getWarehouseId());
+            wmProductSalse.setWarehouseCode(warehouse.getWarehouseCode());
+            wmProductSalse.setWarehouseName(warehouse.getWarehouseName());
+        }
+        if(StringUtils.isNotNull(wmProductSalse.getLocationId())){
+            WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmProductSalse.getLocationId());
+            wmProductSalse.setLocationCode(location.getLocationCode());
+            wmProductSalse.setLocationName(location.getLocationName());
+        }
+        if(StringUtils.isNotNull(wmProductSalse.getAreaId())){
+            WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmProductSalse.getAreaId());
+            wmProductSalse.setAreaCode(area.getAreaCode());
+            wmProductSalse.setAreaName(area.getAreaName());
+        }
         return toAjax(wmProductSalseService.insertWmProductSalse(wmProductSalse));
     }
 
@@ -88,6 +124,24 @@ public class WmProductSalseController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody WmProductSalse wmProductSalse)
     {
+        if(UserConstants.NOT_UNIQUE.equals(wmProductSalseService.checkUnique(wmProductSalse))){
+            return AjaxResult.error("出库单编号已存在！");
+        }
+        if(StringUtils.isNotNull(wmProductSalse.getWarehouseId())){
+            WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmProductSalse.getWarehouseId());
+            wmProductSalse.setWarehouseCode(warehouse.getWarehouseCode());
+            wmProductSalse.setWarehouseName(warehouse.getWarehouseName());
+        }
+        if(StringUtils.isNotNull(wmProductSalse.getLocationId())){
+            WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmProductSalse.getLocationId());
+            wmProductSalse.setLocationCode(location.getLocationCode());
+            wmProductSalse.setLocationName(location.getLocationName());
+        }
+        if(StringUtils.isNotNull(wmProductSalse.getAreaId())){
+            WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmProductSalse.getAreaId());
+            wmProductSalse.setAreaCode(area.getAreaCode());
+            wmProductSalse.setAreaName(area.getAreaName());
+        }
         return toAjax(wmProductSalseService.updateWmProductSalse(wmProductSalse));
     }
 
diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmProductSalseMapper.java b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmProductSalseMapper.java
index fae409a..8fd444e 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmProductSalseMapper.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmProductSalseMapper.java
@@ -27,6 +27,13 @@ public interface WmProductSalseMapper
      */
     public List<WmProductSalse> selectWmProductSalseList(WmProductSalse wmProductSalse);
 
+    /**
+     * 检查编号唯一性
+     * @param wmProductSalse
+     * @return
+     */
+    public WmProductSalse checkUnique(WmProductSalse wmProductSalse);
+
     /**
      * 新增销售出库单
      * 
diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmProductSalseService.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmProductSalseService.java
index 76e536b..752a482 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmProductSalseService.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmProductSalseService.java
@@ -27,6 +27,13 @@ public interface IWmProductSalseService
      */
     public List<WmProductSalse> selectWmProductSalseList(WmProductSalse wmProductSalse);
 
+    /**
+     * 检查编号唯一性
+     * @param wmProductSalse
+     * @return
+     */
+    public String checkUnique(WmProductSalse wmProductSalse);
+
     /**
      * 新增销售出库单
      * 
diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmProductSalseServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmProductSalseServiceImpl.java
index e75a188..15a4bc7 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmProductSalseServiceImpl.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmProductSalseServiceImpl.java
@@ -1,7 +1,11 @@
 package com.ktg.mes.wm.service.impl;
 
 import java.util.List;
+
+import com.ktg.common.constant.UserConstants;
 import com.ktg.common.utils.DateUtils;
+import com.ktg.common.utils.StringUtils;
+import org.apache.catalina.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ktg.mes.wm.mapper.WmProductSalseMapper;
@@ -44,6 +48,16 @@ public class WmProductSalseServiceImpl implements IWmProductSalseService
         return wmProductSalseMapper.selectWmProductSalseList(wmProductSalse);
     }
 
+    @Override
+    public String checkUnique(WmProductSalse wmProductSalse) {
+        WmProductSalse salse = wmProductSalseMapper.checkUnique(wmProductSalse);
+        Long salseId = wmProductSalse.getSalseId() ==null? -1L:wmProductSalse.getSalseId();
+        if(StringUtils.isNotNull(salse) && salseId.longValue() != salse.getSalseId().longValue()){
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
+    }
+
     /**
      * 新增销售出库单
      * 
diff --git a/ktg-mes/src/main/resources/mapper/wm/WmProductSalseMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmProductSalseMapper.xml
index f0dc6b1..ab424b1 100644
--- a/ktg-mes/src/main/resources/mapper/wm/WmProductSalseMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/wm/WmProductSalseMapper.xml
@@ -71,7 +71,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectWmProductSalseVo"/>
         where salse_id = #{salseId}
     </select>
-        
+
+    <select id="checkUnique" parameterMap="WmProductSalse" resultMap="WmProductSalseResult">
+        <include refid="selectWmProductSalseVo"/>
+        where salse_code = #{salseCode}
+    </select>
+
     <insert id="insertWmProductSalse" parameterType="WmProductSalse" useGeneratedKeys="true" keyProperty="salseId">
         insert into wm_product_salse
         <trim prefix="(" suffix=")" suffixOverrides=",">