From 28d0852a81a7f0f2e163f8a2e37268d6ca3fd6a2 Mon Sep 17 00:00:00 2001
From: wangyu <823267011@qq.com>
Date: Tue, 25 Nov 2025 01:13:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E5=90=8E=E7=AB=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 klp-ui/src/api/wms/actualWarehouse.js         |   28 +
 klp-ui/src/assets/styles/element-ui.scss      |   46 +
 .../ActualWarehouseSelect/index.vue           |  237 ++--
 klp-ui/src/views/wms/coil/actflow.vue         |    4 +-
 klp-ui/src/views/wms/coil/box2.vue            |    6 +-
 klp-ui/src/views/wms/coil/index.vue           |  213 +++-
 klp-ui/src/views/wms/coil/panels/base.vue     |    6 +-
 klp-ui/src/views/wms/coil/product.vue         |    2 +-
 klp-ui/src/views/wms/coil/split.vue           |    8 +-
 klp-ui/src/views/wms/coil/typing.vue          |    8 +-
 klp-ui/src/views/wms/warehouse/real.vue       | 1110 ++++++++++++-----
 .../WmsActualWarehouseController.java         |   70 ++
 .../bo/WmsActualWarehouseHierarchyBo.java     |   64 +
 .../domain/vo/WmsActualWarehouseImportVo.java |   41 +
 .../domain/vo/WmsActualWarehouseTreeVo.java   |   18 +
 .../service/IWmsActualWarehouseService.java   |   19 +-
 .../impl/WmsActualWarehouseServiceImpl.java   |  132 +-
 .../impl/WmsCoilPendingActionServiceImpl.java |    2 +-
 18 files changed, 1574 insertions(+), 440 deletions(-)
 create mode 100644 klp-wms/src/main/java/com/klp/domain/bo/WmsActualWarehouseHierarchyBo.java
 create mode 100644 klp-wms/src/main/java/com/klp/domain/vo/WmsActualWarehouseImportVo.java
 create mode 100644 klp-wms/src/main/java/com/klp/domain/vo/WmsActualWarehouseTreeVo.java

diff --git a/klp-ui/src/api/wms/actualWarehouse.js b/klp-ui/src/api/wms/actualWarehouse.js
index b9edb67c..a66c384a 100644
--- a/klp-ui/src/api/wms/actualWarehouse.js
+++ b/klp-ui/src/api/wms/actualWarehouse.js
@@ -9,6 +9,15 @@ export function listActualWarehouse(query) {
   })
 }
 
