From 7fcb94d6ae3dcbafd3008bae0aa1f66aca4cb507 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, 31 Oct 2025 21:13:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=BE=93bug=20=20=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../automatedWarehouse/palletAssembly.vue     | 48 +++++++++++------
 .../automatedWarehouse/palletPacking.vue      | 51 +++++++++++++------
 .../automatedWarehouse/palletSorting.vue      | 48 +++++++++++------
 3 files changed, 101 insertions(+), 46 deletions(-)

diff --git a/src/views/modules/automatedWarehouse/palletAssembly.vue b/src/views/modules/automatedWarehouse/palletAssembly.vue
index 12fc3e6..1f3bdfb 100644
--- a/src/views/modules/automatedWarehouse/palletAssembly.vue
+++ b/src/views/modules/automatedWarehouse/palletAssembly.vue
@@ -87,23 +87,17 @@
           </el-checkbox>
         </div>
 
-        <!-- 第三行：筛选条件 (扫描栈板后显示) -->
+        <!-- 第三行：当前栈板站点显示 (扫描栈板后显示) - rqrq -->
         <div v-if="palletScanned" class="input-group">
-          <label class="input-label">位置</label>
+          <label class="input-label">当前站点</label>
           <div style="display: flex; gap: 8px;">
-            <el-select
-              v-model="selectedPosition"
-              placeholder="请选择位置"
-              style="flex: 0.75;"
-            >
-              <el-option label="ALL" value=""></el-option>
-              <el-option
-                v-for="position in positionOptions"
-                :key="position"
-                :label="position"
-                :value="position"
-              />
-            </el-select>
+            <el-input
+              v-model="currentPalletStation"
+              placeholder="栈板当前站点"
+              class="form-input"
+              readonly
+              style="flex: 0.75;">
+            </el-input>
             <button
               class="action-btn secondary"
               style="flex: 0.25; margin: 0; white-space: nowrap;"
