From 85a46f507dfff41f494880aec760333987722524 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Mon, 14 Sep 2026 11:26:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=88=E6=9D=BF=E5=88=86?=
 =?UTF-8?q?=E7=B1=BBbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../haianAutoWarehouse/haianPalletAssembly.vue    | 13 +++++++++++++
 .../haianAutoWarehouse/haianPalletPacking.vue     | 15 ++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/haianAutoWarehouse/haianPalletAssembly.vue b/src/views/modules/haianAutoWarehouse/haianPalletAssembly.vue
index 1134079..515e5dc 100644
--- a/src/views/modules/haianAutoWarehouse/haianPalletAssembly.vue
+++ b/src/views/modules/haianAutoWarehouse/haianPalletAssembly.vue
@@ -677,6 +677,11 @@ export default {
       this.openCallEmptyModal()
     },
     showScanModal() {
+      // A0206不允许手工组盘主动扫入标签，被分拣场景不走本页 - rqrq
+      if (this.operationType === 'in' && this.currentPalletType === 'A0206') {
+        this.$alert('A0206类型栈板不允许主动扫入标签', '错误', { confirmButtonText: '确定' })
+        return
+      }
       this.scanModalVisible = true
       this.scanCode = ''
       this.currentSelectedPosition = ''
@@ -833,6 +838,14 @@ export default {
           return
         }
         this.scanRequestLoading = true
+        // 提交前再拦一次A0206，避免改类型后仍走扫进接口 - rqrq
+        if (this.currentPalletType === 'A0206') {
+          this.scanRequestLoading = false
+          this.scanCode = ''
+          this.$alert('A0206类型栈板不允许主动扫入标签', '错误', { confirmButtonText: '确定' })
+          this.moveFocusToScanInput()
+          return
+        }
         savePalletDetail({
           site: this.site,
           palletId: this.palletCode,
diff --git a/src/views/modules/haianAutoWarehouse/haianPalletPacking.vue b/src/views/modules/haianAutoWarehouse/haianPalletPacking.vue
index 789ae10..331c643 100644
--- a/src/views/modules/haianAutoWarehouse/haianPalletPacking.vue
+++ b/src/views/modules/haianAutoWarehouse/haianPalletPacking.vue
@@ -721,8 +721,13 @@ export default {
       }
       this.openCallEmptyModal()
     },
-    // 打开扫码弹窗并初始化网格数据，交互与原PDA页面一致 - rqrq
+    // 打开扫码弹窗并初始化网格数据；A0206禁止主动扫进，扫出仍允许 - rqrq
     showScanModal() {
+      // A0206不允许组盘入库主动扫入标签，被分拣场景不走本页 - rqrq
+      if (this.operationType === 'in' && this.currentPalletType === 'A0206') {
+        this.$alert('A0206类型栈板不允许主动扫入标签', '错误', { confirmButtonText: '确定' })
+        return
+      }
       this.scanModalVisible = true
       this.scanCode = ''
       this.currentSelectedPosition = ''
@@ -885,6 +890,14 @@ export default {
           return
         }
         this.scanRequestLoading = true
+        // 提交前再拦一次A0206，避免改类型后仍走扫进接口 - rqrq
+        if (this.currentPalletType === 'A0206') {
+          this.scanRequestLoading = false
+          this.scanCode = ''
+          this.$alert('A0206类型栈板不允许主动扫入标签', '错误', { confirmButtonText: '确定' })
+          this.moveFocusToScanInput()
+          return
+        }
         savePalletDetail({
           site: this.site,
           palletId: this.palletCode,