+// 获取完整三级目录
+export function listActualWarehouseTree(query) {
+  return request({
+    url: '/wms/actualWarehouse/tree',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询实际库区/库位自关联详细
 export function getActualWarehouse(actualWarehouseId) {
   return request({
@@ -26,6 +35,25 @@ export function addActualWarehouse(data) {
   })
 }
 
+// 导入实际库区/库位
+export function importActualWarehouse(data) {
+  return request({
+    url: '/wms/actualWarehouse/importData',
+    method: 'post',
+    data,
+    headers: { 'Content-Type': 'multipart/form-data' }
+  })
+}
+
+// 批量新增三级目录
+export function createActualWarehouseHierarchy(data) {
+  return request({
+    url: '/wms/actualWarehouse/hierarchy',
+    method: 'post',
+    data
+  })
+}
+
 // 修改实际库区/库位自关联
 export function updateActualWarehouse(data) {
   return request({
diff --git a/klp-ui/src/assets/styles/element-ui.scss b/klp-ui/src/assets/styles/element-ui.scss
index b3cf536d..001e94e2 100644
--- a/klp-ui/src/assets/styles/element-ui.scss
+++ b/klp-ui/src/assets/styles/element-ui.scss
@@ -793,6 +793,52 @@ body {
   }
 }
 
+// Treeselect 样式
+.vue-treeselect {
+  &__control {
+    min-height: 24px;
+    border-radius: 0;
+    border-color: $--border-color-light;
+    background: linear-gradient(180deg, #fdfdff 0%, #f4f6fa 100%);
+    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.04);
+  }
+
+  &__single-value,
+  &__placeholder,
+  &__input-container {
+    line-height: 24px;
+    font-size: 12px;
+    color: $--color-text-regular;
+  }
+
+  &__control-arrow-container {
+    height: 24px;
+  }
+
+  &__menu {
+    background: $--metal-gradient-light;
+    border: 1px solid $--border-color-light;
+    border-radius: 6px;
+    box-shadow: $--metal-shadow;
+    padding: 4px 0;
+  }
+
+  &__option {
+    color: $--color-text-regular;
+    padding: 6px 16px;
+    font-size: 13px;
+
+    &--highlight {
+      background-color: rgba($--color-primary, .12);
+    }
+
+    &--selected {
+      background-color: rgba($--color-primary, .20);
+      color: $--color-text-primary;
+    }
+  }
+}
+
 // 开关
 .el-switch {
   .el-switch__core {
diff --git a/klp-ui/src/components/KLPService/ActualWarehouseSelect/index.vue b/klp-ui/src/components/KLPService/ActualWarehouseSelect/index.vue
index 46b9a397..f1255333 100644
--- a/klp-ui/src/components/KLPService/ActualWarehouseSelect/index.vue
+++ b/klp-ui/src/components/KLPService/ActualWarehouseSelect/index.vue
@@ -1,156 +1,189 @@
 <template>
-  <div style="width: 100%; max-width: 300px;">
-    <treeselect
-      :max-height="200"
+  <div :class="['actual-warehouse-select', { 'is-block': block }]" :style="wrapperStyle">
+    <el-select
       v-model="innerValue"
-      :options="warehouseOptions"
-      :normalizer="normalizer"
       :placeholder="placeholder"
       :clearable="clearable"
-      search-nested
-      :load-options="loadOptions"
-      @input="onInput"
-    />
+      filterable
+      :filter-method="handleFilter"
+      :disabled="disabled"
+      size="small"
+      class="actual-warehouse-select__inner"
+      @change="handleChange"
+      @visible-change="handleVisibleChange"
+    >
+      <el-option
+        v-for="option in displayOptions"
+        :key="option.actualWarehouseId"
+        :label="option.fullLabel"
+        :value="option.actualWarehouseId"
+      >
+        <div class="option-content">
+          <span class="level-tag">{{ levelLabels[option.level] }}</span>
+          <span class="option-text">{{ option.fullLabel }}</span>
+        </div>
+      </el-option>
+    </el-select>
   </div>
 </template>
 
 <script>
-import Treeselect from '@riophae/vue-treeselect';
-import '@riophae/vue-treeselect/dist/vue-treeselect.css';
-import { listActualWarehouse } from '@/api/wms/actualWarehouse';
-import { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect';
+import { listActualWarehouseTree } from '@/api/wms/actualWarehouse';
+
+const LEVEL_LABELS = {
+  1: '一级',
+  2: '二级',
+  3: '三级'
+};
 
 export default {
   name: 'ActualWarehouseSelect',
-  components: { Treeselect },
   props: {
     value: {
-      type: [Number, String, null], // 仅保留单选类型
+      type: [Number, String, null],
       default: null
     },
     placeholder: {
       type: String,
-      default: '请选择库区/仓库/库位'
+      default: '请选择实际库区/库位'
     },
     clearable: {
       type: Boolean,
       default: true
     },
-    showTop: {
+    block: {
       type: Boolean,
-      default: true // 是否显示顶级节点（actualWarehouseId=0）
+      default: false
+    },
+    width: {
+      type: [String, Number],
+      default: 240
+    },
+    disabled: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
     return {
       innerValue: this.value,
-      warehouseOptions: [], // 初始选项（含未加载子节点的节点，标记 children: null）
-      loadedChildren: {}, // 缓存已加载的子节点：key=父节点ID，value=子节点数组
-      allLoadedNodes: [] // 存储所有已加载的节点，用于快速查找完整对象
+      flatOptions: [],
+      displayOptions: [],
+      levelLabels: LEVEL_LABELS
     };
   },
+  computed: {
+    wrapperStyle() {
+      const widthValue = this.block ? '100%' : (typeof this.width === 'number' ? `${this.width}px` : this.width);
+      return { width: widthValue };
+    }
+  },
   watch: {
     value(val) {
       this.innerValue = val;
-    },
+    }
   },
-  mounted() {
-    this.initOptions();
+  created() {
+    this.fetchTree();
   },
   methods: {
-    /** 初始化顶级选项 */
-    initOptions() {
-      // 重置状态
-      this.loadedChildren = {};
-      this.allLoadedNodes = [];
-      this.warehouseOptions = [];
-
-      if (this.showTop) {
-        // 显示顶级节点：标记 children: null 表示需要懒加载子节点
-        const topNode = {
-          actualWarehouseId: 0,
-          actualWarehouseName: '顶级节点',
-          children: null, // 关键：标记为未加载子节点
-          isDisabled: false
-        };
-        this.warehouseOptions.push(topNode);
-        this.allLoadedNodes.push(topNode);
-      } else {
-        // 不显示顶级节点：直接加载 parentId=0 的节点作为顶级（初始标记为未加载）
-        this.warehouseOptions.push({
-          actualWarehouseId: 'temp-parent-0', // 临时父节点ID（仅用于触发首次加载）
-          actualWarehouseName: '加载中...',
-          children: null,
-          isDisabled: true
-        });
-        // 触发首次加载 parentId=0 的节点
-        this.loadOptions({
-          action: LOAD_CHILDREN_OPTIONS,
-          parentNode: { id: 0 },
-          callback: (children) => {
-            this.warehouseOptions = children;
-          }
-        });
+    async fetchTree() {
+      try {
+        const res = await listActualWarehouseTree();
+        this.flatOptions = this.flattenTree(res.data || []);
+        this.displayOptions = [...this.flatOptions];
+      } catch (error) {
+        console.error('获取实际库区树失败', error);
       }
     },
 
-    /** 懒加载核心方法 */
-    loadOptions({ action, parentNode, callback, instanceId }) {
-      // 仅处理 "加载子节点" 动作
-      if (action !== LOAD_CHILDREN_OPTIONS) {
-        callback();
+    flattenTree(nodes, parentPath = [], level = 1) {
+      const result = [];
+      nodes.forEach(node => {
+        const path = [...parentPath, node.actualWarehouseName];
+        const current = {
+          actualWarehouseId: node.actualWarehouseId,
+          parentId: node.parentId || 0,
+          level,
+          fullLabel: path.join(' / '),
+          descendantIds: [],
+          children: node.children || []
+        };
+        result.push(current);
+        if (node.children && node.children.length) {
+          const children = this.flattenTree(node.children, path, level + 1);
+          children.forEach(child => {
+            current.descendantIds.push(child.actualWarehouseId);
+            current.descendantIds.push(...child.descendantIds);
+          });
+          result.push(...children);
+        }
+      });
+      return result;
+    },
+
+    handleFilter(keyword) {
+      const text = (keyword || '').trim();
+      if (!text) {
+        this.displayOptions = [...this.flatOptions];
         return;
       }
-      console.log('加载子节点请求参数：', parentNode);
-
-      const parentId = parentNode.actualWarehouseId; // 当前父节点ID（对应 actualWarehouseId）
-
-      // 2. 调用接口加载子节点（parentId 作为查询条件）
-      listActualWarehouse({ parentId }).then(response => {
-        const children = response.data.map(item => ({
-          ...item,
-          isDisabled: !item.isEnabled, // 禁用未启用的节点
-          children: item.hasChildren ?? true ? null : [] // 有子节点则标记 children: null（需懒加载），否则空数组
-        }));
-
-        // 如果没有子节点了，则不添加children属性
-        if (children.length === 0) {
-          delete parentNode.children;
-          callback()
-          return;
+      const matchedIds = new Set();
+      this.flatOptions.forEach(option => {
+        if (option.fullLabel.includes(text)) {
+          matchedIds.add(option.actualWarehouseId);
+          option.descendantIds.forEach(id => matchedIds.add(id));
         }
-
-        // 5. 给父节点赋值子节点（treeselect 自动渲染）
-        parentNode.children = children;
-
-        // 6. 回调通知加载成功
-        callback();
-      }).catch((error) => {
-        console.error('加载子节点失败：', error);
-        callback(new Error('加载失败，请重试'));
       });
+      this.displayOptions = this.flatOptions.filter(option => matchedIds.has(option.actualWarehouseId));
     },
 
-    /** 节点格式标准化 */
-    normalizer(node) {
-      return {
-        id: node.actualWarehouseId, // 节点唯一ID
-        label: node.actualWarehouseName, // 显示文本
-        children: node.children, // 子节点（null=未加载，[]=无节点）
-        isDisabled: node.isDisabled, // 是否禁用
-        raw: node // 保留原始节点数据，方便后续查找
-      };
+    handleVisibleChange(visible) {
+      if (!visible) {
+        this.displayOptions = [...this.flatOptions];
+      }
     },
 
-    /** 选中值变化时触发（仅单选） */
-    onInput(val) {
+    handleChange(val) {
       this.$emit('input', val);
+      const node = this.flatOptions.find(option => option.actualWarehouseId === val);
+      this.$emit('select', node);
     },
 
-    /** 外部刷新方法（如需重新加载数据可调用） */
     refresh() {
-      this.initOptions();
+      this.fetchTree();
     }
   }
 };
-</script>
\ No newline at end of file
+</script>
+
+<style scoped>
+.actual-warehouse-select {
+  display: inline-block;
+}
+
+.actual-warehouse-select.is-block {
+  width: 100%;
+}
+
+.actual-warehouse-select__inner {
+  width: 100%;
+}
+
+.option-content {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.level-tag {
+  font-size: 12px;
+  color: #909399;
+  width: 34px;
+}
+
+.option-text {
+  font-size: 13px;
+  color: #606266;
+}
+</style>
diff --git a/klp-ui/src/views/wms/coil/actflow.vue b/klp-ui/src/views/wms/coil/actflow.vue
index 24901a43..e534b979 100644
--- a/klp-ui/src/views/wms/coil/actflow.vue
+++ b/klp-ui/src/views/wms/coil/actflow.vue
@@ -114,9 +114,9 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="扫码时间" align="center" prop="scanTime" width="155" :show-overflow-tooltip="true">
+      <el-table-column label="新增时间" align="center" prop="createTime" width="155" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.scanTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
         </template>
       </el-table-column>
 
diff --git a/klp-ui/src/views/wms/coil/box2.vue b/klp-ui/src/views/wms/coil/box2.vue
index 07d73678..6334a70e 100644
--- a/klp-ui/src/views/wms/coil/box2.vue
+++ b/klp-ui/src/views/wms/coil/box2.vue
@@ -11,7 +11,11 @@
 
       <!-- 真实库区 -->
       <el-form-item label="真实库区">
-        <ActualWarehouseSelect v-model="queryParams.actualWarehouseId" @change="handleActualWarehouseChange" />
+        <ActualWarehouseSelect
+          v-model="queryParams.actualWarehouseId"
+          @change="handleActualWarehouseChange"
+          :width="220"
+        />
       </el-form-item>
     </el-form>
 
diff --git a/klp-ui/src/views/wms/coil/index.vue b/klp-ui/src/views/wms/coil/index.vue
index da51480b..a4c8383b 100644
--- a/klp-ui/src/views/wms/coil/index.vue
+++ b/klp-ui/src/views/wms/coil/index.vue
@@ -1,25 +1,212 @@
 <template>
-  <BasePage :qrcode="qrcode" :querys="querys" :labelType="labelType" :hideType="hideType" />
+  <div
+    :class="['actual-warehouse-select', { 'is-block': block }]"
+    :style="wrapperStyle"
+  >
+    <el-cascader
+      ref="cascader"
+      v-model="innerPath"
+      :props="cascaderProps"
+      :placeholder="placeholder"
+      :clearable="clearable"
+      :show-all-levels="true"
+      :emit-path="true"
+      style="width: 100%;"
+      @change="handleChange"
+    />
+  </div>
 </template>
 
 <script>
-import BasePage from './panels/base.vue';
+import { listActualWarehouse } from '@/api/wms/actualWarehouse';
 
 export default {
-  components: {
-    BasePage
+  name: 'ActualWarehouseSelect',
+  props: {
+    // 对外仍然是「单个 ID」，即第三级 actualWarehouseId
+    value: {
+      type: [Number, String, null],
+      default: null
+    },
+    placeholder: {
+      type: String,
+      default: '请选择实际库位'
+    },
+    clearable: {
+      type: Boolean,
+      default: true
+    },
+    // 已经不再显示“最高级”
+    showTop: {
+      type: Boolean,
+      default: false
+    },
+    block: {
+      type: Boolean,
+      default: false
+    },
+    width: {
+      type: [String, Number],
+      default: 240
+    },
+    size: {
+      type: String,
+      default: 'small'
+    }
   },
   data() {
     return {
-      qrcode: true,
-      querys: {
-        dataType: 1,
-        // itemType: 'raw_material'
-        materialType: '原料'
-      },
-      labelType: '2',
-      hideType: true
+      // 级联组件内部使用的「路径值」，例如 [一级ID, 二级ID, 三级ID]
+      innerPath: [],
+      // 记录所有已加载节点（如果后面要根据 ID 反查路径，可复用）
+      allLoadedNodes: []
+    };
+  },
+  computed: {
+    wrapperStyle() {
+      const widthValue = this.block
+        ? '100%'
+        : (typeof this.width === 'number' ? `${this.width}px` : this.width);
+      return { width: widthValue };
+    },
+    // el-cascader 的 props 配置
+    cascaderProps() {
+      return {
+        lazy: true,
+        lazyLoad: this.loadNode,  // 懒加载方法
+        checkStrictly: false,     // 只允许选叶子节点
+        value: 'value',
+        label: 'label',
+        children: 'children'
+      };
+    }
+  },
+  watch: {
+    // 外部把 value 置空时，同步清空面板
+    value(val) {
+      if (val == null || val === '') {
+        this.innerPath = [];
+      }
+    }
+  },
+  methods: {
+    /**
+     * 级联懒加载
+     * node.level:
+     *  0：根（还没选任何东西，parentId = 0 -> 加载一级）
+     *  1：一级节点，加载二级
+     *  2：二级节点，加载三级（三级设为叶子，不再展开）
+     */
+    loadNode(node, resolve) {
+      const { level, value } = node;
+
+      // 超过第三级就不再加载
+      if (level >= 3) {
+        resolve([]);
+        return;
+      }
+
+      const parentId = level === 0 ? 0 : value;
+
+      listActualWarehouse({ parentId }).then(res => {
+        const list = (res.data || []).map(item => {
+          const nextLevel = level + 1;
+          const isLeafLevel = nextLevel >= 3; // 第三级为叶子，不能再展开
+
+          const nodeData = {
+            value: item.actualWarehouseId,
+            label: item.actualWarehouseName,
+            leaf: isLeafLevel,
+            // 只有第三级可选；一、二级全部 disabled
+            disabled: nextLevel < 3 || item.isEnabled === false,
+            // 保留原始数据和层级
+            raw: item,
+            level: nextLevel
+          };
+
+          this.registerNode(nodeData);
+          return nodeData;
+        });
+
+        resolve(list);
+      }).catch(err => {
+        console.error('加载仓库树失败：', err);
+        resolve([]);
+      });
+    },
+
+    /** 把节点放进缓存数组里，后面如需扩展可用 */
+    registerNode(node) {
+      const id = node.value;
+      const idx = this.allLoadedNodes.findIndex(
+        n => String(n.value) === String(id)
+      );
+      if (idx === -1) {
+        this.allLoadedNodes.push(node);
+      } else {
+        this.$set(this.allLoadedNodes, idx, {
+          ...this.allLoadedNodes[idx],
+          ...node
+        });
+      }
+    },
+
+    /**
+     * 选中变化：
+     * value 是路径数组，如 [一级ID, 二级ID, 三级ID]
+     * 我们对外只抛最后一个（第三级）ID
+     */
+    handleChange(value) {
+      if (!Array.isArray(value) || value.length === 0) {
+        this.$emit('input', null);
+        this.$emit('select', null);
+        return;
+      }
+
+      const leafId = value[value.length - 1];
+
+      // 拿到当前选中节点，获取完整路径信息
+      const nodes = this.$refs.cascader.getCheckedNodes();
+      let payload = null;
+      if (nodes && nodes.length > 0) {
+        const node = nodes[0];
+        const pathNodes = node.path || [];
+
+        payload = {
+          id: leafId,
+          pathIds: pathNodes.map(n => n.value),
+          pathLabels: pathNodes.map(n => n.label),
+          // 原始 data（如果需要后台做别的处理可以用）
+          rawPath: pathNodes.map(n => n.data || n.raw || {})
+        };
+      }
+
+      this.$emit('input', leafId);
+      this.$emit('select', payload);
+    },
+
+    /** 外部刷新：如果以后需要强制重载，可以扩展这里（目前不需要缓存） */
+    refresh() {
+      this.innerPath = [];
+      this.allLoadedNodes = [];
+      // el-cascader 的懒加载不需要预载，这里清空即可
     }
   }
+};
+</script>
+
+<style scoped>
+.actual-warehouse-select {
+  display: inline-block;
+  width: 100%;
 }
-</script>
\ No newline at end of file
+
+.actual-warehouse-select.is-block {
+  width: 100%;
+}
+
+/* 让级联宽度占满容器，其他高度、边框等跟 el-select 共用全局 .el-input__inner 样式 */
+.actual-warehouse-select .el-cascader {
+  width: 100%;
+}
+</style>
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index 2768117b..e421c3ac 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -15,13 +15,13 @@
           <el-option :value="1" label="当前数据">当前数据</el-option>
         </el-select>
       </el-form-item> -->
-      <el-form-item label="所在库位" prop="warehouseId" v-if="!hideWarehouseQuery">
+      <el-form-item label="逻辑库位" prop="warehouseId" v-if="!hideWarehouseQuery">
         <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
           style="width: 100%; display: inline-block;" clearable />
       </el-form-item>
       <el-form-item label="实际库区" prop="actualWarehouseId" v-if="!hideWarehouseQuery">
         <actual-warehouse-select v-model="queryParams.actualWarehouseId" placeholder="请选择实际库位"
-          style="width: 100%; display: inline-block;" clearable />
+          style="display: inline-block;" clearable />
       </el-form-item>
       <el-form-item label="厂家卷号" prop="supplierCoilNo">
         <el-input v-model="queryParams.supplierCoilNo" placeholder="请输入厂家原料卷号" clearable
@@ -69,7 +69,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="materialCoilList" @selection-change="handleSelectionChange" height="450px">
+    <el-table v-loading="loading" :data="materialCoilList" @selection-change="handleSelectionChange" >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="入场钢卷号" align="center" prop="enterCoilNo" />
       <el-table-column label="当前钢卷号" align="center" prop="currentCoilNo" />
diff --git a/klp-ui/src/views/wms/coil/product.vue b/klp-ui/src/views/wms/coil/product.vue
index a1234828..ed6ed298 100644
--- a/klp-ui/src/views/wms/coil/product.vue
+++ b/klp-ui/src/views/wms/coil/product.vue
@@ -19,7 +19,7 @@ export default {
       },
       labelType: '3',
       showStatus: true,
-      hideType: true,
+      hideType: false,
     }
   }
 }
diff --git a/klp-ui/src/views/wms/coil/split.vue b/klp-ui/src/views/wms/coil/split.vue
index ed1dc55a..e30807ba 100644
--- a/klp-ui/src/views/wms/coil/split.vue
+++ b/klp-ui/src/views/wms/coil/split.vue
@@ -171,8 +171,12 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="真实库区" required>
-                  <ActualWarehouseSelect v-model="item.actualWarehouseId" placeholder="请选择真实库区" style="width: 100%"
-                    filterable :disabled="readonly" />
+                  <ActualWarehouseSelect
+                    v-model="item.actualWarehouseId"
+                    placeholder="请选择真实库区"
+                    block
+                    :disabled="readonly"
+                  />
                 </el-form-item>
               </el-form>
             </div>
diff --git a/klp-ui/src/views/wms/coil/typing.vue b/klp-ui/src/views/wms/coil/typing.vue
index 0117db6c..d6d8a743 100644
--- a/klp-ui/src/views/wms/coil/typing.vue
+++ b/klp-ui/src/views/wms/coil/typing.vue
@@ -167,8 +167,12 @@
             </el-form-item>
 
             <el-form-item label="真实库区" prop="warehouseId">
-              <ActualWarehouseSelect v-model="updateForm.actualWarehouseId" placeholder="请选择真实库区" style="width: 100%"
-                filterable :disabled="readonly" />
+              <ActualWarehouseSelect
+                v-model="updateForm.actualWarehouseId"
+                placeholder="请选择真实库区"
+                block
+                :disabled="readonly"
+              />
             </el-form-item>
 
             <el-form-item label="备注" prop="remark">
diff --git a/klp-ui/src/views/wms/warehouse/real.vue b/klp-ui/src/views/wms/warehouse/real.vue
index a275dbb6..59d0ad29 100644
--- a/klp-ui/src/views/wms/warehouse/real.vue
+++ b/klp-ui/src/views/wms/warehouse/real.vue
@@ -1,37 +1,27 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="库位编码" prop="actualWarehouseCode">
+  <div class="app-container warehouse-page">
+    <el-form
+      v-show="showSearch"
+      ref="queryForm"
+      :model="queryParams"
+      size="small"
+      :inline="true"
+      label-width="80px"
+    >
+      <el-form-item label="关键字">
         <el-input
-          v-model="queryParams.actualWarehouseCode"
-          placeholder="请输入实际库区/库位编码"
+          v-model="queryParams.keyword"
+          placeholder="输入编码/名称关键字"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="库位名称" prop="actualWarehouseName">
-        <el-input
-          v-model="queryParams.actualWarehouseName"
-          placeholder="请输入实际库区/库位名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="排序号" prop="sortNo">
-        <el-input
-          v-model="queryParams.sortNo"
-          placeholder="请输入同级排序号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否启用" prop="isEnabled">
-        <el-input
-          v-model="queryParams.isEnabled"
-          placeholder="请输入是否启用"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="层级">
+        <el-select v-model="queryParams.level" placeholder="全部" clearable @change="handleQuery">
+          <el-option label="一级" :value="1" />
+          <el-option label="二级" :value="2" />
+          <el-option label="三级" :value="3" />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -39,359 +29,861 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button>
+    <el-row :gutter="12" class="toolbar-row">
+      <el-col :xs="24" :sm="16" :md="16" class="toolbar-actions">
+        <el-button type="primary" icon="el-icon-plus" size="mini" @click="openQuickDialog()">
+          快速新增 1~3 级
+        </el-button>
+        <el-button type="success" icon="el-icon-plus" size="mini" @click="openCreateDialog()">
+          新增单级节点
+        </el-button>
+        <el-button type="warning" icon="el-icon-download" size="mini" @click="handleDownloadTemplate">
+          下载导入模板
+        </el-button>
+        <el-button type="danger" icon="el-icon-upload2" size="mini" @click="triggerImport">
+          导入
+        </el-button>
+        <el-button type="info" icon="el-icon-sort" size="mini" @click="toggleExpand">
+          {{ isExpandAll ? '折叠全部' : '展开全部' }}
+        </el-button>
+        <input
+          ref="importInput"
+          type="file"
+          accept=".xls,.xlsx"
+          style="display: none"
+          @change="handleImportChange"
+        />
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          plain
-          icon="el-icon-sort"
-          size="mini"
-          @click="toggleExpandAll"
-        >展开/折叠</el-button>
+      <el-col :xs="24" :sm="8" :md="8" class="toolbar-right">
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getTreeData"></right-toolbar>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <!-- 懒加载树形表格核心配置：lazy + load + ref -->
     <el-table
       ref="treeTable"
       v-loading="loading"
-      :data="actualWarehouseList"
+      :data="filteredTreeData"
       row-key="actualWarehouseId"
-      lazy
-      :load="loadChildren"
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      :default-expand-all="isExpandAll"
+      class="warehouse-table"
+      :tree-props="{ children: 'children' }"
     >
-      <el-table-column label="库位编码" align="center" prop="actualWarehouseCode" />
-      <el-table-column label="库位名称" align="center" prop="actualWarehouseName" />
-      <el-table-column label="占用状态" align="center" prop="isEnabled">
+      <el-table-column label="层级"  align="center">
         <template slot-scope="scope">
-          <el-tag :type="scope.row.isEnabled === 1 ? 'success' : 'danger'">
-            {{ scope.row.isEnabled === 1 ? '空闲' : '占用' }}
+          <span >{{ getLevelLabel(scope.row.level) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="编码" prop="actualWarehouseCode" show-overflow-tooltip />
+      <el-table-column label="名称" prop="actualWarehouseName" show-overflow-tooltip />
+      <el-table-column label="排序号" prop="sortNo" width="100" align="center" />
+      <el-table-column label="状态" width="120" align="center">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.isEnabled === 1 ? 'success' : 'info'" effect="plain">
+            {{ scope.row.isEnabled === 1 ? '未占用' : '已占用' }}
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="同级排序号" align="center" prop="sortNo" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="二维码" align="center" prop="qrCode">
+      <el-table-column label="备注" prop="remark" show-overflow-tooltip />
+      <el-table-column label="二维码" width="120" align="center">
         <template slot-scope="scope">
-          <QRCode :content="scope.row.actualWarehouseId" :size="60" />
+          <QRCode
+            v-if="scope.row.level === 3"
+            :content="scope.row.actualWarehouseId"
+            :size="60"
+          />
+        
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="220" align="center">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-plus"
-            @click="handleAdd(scope.row)"
-          >新增</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
+          <el-button type="text" size="mini" @click="openCreateDialog(scope.row)">新增下级</el-button>
+          <el-button type="text" size="mini" @click="openEditDialog(scope.row)">编辑</el-button>
+          <el-button type="text" size="mini" @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <!-- 添加或修改实际库区/库位自关联对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="父节点" prop="parentId">
-          <ActualWarehouseSelect v-model="form.parentId"></ActualWarehouseSelect>
-          <!-- <treeselect :max-height="200" v-model="form.parentId" :options="actualWarehouseOptions" :normalizer="normalizer" placeholder="请选择父节点ID" /> -->
+    <el-dialog
+      title="批量新增 1-3 级"
+      :visible.sync="quickDialog.visible"
+      width="860px"
+      append-to-body
+      custom-class="warehouse-dialog"
+    >
+      <el-form label-position="top" class="quick-form">
+        <div class="level-card">
+          <div class="level-card__header">
+            <div class="level-card__title">一级节点</div>
+          </div>
+          <el-row :gutter="12">
+            <el-col :span="8">
+              <el-form-item label="编码">
+                <el-input v-model="quickForm.level1.code" placeholder="请输入一级编码" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="名称">
+                <el-input v-model="quickForm.level1.name" placeholder="请输入一级名称" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="排序号">
+                <el-input-number v-model="quickForm.level1.sortNo" :min="0" :max="9999" controls-position="right" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+
+        <div class="level-card">
+          <div class="level-card__header">
+            <div class="level-card__title">二级 / 三级节点</div>
+            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="addLevel2">新增二级</el-button>
+          </div>
+
+          <div
+            class="level-card__item"
+            v-for="(level2, index) in quickForm.level2List"
+            :key="`level2-${index}`"
+          >
+            <div class="level-card__item-header">
+              <div class="level-card__item-title">二级节点 {{ index + 1 }}</div>
+              <div class="level-card__item-actions">
+                <el-button
+                  v-if="quickForm.level2List.length > 1"
+                  type="text"
+                  size="mini"
+                  icon="el-icon-minus"
+                  @click="removeLevel2(index)"
+                >移除</el-button>
+                <el-button
+                  type="text"
+                  size="mini"
+                  icon="el-icon-plus"
+                  @click="addLevel3(level2)"
+                >添加三级</el-button>
+              </div>
+            </div>
+
+            <el-row :gutter="12">
+              <el-col :span="8">
+                <el-form-item label="二级编码">
+                  <el-input v-model="level2.code" placeholder="请输入二级编码" clearable />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="二级名称">
+                  <el-input v-model="level2.name" placeholder="请输入二级名称" clearable />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="排序号">
+                  <el-input-number v-model="level2.sortNo" :min="0" :max="9999" controls-position="right" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <div class="level-card__children" v-if="level2.children.length">
+              <div
+                class="level-card__child"
+                v-for="(child, cIndex) in level2.children"
+                :key="`level3-${index}-${cIndex}`"
+              >
+                <div class="level-card__child-header">
+                  <span>三级节点 {{ index + 1 }}-{{ cIndex + 1 }}</span>
+                  <el-button
+                    type="text"
+                    size="mini"
+                    icon="el-icon-delete"
+                    @click="removeLevel3(level2, cIndex)"
+                  >移除</el-button>
+                </div>
+                <el-row :gutter="12">
+                  <el-col :span="8">
+                    <el-form-item label="三级编码">
+                      <el-input v-model="child.code" placeholder="请输入三级编码" clearable />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="三级名称">
+                      <el-input v-model="child.name" placeholder="请输入三级名称" clearable />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="排序号">
+                      <el-input-number v-model="child.sortNo" :min="0" :max="9999" controls-position="right" />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </div>
+            </div>
+          </div>
+        </div>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="quickDialog.visible = false">取 消</el-button>
+        <el-button type="primary" :loading="quickDialog.loading" @click="submitQuickForm">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog
+      :title="editDialog.title"
+      :visible.sync="editDialog.visible"
+      width="520px"
+      append-to-body
+      custom-class="warehouse-dialog"
+    >
+      <el-form ref="editForm" :model="editDialog.form" :rules="editDialog.rules" label-width="90px">
+        <el-form-item label="层级" prop="actualWarehouseType">
+          <el-radio-group v-model="editDialog.form.actualWarehouseType" size="small">
+            <el-radio-button :label="1">一级</el-radio-button>
+            <el-radio-button :label="2">二级</el-radio-button>
+            <el-radio-button :label="3">三级</el-radio-button>
+          </el-radio-group>
         </el-form-item>
-        <el-form-item label="库位编码" prop="actualWarehouseCode">
-          <el-input v-model="form.actualWarehouseCode" placeholder="请输入实际库区/库位编码" />
+        <el-form-item label="父节点">
+          <span>{{ editDialog.parentPath || '最高级' }}</span>
         </el-form-item>
-        <el-form-item label="库位名称" prop="actualWarehouseName">
-          <el-input v-model="form.actualWarehouseName" placeholder="请输入实际库区/库位名称" />
+        <el-form-item label="编码" prop="actualWarehouseCode">
+          <el-input v-model="editDialog.form.actualWarehouseCode" placeholder="请输入编码" />
         </el-form-item>
-        <el-form-item label="排序" prop="sortNo">
-          <el-input v-model="form.sortNo" type="number" placeholder="请输入同级排序号" />
+        <el-form-item label="名称" prop="actualWarehouseName">
+          <el-input v-model="editDialog.form.actualWarehouseName" placeholder="请输入名称" />
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+        <el-form-item label="排序号" prop="sortNo">
+          <el-input-number v-model="editDialog.form.sortNo" :min="0" :max="9999" controls-position="right" />
+        </el-form-item>
+        <el-form-item label="状态" prop="isEnabled">
+          <el-radio-group v-model="editDialog.form.isEnabled">
+            <el-radio :label="1">启用</el-radio>
+            <el-radio :label="0">停用</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input v-model="editDialog.form.remark" type="textarea" rows="2" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="editDialog.visible = false">取 消</el-button>
+        <el-button type="primary" :loading="editDialog.loading" @click="submitEditForm">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog
+      :title="createDialog.title"
+      :visible.sync="createDialog.visible"
+      width="520px"
+      append-to-body
+      custom-class="warehouse-dialog"
+    >
+      <el-form ref="createForm" :model="createDialog.form" :rules="createDialog.rules" label-width="90px">
+        <el-form-item label="父节点">
+          <template v-if="createDialog.parentPath">
+            <span>{{ createDialog.parentPath }}</span>
+          </template>
+          <template v-else>
+            <ActualWarehouseSelect
+              v-model="createDialog.form.parentId"
+              placeholder="选择父节点(可留空)"
+              :width="240"
+              @select="handleCreateParentSelect"
+            />
+          </template>
+        </el-form-item>
+        <el-form-item label="层级" prop="actualWarehouseType">
+          <el-radio-group v-model="createDialog.form.actualWarehouseType" size="small" :disabled="!!createDialog.parentNode">
+            <el-radio-button :label="1">一级</el-radio-button>
+            <el-radio-button :label="2">二级</el-radio-button>
+            <el-radio-button :label="3">三级</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="编码" prop="actualWarehouseCode">
+          <el-input v-model="createDialog.form.actualWarehouseCode" placeholder="请输入编码" />
+        </el-form-item>
+        <el-form-item label="名称" prop="actualWarehouseName">
+          <el-input v-model="createDialog.form.actualWarehouseName" placeholder="请输入名称" />
+        </el-form-item>
+        <el-form-item label="排序号" prop="sortNo">
+          <el-input-number v-model="createDialog.form.sortNo" :min="0" :max="9999" controls-position="right" />
+        </el-form-item>
+        <el-form-item label="状态" prop="isEnabled">
+          <el-radio-group v-model="createDialog.form.isEnabled">
+            <el-radio :label="1">启用</el-radio>
+            <el-radio :label="0">停用</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input v-model="createDialog.form.remark" type="textarea" rows="2" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="createDialog.visible = false">取 消</el-button>
+        <el-button type="primary" :loading="createDialog.loading" @click="submitCreateForm">确 定</el-button>
       </div>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { listActualWarehouse, getActualWarehouse, delActualWarehouse, addActualWarehouse, updateActualWarehouse } from "@/api/wms/actualWarehouse";
-// import Treeselect from "@riophae/vue-treeselect";
-// import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {
+  listActualWarehouseTree,
+  getActualWarehouse,
+  delActualWarehouse,
+  addActualWarehouse,
+  updateActualWarehouse,
+  createActualWarehouseHierarchy,
+  importActualWarehouse
+} from "@/api/wms/actualWarehouse";
+import QRCode from "../print/components/QRCode.vue";
 import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect";
-import QRCode from '../print/components/QRCode.vue'
+
+const LEVELS = [1, 2, 3];
+const LEVEL_LABELS = {
+  1: "一级",
+  2: "二级",
+  3: "三级"
+};
 
 export default {
   name: "ActualWarehouse",
-  components: {
-    // Treeselect,
-    ActualWarehouseSelect,
-    QRCode,
-  },
+  components: { QRCode, ActualWarehouseSelect },
   data() {
     return {
-      // 按钮loading
-      buttonLoading: false,
-      // 遮罩层（仅控制根节点加载）
-      loading: true,
-      // 显示搜索条件
       showSearch: true,
-      // 根节点数据（懒加载模式下仅存储当前层级数据）
-      actualWarehouseList: [],
-      // 实际库区/库位自关联树选项
-      actualWarehouseOptions: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 是否全部展开（懒加载下仅控制已加载节点）
-      isExpandAll: false,
-      // 查询参数（核心：parentId用于懒加载子节点）
+      loading: false,
+      isExpandAll: true,
+      warehouseTree: [],
+      filteredCache: [],
+      nodeIndex: {},
       queryParams: {
-        parentId: 0, // 初始加载根节点（parentId=0）
-        actualWarehouseCode: undefined,
-        actualWarehouseName: undefined,
-        actualWarehouseType: undefined,
-        sortNo: undefined,
-        isEnabled: undefined,
+        keyword: undefined,
+        level: undefined
       },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        actualWarehouseCode: [{ required: true, message: "请输入库位编码", trigger: "blur" }],
-        actualWarehouseName: [{ required: true, message: "请输入库位名称", trigger: "blur" }],
-        sortNo: [{ required: true, type: "number", message: "请输入有效排序号", trigger: "blur" }]
+      quickDialog: {
+        visible: false,
+        loading: false
+      },
+      quickForm: this.buildQuickForm(),
+      editDialog: {
+        visible: false,
+        loading: false,
+        title: "编辑节点",
+        parentPath: "",
+        form: {
+          actualWarehouseId: null,
+          actualWarehouseType: 1,
+          actualWarehouseCode: "",
+          actualWarehouseName: "",
+          sortNo: 0,
+          isEnabled: 1,
+          remark: ""
+        },
+        rules: {
+          actualWarehouseType: [{ required: true, message: "请选择层级", trigger: "change" }],
+          actualWarehouseCode: [{ required: true, message: "请输入编码", trigger: "blur" }],
+          actualWarehouseName: [{ required: true, message: "请输入名称", trigger: "blur" }],
+          sortNo: [{ required: true, type: "number", message: "请输入排序号", trigger: "change" }]
+        }
+      },
+      createDialog: {
+        visible: false,
+        loading: false,
+        title: "新增节点",
+        parentNode: null,
+        parentPath: "",
+        form: {
+          parentId: 0,
+          actualWarehouseType: 1,
+          actualWarehouseCode: "",
+          actualWarehouseName: "",
+          sortNo: 0,
+          isEnabled: 1,
+          remark: ""
+        },
+        rules: {
+          actualWarehouseType: [{ required: true, message: "请选择层级", trigger: "change" }],
+          actualWarehouseCode: [{ required: true, message: "请输入编码", trigger: "blur" }],
+          actualWarehouseName: [{ required: true, message: "请输入名称", trigger: "blur" }],
+          sortNo: [{ required: true, type: "number", message: "请输入排序号", trigger: "change" }]
+        }
       }
     };
   },
+  computed: {
+    filteredTreeData() {
+      const keyword = (this.queryParams.keyword || "").trim();
+      const levelFilter = this.queryParams.level;
+      if (!keyword && !levelFilter) {
+        return this.warehouseTree;
+      }
+      return this.filterTree(this.warehouseTree, keyword, levelFilter);
+    }
+  },
   created() {
-    this.getList(); // 初始加载根节点
+    this.getTreeData();
   },
   methods: {
-    /** 加载根节点数据（parentId=0） */
-    getList() {
-      this.loading = true;
-      // 强制设置parentId=0，加载根节点
-      this.queryParams.parentId = 0;
-      listActualWarehouse(this.queryParams).then(response => {
-        // 为根节点添加hasChildren标识（后端未返回时默认true，确保显示展开按钮）
-        this.actualWarehouseList = response.data.map(node => ({
-          ...node,
-          hasChildren: node.hasChildren ?? true // 双问号兼容null/undefined
-        }));
-        this.loading = false;
-      }).catch(() => {
-        this.loading = false;
-      });
-    },
-
-    /** 懒加载子节点核心方法（Element UI自带回调） */
-    loadChildren(treeData, treeNode, resolve) {
-      // treeNode：当前展开的父节点对象，treeNode.data为父节点数据
-      console.log(treeNode, resolve);
-      const parentId = treeData.actualWarehouseId;
-      
-      // 构造子节点查询参数（继承当前查询条件，仅修改parentId）
-      const childParams = {
-        ...this.queryParams,
-        parentId: parentId // 关键：用父节点ID作为子节点查询条件
-      };
-
-      // 显示节点加载状态
-      treeNode.loading = true;
-
-      // 调用接口加载子节点
-      listActualWarehouse(childParams).then(response => {
-        const children = response.data.map(node => ({
-          ...node,
-          hasChildren: node.hasChildren ?? false // 子节点默认可能无下级，根据实际业务调整
-        }));
-        treeNode.loading = false;
-        resolve(children); // 回调返回子节点数据，表格自动渲染
-      }).catch(() => {
-        treeNode.loading = false;
-        resolve([]); // 加载失败返回空数组
-      });
-    },
-
-    /** 转换实际库区/库位自关联数据结构（下拉树用） */
-    normalizer(node) {
-      if (node.children && !node.children.length) {
-        delete node.children;
-      }
+    createLevelNode(level) {
       return {
-        id: node.actualWarehouseId,
-        label: node.actualWarehouseName,
-        children: node.children
+        level,
+        code: "",
+        name: "",
+        sortNo: level * 10,
+        isEnabled: 1,
+        remark: "",
+        actualWarehouseId: null,
+        children: level === 2 ? [] : undefined
       };
     },
-
-    // /** 查询实际库区/库位自关联下拉树结构 */
-    // getTreeselect() {
-    //   listActualWarehouse().then(response => {
-    //     this.actualWarehouseOptions = [];
-    //     const data = { actualWarehouseId: 0, actualWarehouseName: '顶级节点', children: [] };
-    //     data.children = this.handleTree(response.data, "actualWarehouseId", "parentId");
-    //     this.actualWarehouseOptions.push(data);
-    //   });
-    // },
-
-    // 树形结构处理（仅下拉树用，懒加载表格无需）
-    handleTree(data, id, parentId, children = 'children') {
+    buildQuickForm() {
+      return {
+        level1: this.createLevelNode(1),
+        level2List: [this.createLevelNode(2)]
+      };
+    },
+    getTreeData() {
+      this.loading = true;
+      listActualWarehouseTree({ actualWarehouseName: this.queryParams.keyword })
+        .then(res => {
+          const list = res.data || [];
+          this.decorateTree(list);
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    decorateTree(list) {
+      this.nodeIndex = {};
+      const walker = (nodes, level = 1, parentId = 0, parentPath = []) => {
+        return (nodes || []).map(item => {
+          const current = {
+            ...item,
+            level,
+            parentId: item.parentId ?? parentId,
+            path: [...parentPath, item.actualWarehouseName].filter(Boolean)
+          };
+          this.nodeIndex[current.actualWarehouseId] = current;
+          current.children = walker(item.children || [], level + 1, current.actualWarehouseId, current.path);
+          return current;
+        });
+      };
+      this.warehouseTree = walker(list);
+    },
+    filterTree(nodes, keyword, levelFilter) {
       const result = [];
-      const map = {};
-      data.forEach(item => {
-        map[item[id]] = item;
-      });
-      data.forEach(item => {
-        const parent = map[item[parentId]];
-        if (parent) {
-          (parent[children] || (parent[children] = [])).push(item);
-        } else {
-          result.push(item);
+      nodes.forEach(node => {
+        const matchKeyword =
+          !keyword ||
+          (node.actualWarehouseName && node.actualWarehouseName.includes(keyword)) ||
+          (node.actualWarehouseCode && node.actualWarehouseCode.includes(keyword));
+        const matchLevel = !levelFilter || node.level === levelFilter;
+        const filteredChildren = this.filterTree(node.children || [], keyword, levelFilter);
+        if ((matchKeyword && matchLevel) || filteredChildren.length) {
+          result.push({
+            ...node,
+            children: filteredChildren.length ? filteredChildren : node.children
+          });
         }
       });
       return result;
     },
-
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-
-    // 表单重置
-    reset() {
-      this.form = {
-        actualWarehouseId: null,
-        parentId: 0, // 默认顶级节点
-        actualWarehouseCode: null,
-        actualWarehouseName: null,
-        actualWarehouseType: 1,
-        sortNo: 0,
-        isEnabled: null,
-        delFlag: null,
-        remark: null
-      };
-      this.resetForm("form");
-    },
-
-    /** 搜索按钮操作（重新加载根节点 + 清空已加载子节点） */
     handleQuery() {
-      this.getList();
-      // 清空表格已加载的子节点缓存
-      if (this.$refs.treeTable) {
-        this.$refs.treeTable.store.clearNodes();
-      }
+      this.getTreeData();
     },
-
-    /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.queryParams.keyword = undefined;
+      this.queryParams.level = undefined;
       this.handleQuery();
     },
-
-    /** 新增按钮操作 */
-    handleAdd(row) {
-      this.reset();
-      // this.getTreeselect();
-      // 若从节点操作栏点击新增，设置父节点为当前节点ID
-      if (row?.actualWarehouseId) {
-        this.form.parentId = row.actualWarehouseId;
-      }
-      this.open = true;
-      this.title = "添加实际库区/库位自关联";
-    },
-
-    /** 展开/折叠所有已加载节点 */
-    toggleExpandAll() {
-      const treeTable = this.$refs.treeTable;
-      if (!treeTable) return;
-      
+    toggleExpand() {
       this.isExpandAll = !this.isExpandAll;
-      if (this.isExpandAll) {
-        treeTable.expandAll(); // 展开所有已加载节点
-      } else {
-        treeTable.collapseAll(); // 折叠所有节点
+      this.$nextTick(() => {
+        this.toggleTreeRows(this.filteredTreeData, this.isExpandAll);
+      });
+    },
+    toggleTreeRows(nodes, expand) {
+      const table = this.$refs.treeTable;
+      if (!table || !Array.isArray(nodes)) return;
+      nodes.forEach(node => {
+        table.toggleRowExpansion(node, expand);
+        if (node.children && node.children.length) {
+          this.toggleTreeRows(node.children, expand);
+        }
+      });
+    },
+    handleDownloadTemplate() {
+      this.download("wms/actualWarehouse/importTemplate", {}, "实际库区导入模板.xlsx");
+    },
+    triggerImport() {
+      if (this.$refs.importInput) {
+        this.$refs.importInput.value = null;
+        this.$refs.importInput.click();
       }
     },
-
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.loading = true;
-      this.reset();
-      // this.getTreeselect();
-      
-      getActualWarehouse(row.actualWarehouseId).then(response => {
-        this.loading = false;
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改实际库区/库位自关联";
-      }).catch(() => {
-        this.loading = false;
+    handleImportChange(e) {
+      const file = e.target.files && e.target.files[0];
+      if (!file) return;
+      const formData = new FormData();
+      formData.append("file", file);
+      const loading = this.$loading({
+        lock: true,
+        text: "导入中，请稍候...",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.4)"
       });
+      importActualWarehouse(formData)
+        .then(res => {
+          this.$modal.msgSuccess(res.msg || "导入成功");
+          this.getTreeData();
+        })
+        .catch(() => {
+          this.$modal.msgError("导入失败，请检查模板数据");
+        })
+        .finally(() => {
+          loading.close();
+          if (this.$refs.importInput) {
+            this.$refs.importInput.value = null;
+          }
+        });
     },
-
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.buttonLoading = true;
-          const request = this.form.actualWarehouseId 
-            ? updateActualWarehouse(this.form) 
-            : addActualWarehouse(this.form);
-          
-          request.then(response => {
-            this.$modal.msgSuccess(this.form.actualWarehouseId ? "修改成功" : "新增成功");
-            this.open = false;
-            this.getList(); // 新增/修改后刷新根节点
-          }).catch(() => {
-            this.$modal.msgError(this.form.actualWarehouseId ? "修改失败" : "新增失败");
-          }).finally(() => {
-            this.buttonLoading = false;
+    getLevelLabel(level) {
+      return LEVEL_LABELS[level] || `第${level}级`;
+    },
+    openQuickDialog() {
+      this.quickDialog.visible = true;
+      this.quickDialog.loading = false;
+      this.quickForm = this.buildQuickForm();
+    },
+    addLevel2() {
+      this.quickForm.level2List.push(this.createLevelNode(2));
+    },
+    removeLevel2(index) {
+      if (this.quickForm.level2List.length === 1) return;
+      this.quickForm.level2List.splice(index, 1);
+    },
+    addLevel3(level2) {
+      if (!Array.isArray(level2.children)) {
+        this.$set(level2, "children", []);
+      }
+      level2.children.push(this.createLevelNode(3));
+    },
+    removeLevel3(level2, childIndex) {
+      level2.children.splice(childIndex, 1);
+    },
+    submitQuickForm() {
+      const level1Payload = this.normalizeNode(this.quickForm.level1);
+      if (!level1Payload) {
+        this.$modal.msgWarning("请先填写完整的一级编码和名称");
+        return;
+      }
+      const validationError = this.validateQuickForm();
+      if (validationError) {
+        this.$modal.msgWarning(validationError);
+        return;
+      }
+      const paths = this.buildHierarchyPaths(level1Payload);
+      if (!paths.length) {
+        this.$modal.msgWarning("请至少填写一个二级或三级节点");
+        return;
+      }
+      this.quickDialog.loading = true;
+      const runner = async () => {
+        for (const path of paths) {
+          await createActualWarehouseHierarchy({ levels: path });
+        }
+      };
+      runner()
+        .then(() => {
+          this.$modal.msgSuccess("已完成录入");
+          this.quickDialog.visible = false;
+          this.getTreeData();
+        })
+        .catch(() => {
+          this.$modal.msgError("批量新增失败，请重试");
+        })
+        .finally(() => {
+          this.quickDialog.loading = false;
+        });
+    },
+    validateQuickForm() {
+      const level2List = this.quickForm.level2List;
+      const hasSecondOrThird = level2List.some(item => {
+        const hasSecond = (item.code || "").trim() && (item.name || "").trim();
+        const hasThird = (item.children || []).some(child => (child.code || "").trim() || (child.name || "").trim());
+        return hasSecond || hasThird;
+      });
+      if (!hasSecondOrThird) {
+        return "请至少填写一个二级或三级节点";
+      }
+      for (const level2 of level2List) {
+        const children = level2.children || [];
+        const hasChildren = children.some(child => (child.code || "").trim() || (child.name || "").trim());
+        if (hasChildren && (!(level2.code || "").trim() || !(level2.name || "").trim())) {
+          return "有三级节点时，所属的二级节点必须填写完整";
+        }
+        const invalidChild = children.find(child => {
+          const code = (child.code || "").trim();
+          const name = (child.name || "").trim();
+          return (code && !name) || (!code && name);
+        });
+        if (invalidChild) {
+          return "三级节点需同时填写编码与名称";
+        }
+        if (!hasChildren && ((level2.code || "").trim() && !(level2.name || "").trim())) {
+          return "二级节点需同时填写编码与名称";
+        }
+      }
+      return "";
+    },
+    buildHierarchyPaths(level1Payload) {
+      const paths = [];
+      this.quickForm.level2List.forEach(level2 => {
+        const level2Payload = this.normalizeNode(level2);
+        const childNodes = level2.children
+          .map(child => this.normalizeNode(child))
+          .filter(Boolean);
+        if (childNodes.length) {
+          if (!level2Payload) return;
+          childNodes.forEach(child => {
+            paths.push([level1Payload, level2Payload, child]);
           });
+        } else if (level2Payload) {
+          paths.push([level1Payload, level2Payload]);
         }
       });
+      if (!paths.some(path => path.length > 1)) {
+        paths.push([level1Payload]);
+      }
+      return paths;
+    },
+    normalizeNode(node) {
+      if (!node) return null;
+      const code = (node.code || "").trim();
+      const name = (node.name || "").trim();
+      if (!code || !name) return null;
+      return {
+        level: node.level,
+        actualWarehouseId: node.actualWarehouseId || null,
+        actualWarehouseCode: code,
+        actualWarehouseName: name,
+        actualWarehouseType: node.level,
+        sortNo: Number(node.sortNo) || 0,
+        isEnabled: node.isEnabled ?? 1,
+        remark: node.remark
+      };
+    },
+    openEditDialog(row) {
+      this.editDialog.visible = true;
+      this.editDialog.loading = false;
+      getActualWarehouse(row.actualWarehouseId).then(res => {
+        const data = res.data || {};
+        this.editDialog.form = {
+          actualWarehouseId: data.actualWarehouseId,
+          actualWarehouseType: data.actualWarehouseType,
+          actualWarehouseCode: data.actualWarehouseCode,
+          actualWarehouseName: data.actualWarehouseName,
+          sortNo: data.sortNo,
+          isEnabled: data.isEnabled ?? 1,
+          remark: data.remark
+        };
+        const chain = this.findNodeChain(data.parentId);
+        this.editDialog.parentPath = chain.map(item => item.actualWarehouseName).join(" / ");
+      });
+    },
+    openCreateDialog(parentNode) {
+      if (parentNode && parentNode.level >= 3) {
+        this.$modal.msgWarning("三级节点无法继续新增下级");
+        return;
+      }
+      this.createDialog.visible = true;
+      this.createDialog.loading = false;
+      this.createDialog.parentNode = parentNode || null;
+      this.createDialog.parentPath = "";
+      this.createDialog.title = parentNode
+        ? `在【${parentNode.actualWarehouseName}】下新增`
+        : "新增节点";
+      const nextLevel = parentNode ? Math.min(parentNode.level + 1, 3) : 1;
+      this.createDialog.form = {
+        parentId: parentNode ? parentNode.actualWarehouseId : 0,
+        actualWarehouseType: nextLevel,
+        actualWarehouseCode: "",
+        actualWarehouseName: "",
+        sortNo: (parentNode?.children?.length || 0) * 10,
+        isEnabled: 1,
+        remark: ""
+      };
+      if (parentNode) {
+        this.createDialog.parentPath = this.findNodeChain(parentNode.actualWarehouseId)
+          .map(item => item.actualWarehouseName)
+          .join(" / ");
+      }
+    },
+    handleCreateParentSelect(node) {
+      if (!node) {
+        this.createDialog.form.parentId = 0;
+        this.createDialog.form.actualWarehouseType = 1;
+        this.createDialog.parentPath = "";
+        return;
+      }
+      if (node.level >= 3) {
+        this.$modal.msgWarning("三级节点无法再新增下级");
+        this.createDialog.form.parentId = 0;
+        this.createDialog.form.actualWarehouseType = 1;
+        return;
+      }
+      this.createDialog.form.actualWarehouseType = node.level + 1;
+      this.createDialog.parentPath = this.findNodeChain(node.actualWarehouseId)
+        .map(item => item.actualWarehouseName)
+        .join(" / ");
+    },
+    submitCreateForm() {
+      this.$refs.createForm.validate(valid => {
+        if (!valid) return;
+        const payload = { ...this.createDialog.form };
+        this.createDialog.loading = true;
+        addActualWarehouse(payload)
+          .then(() => {
+            this.$modal.msgSuccess("新增成功");
+            this.createDialog.visible = false;
+            this.getTreeData();
+          })
+          .finally(() => {
+            this.createDialog.loading = false;
+          });
+      });
+    },
+    submitEditForm() {
+      this.$refs.editForm.validate(valid => {
+        if (!valid) return;
+        this.editDialog.loading = true;
+        updateActualWarehouse(this.editDialog.form)
+          .then(() => {
+            this.$modal.msgSuccess("修改成功");
+            this.editDialog.visible = false;
+            this.getTreeData();
+          })
+          .finally(() => {
+            this.editDialog.loading = false;
+          });
+      });
     },
-
-    /** 删除按钮操作 */
     handleDelete(row) {
-      this.$modal.confirm(`是否确认删除实际库区/库位自关联【${row.actualWarehouseName}】？`).then(() => {
-        return delActualWarehouse(row.actualWarehouseId);
-      }).then(() => {
-        this.getList(); // 删除后刷新根节点
-        if (this.$refs.treeTable) {
-          this.$refs.treeTable.store.clearNodes();
-        }
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm(`确认删除【${row.actualWarehouseName}】吗？`)
+        .then(() => delActualWarehouse(row.actualWarehouseId))
+        .then(() => {
+          this.$modal.msgSuccess("删除成功");
+          this.getTreeData();
+        })
+        .catch(() => {});
+    },
+    findNodeChain(nodeId) {
+      if (!nodeId) return [];
+      const chain = [];
+      let current = this.nodeIndex[nodeId];
+      while (current) {
+        chain.unshift(current);
+        current = current.parentId ? this.nodeIndex[current.parentId] : null;
+      }
+      return chain;
     }
   }
 };
-</script>
\ No newline at end of file
+</script>
+
+<style scoped>
+.warehouse-page {
+  min-height: 100%;
+}
+
+.toolbar-row {
+  margin-bottom: 12px;
+  align-items: center;
+}
+
+.toolbar-actions .el-button + .el-button {
+  margin-left: 8px;
+}
+
+.toolbar-right {
+  text-align: right;
+}
+
+.warehouse-table {
+  width: 100%;
+}
+
+.warehouse-dialog ::v-deep .el-dialog__body {
+  max-height: 60vh;
+  overflow-y: auto;
+}
+
+.quick-form {
+  padding-bottom: 8px;
+}
+
+.level-card {
+  border: 1px solid #ebeef5;
+  border-radius: 6px;
+  padding: 12px;
+  margin-bottom: 12px;
+  background: #fff;
+}
+
+.level-card__header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 8px;
+}
+
+.level-card__title {
+  font-weight: 600;
+  color: #303133;
+}
+
+.level-card__item {
+  border-top: 1px dashed #ebeef5;
+  padding-top: 12px;
+  margin-top: 12px;
+}
+
+.level-card__item-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 8px;
+  font-weight: 600;
+}
+
+.level-card__item-actions .el-button + .el-button {
+  margin-left: 6px;
+}
+
+.level-card__children {
+  margin-top: 12px;
+  border-left: 2px solid #f2f6fc;
+  padding-left: 12px;
+}
+
+.level-card__child {
+  border: 1px dashed #dcdfe6;
+  border-radius: 4px;
+  padding: 10px;
+  margin-bottom: 10px;
+  background: #fafafa;
+}
+
+.level-card__child-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 8px;
+  font-weight: 500;
+}
+
+.qr-disabled {
+  color: #c0c4cc;
+  font-size: 12px;
+}
+</style>
+
diff --git a/klp-wms/src/main/java/com/klp/controller/WmsActualWarehouseController.java b/klp-wms/src/main/java/com/klp/controller/WmsActualWarehouseController.java
index 8100c35a..bd094009 100644
--- a/klp-wms/src/main/java/com/klp/controller/WmsActualWarehouseController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsActualWarehouseController.java
@@ -2,10 +2,13 @@ package com.klp.controller;
 
 import java.util.List;
 import java.util.Arrays;
+import java.util.ArrayList;
 
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
+import org.springframework.http.MediaType;
+import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import com.klp.common.annotation.RepeatSubmit;
@@ -16,9 +19,13 @@ import com.klp.common.core.domain.R;
 import com.klp.common.core.validate.AddGroup;
 import com.klp.common.core.validate.EditGroup;
 import com.klp.common.enums.BusinessType;
+import com.klp.common.excel.ExcelResult;
 import com.klp.common.utils.poi.ExcelUtil;
 import com.klp.domain.vo.WmsActualWarehouseVo;
+import com.klp.domain.vo.WmsActualWarehouseTreeVo;
+import com.klp.domain.vo.WmsActualWarehouseImportVo;
 import com.klp.domain.bo.WmsActualWarehouseBo;
+import com.klp.domain.bo.WmsActualWarehouseHierarchyBo;
 import com.klp.service.IWmsActualWarehouseService;
 
 /**
@@ -44,6 +51,34 @@ public class WmsActualWarehouseController extends BaseController {
         return R.ok(list);
     }
 
+    /**
+     * 获取完整三级目录树
+     */
+    @GetMapping("/tree")
+    public R<List<WmsActualWarehouseTreeVo>> tree(WmsActualWarehouseBo bo) {
+        return R.ok(iWmsActualWarehouseService.queryTree(bo));
+    }
+
+    /**
+     * 导入实际库区/库位数据
+     */
+    @Log(title = "实际库区/库位自关联", businessType = BusinessType.IMPORT)
+    @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public R<Void> importData(@RequestPart("file") MultipartFile file) throws Exception {
+        ExcelResult<WmsActualWarehouseImportVo> result = ExcelUtil.importExcel(file.getInputStream(), WmsActualWarehouseImportVo.class, true);
+        iWmsActualWarehouseService.importHierarchy(result.getList());
+        return R.ok(result.getAnalysis());
+    }
+
+    /**
+     * 下载导入模板
+     */
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response) {
+        List<WmsActualWarehouseImportVo> template = buildTemplateData();
+        ExcelUtil.exportExcel(template, "实际库区导入模板", WmsActualWarehouseImportVo.class, response);
+    }
+
     /**
      * 导出实际库区/库位自关联列表
      */
@@ -75,6 +110,15 @@ public class WmsActualWarehouseController extends BaseController {
         return toAjax(iWmsActualWarehouseService.insertByBo(bo));
     }
 
+    /**
+     * 批量新增或复用层级目录
+     */
+    @Log(title = "实际库区/库位自关联-批量新增", businessType = BusinessType.INSERT)
+    @PostMapping("/hierarchy")
+    public R<List<Long>> addHierarchy(@Validated @RequestBody WmsActualWarehouseHierarchyBo bo) {
+        return R.ok(iWmsActualWarehouseService.createHierarchy(bo));
+    }
+
     /**
      * 修改实际库区/库位自关联
      */
@@ -96,4 +140,30 @@ public class WmsActualWarehouseController extends BaseController {
                           @PathVariable Long[] actualWarehouseIds) {
         return toAjax(iWmsActualWarehouseService.deleteWithValidByIds(Arrays.asList(actualWarehouseIds), true));
     }
+
+    private List<WmsActualWarehouseImportVo> buildTemplateData() {
+        List<WmsActualWarehouseImportVo> list = new ArrayList<>();
+        list.add(buildRow("L1-001", "一号库区", 10L, "L1-001-A", "A通道", 10L, "L1-001-A-01", "A-01货位", 10L));
+        list.add(buildRow("L1-001", "一号库区", 10L, "L1-001-A", "A通道", 10L, "L1-001-A-02", "A-02货位", 20L));
+        list.add(buildRow("L1-001", "一号库区", 10L, "L1-001-B", "B通道", 20L, "L1-001-B-01", "B-01货位", 10L));
+        list.add(buildRow("L1-002", "二号库区", 20L, "L1-002-A", "冷藏区", 10L, null, null, null));
+        list.add(buildRow("L1-002", "二号库区", 20L, "L1-002-B", "常温区", 20L, "L1-002-B-01", "常温-01", 10L));
+        return list;
+    }
+
+    private WmsActualWarehouseImportVo buildRow(String l1Code, String l1Name, Long l1Sort,
+                                                String l2Code, String l2Name, Long l2Sort,
+                                                String l3Code, String l3Name, Long l3Sort) {
+        WmsActualWarehouseImportVo vo = new WmsActualWarehouseImportVo();
+        vo.setLevelOneCode(l1Code);
+        vo.setLevelOneName(l1Name);
+        vo.setLevelOneSort(l1Sort);
+        vo.setLevelTwoCode(l2Code);
+        vo.setLevelTwoName(l2Name);
+        vo.setLevelTwoSort(l2Sort);
+        vo.setLevelThreeCode(l3Code);
+        vo.setLevelThreeName(l3Name);
+        vo.setLevelThreeSort(l3Sort);
+        return vo;
+    }
 }
diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsActualWarehouseHierarchyBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsActualWarehouseHierarchyBo.java
new file mode 100644
index 00000000..0929f743
--- /dev/null
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsActualWarehouseHierarchyBo.java
@@ -0,0 +1,64 @@
+package com.klp.domain.bo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 用于批量新增/匹配一级-三级节点的请求体
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WmsActualWarehouseHierarchyBo implements Serializable {
+
+    @NotEmpty(message = "三级目录数据不能为空")
+    @Valid
+    private List<HierarchyLevel> levels = new ArrayList<>();
+
+    @Data
+    public static class HierarchyLevel implements Serializable {
+        /**
+         * 层级：1/2/3
+         */
+        @NotNull(message = "层级不能为空")
+        @Min(value = 1, message = "层级最小为1")
+        @Max(value = 3, message = "层级最大为3")
+        private Integer level;
+
+        /**
+         * 选中了已有节点时携带的ID，用于比对去重
+         */
+        private Long actualWarehouseId;
+
+        /**
+         * 编码（当 actualWarehouseId 为空时必填）
+         */
+        private String actualWarehouseCode;
+
+        /**
+         * 名称（当 actualWarehouseId 为空时必填）
+         */
+        private String actualWarehouseName;
+
+        /**
+         * 同级排序号
+         */
+        private Long sortNo;
+
+        /**
+         * 状态
+         */
+        private Integer isEnabled;
+
+        /**
+         * 备注
+         */
+        private String remark;
+    }
+}
+
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsActualWarehouseImportVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsActualWarehouseImportVo.java
new file mode 100644
index 00000000..31192bec
--- /dev/null
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsActualWarehouseImportVo.java
@@ -0,0 +1,41 @@
+package com.klp.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+/**
+ * 实际库区/库位导入模板
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class WmsActualWarehouseImportVo {
+
+    @ExcelProperty("一级编码")
+    private String levelOneCode;
+
+    @ExcelProperty("一级名称")
+    private String levelOneName;
+
+    @ExcelProperty("一级排序号")
+    private Long levelOneSort;
+
+    @ExcelProperty("二级编码")
+    private String levelTwoCode;
+
+    @ExcelProperty("二级名称")
+    private String levelTwoName;
+
+    @ExcelProperty("二级排序号")
+    private Long levelTwoSort;
+
+    @ExcelProperty("三级编码")
+    private String levelThreeCode;
+
+    @ExcelProperty("三级名称")
+    private String levelThreeName;
+
+    @ExcelProperty("三级排序号")
+    private Long levelThreeSort;
+}
+
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsActualWarehouseTreeVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsActualWarehouseTreeVo.java
new file mode 100644
index 00000000..4280bb61
--- /dev/null
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsActualWarehouseTreeVo.java
@@ -0,0 +1,18 @@
+package com.klp.domain.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 树形结构视图对象，用于一次性返回三级目录
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WmsActualWarehouseTreeVo extends WmsActualWarehouseVo {
+
+    private List<WmsActualWarehouseTreeVo> children = new ArrayList<>();
+}
+
diff --git a/klp-wms/src/main/java/com/klp/service/IWmsActualWarehouseService.java b/klp-wms/src/main/java/com/klp/service/IWmsActualWarehouseService.java
index 9805974c..2921e4bc 100644
--- a/klp-wms/src/main/java/com/klp/service/IWmsActualWarehouseService.java
+++ b/klp-wms/src/main/java/com/klp/service/IWmsActualWarehouseService.java
@@ -1,8 +1,10 @@
 package com.klp.service;
 
-import com.klp.domain.WmsActualWarehouse;
 import com.klp.domain.vo.WmsActualWarehouseVo;
+import com.klp.domain.vo.WmsActualWarehouseTreeVo;
+import com.klp.domain.vo.WmsActualWarehouseImportVo;
 import com.klp.domain.bo.WmsActualWarehouseBo;
+import com.klp.domain.bo.WmsActualWarehouseHierarchyBo;
 
 import java.util.Collection;
 import java.util.List;
@@ -26,11 +28,26 @@ public interface IWmsActualWarehouseService {
      */
     List<WmsActualWarehouseVo> queryList(WmsActualWarehouseBo bo);
 
+    /**
+     * 查询完整的三级目录树
+     */
+    List<WmsActualWarehouseTreeVo> queryTree(WmsActualWarehouseBo bo);
+
     /**
      * 新增实际库区/库位自关联
      */
     Boolean insertByBo(WmsActualWarehouseBo bo);
 
+    /**
+     * 通过一次提交批量创建/复用三级目录
+     */
+    List<Long> createHierarchy(WmsActualWarehouseHierarchyBo bo);
+
+    /**
+     * 导入层级目录
+     */
+    void importHierarchy(List<WmsActualWarehouseImportVo> importList);
+
     /**
      * 修改实际库区/库位自关联
      */
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsActualWarehouseServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsActualWarehouseServiceImpl.java
index 262453f8..c84a0e8b 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsActualWarehouseServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsActualWarehouseServiceImpl.java
@@ -1,20 +1,25 @@
 package com.klp.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.klp.common.exception.ServiceException;
 import com.klp.common.utils.StringUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import com.klp.domain.bo.WmsActualWarehouseBo;
+import com.klp.domain.bo.WmsActualWarehouseHierarchyBo;
+import com.klp.domain.vo.WmsActualWarehouseTreeVo;
+import com.klp.domain.vo.WmsActualWarehouseImportVo;
 import com.klp.domain.vo.WmsActualWarehouseVo;
 import com.klp.domain.WmsActualWarehouse;
 import com.klp.mapper.WmsActualWarehouseMapper;
 import com.klp.service.IWmsActualWarehouseService;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 实际库区/库位自关联Service业务层处理
@@ -46,6 +51,36 @@ public class WmsActualWarehouseServiceImpl implements IWmsActualWarehouseService
         return baseMapper.selectVoList(lqw);
     }
 
+    @Override
+    public List<WmsActualWarehouseTreeVo> queryTree(WmsActualWarehouseBo bo) {
+        if (bo == null) {
+            bo = new WmsActualWarehouseBo();
+        }
+        LambdaQueryWrapper<WmsActualWarehouse> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(StringUtils.isNotBlank(bo.getActualWarehouseCode()), WmsActualWarehouse::getActualWarehouseCode, bo.getActualWarehouseCode());
+        wrapper.like(StringUtils.isNotBlank(bo.getActualWarehouseName()), WmsActualWarehouse::getActualWarehouseName, bo.getActualWarehouseName());
+        wrapper.eq(bo.getActualWarehouseType() != null, WmsActualWarehouse::getActualWarehouseType, bo.getActualWarehouseType());
+        wrapper.eq(bo.getIsEnabled() != null, WmsActualWarehouse::getIsEnabled, bo.getIsEnabled());
+        wrapper.orderByAsc(WmsActualWarehouse::getSortNo, WmsActualWarehouse::getActualWarehouseId);
+        List<WmsActualWarehouseVo> flatList = baseMapper.selectVoList(wrapper);
+        Map<Long, WmsActualWarehouseTreeVo> nodeMap = new LinkedHashMap<>();
+        flatList.forEach(item -> {
+            WmsActualWarehouseTreeVo node = new WmsActualWarehouseTreeVo();
+            BeanUtil.copyProperties(item, node);
+            nodeMap.put(node.getActualWarehouseId(), node);
+        });
+        List<WmsActualWarehouseTreeVo> roots = new ArrayList<>();
+        nodeMap.values().forEach(node -> {
+            Long parentId = Optional.ofNullable(node.getParentId()).orElse(0L);
+            if (parentId == 0 || !nodeMap.containsKey(parentId)) {
+                roots.add(node);
+            } else {
+                nodeMap.get(parentId).getChildren().add(node);
+            }
+        });
+        return roots;
+    }
+
     private LambdaQueryWrapper<WmsActualWarehouse> buildQueryWrapper(WmsActualWarehouseBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<WmsActualWarehouse> lqw = Wrappers.lambdaQuery();
@@ -82,6 +117,80 @@ public class WmsActualWarehouseServiceImpl implements IWmsActualWarehouseService
         return baseMapper.updateById(update) > 0;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<Long> createHierarchy(WmsActualWarehouseHierarchyBo bo) {
+        if (bo.getLevels() == null || bo.getLevels().isEmpty()) {
+            throw new ServiceException("层级数据不能为空");
+        }
+        List<WmsActualWarehouseHierarchyBo.HierarchyLevel> sortedLevels = bo.getLevels().stream()
+            .sorted(Comparator.comparing(WmsActualWarehouseHierarchyBo.HierarchyLevel::getLevel))
+            .collect(Collectors.toList());
+        Long parentId = 0L;
+        List<Long> createdIds = new ArrayList<>();
+        for (WmsActualWarehouseHierarchyBo.HierarchyLevel level : sortedLevels) {
+            Integer levelValue = level.getLevel();
+            if (levelValue == null || levelValue < 1 || levelValue > 3) {
+                throw new ServiceException("层级必须在1-3之间");
+            }
+            if (level.getActualWarehouseId() != null) {
+                WmsActualWarehouse existing = baseMapper.selectById(level.getActualWarehouseId());
+                if (existing == null) {
+                    throw new ServiceException("指定的节点不存在：" + level.getActualWarehouseId());
+                }
+                if (!Objects.equals(Optional.ofNullable(existing.getParentId()).orElse(0L), parentId)) {
+                    throw new ServiceException("节点不属于当前父级，无法复用");
+                }
+                parentId = existing.getActualWarehouseId();
+                continue;
+            }
+            if (StringUtils.isBlank(level.getActualWarehouseCode()) || StringUtils.isBlank(level.getActualWarehouseName())) {
+                throw new ServiceException("编码与名称不能为空");
+            }
+            WmsActualWarehouse duplicate = baseMapper.selectOne(Wrappers.<WmsActualWarehouse>lambdaQuery()
+                .eq(WmsActualWarehouse::getParentId, parentId)
+                .and(wrapper -> wrapper.eq(WmsActualWarehouse::getActualWarehouseCode, level.getActualWarehouseCode())
+                    .or()
+                    .eq(WmsActualWarehouse::getActualWarehouseName, level.getActualWarehouseName())));
+            if (duplicate != null) {
+                parentId = duplicate.getActualWarehouseId();
+                continue;
+            }
+            WmsActualWarehouse entity = new WmsActualWarehouse();
+            entity.setParentId(parentId);
+            entity.setActualWarehouseType(levelValue.longValue());
+            entity.setActualWarehouseCode(level.getActualWarehouseCode());
+            entity.setActualWarehouseName(level.getActualWarehouseName());
+            entity.setSortNo(Optional.ofNullable(level.getSortNo()).orElse(0L));
+            entity.setIsEnabled(Optional.ofNullable(level.getIsEnabled()).orElse(1));
+            entity.setRemark(level.getRemark());
+            baseMapper.insert(entity);
+            parentId = entity.getActualWarehouseId();
+            createdIds.add(parentId);
+        }
+        return createdIds;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void importHierarchy(List<WmsActualWarehouseImportVo> importList) {
+        if (CollUtil.isEmpty(importList)) {
+            throw new ServiceException("导入数据不能为空");
+        }
+        for (WmsActualWarehouseImportVo row : importList) {
+            List<WmsActualWarehouseHierarchyBo.HierarchyLevel> levels = new ArrayList<>();
+            appendLevel(levels, 1, row.getLevelOneCode(), row.getLevelOneName(), row.getLevelOneSort());
+            appendLevel(levels, 2, row.getLevelTwoCode(), row.getLevelTwoName(), row.getLevelTwoSort());
+            appendLevel(levels, 3, row.getLevelThreeCode(), row.getLevelThreeName(), row.getLevelThreeSort());
+            if (levels.isEmpty()) {
+                continue;
+            }
+            WmsActualWarehouseHierarchyBo bo = new WmsActualWarehouseHierarchyBo();
+            bo.setLevels(levels);
+            createHierarchy(bo);
+        }
+    }
+
     /**
      * 保存前的数据校验
      */
@@ -89,6 +198,23 @@ public class WmsActualWarehouseServiceImpl implements IWmsActualWarehouseService
         //TODO 做一些数据校验,如唯一约束
     }
 
+    private void appendLevel(List<WmsActualWarehouseHierarchyBo.HierarchyLevel> levels,
+                             int level,
+                             String code,
+                             String name,
+                             Long sortNo) {
+        if (StringUtils.isBlank(code) || StringUtils.isBlank(name)) {
+            return;
+        }
+        WmsActualWarehouseHierarchyBo.HierarchyLevel item = new WmsActualWarehouseHierarchyBo.HierarchyLevel();
+        item.setLevel(level);
+        item.setActualWarehouseCode(code.trim());
+        item.setActualWarehouseName(name.trim());
+        item.setSortNo(Optional.ofNullable(sortNo).orElse(0L));
+        item.setIsEnabled(1);
+        levels.add(item);
+    }
+
     /**
      * 批量删除实际库区/库位自关联
      */
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java
index 6b78f386..16103f2e 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java
@@ -56,7 +56,7 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer
         qw.eq(bo.getCoilId() != null, "wcpa.coil_id", bo.getCoilId());
         qw.like(StringUtils.isNotBlank(bo.getCurrentCoilNo()), "wcpa.current_coil_no", bo.getCurrentCoilNo());
         qw.eq(bo.getActionType() != null, "wcpa.action_type", bo.getActionType());
-        qw.eq(bo.getActionStatus() != null, "wcpa.action_status", bo.getActionStatus());
+        qw.ne(bo.getActionStatus() != null, "wcpa.action_status",2);
         qw.eq(bo.getWarehouseId() != null, "wcpa.warehouse_id", bo.getWarehouseId());
         qw.eq(bo.getPriority() != null, "wcpa.priority", bo.getPriority());
         qw.like(StringUtils.isNotBlank(bo.getSourceType()), "wcpa.source_type", bo.getSourceType());