diff --git a/klp-ui/src/views/wms/stock/box.vue b/klp-ui/src/views/wms/stock/box.vue
new file mode 100644
index 00000000..849f414c
--- /dev/null
+++ b/klp-ui/src/views/wms/stock/box.vue
@@ -0,0 +1,259 @@
+
+<template>
+  <div>
+    <div class="chart-header">
+      <el-radio-group v-model="groupMode" @change="updateChart">
+        <el-radio-button label="warehouse">按仓库汇总</el-radio-button>
+        <el-radio-button label="item">按物品汇总</el-radio-button>
+      </el-radio-group>
+    </div>
+    <div ref="chartContainer" style="width: 100%; height: 600px;"></div>
+  </div>
+</template>
+
+<script>
+
+import * as echarts from 'echarts';
+import { listStock } from "@/api/wms/stock";
+import { listWarehouse } from "@/api/wms/warehouse";
+
+export default {
+  name: "StockBox",
+  data() {
+    return {
+      chart: null,
+      stockData: [],
+      warehouseData: [],
+      groupMode: 'warehouse', // 默认按仓库汇总
+      warehouseTreeData: []
+    };
+  },
+  mounted() {
+    this.initChart();
+    this.loadData();
+  },
+  methods: {
+    initChart() {
+      if (this.chart) {
+        this.chart.dispose();
+      }
+      this.chart = echarts.init(this.$refs.chartContainer);
+      window.addEventListener('resize', this.handleResize);
+    },
+    handleResize() {
+      this.chart && this.chart.resize();
+    },
+    async loadData() {
+      try {
+        // 并行加载仓库结构和库存数据
+        const [warehouseRes, stockRes] = await Promise.all([
+          listWarehouse(),
+          listStock({ pageNum: 1, pageSize: 9999 })
+        ]);
+        
+        this.warehouseTreeData = this.handleTree(warehouseRes.data, 'warehouseId', 'parentId');
+        this.stockData = stockRes.rows;
+        this.updateChart();
+      } catch (error) {
+        console.error('加载数据失败:', error);
+      }
+    },
+    // 处理树结构
+    handleTree(data, id, parentId) {
+      const cloneData = JSON.parse(JSON.stringify(data));
+      return cloneData.filter(father => {
+        const branchArr = cloneData.filter(child => father[id] === child[parentId]);
+        if (branchArr.length > 0) father.children = branchArr;
+        return father[parentId] === 0 || father[parentId] === null;
+      });
+    },
+    updateChart() {
+      let treeData;
+      if (this.groupMode === 'warehouse') {
+        treeData = this.getWarehouseTreeData();
+      } else {
+        treeData = this.getItemTreeData();
+      }
+
+      const option = {
+        tooltip: {
+          formatter: (params) => {
+            const data = params.data;
+            if (data.stockInfo) {
+              return this.formatTooltip(data);
+            }
+            return `${params.name}<br/>总数量: ${params.value || 0}`;
+          }
+        },
+        series: [{
+          type: 'treemap',
+          data: treeData.children,
+          label: {
+            show: true,
+            formatter: (params) => {
+              const data = params.data;
+              if (data.stockInfo) {
+                return `${params.name}\n${params.value}${data.stockInfo.unit || ''}`;
+              }
+              return `${params.name}\n${params.value || ''}`;
+            }
+          },
+          breadcrumb: {
+            show: true
+          },
+          roam: false,
+          levels: [
+            {
+              itemStyle: {
+                borderColor: '#555',
+                borderWidth: 4,
+                gapWidth: 4
+              }
+            },
+            {
+              itemStyle: {
+                borderColor: '#777',
+                borderWidth: 2,
+                gapWidth: 2
+              }
+            }
+          ]
+        }]
+      };
+
+      this.chart && this.chart.setOption(option);
+    },
+    getWarehouseTreeData() {
+      const buildWarehouseTree = (warehouseNode) => {
+        const stocks = this.stockData.filter(stock => stock.warehouseId === warehouseNode.warehouseId);
+        const children = [];
+        let totalQuantity = 0;
+
+        // 处理当前仓库的库存
+        stocks.forEach(stock => {
+          const quantity = Number(stock.quantity) || 0;
+          totalQuantity += quantity;
+          children.push({
+            name: this.getItemName(stock),
+            value: quantity,
+            stockInfo: {
+              itemType: stock.itemType,
+              itemCode: stock.itemCode,
+              unit: stock.unit,
+              batchNo: stock.batchNo
+            }
+          });
+        });
+
+        // 处理子仓库
+        if (warehouseNode.children && warehouseNode.children.length > 0) {
+          warehouseNode.children.forEach(child => {
+            const childNode = buildWarehouseTree(child);
+            if (childNode.value > 0) {
+              children.push(childNode);
+              totalQuantity += childNode.value;
+            }
+          });
+        }
+
+        return {
+          name: warehouseNode.warehouseName,
+          value: totalQuantity,
+          children: children.length > 0 ? children : undefined
+        };
+      };
+
+      return {
+        name: '库存总览',
+        children: this.warehouseTreeData.map(warehouse => buildWarehouseTree(warehouse))
+      };
+    },
+    getItemTreeData() {
+      // 按物品类型和物品分组
+      const itemGroups = {};
+      this.stockData.forEach(stock => {
+        const itemType = this.getItemTypeName(stock.itemType);
+        if (!itemGroups[itemType]) {
+          itemGroups[itemType] = {};
+        }
+        
+        const itemKey = stock.itemId + '_' + stock.itemName;
+        if (!itemGroups[itemType][itemKey]) {
+          itemGroups[itemType][itemKey] = {
+            name: stock.itemName,
+            value: 0,
+            children: []
+          };
+        }
+
+        const quantity = Number(stock.quantity) || 0;
+        itemGroups[itemType][itemKey].value += quantity;
+        itemGroups[itemType][itemKey].children.push({
+          name: this.getWarehouseName(stock.warehouseId),
+          value: quantity,
+          stockInfo: {
+            itemType: stock.itemType,
+            itemCode: stock.itemCode,
+            unit: stock.unit,
+            batchNo: stock.batchNo
+          }
+        });
+      });
+
+      return {
+        name: '库存总览',
+        children: Object.entries(itemGroups).map(([type, items]) => ({
+          name: type,
+          children: Object.values(items)
+        }))
+      };
+    },
+    formatTooltip(data) {
+      const stockInfo = data.stockInfo;
+      return `${data.name}<br/>
+              数量: ${data.value} ${stockInfo.unit || ''}<br/>
+              类型: ${this.getItemTypeName(stockInfo.itemType)}<br/>
+              编号: ${stockInfo.itemCode || '无'}<br/>
+              批次: ${stockInfo.batchNo || '无'}`;
+    },
+    getItemTypeName(type) {
+      const typeMap = {
+        raw_material: '原材料',
+        product: '产品',
+      };
+      return typeMap[type] || type;
+    },
+    getItemName(stock) {
+      return stock.itemName || `${this.getItemTypeName(stock.itemType)}-${stock.itemCode}`;
+    },
+    getWarehouseName(warehouseId) {
+      const findWarehouse = (warehouses) => {
+        for (const warehouse of warehouses) {
+          if (warehouse.warehouseId === warehouseId) {
+            return warehouse.warehouseName;
+          }
+          if (warehouse.children) {
+            const name = findWarehouse(warehouse.children);
+            if (name) return name;
+          }
+        }
+        return null;
+      };
+      return findWarehouse(this.warehouseTreeData) || '未知仓库';
+    },
+    refresh() {
+      this.loadData();
+    }
+  },
+  beforeDestroy() {
+    window.removeEventListener('resize', this.handleResize);
+    if (this.chart) {
+      this.chart.dispose();
+      this.chart = null;
+    }
+  }
+};
+</script>
+
+<style scoped>
+</style>
diff --git a/klp-ui/src/views/wms/stock/index.vue b/klp-ui/src/views/wms/stock/index.vue
index 1f209df2..0918e425 100644
--- a/klp-ui/src/views/wms/stock/index.vue
+++ b/klp-ui/src/views/wms/stock/index.vue
@@ -51,6 +51,9 @@
           <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
             v-hasPermi="['wms:stock:export']">导出</el-button>
         </el-col>
