From 84a30449d8df1ff820f4c252f8ea85c002051691 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: Fri, 28 Aug 2026 09:57:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=BE=93=E6=A0=88=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../haianEmptyPalletAssembly.vue              | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/haianAutoWarehouse/haianEmptyPalletAssembly.vue b/src/views/modules/haianAutoWarehouse/haianEmptyPalletAssembly.vue
index 760c073..2edbde7 100644
--- a/src/views/modules/haianAutoWarehouse/haianEmptyPalletAssembly.vue
+++ b/src/views/modules/haianAutoWarehouse/haianEmptyPalletAssembly.vue
@@ -49,7 +49,7 @@
 
             <div class="input-group">
               <label class="input-label">空托数量</label>
-              <el-select v-model="count">
+              <el-select v-model="count" disabled>
                 <el-option value=1 label=1></el-option>
                 <el-option value=2 label=2></el-option>
                 <el-option value=3 label=3></el-option>
@@ -272,6 +272,21 @@ export default {
       });
     },
 
+    // 通知入库前置校验：仅允许“外部回库”空托盘（area和location_code都为空）继续操作 - rqrq
+    validateNotifyInboundPalletStatus() {
+      const areaCode = this.palletInfo && this.palletInfo.area ? String(this.palletInfo.area).trim() : ''
+      const locationCode = this.palletInfo && this.palletInfo.locationCode
+        ? String(this.palletInfo.locationCode).trim()
+        : (this.palletInfo && this.palletInfo.currentStationCode ? String(this.palletInfo.currentStationCode).trim() : '')
+      if (areaCode || locationCode) {
+        this.$alert('通知入库仅允许未绑定站点的空托盘', '提示', {
+          confirmButtonText: '确定'
+        })
+        return false
+      }
+      return true
+    },
+
     // 通知入库 - rqrq
     handleNotifyInbound() {
       if (!this.currentPalletType) {
@@ -280,6 +295,9 @@ export default {
         });
         return;
       }
+      if (!this.validateNotifyInboundPalletStatus()) {
+        return;
+      }
       // 左按钮“通知入库”必须先选入库口，后端再把入库口映射为固定站点号 - rqrq
       this.selectedInboundPort = '';
       this.inboundPortDialogVisible = true;
@@ -299,6 +317,9 @@ export default {
         });
         return;
       }
+      if (!this.validateNotifyInboundPalletStatus()) {
+        return;
+      }
       this.inboundPortDialogVisible = false;
       this.$confirm('确定要执行通知入库操作吗？', '确认操作', {
         confirmButtonText: '确定',