diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/mapper/BaseKnifeMapper.java b/ktg-mes/src/main/java/com/ktg/mes/md/mapper/BaseKnifeMapper.java
index 3eba3c4..9c17bf1 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/md/mapper/BaseKnifeMapper.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/md/mapper/BaseKnifeMapper.java
@@ -121,4 +121,6 @@ public interface BaseKnifeMapper {
     public Boolean isDuplicateRfid(String  rfid);
 
     List<BaseKnife> selectBaseKnifeNotValidList(BaseKnife baseKnifeWrapper);
+
+    List<String> selectNotEmptyAreaCodeList();
 }
diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmStorageLocationService.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmStorageLocationService.java
index af5a02d..d2b2ef2 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmStorageLocationService.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmStorageLocationService.java
@@ -1,6 +1,8 @@
 package com.ktg.mes.wm.service;
 
 import java.util.List;
+
+import com.ktg.mes.wm.domain.WmStorageArea;
 import com.ktg.mes.wm.domain.WmStorageLocation;
 import com.ktg.mes.wm.domain.vo.WmStorageLocationVo;
 
@@ -105,4 +107,13 @@ public interface IWmStorageLocationService
      * @return
      */
     public int deleteByWarehouseId(Long warehouseId);
+
+    /**
+     * 查询一个库位
+     *
+     * @param code  库区编码
+     * @param isBig 是否大件
+     * @return 库位
+     */
+    WmStorageArea queryOneAreaByLocationCode(String code, Boolean isBig);
 }
diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageLocationServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageLocationServiceImpl.java
index 9a25b15..55a50da 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageLocationServiceImpl.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageLocationServiceImpl.java
@@ -1,11 +1,15 @@
 package com.ktg.mes.wm.service.impl;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import com.ktg.common.constant.UserConstants;
 import com.ktg.common.utils.DateUtils;
 import com.ktg.common.utils.StringUtils;
+import com.ktg.mes.md.mapper.BaseKnifeMapper;
+import com.ktg.mes.wm.domain.WmStorageArea;
 import com.ktg.mes.wm.domain.vo.WmStorageLocationVo;
+import com.ktg.mes.wm.mapper.WmStorageAreaMapper;
 import org.apache.catalina.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,6 +29,12 @@ public class WmStorageLocationServiceImpl implements IWmStorageLocationService
     @Autowired
     private WmStorageLocationMapper wmStorageLocationMapper;
 
