feat: 库存盘点页面按层模版分层显示，每行3个商品

- 后端: getDeviceInventory 接口新增 floors 字段，合并层模版结构与实际库存
- 前端: 改用楼层卡片+3列grid布局，按 productCode 匹配合并
- 修复: 补货员无权限跨模块调用 DeviceController 的问题

Co-Authored-By: Claude <noreply@anthropic.com>

haha-admin-mp/src/pages/replenish/audit.vue

@@ -2,71 +2,102 @@
   <view class="page">
     <NavBar title="库存盘点" showBack />
 
-    <template>
-      <!-- 设备信息 -->
-      <view class="device-bar">
-        <text class="device-bar-text">{{ deviceId }}<text v-if="deviceName"> · {{ deviceName }}</text></text>
-      </view>
+    <!-- 设备信息 -->
+    <view class="device-bar">
+      <text class="device-bar-text">{{ deviceId }}<text v-if="deviceName"> · {{ deviceName }}</text></text>
+    </view>
 
-      <!-- 商品清单 -->
-      <view class="inventory-section">
-        <view class="section-head">
-          <text class="section-title">盘点清单</text>
-          <text class="section-count">{{ searchKeyword ? filteredInventoryList.length + ' / ' + inventoryList.length : inventoryList.length }} 种</text>
-        </view>
+    <!-- 搜索栏 -->
+    <view class="search-bar">
+      <view class="search-icon"></view>
+      <input class="search-input" v-model="searchKeyword" placeholder="搜索商品名称或编码" confirm-type="search" />
+      <view class="search-clear" v-if="searchKeyword" @click="searchKeyword = ''"><text>✕</text></view>
+    </view>
 
-        <view class="search-bar">
-          <view class="search-icon"></view>
-          <input class="search-input" v-model="searchKeyword" placeholder="搜索商品名称或编码" confirm-type="search" />
-          <view class="search-clear" v-if="searchKeyword" @click="searchKeyword = ''"><text>✕</text></view>
-        </view>
+    <!-- 加载中 -->
+    <view class="empty-state" v-if="loading">
+      <text class="empty-text">加载中...</text>
+    </view>
 
-        <view class="empty-state" v-if="inventoryList.length === 0">
-          <view class="empty-icon-box"><view class="empty-doc-icon"></view></view>
-          <text class="empty-text">暂无商品库存数据</text>
-        </view>
+    <!-- 空状态 -->
+    <view class="empty-state" v-else-if="auditItems.length === 0">
+      <view class="empty-icon-box"><view class="empty-doc-icon"></view></view>
+      <text class="empty-text">暂无商品数据</text>
+    </view>
+
+    <!-- 搜索无结果 -->
+    <view class="empty-state" v-else-if="currentFloors.length === 0">
+      <text class="empty-text">未找到匹配商品</text>
+    </view>
 
-        <view class="empty-state" v-else-if="inventoryList.length > 0 && filteredInventoryList.length === 0">
-          <text class="empty-text">未找到匹配商品</text>
+    <!-- 楼层列表 -->
+    <view v-else class="floors-scroll">
+      <view v-for="floor in currentFloors" :key="'floor-' + floor.floor" class="floor-card">
+        <!-- 楼层头部 -->
+        <view class="floor-header">
+          <view class="floor-badge">{{ floor.floor }}</view>
+          <text class="floor-title">{{ floor.name }}</text>
+          <text class="floor-count">{{ floor.entries.length }}件商品</text>
         </view>
 
-        <view class="inventory-card" v-for="({ item, idx }, i) in filteredInventoryList" :key="idx">
-          <view class="item-row">
-            <image v-if="item.product_image" :src="item.product_image" class="item-img" mode="aspectFill" />
-            <view v-else class="item-img-placeholder"><text>无图</text></view>
-            <view class="item-info">
-              <view class="item-name-row">
-                <text class="item-name">{{ item.product_name || item.productName || '未知商品' }}</text>
-                <view class="stock-badge" :class="getDiffClass(item, idx)">{{ getDiffLabel(item, idx) }}</view>
-              </view>
-              <view class="item-meta">
-                <text class="item-code" v-if="item.product_code || item.productCode">{{ item.product_code || item.productCode }}</text>
-                <text class="item-std">标准 {{ item.standard_stock || item.standardStock || '-' }}</text>
-                <text class="item-cur">当前 {{ item.stock || 0 }}</text>
+        <!-- 商品网格（3列） -->
+        <view class="goods-grid">
+          <view v-for="entry in floor.entries" :key="entry.idx" class="goods-cell">
+            <view class="goods-cell-inner">
+            <!-- 商品图片 -->
+            <view class="cell-image-wrap">
+              <image
+                v-if="entry.item.productImage"
+                :src="entry.item.productImage"
+                class="cell-image"
+                mode="aspectFill"
+              />
+              <view v-else class="cell-image-placeholder">
+                <text>无图</text>
               </view>
             </view>