@@ -530,6 +524,7 @@ export default {
       selectedLayer: '',
       positionOptions: [],
       layerOptions: [],
+      currentPalletStation: '',       // 当前栈板站点 - rqrq
 
       // 扫码模态框 - rqrq
       scanModalVisible: false,
@@ -608,6 +603,7 @@ export default {
       this.selectedLayer = '';
       this.positionOptions = [];
       this.layerOptions = [];
+      this.currentPalletStation = ''; // 清空当前站点 - rqrq
 
       // 清空栈板明细
       this.detailList = [];
@@ -717,6 +713,28 @@ export default {
           this.currentPalletFamily = palletInfo.palletFamily || '';
           this.currentPalletType = palletInfo.palletType || '';
           this.currentAutoSort = palletInfo.autoSort || 'N';
+          this.currentPalletStation = palletInfo.locationCode || ''; // 获取当前站点 - rqrq
+
+          // 空托盘组盘界面：校验栈板站点不能是R1/R2/R3/R4 - rqrq
+          const forbiddenStations = ['R1', 'R2', 'R3', 'R4'];
+          if (this.currentPalletStation && forbiddenStations.includes(this.currentPalletStation)) {
+            this.$alert(
+              `空托盘组盘功能不能在R1/R2/R3/R4站点使用，当前栈板站点为：${this.currentPalletStation}`,
+              '站点错误',
+              {
+                confirmButtonText: '确定',
+                callback: () => {
+                  this.resetPage();
+                  this.$nextTick(() => {
+                    if (this.$refs.palletInput) {
+                      this.$refs.palletInput.focus();
+                    }
+                  });
+                }
+              }
+            );
+            return;
+          }
 
           // 第一次进页面扫描栈板查询的时候，如果sore_Type=3，那么也要显示勾选 - rqrq
           const soreType = palletInfo.soreType;
diff --git a/src/views/modules/automatedWarehouse/palletPacking.vue b/src/views/modules/automatedWarehouse/palletPacking.vue
index 5266ddd..4352c8e 100644
--- a/src/views/modules/automatedWarehouse/palletPacking.vue
+++ b/src/views/modules/automatedWarehouse/palletPacking.vue
@@ -87,23 +87,17 @@
           </el-checkbox>
         </div>
 
-        <!-- 第三行：筛选条件 (扫描栈板后显示) -->
+        <!-- 第三行：当前栈板站点显示 (扫描栈板后显示) - rqrq -->
         <div v-if="palletScanned" class="input-group">
-          <label class="input-label">位置</label>
+          <label class="input-label">当前站点</label>
           <div style="display: flex; gap: 8px;">
-            <el-select
-              v-model="selectedPosition"
-              placeholder="请选择位置"
-              style="flex: 0.75;"
-            >
-              <el-option label="ALL" value=""></el-option>
-              <el-option
-                v-for="position in positionOptions"
-                :key="position"
-                :label="position"
-                :value="position"
-              />
-            </el-select>
+            <el-input
+              v-model="currentPalletStation"
+              placeholder="栈板当前站点"
+              class="form-input"
+              readonly
+              style="flex: 0.75;">
+            </el-input>
             <button
               class="action-btn secondary"
               style="flex: 0.25; margin: 0; white-space: nowrap;"
@@ -596,6 +590,7 @@ export default {
       selectedLayer: '',
       positionOptions: [],
       layerOptions: [],
+      currentPalletStation: '',       // 当前栈板站点 - rqrq
 
       // 扫码模态框 - rqrq
       scanModalVisible: false,
@@ -680,6 +675,7 @@ export default {
       this.selectedLayer = '';
       this.positionOptions = [];
       this.layerOptions = [];
+      this.currentPalletStation = ''; // 清空当前站点 - rqrq
 
       // 清空栈板明细
       this.detailList = [];
@@ -793,6 +789,28 @@ export default {
           this.currentPalletFamily = palletInfo.palletFamily || '';
           this.currentPalletType = palletInfo.palletType || '';
           this.currentAutoSort = palletInfo.autoSort || 'N';
+          this.currentPalletStation = palletInfo.locationCode || ''; // 获取当前站点 - rqrq
+
+          // 组盘界面：校验栈板站点不能是R1/R2/R3/R4 - rqrq
+          const forbiddenStations = ['R1', 'R2', 'R3', 'R4'];
+          if (this.currentPalletStation && forbiddenStations.includes(this.currentPalletStation)) {
+            this.$alert(
+              `组盘功能不能在R1/R2/R3/R4站点使用，当前栈板站点为：${this.currentPalletStation}`,
+              '站点错误',
+              {
+                confirmButtonText: '确定',
+                callback: () => {
+                  this.resetPage();
+                  this.$nextTick(() => {
+                    if (this.$refs.palletInput) {
+                      this.$refs.palletInput.focus();
+                    }
+                  });
+                }
+              }
+            );
+            return;
+          }
 
           // 第一次进页面扫描栈板查询的时候，如果sore_Type=3，那么也要显示勾选 - rqrq
           const soreType = palletInfo.soreType;
@@ -1583,7 +1601,8 @@ export default {
       callPalletToStationWithUpdateZuPan({
         site: this.site,
         startStation: this.currentPalletStation,
-        targetArea: this.selectedTargetArea
+        targetArea: this.selectedTargetArea,
+        palletId: this.palletCode
       }).then(({ data }) => {
         if (data.code === 0) {
           this.$message.success('栈板运输任务创建成功');
diff --git a/src/views/modules/automatedWarehouse/palletSorting.vue b/src/views/modules/automatedWarehouse/palletSorting.vue
index 23de284..c0ded2d 100644
--- a/src/views/modules/automatedWarehouse/palletSorting.vue
+++ b/src/views/modules/automatedWarehouse/palletSorting.vue
@@ -90,23 +90,17 @@
           </el-checkbox>
         </div>
 
-        <!-- 第三行：筛选条件 (扫描栈板后显示) -->
+        <!-- 第三行：当前栈板站点显示 (扫描栈板后显示) - rqrq -->
         <div v-if="palletScanned" class="input-group">
-          <label class="input-label">位置</label>
+          <label class="input-label">当前站点</label>
           <div style="display: flex; gap: 8px;">
-            <el-select
-              v-model="selectedPosition"
-              placeholder="请选择位置"
-              style="flex: 0.75;"
-            >
-              <el-option label="ALL" value=""></el-option>
-              <el-option
-                v-for="position in positionOptions"
-                :key="position"
-                :label="position"
-                :value="position"
-              />
-            </el-select>
+            <el-input
+              v-model="currentPalletStation"
+              placeholder="栈板当前站点"
+              class="form-input"
+              readonly
+              style="flex: 0.75;">
+            </el-input>
             <button
               class="action-btn secondary"
               style="flex: 0.25; margin: 0; white-space: nowrap;"
@@ -463,6 +457,7 @@ export default {
       selectedLayer: '',
       positionOptions: [],
       layerOptions: [],
+      currentPalletStation: '',       // 当前栈板站点 - rqrq
 
       // 扫码模态框 - rqrq
       scanModalVisible: false,
@@ -541,6 +536,7 @@ export default {
       this.selectedLayer = '';
       this.positionOptions = [];
       this.layerOptions = [];
+      this.currentPalletStation = ''; // 清空当前站点 - rqrq
 
       // 清空栈板明细
       this.detailList = [];
@@ -650,6 +646,28 @@ export default {
           this.currentPalletFamily = palletInfo.palletFamily || '';
           this.currentPalletType = palletInfo.palletType || '';
           this.currentAutoSort = palletInfo.autoSort || 'N';
+          this.currentPalletStation = palletInfo.locationCode || ''; // 获取当前站点 - rqrq
+
+          // 分拣界面：校验栈板站点必须是R1/R2/R3/R4 - rqrq
+          const allowedStations = ['R1', 'R2', 'R3', 'R4'];
+          if (!allowedStations.includes(this.currentPalletStation)) {
+            this.$alert(
+              `分拣功能只能在R1/R2/R3/R4站点使用，当前栈板站点为：${this.currentPalletStation || '空'}`,
+              '站点错误',
+              {
+                confirmButtonText: '确定',
+                callback: () => {
+                  this.resetPage();
+                  this.$nextTick(() => {
+                    if (this.$refs.palletInput) {
+                      this.$refs.palletInput.focus();
+                    }
+                  });
+                }
+              }
+            );
+            return;
+          }
 
           // 第一次进页面扫描栈板查询的时候，如果sore_Type=3，那么也要显示勾选 - rqrq
           const soreType = palletInfo.soreType;