From f1637501b283b66a514335491153a9dbe4058b26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Tue, 30 Dec 2025 10:36:44 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E5=A4=8D?=
 =?UTF-8?q?=E5=90=88=E6=9E=B6=E6=8B=86=E5=88=86=E6=8C=89=E9=92=AE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=80=BB=E8=BE=91=E5=8F=8A=E6=9B=B4=E6=96=B0=E5=BA=93?=
 =?UTF-8?q?=E4=BD=8D=E7=BC=96=E7=A0=81=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复复合架拆分按钮仅在支持拆分的列显示的问题
更新库位编码解析注释以反映最新格式要求
---
 .../warehouse/components/WarehouseBird.vue    |  2 +-
 .../components/WarehouseInterlaced.vue        | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/klp-ui/src/views/wms/warehouse/components/WarehouseBird.vue b/klp-ui/src/views/wms/warehouse/components/WarehouseBird.vue
index a8a422e3..eb065c8e 100644
--- a/klp-ui/src/views/wms/warehouse/components/WarehouseBird.vue
+++ b/klp-ui/src/views/wms/warehouse/components/WarehouseBird.vue
@@ -127,7 +127,7 @@ export default {
     },
 
     /**
-     * 解析第四级库位编码，格式为F2A1-01-01-1
+     * 解析第四级库位编码，格式为F2A1-X01-1
      */
     parseWarehouseCodeFourth(code) {
       if (!code) return null;
diff --git a/klp-ui/src/views/wms/warehouse/components/WarehouseInterlaced.vue b/klp-ui/src/views/wms/warehouse/components/WarehouseInterlaced.vue
index c0e79b70..73a1a725 100644
--- a/klp-ui/src/views/wms/warehouse/components/WarehouseInterlaced.vue
+++ b/klp-ui/src/views/wms/warehouse/components/WarehouseInterlaced.vue
@@ -9,7 +9,7 @@
         <span class="column-number">{{ col }}</span>
         <!-- 拆分/合并切换按钮 -->
         <button class="split-merge-toggle"
-          v-if="isComposite"
+          v-if="isComposite && splitColumns.includes(Number(col))"
           :class="{ 'is-split': getColumnLevel(col) === 4, 'is-merge': getColumnLevel(col) === 3 }"
           @click.stop="handleColumnToggle(col)" :title="getColumnLevel(col) === 3 ? '点击切换为小卷状态' : '点击切换为大卷状态'">
           <i class="el-icon-s-tools"></i>
@@ -124,14 +124,18 @@ export default {
           col: 5,
           big: 19,
           small: 29,
-          rows: [0, 1, 2, 3, 4]
+          rows: [0, 1, 2, 3, 4],
+          // 支持拆分的列
+          splitColumns: [1, 2, 3, 4, 5]
         },
         // 成品2库B区，F2B
         '1998933646134919170': {
           col: 7,
           big: 29 + 28,
           small: 43 + 42,
-          rows: [0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26]
+          rows: [0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26],
+          // 支持拆分的列
+          splitColumns: [1, 2, 3]
         }
       },
       dialogOpen: false,
@@ -141,7 +145,7 @@ export default {
       currentContextWarehouse: null,
       rulerRowHeight: 80,
       // rulerMaxRow: 0,
-      isMounted: false
+      isMounted: false,
     };
   },
   computed: {
@@ -166,6 +170,13 @@ export default {
 
       return this.compositeRules[this.id];
     },
+    splitColumns() {
+      if (!this.compositeRules[this.id]) {
+        console.log('当前库区不支持复合架');
+        return [];
+      }
+      return this.compositeRules[this.id].splitColumns || [];
+    },
     sortedColumnKeys() {
       return Object.keys(this.columns)
         .map(key => Number(key))