+        <el-col :span="1.5">
+          <el-button type="primary" plain icon="el-icon-data-analysis" size="mini" @click="showStockBox">库存分析</el-button>
+        </el-col>
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
 
@@ -81,6 +84,11 @@
       <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
         @pagination="getList" />
 
+      <!-- 库存分析对话框 -->
+      <el-dialog title="库存统计" :visible.sync="stockBoxVisible" width="80%" append-to-body destroy-on-close>
+        <stock-box ref="stockBoxChart" />
+      </el-dialog>
+
       <!-- 添加或修改库存对话框（保持不变） -->
       <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
@@ -128,6 +136,7 @@ import { listWarehouse } from "@/api/wms/warehouse";
 import RawMaterialSelect from "@/components/KLPService/RawMaterialSelect";
 import ProductSelect from "@/components/KLPService/ProductSelect";
 import WarehouseSelect from "@/components/WarehouseSelect";
+import StockBox from './box';
 
 export default {
   name: "Stock",
@@ -135,10 +144,13 @@ export default {
   components: {
     WarehouseSelect,
     RawMaterialSelect,
-    ProductSelect
+    ProductSelect,
+    StockBox
   },
   data() {
     return {
+      // 库存分析对话框显示状态
+      stockBoxVisible: false,
       // 按钮loading
       buttonLoading: false,
       // 遮罩层
@@ -340,6 +352,13 @@ export default {
       this.download('wms/stock/export', {
         ...this.queryParams
       }, `stock_${new Date().getTime()}.xlsx`)
+    },
+    /** 显示库存分析图表 */
+    showStockBox() {
+      this.stockBoxVisible = true;
+      this.$nextTick(() => {
+        this.$refs.stockBoxChart && this.$refs.stockBoxChart.refresh();
+      });
     }
   }
 };