-          </view>
-          <view class="audit-row">
-            <view class="qty-control">
-              <view class="qty-btn" @click="decrease(idx)"><text>-</text></view>
-              <input class="qty-input" type="number" v-model.number="auditItems[idx].newStock" />
-              <view class="qty-btn" @click="increase(idx)"><text>+</text></view>
+
+            <!-- 商品名称 -->
+            <text class="cell-name">{{ entry.item.productName || '未知' }}</text>
+
+            <!-- 状态标签 -->
+            <view class="cell-badge" :class="getDiffClass(entry.item, entry.idx)">{{ getDiffLabel(entry.item, entry.idx) }}</view>
+
+            <!-- 库存信息 -->
+            <view class="cell-stock-row">
+              <text class="cell-stock-label">标{{ entry.item.standardStock }}</text>
+              <text class="cell-stock-cur">当{{ auditItems[entry.idx]?.newStock ?? 0 }}</text>
+            </view>
+
+            <!-- 数量调节 -->
+            <view class="cell-qty">
+              <view class="cell-qty-btn" @click="decrease(entry.idx)"><text>-</text></view>
+              <text class="cell-qty-val">{{ auditItems[entry.idx]?.newStock ?? 0 }}</text>
+              <view class="cell-qty-btn" @click="increase(entry.idx)"><text>+</text></view>
+            </view>
+
+            <!-- 快捷操作 -->
+            <view class="cell-actions">
+              <text class="cell-action-btn" @click="setToStandard(entry.idx)">设标</text>
+              <text class="cell-action-divider">|</text>
+              <text class="cell-action-btn cell-action-reset" @click="setToCurrent(entry.idx)">重置</text>
+            </view>
             </view>
-            <view class="quick-btn" @click="setToStandard(item, idx)"><text>设标</text></view>
-            <view class="quick-btn quick-reset" @click="setToCurrentStock(item, idx)"><text>重置</text></view>
           </view>
         </view>
       </view>
 
-      <!-- 底部操作栏 -->
-      <view class="bottom-bar" v-if="inventoryList.length > 0">
-        <text class="total-label">修正 <text class="total-num">{{ changedCount }}</text> 项</text>
-        <view class="submit-btn" :class="{ disabled: submitting || changedCount === 0 }" @click="handleSubmit">
-          <view class="btn-spinner" v-if="submitting"></view>
-          <text>{{ submitting ? '提交中' : '提交盘点' }}</text>
-        </view>
+      <view class="scroll-bottom-spacer"></view>
+    </view>
+
+    <!-- 底部操作栏 -->
+    <view class="bottom-bar" v-if="auditItems.length > 0">
+      <text class="total-label">修正 <text class="total-num">{{ changedCount }}</text> 项</text>
+      <view class="submit-btn" :class="{ disabled: submitting || changedCount === 0 }" @click="handleSubmit">
+        <view class="btn-spinner" v-if="submitting"></view>
+        <text>{{ submitting ? '提交中' : '提交盘点' }}</text>
       </view>
-    </template>
+    </view>
   </view>
 </template>
 
@@ -76,67 +107,101 @@ import NavBar from '@/components/NavBar.vue';
 import { getDeviceInventory } from '@/api/replenish';
 import { adjustStock } from '@/api/inventory';
 