+    @Autowired
+    private BaseKnifeMapper baseKnifeMapper;
+
+    @Autowired
+    private WmStorageAreaMapper wmStorageAreaMapper;
+
     /**
      * 查询库区设置
      * 
@@ -151,4 +161,27 @@ public class WmStorageLocationServiceImpl implements IWmStorageLocationService
     public int deleteByWarehouseId(Long warehouseId) {
         return wmStorageLocationMapper.deleteByWarehouseId(warehouseId);
     }
+
+    @Override
+    public WmStorageArea queryOneAreaByLocationCode(String code, Boolean isBig) {
+        // 获取库区
+        WmStorageLocation wmStorageLocationByCode = this.wmStorageLocationMapper.selectWmStorageLocationByLocationCode(code);
+        if (wmStorageLocationByCode == null) throw new RuntimeException("自动获取库位失败，该库区不存在");
+
+        // 获取台账中已经使用的库位编码
+        List<String> selectNotEmptyAreaCodeList = this.baseKnifeMapper.selectNotEmptyAreaCodeList();
+
+        // 获取库位列表
+        WmStorageArea wmStorageAreaQuery = new WmStorageArea();
+        wmStorageAreaQuery.setLocationId(wmStorageLocationByCode.getLocationId());
+        if (isBig) wmStorageAreaQuery.setAttr3(1L);
+        List<WmStorageArea> wmStorageAreaList = this.wmStorageAreaMapper.selectWmStorageAreaList(wmStorageAreaQuery).stream()
+                // 过滤掉全部存在物品的库位
+                .filter(it -> !selectNotEmptyAreaCodeList.contains(it.getAreaCode()))
+                .collect(Collectors.toList());
+        if (wmStorageAreaList.isEmpty()) throw new RuntimeException("自动获取库位失败，无可用库位");
+
+        // 返回第一个可用的库位
+        return wmStorageAreaList.get(0);
+    }
 }
diff --git a/ktg-mes/src/main/resources/mapper/md/BaseKnifeMapper.xml b/ktg-mes/src/main/resources/mapper/md/BaseKnifeMapper.xml
index 0f2ad03..e7a50d9 100644
--- a/ktg-mes/src/main/resources/mapper/md/BaseKnifeMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/md/BaseKnifeMapper.xml
@@ -612,4 +612,11 @@
         FROM BASE_KNIFE
         WHERE RFID = #{value}
     </select>
-</mapper>
\ No newline at end of file
+
+    <select id="selectNotEmptyAreaCodeList" resultType="java.lang.String">
+        SELECT AREA_CODE
+        FROM BASE_KNIFE
+        WHERE KNIFE_FINE_STATE == 1
+        GROUP BY AREA_CODE
+    </select>
+</mapper>
diff --git a/ktg-mes/src/main/resources/mapper/wm/WmStorageAreaMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmStorageAreaMapper.xml
index 90b2a73..85d08b6 100644
--- a/ktg-mes/src/main/resources/mapper/wm/WmStorageAreaMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/wm/WmStorageAreaMapper.xml
@@ -1,189 +1,370 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ktg.mes.wm.mapper.WmStorageAreaMapper">
-    
     <resultMap type="WmStorageArea" id="WmStorageAreaResult">
-        <result property="areaId"    column="area_id"    />
-        <result property="areaCode"    column="area_code"    />
-        <result property="areaName"    column="area_name"    />
-        <result property="locationId"    column="location_id"    />
-        <result property="area"    column="area"    />
-        <result property="maxLoa"    column="max_loa"    />
-        <result property="positionX"    column="position_x"    />
-        <result property="positionY"    column="position_y"    />
-        <result property="positionZ"    column="position_z"    />
-        <result property="enableFlag"    column="enable_flag"    />
-        <result property="frozenFlag"    column="frozen_flag"    />
-        <result property="remark"    column="remark"    />
-        <result property="attr1"    column="attr1"    />
-        <result property="attr2"    column="attr2"    />
-        <result property="attr3"    column="attr3"    />
-        <result property="attr4"    column="attr4"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
+        <result property="areaId" column="area_id"/>
+        <result property="areaCode" column="area_code"/>
+        <result property="areaName" column="area_name"/>
+        <result property="locationId" column="location_id"/>
+        <result property="area" column="area"/>
+        <result property="maxLoa" column="max_loa"/>
+        <result property="positionX" column="position_x"/>
+        <result property="positionY" column="position_y"/>
+        <result property="positionZ" column="position_z"/>
+        <result property="enableFlag" column="enable_flag"/>
+        <result property="frozenFlag" column="frozen_flag"/>
+        <result property="remark" column="remark"/>
+        <result property="attr1" column="attr1"/>
+        <result property="attr2" column="attr2"/>
+        <result property="attr3" column="attr3"/>
+        <result property="attr4" column="attr4"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <resultMap type="AreaVo" id="WmStorageAreaVoResult">
-        <result property="areaId"    column="area_id"    />
-        <result property="areaCode"    column="area_code"    />
-        <result property="locationName"    column="location_name"    />
-        <result property="areaName"    column="area_name"    />
-        <result property="locationId"    column="location_id"    />
-        <result property="area"    column="area"    />
-        <result property="maxLoa"    column="max_loa"    />
-        <result property="positionX"    column="position_x"    />
-        <result property="positionY"    column="position_y"    />
-        <result property="positionZ"    column="position_z"    />
-        <result property="enableFlag"    column="enable_flag"    />
-        <result property="frozenFlag"    column="frozen_flag"    />
-        <result property="remark"    column="remark"    />
-        <result property="attr1"    column="attr1"    />
-        <result property="attr2"    column="attr2"    />
-        <result property="attr3"    column="attr3"    />
-        <result property="attr4"    column="attr4"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
+        <result property="areaId" column="area_id"/>
+        <result property="areaCode" column="area_code"/>
+        <result property="locationName" column="location_name"/>
+        <result property="areaName" column="area_name"/>
+        <result property="locationId" column="location_id"/>
+        <result property="area" column="area"/>
+        <result property="maxLoa" column="max_loa"/>
+        <result property="positionX" column="position_x"/>
+        <result property="positionY" column="position_y"/>
+        <result property="positionZ" column="position_z"/>
+        <result property="enableFlag" column="enable_flag"/>
+        <result property="frozenFlag" column="frozen_flag"/>
+        <result property="remark" column="remark"/>
+        <result property="attr1" column="attr1"/>
+        <result property="attr2" column="attr2"/>
+        <result property="attr3" column="attr3"/>
+        <result property="attr4" column="attr4"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectWmStorageAreaVo">
-        select area_id, area_code, area_name, location_id, area, max_loa, position_x, position_y, position_z, enable_flag, frozen_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_storage_area
+        select area_id,
+               area_code,
+               area_name,
+               location_id,
+               area,
+               max_loa,
+               position_x,
+               position_y,
+               position_z,
+               enable_flag,
+               frozen_flag,
+               remark,
+               attr1,
+               attr2,
+               attr3,
+               attr4,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from wm_storage_area
     </sql>
 
-        <select id="selectWmStorageAreaList" parameterType="WmStorageArea" resultMap="WmStorageAreaResult">
-            <include refid="selectWmStorageAreaVo"/>
-            <where>
-                <if test="areaCode != null  and areaCode != ''"> and area_code like concat('%', #{areaCode}, '%')  </if>
-                <if test="areaName != null  and areaName != ''"> and area_name like concat('%', #{areaName}, '%')</if>
-                <if test="locationId != null "> and location_id  like concat('%', #{locationId}, '%')  </if>
-                <if test="area != null "> and  like concat('%',#{area}, '%') </if>
-                <if test="maxLoa != null "> and max_loa = #{maxLoa}</if>
-                <if test="positionX != null and  positionX !=0 "> and position_x = #{positionX}</if>
-                <if test="positionY != null and  positionY !=0"> and position_y = #{positionY}</if>
-                <if test="positionZ != null and  positionZ !=0"> and position_z = #{positionZ}</if>
-                <if test="enableFlag != null  and enableFlag != ''"> and enable_flag = #{enableFlag}</if>
-                and IS_DELETE = 0
-            </where>
-        </select>
+    <select id="selectWmStorageAreaList" parameterType="WmStorageArea" resultMap="WmStorageAreaResult">
+        <include refid="selectWmStorageAreaVo"/>
+        <where>
+            <if test="areaCode != null  and areaCode != ''">
+                and area_code like concat('%', #{areaCode}, '%')
+            </if>
+            <if test="areaName != null  and areaName != ''">
+                and area_name like concat('%', #{areaName}, '%')
+            </if>
+            <if test="locationId != null">
+                and location_id like concat('%', #{locationId}, '%')
+            </if>
+            <if test="area != null">
+                and  like concat('%', #{area}, '%')
+            </if>
+            <if test="maxLoa != null">
+                and max_loa = #{maxLoa}
+            </if>
+            <if test="positionX != null and positionX != 0">
+                and position_x = #{positionX}
+            </if>
+            <if test="positionY != null and positionY != 0">
+                and position_y = #{positionY}
+            </if>
+            <if test="positionZ != null and positionZ != 0">
+                and position_z = #{positionZ}
+            </if>
+            <if test="enableFlag != null  and enableFlag != ''">
+                and enable_flag = #{enableFlag}
+            </if>
+            and IS_DELETE = 0
+        </where>
+        ORDER BY AREA_CODE ASC
+    </select>
 
     <select id="selectWmStorageAreaListVo" parameterType="AreaVo" resultMap="WmStorageAreaVoResult">
-        select w.*,l.location_name from wm_storage_area w join wm_storage_location l on w.location_id = l.location_id
+        select w.*, l.location_name
+        from wm_storage_area w
+                 join wm_storage_location l on w.location_id = l.location_id
         <where>
-            <if test="areaCode != null  and areaCode != ''"> and w.area_code like concat('%', #{areaCode}, '%')  </if>
-            <if test="areaName != null  and areaName != ''"> and w.area_name like concat('%', #{areaName}, '%')</if>
-            <if test="locationId != null "> and w.location_id  like concat('%', #{locationId}, '%')  </if>
-            <if test="area != null "> and  like concat('%',#{area}, '%') </if>
-            <if test="maxLoa != null "> and max_loa = #{maxLoa}</if>
-            <if test="positionX != null and  positionX !=0 "> and w.position_x = #{positionX}</if>
-            <if test="positionY != null and  positionY !=0"> and w.position_y = #{positionY}</if>
-            <if test="positionZ != null and  positionZ !=0"> and w.position_z = #{positionZ}</if>
-            <if test="enableFlag != null  and enableFlag != ''"> and w.enable_flag = #{enableFlag}</if>
+            <if test="areaCode != null  and areaCode != ''">
+                and w.area_code like concat('%', #{areaCode}, '%')
+            </if>
+            <if test="areaName != null  and areaName != ''">
+                and w.area_name like concat('%', #{areaName}, '%')
+            </if>
+            <if test="locationId != null">
+                and w.location_id like concat('%', #{locationId}, '%')
+            </if>
+            <if test="area != null">
+                and  like concat('%', #{area}, '%')
+            </if>
+            <if test="maxLoa != null">
+                and max_loa = #{maxLoa}
+            </if>
+            <if test="positionX != null and positionX != 0">
+                and w.position_x = #{positionX}
+            </if>
+            <if test="positionY != null and positionY != 0">
+                and w.position_y = #{positionY}
+            </if>
+            <if test="positionZ != null and positionZ != 0">
+                and w.position_z = #{positionZ}
+            </if>
+            <if test="enableFlag != null  and enableFlag != ''">
+                and w.enable_flag = #{enableFlag}
+            </if>
             and w.IS_DELETE = 0
         </where>
     </select>
-    
+
     <select id="selectWmStorageAreaByAreaId" parameterType="Long" resultMap="WmStorageAreaResult">
         <include refid="selectWmStorageAreaVo"/>
-        where area_id = #{areaId} and IS_DELETE = 0
+        where area_id = #{areaId}
+          and IS_DELETE = 0
     </select>
 
     <select id="selectWmStorageAreaByAreaIdVo" parameterType="Long" resultMap="WmStorageAreaVoResult">
-        select w.*,l.location_name from wm_storage_area w join wm_storage_location l on w.location_id = l.location_id
-        where area_id = #{areaId} and w.IS_DELETE = 0
+        select w.*, l.location_name
+        from wm_storage_area w
+                 join wm_storage_location l on w.location_id = l.location_id
+        where area_id = #{areaId}
+          and w.IS_DELETE = 0
     </select>
 
     <select id="selectWmStorageAreaByAreaCode" parameterType="String" resultMap="WmStorageAreaResult">
         <include refid="selectWmStorageAreaVo"/>
-        where area_code = #{areaCode} and IS_DELETE = 0
+        where area_code = #{areaCode}
+          and IS_DELETE = 0
     </select>
     <select id="getAll" resultType="com.ktg.mes.wm.domain.WmStorageArea" resultMap="WmStorageAreaResult">
-        SELECT * FROM wm_storage_area where  IS_DELETE = 0
+        SELECT *
+        FROM wm_storage_area
+        where IS_DELETE = 0
     </select>
 
     <insert id="insertWmStorageArea" parameterType="WmStorageArea" useGeneratedKeys="true" keyProperty="areaId">
         insert into wm_storage_area
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="areaCode != null and areaCode != ''">area_code,</if>
-            <if test="areaName != null and areaName != ''">area_name,</if>
-            <if test="locationId != null">location_id,</if>
-            <if test="area != null">area,</if>
-            <if test="maxLoa != null">max_loa,</if>
-            <if test="positionX != null">position_x,</if>
-            <if test="positionY != null">position_y,</if>
-            <if test="positionZ != null">position_z,</if>
-            <if test="enableFlag != null">enable_flag,</if>
-            <if test="frozenFlag != null">frozen_flag,</if>
-            <if test="remark != null">remark,</if>
-            <if test="attr1 != null">attr1,</if>
-            <if test="attr2 != null">attr2,</if>
-            <if test="attr3 != null">attr3,</if>
-            <if test="attr4 != null">attr4,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-         </trim>
+            <if test="areaCode != null and areaCode != ''">
+                area_code,
+            </if>
+            <if test="areaName != null and areaName != ''">
+                area_name,
+            </if>
+            <if test="locationId != null">
+                location_id,
+            </if>
+            <if test="area != null">
+                area,
+            </if>
+            <if test="maxLoa != null">
+                max_loa,
+            </if>
+            <if test="positionX != null">
+                position_x,
+            </if>
+            <if test="positionY != null">
+                position_y,
+            </if>
+            <if test="positionZ != null">
+                position_z,
+            </if>
+            <if test="enableFlag != null">
+                enable_flag,
+            </if>
+            <if test="frozenFlag != null">
+                frozen_flag,
+            </if>
+            <if test="remark != null">
+                remark,
+            </if>
+            <if test="attr1 != null">
+                attr1,
+            </if>
+            <if test="attr2 != null">
+                attr2,
+            </if>
+            <if test="attr3 != null">
+                attr3,
+            </if>
+            <if test="attr4 != null">
+                attr4,
+            </if>
+            <if test="createBy != null">
+                create_by,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="updateBy != null">
+                update_by,
+            </if>
+            <if test="updateTime != null">
+                update_time,
+            </if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="areaCode != null and areaCode != ''">#{areaCode},</if>
-            <if test="areaName != null and areaName != ''">#{areaName},</if>
-            <if test="locationId != null">#{locationId},</if>
-            <if test="area != null">#{area},</if>
-            <if test="maxLoa != null">#{maxLoa},</if>
-            <if test="positionX != null">#{positionX},</if>
-            <if test="positionY != null">#{positionY},</if>
-            <if test="positionZ != null">#{positionZ},</if>
-            <if test="enableFlag != null">#{enableFlag},</if>
-            <if test="frozenFlag != null">#{frozenFlag},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="attr1 != null">#{attr1},</if>
-            <if test="attr2 != null">#{attr2},</if>
-            <if test="attr3 != null">#{attr3},</if>
-            <if test="attr4 != null">#{attr4},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+            <if test="areaCode != null and areaCode != ''">
+                #{areaCode},
+            </if>
+            <if test="areaName != null and areaName != ''">
+                #{areaName},
+            </if>
+            <if test="locationId != null">
+                #{locationId},
+            </if>
+            <if test="area != null">
+                #{area},
+            </if>
+            <if test="maxLoa != null">
+                #{maxLoa},
+            </if>
+            <if test="positionX != null">
+                #{positionX},
+            </if>
+            <if test="positionY != null">
+                #{positionY},
+            </if>
+            <if test="positionZ != null">
+                #{positionZ},
+            </if>
+            <if test="enableFlag != null">
+                #{enableFlag},
+            </if>
+            <if test="frozenFlag != null">
+                #{frozenFlag},
+            </if>
+            <if test="remark != null">
+                #{remark},
+            </if>
+            <if test="attr1 != null">
+                #{attr1},
+            </if>
+            <if test="attr2 != null">
+                #{attr2},
+            </if>
+            <if test="attr3 != null">
+                #{attr3},
+            </if>
+            <if test="attr4 != null">
+                #{attr4},
+            </if>
+            <if test="createBy != null">
+                #{createBy},
+            </if>
+            <if test="createTime != null">
+                #{createTime},
+            </if>
+            <if test="updateBy != null">
+                #{updateBy},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime},
+            </if>
+        </trim>
     </insert>
 
     <update id="updateWmStorageArea" parameterType="WmStorageArea">
         update wm_storage_area
         <trim prefix="SET" suffixOverrides=",">
-            <if test="areaCode != null and areaCode != ''">area_code = #{areaCode},</if>
-            <if test="areaName != null and areaName != ''">area_name = #{areaName},</if>
-            <if test="locationId != null">location_id = #{locationId},</if>
-            <if test="area != null">area = #{area},</if>
-            <if test="maxLoa != null">max_loa = #{maxLoa},</if>
-            <if test="positionX != null">position_x = #{positionX},</if>
-            <if test="positionY != null">position_y = #{positionY},</if>
-            <if test="positionZ != null">position_z = #{positionZ},</if>
-            <if test="enableFlag != null">enable_flag = #{enableFlag},</if>
-            <if test="frozenFlag != null">frozen_flag = #{frozenFlag},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="attr1 != null">attr1 = #{attr1},</if>
-            <if test="attr2 != null">attr2 = #{attr2},</if>
-            <if test="attr3 != null">attr3 = #{attr3},</if>
-            <if test="attr4 != null">attr4 = #{attr4},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="areaCode != null and areaCode != ''">
+                area_code = #{areaCode},
+            </if>
+            <if test="areaName != null and areaName != ''">
+                area_name = #{areaName},
+            </if>
+            <if test="locationId != null">
+                location_id = #{locationId},
+            </if>
+            <if test="area != null">
+                area = #{area},
+            </if>
+            <if test="maxLoa != null">
+                max_loa = #{maxLoa},
+            </if>
+            <if test="positionX != null">
+                position_x = #{positionX},
+            </if>
+            <if test="positionY != null">
+                position_y = #{positionY},
+            </if>
+            <if test="positionZ != null">
+                position_z = #{positionZ},
+            </if>
+            <if test="enableFlag != null">
+                enable_flag = #{enableFlag},
+            </if>
+            <if test="frozenFlag != null">
+                frozen_flag = #{frozenFlag},
+            </if>
+            <if test="remark != null">
+                remark = #{remark},
+            </if>
+            <if test="attr1 != null">
+                attr1 = #{attr1},
+            </if>
+            <if test="attr2 != null">
+                attr2 = #{attr2},
+            </if>
+            <if test="attr3 != null">
+                attr3 = #{attr3},
+            </if>
+            <if test="attr4 != null">
+                attr4 = #{attr4},
+            </if>
+            <if test="createBy != null">
+                create_by = #{createBy},
+            </if>
+            <if test="createTime != null">
+                create_time = #{createTime},
+            </if>
+            <if test="updateBy != null">
+                update_by = #{updateBy},
+            </if>
+            <if test="updateTime != null">
+                update_time = #{updateTime},
+            </if>
         </trim>
         where area_id = #{areaId}
     </update>
 
     <update id="deleteWmStorageAreaByAreaId" parameterType="Long">
-        update  wm_storage_area set IS_DELETE =1
+        update wm_storage_area
+        set IS_DELETE =1
         where area_id = #{areaId}
     </update>
 
     <update id="deleteWmStorageAreaByAreaIds" parameterType="String">
-        update  wm_storage_area set IS_DELETE = 1
+        update wm_storage_area
+        set IS_DELETE = 1
         where area_id in
         <foreach item="areaId" collection="array" open="(" separator="," close=")">
             #{areaId}
@@ -191,13 +372,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <update id="deleteByWarehouseId" parameterType="Long">
-        update  wm_storage_area set IS_DELETE =1
-        where location_id in ( select location_id from wm_storage_location where warehouse_id = #{warehouseId})
+        update wm_storage_area
+        set IS_DELETE =1
+        where location_id in (select location_id from wm_storage_location where warehouse_id = #{warehouseId})
     </update>
 
     <update id="deleteByLocationId" parameterType="Long">
-        update  wm_storage_area set IS_DELETE = 1
+        update wm_storage_area
+        set IS_DELETE = 1
         where location_id = #{locationId}
     </update>
-
 </mapper>
\ No newline at end of file