-interface AuditInput {
+// ── 类型 ──
+interface AuditEntry {
   productId: number | null;
   productCode: string;
   productName: string;
+  productImage: string;
+  standardStock: number;
   newStock: number;
   originalStock: number;
+  floorNumber: number;
+  floorName: string;
+}
+
+interface FloorGroup {
+  floor: number;
+  name: string;
+  entries: { item: AuditEntry; idx: number }[];
 }
 
+// ── 状态 ──
 const deviceId = ref('');
 const deviceName = ref('');
-const inventoryList = ref<any[]>([]);
-const auditItems = ref<AuditInput[]>([]);
+const loading = ref(true);
+const auditItems = ref<AuditEntry[]>([]);
 const submitting = ref(false);
 const searchKeyword = ref('');
 
-const filteredInventoryList = computed(() => {
+// ── 搜索过滤 ──
+const filteredItems = computed(() => {
   const kw = searchKeyword.value.trim().toLowerCase();
-  return inventoryList.value
+  return auditItems.value
     .map((item, idx) => ({ item, idx }))
     .filter(({ item }) => {
       if (!kw) return true;
-      const name = (item.product_name || item.productName || '').toLowerCase();
-      const code = (item.product_code || item.productCode || '').toLowerCase();
+      const name = (item.productName || '').toLowerCase();
+      const code = (item.productCode || '').toLowerCase();
       return name.includes(kw) || code.includes(kw);
     });
 });
 
+// ── 按楼层分组 ──
+const currentFloors = computed(() => {
+  const map = new Map<number, { item: AuditEntry; idx: number }[]>();
+  for (const { item, idx } of filteredItems.value) {
+    const fn = item.floorNumber;
+    if (!map.has(fn)) map.set(fn, []);
+    map.get(fn)!.push({ item, idx });
+  }
+  return Array.from(map.entries())
+    .sort((a, b) => a[0] - b[0])
+    .map(([floor, entries]) => ({
+      floor,
+      name: entries[0]?.item.floorName || ('第' + floor + '层'),
+      entries,
+    }));
+});
+
+// ── 变更计数 ──
 const changedCount = computed(() =>
   auditItems.value.filter(i => i.productId != null && i.newStock !== i.originalStock).length
 );
 
+// ── 数量操作 ──
 function decrease(index: number) {
-  if (auditItems.value[index].newStock > 0) auditItems.value[index].newStock--;
+  const it = auditItems.value[index];
+  if (it && it.newStock > 0) it.newStock--;
 }
 function increase(index: number) {
-  if (auditItems.value[index].newStock < 9999) auditItems.value[index].newStock++;
+  const it = auditItems.value[index];
+  if (it && it.newStock < 9999) it.newStock++;
 }
-function setToCurrentStock(item: any, index: number) {
-  auditItems.value[index].newStock = item.stock || 0;
+function setToStandard(index: number) {
+  const it = auditItems.value[index];
+  if (it) it.newStock = it.standardStock;
 }
-function setToStandard(item: any, index: number) {
-  const std = item.standard_stock || item.standardStock || 0;
-  auditItems.value[index].newStock = std;
+function setToCurrent(index: number) {
+  const it = auditItems.value[index];
+  if (it) it.newStock = it.originalStock;
 }
-function getDiffLabel(item: any, index: number) {
-  if (!auditItems.value[index]) return '正常';
-  const cur = auditItems.value[index].newStock;
-  const std = item.standard_stock || item.standardStock || 0;
-  if (cur < std) return '偏少';
-  if (cur > std) return '偏多';
+
+// ── 状态标签 ──
+function getDiffLabel(item: AuditEntry, index: number) {
+  const cur = auditItems.value[index]?.newStock ?? item.originalStock;
+  if (cur < item.standardStock) return '偏少';
+  if (cur > item.standardStock) return '偏多';
   return '正常';
 }
-function getDiffClass(item: any, index: number) {
-  if (!auditItems.value[index]) return 'normal';
-  const cur = auditItems.value[index].newStock;
-  const std = item.standard_stock || item.standardStock || 0;
-  if (cur < std) return 'warning';
-  if (cur > std) return 'danger';
+function getDiffClass(item: AuditEntry, index: number) {
+  const cur = auditItems.value[index]?.newStock ?? item.originalStock;
+  if (cur < item.standardStock) return 'warning';
+  if (cur > item.standardStock) return 'danger';
   return 'normal';
 }
 
+// ── 提交 ──
 async function handleSubmit() {
   if (submitting.value || changedCount.value === 0) return;
   const changes = auditItems.value.filter(i => i.productId != null && i.newStock !== i.originalStock);
@@ -151,7 +216,7 @@ async function handleSubmit() {
         deviceId: deviceId.value,
         productId: item.productId!,
         newStock: item.newStock,
-        remark: '小程序盘点修正'
+        remark: '小程序盘点修正',
       });
       success++;
     } catch {
@@ -168,35 +233,53 @@ async function handleSubmit() {
   submitting.value = false;
 }
 
+// ── 初始化：单个 API 调用，后端已合并楼层+库存 ──
 onMounted(async () => {
   const pages = getCurrentPages();
   const opts = (pages[pages.length - 1] as any)?.$page?.options || (pages[pages.length - 1] as any)?.options || {};
   deviceId.value = opts.deviceId || '';
-  if (!deviceId.value) { uni.showToast({ title: '缺少设备ID', icon: 'none' }); setTimeout(() => uni.navigateBack(), 500); return; }
+  if (!deviceId.value) {
+    uni.showToast({ title: '缺少设备ID', icon: 'none' });
+    setTimeout(() => uni.navigateBack(), 500);
+    return;
+  }
 
   try {
     const data = await getDeviceInventory(deviceId.value);
     deviceName.value = data?.name || '';
-    const list = (data?.inventoryList || data || []) as any[];
-    // 兼容两种返回格式
-    if (Array.isArray(data)) {
-      inventoryList.value = data;
-    } else if (data?.inventoryList) {
-      inventoryList.value = data.inventoryList;
-      deviceName.value = data.name || '';
-    } else {
-      inventoryList.value = [];
+
+    // 后端已在 floors 中合并了模版楼层和库存数据
+    const floors: any[] = data?.floors || [];
+    const items: AuditEntry[] = [];
+
+    for (const floor of floors) {
+      const floorNum = floor.floorNumber || 1;
+      const floorName = floor.floorName || ('第' + floorNum + '层');
+
+      for (const slot of (floor.slots || [])) {
+        const code = (slot.productCode || '').toString().trim();
+        if (!code) continue;
+
+        const curStock = slot.currentStock ?? 0;
+        items.push({
+          productId: slot.inventoryProductId ?? null,
+          productCode: code,
+          productName: slot.productName || code,
+          productImage: slot.productImage || '',
+          standardStock: slot.standardStock ?? 0,
+          newStock: curStock,
+          originalStock: curStock,
+          floorNumber: floorNum,
+          floorName,
+        });
+      }
     }
 
-    auditItems.value = inventoryList.value.map((it: any) => ({
-      productId: it.product_id || it.productId || null,
-      productCode: it.product_code || it.productCode || '',
-      productName: it.product_name || it.productName || '',
-      newStock: it.stock || 0,
-      originalStock: it.stock || 0
-    }));
+    auditItems.value = items;
   } catch (e: any) {
     uni.showToast({ title: e.message || '加载失败', icon: 'none' });
+  } finally {
+    loading.value = false;
   }
 });
 </script>
@@ -204,14 +287,12 @@ onMounted(async () => {
 <style lang="scss" scoped>
 .page { height: 100vh; background: $bg-color-page; display: flex; flex-direction: column; }
 
+/* ── 设备信息 ── */
 .device-bar { margin: 12rpx 24rpx; padding: 16rpx 20rpx; background: $bg-color-card; border-radius: $radius-md; box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.04); }
 .device-bar-text { font-size: $font-size-sm; font-weight: 600; color: $text-color-primary; }
 
-.inventory-section { padding: 0 24rpx; flex: 1; height: 0; overflow-y: auto; }
-.section-head { display: flex; align-items: center; justify-content: space-between; padding: 16rpx 0 12rpx; }
-.section-title { font-size: $font-size-md; font-weight: 700; color: $text-color-primary; }
-.section-count { font-size: $font-size-sm; color: $text-color-muted; }
-.search-bar { display: flex; align-items: center; background: $bg-color-card; border: 1rpx solid $border-color; border-radius: $radius-base; padding: 0 16rpx; height: 60rpx; margin-bottom: 12rpx; }
+/* ── 搜索栏 ── */
+.search-bar { display: flex; align-items: center; margin: 0 24rpx 10rpx; padding: 0 16rpx; height: 60rpx; background: $bg-color-card; border: 1rpx solid $border-color; border-radius: $radius-base; }
 .search-icon { width: 28rpx; height: 28rpx; border: 2.5rpx solid $text-color-muted; border-radius: 50%; position: relative; flex-shrink: 0; margin-right: 10rpx;
   &::after { content: ''; position: absolute; bottom: -2rpx; right: -4rpx; width: 2.5rpx; height: 10rpx; background: $text-color-muted; border-radius: 1rpx; transform: rotate(-45deg); }
 }
@@ -220,6 +301,7 @@ onMounted(async () => {
   text { font-size: 20rpx; color: $text-color-muted; line-height: 1; }
 }
 
+/* ── 空状态 ── */
 .empty-state { display: flex; flex-direction: column; align-items: center; padding: 80rpx 0; }
 .empty-icon-box { width: 96rpx; height: 96rpx; background: $bg-color-secondary; border-radius: $radius-lg; display: flex; align-items: center; justify-content: center; margin-bottom: $spacing-2; }
 .empty-doc-icon { width: 40rpx; height: 48rpx; border: 2.5rpx solid $text-color-placeholder; border-radius: 4rpx; position: relative;
@@ -227,41 +309,62 @@ onMounted(async () => {
 }
 .empty-text { font-size: $font-size-base; color: $text-color-muted; }
 
-.inventory-card { margin-bottom: 10rpx; padding: 16rpx; background: $bg-color-card; border-radius: $radius-md; box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.04); }
+/* ── 楼层列表滚动区 ── */
+.floors-scroll { flex: 1; height: 0; overflow-y: auto; padding: 0 24rpx; }
+
+/* ── 楼层卡片 ── */
+.floor-card { background: $bg-color-card; border-radius: $radius-md; margin-bottom: 12rpx; overflow: hidden; box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.04); }
+.floor-header { display: flex; align-items: center; padding: 18rpx 20rpx; border-bottom: 1rpx solid $border-color-light; }
+.floor-badge { width: 40rpx; height: 40rpx; line-height: 40rpx; text-align: center; background: $primary-color; color: $text-color-primary; border-radius: $radius-sm; font-size: 22rpx; font-weight: 600; margin-right: 10rpx; }
+.floor-title { font-size: $font-size-base; font-weight: 600; color: $text-color-primary; flex: 1; }
+.floor-count { font-size: $font-size-sm; color: $text-color-muted; }
+
+/* ── 商品网格（3列） ── */
+.goods-grid { display: flex; flex-wrap: wrap; padding: 8rpx; }
 
-.item-row { display: flex; align-items: center; margin-bottom: 10rpx; }
-.item-img { width: 56rpx; height: 56rpx; border-radius: $radius-sm; background: $bg-color-page; flex-shrink: 0; margin-right: 12rpx; }
-.item-img-placeholder { width: 56rpx; height: 56rpx; border-radius: $radius-sm; background: $bg-color-page; flex-shrink: 0; margin-right: 12rpx; display: flex; align-items: center; justify-content: center;
-  text { font-size: 18rpx; color: $text-color-muted; }
+/* ── 商品单元格 ── */
+.goods-cell { width: 33.33%; padding: 6rpx; box-sizing: border-box; }
+.goods-cell-inner { display: flex; flex-direction: column; align-items: center; padding: 12rpx 8rpx; background: $bg-color-page; border-radius: $radius-sm; width: 100%; box-sizing: border-box; }
+
+.cell-image-wrap { width: 120rpx; height: 120rpx; border-radius: $radius-sm; overflow: hidden; background: $bg-color-tertiary; margin-bottom: 8rpx; flex-shrink: 0; }
+.cell-image { width: 100%; height: 100%; }
+.cell-image-placeholder { width: 100%; height: 100%; display: flex; align-items: center; justify-content: center;
+  text { font-size: 20rpx; color: $text-color-muted; }
 }
-.item-info { flex: 1; min-width: 0; overflow: hidden; }
-.item-name-row { display: flex; align-items: center; justify-content: space-between; margin-bottom: 4rpx; }
-.item-name { font-size: $font-size-base; font-weight: 600; color: $text-color-primary; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; flex: 1; }
-.item-meta { display: flex; gap: 16rpx; }
-.item-code { font-size: 20rpx; color: $text-color-muted; }
-.item-std { font-size: 20rpx; color: $text-color-muted; }
-.item-cur { font-size: 20rpx; font-weight: 500; color: $text-color-primary; }
-
-.stock-badge { padding: 2rpx 10rpx; border-radius: $radius-sm; font-size: 20rpx; font-weight: 500; flex-shrink: 0; margin-left: 8rpx;
+
+.cell-name { font-size: 22rpx; font-weight: 500; color: $text-color-primary; width: 100%; text-align: center; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; margin-bottom: 4rpx; }
+
+.cell-badge { padding: 2rpx 8rpx; border-radius: 6rpx; font-size: 18rpx; font-weight: 500; margin-bottom: 6rpx;
   &.normal { background: $success-color-bg; color: $success-color; }
   &.warning { background: $warning-color-bg; color: $warning-color; }
   &.danger { background: $error-color-bg; color: $error-color; }
 }
 
-.audit-row { display: flex; align-items: center; gap: 10rpx; background: $bg-color-page; border-radius: $radius-base; padding: 8rpx 12rpx; }
-.qty-control { display: flex; align-items: center; border: 1rpx solid $border-color; border-radius: $radius-sm; overflow: hidden; }
-.qty-btn { width: 44rpx; height: 44rpx; display: flex; align-items: center; justify-content: center; background: $bg-color-card;
-  text { font-size: 26rpx; color: $text-color-secondary; line-height: 1; }
+.cell-stock-row { display: flex; gap: 10rpx; margin-bottom: 6rpx; }
+.cell-stock-label { font-size: 20rpx; color: $text-color-muted; }
+.cell-stock-cur { font-size: 20rpx; font-weight: 500; color: $text-color-primary; }
+
+/* 数量调节 */
+.cell-qty { display: flex; align-items: center; gap: 0; border: 1rpx solid $border-color; border-radius: 6rpx; overflow: hidden; margin-bottom: 6rpx; }
+.cell-qty-btn { width: 36rpx; height: 36rpx; display: flex; align-items: center; justify-content: center; background: $bg-color-card;
+  text { font-size: 24rpx; color: $text-color-secondary; line-height: 1; }
   &:active { background: $bg-color-secondary; }
 }
-.qty-input { width: 64rpx; height: 44rpx; text-align: center; font-size: $font-size-base; font-weight: 600; color: $text-color-primary; border-left: 1rpx solid $border-color; border-right: 1rpx solid $border-color; }
-.quick-btn { padding: 8rpx 16rpx; background: $bg-color-secondary; border-radius: $radius-sm;
-  text { font-size: 22rpx; color: $text-color-secondary; }
+.cell-qty-val { width: 48rpx; height: 36rpx; line-height: 36rpx; text-align: center; font-size: 22rpx; font-weight: 600; color: $text-color-primary; border-left: 1rpx solid $border-color; border-right: 1rpx solid $border-color; }
+
+/* 快捷操作 */
+.cell-actions { display: flex; align-items: center; gap: 4rpx; }
+.cell-action-btn { font-size: 18rpx; color: $text-color-secondary; padding: 2rpx 4rpx;
   &:active { opacity: 0.7; }
-  &.quick-reset { background: $error-color-bg; text { color: $error-color; } }
 }
+.cell-action-reset { color: $error-color; }
+.cell-action-divider { font-size: 18rpx; color: $border-color; }
+
+/* 滚动底部占位 */
+.scroll-bottom-spacer { height: 20rpx; }
 
-.bottom-bar { display: flex; align-items: center; gap: 12rpx; padding: 16rpx 24rpx; padding-bottom: calc(16rpx + env(safe-area-inset-bottom)); background: $bg-color-card; border-top: 1rpx solid $border-color-light; }
+/* ── 底部操作栏 ── */
+.bottom-bar { display: flex; align-items: center; gap: 12rpx; padding: 16rpx 24rpx; padding-bottom: calc(16rpx + env(safe-area-inset-bottom)); background: $bg-color-card; border-top: 1rpx solid $border-color-light; flex-shrink: 0; }
 .total-label { font-size: $font-size-sm; color: $text-color-muted; flex-shrink: 0; }
 .total-num { font-size: $font-size-xl; font-weight: 700; color: $primary-color-dark; margin: 0 4rpx; }
 .submit-btn { flex: 1; display: flex; align-items: center; justify-content: center; gap: 12rpx; height: 72rpx; background: $primary-color; border-radius: $radius-base;

haha-admin/src/main/java/com/haha/admin/controller/ReplenisherOperationController.java

@@ -24,6 +24,7 @@ import com.haha.mapper.StockRecordMapper;
 import com.haha.service.DeviceInventoryService;
 import com.haha.service.DeviceService;
 import com.haha.service.InventoryLogService;
+import com.haha.service.LayerTemplateService;
 import com.haha.service.ReplenisherService;
 import com.haha.service.ReplenishmentOrderService;
 import jakarta.validation.Valid;
@@ -51,6 +52,7 @@ public class ReplenisherOperationController {
     private final DeviceInventoryService deviceInventoryService;
     private final DeviceService deviceService;
     private final ReplenishmentOrderService replenishmentOrderService;
+    private final LayerTemplateService layerTemplateService;
     private final InventoryLogService inventoryLogService;
     private final ReplenishmentOrderItemMapper orderItemMapper;
     private final StockRecordMapper stockRecordMapper;
@@ -299,11 +301,71 @@ public class ReplenisherOperationController {
         // 查询库存详情
         List<Map<String, Object>> inventoryList = deviceInventoryService.getInventoryWithProduct(deviceId);
 
+        // 构建库存索引：productCode → { productId, stock, standardStock }
+        Map<String, Map<String, Object>> invMap = new HashMap<>();
+        for (Map<String, Object> inv : inventoryList) {
+            String code = String.valueOf(inv.getOrDefault("productCode", "")).trim();
+            if (!code.isEmpty()) {
+                invMap.put(code, inv);
+            }
+        }
+
+        // 获取设备层模版，合并库存数据到楼层结构
+        List<Map<String, Object>> floors = new ArrayList<>();
+        try {
+            Map<String, Object> config = layerTemplateService.getProductConfig(deviceId);
+            if (config != null && config.get("floors") != null) {
+                @SuppressWarnings("unchecked")
+                List<Map<String, Object>> templateFloors = (List<Map<String, Object>>) config.get("floors");
+                for (Map<String, Object> floor : templateFloors) {
+                    Map<String, Object> mergedFloor = new HashMap<>(floor);
+                    @SuppressWarnings("unchecked")
+                    List<Map<String, Object>> slots = (List<Map<String, Object>>) floor.get("slots");
+                    List<Map<String, Object>> mergedSlots = new ArrayList<>();
+
+                    if (slots != null) {
+                        for (Map<String, Object> slot : slots) {
+                            Map<String, Object> mergedSlot = new HashMap<>();
+                            String productCode = String.valueOf(slot.getOrDefault("productId", "")).trim();
+                            mergedSlot.put("slotId", slot.get("slotId"));
+                            mergedSlot.put("productCode", productCode);
+                            mergedSlot.put("productName", slot.getOrDefault("productName", productCode));
+                            mergedSlot.put("productImage", slot.getOrDefault("productImage", ""));
+
+                            // 从模板取标准库存
+                            Object templateStock = slot.get("stock");
+                            mergedSlot.put("standardStock", templateStock != null ? templateStock : 0);
+
+                            // 从库存记录取实际数据
+                            Map<String, Object> inv = invMap.get(productCode);
+                            if (inv != null) {
+                                mergedSlot.put("currentStock", inv.getOrDefault("stock", 0));
+                                mergedSlot.put("inventoryProductId", inv.getOrDefault("productId", null));
+                                // 库存记录的 standardStock 优先（更准确）
+                                if (inv.get("standardStock") != null) {
+                                    mergedSlot.put("standardStock", inv.get("standardStock"));
+                                }
+                            } else {
+                                mergedSlot.put("currentStock", 0);
+                                mergedSlot.put("inventoryProductId", null);
+                            }
+                            mergedSlots.add(mergedSlot);
+                        }
+                    }
+                    mergedFloor.put("slots", mergedSlots);
+                    floors.add(mergedFloor);
+                }
+            }
+        } catch (Exception e) {
+            log.warn("获取设备层模版失败, deviceId={}", deviceId, e);
+        }
+
         Map<String, Object> result = new HashMap<>();
         result.put("deviceId", device.getDeviceId());
         result.put("name", device.getName());
         result.put("address", device.getAddress());
         result.put("inventoryList", inventoryList);
+        result.put("floors", floors);
 
         return Result.success("查询成功", result);
     }