From 2274aded40f9325fff797e3258e87bcc9aeff3d2 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: Thu, 27 Aug 2026 13:27:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=9B=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/haianAutoWarehouse/callOut.js         |    7 +
 .../haianAutoWarehouse/callOutToStation.js    |    4 +
 .../haianAutoWarehouse/palletChangeStation.js |    7 +
 src/api/haianAutoWarehouse/palletPacking.js   |   75 +
 src/router/index.js                           |    5 +
 src/views/main.vue                            |   33 +
 .../haianCallOutToStation.vue                 |  538 ++++++++
 .../haianAutoWarehouse/haianPalletPacking.vue | 1216 +++++++++++++++++
 .../haianAutoWarehouse/haianPalletSearch.vue  |  601 ++++++++
 .../haianAutoWarehouse/haianPalletSorting.vue | 1064 +++++++++++++++
 10 files changed, 3550 insertions(+)
 create mode 100644 src/api/haianAutoWarehouse/callOut.js
 create mode 100644 src/api/haianAutoWarehouse/callOutToStation.js
 create mode 100644 src/api/haianAutoWarehouse/palletChangeStation.js
 create mode 100644 src/api/haianAutoWarehouse/palletPacking.js
 create mode 100644 src/views/modules/haianAutoWarehouse/haianCallOutToStation.vue
 create mode 100644 src/views/modules/haianAutoWarehouse/haianPalletPacking.vue
 create mode 100644 src/views/modules/haianAutoWarehouse/haianPalletSearch.vue
 create mode 100644 src/views/modules/haianAutoWarehouse/haianPalletSorting.vue

diff --git a/src/api/haianAutoWarehouse/callOut.js b/src/api/haianAutoWarehouse/callOut.js
new file mode 100644
index 0000000..85f46f0
--- /dev/null
+++ b/src/api/haianAutoWarehouse/callOut.js
@@ -0,0 +1,7 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+// 海安-按物料/批次/托盘号查询可Call料栈板清单 - rqrq
+export const getPalletList = data => createAPI(`/haiAnWcsIntegration/palletListForPartNo`, 'post', data)
+
+// 海安-旧页面兼容占位：当前页面未实际使用IFS查料接口 - rqrq
+export const getShopOrderFromIFSWithOrderNo = data => createAPI(`/haiAnWcsIntegration/palletListForPartNo`, 'post', data)
diff --git a/src/api/haianAutoWarehouse/callOutToStation.js b/src/api/haianAutoWarehouse/callOutToStation.js
new file mode 100644
index 0000000..65916e4
--- /dev/null
+++ b/src/api/haianAutoWarehouse/callOutToStation.js
@@ -0,0 +1,4 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+// 海安-Call料到指定区域/站点（立库开关分流）- rqrq
+export const callOutToStation = data => createAPI(`/haiAnWcsIntegration/callOutToStation`, 'post', data)
diff --git a/src/api/haianAutoWarehouse/palletChangeStation.js b/src/api/haianAutoWarehouse/palletChangeStation.js
new file mode 100644
index 0000000..6d180e9
--- /dev/null
+++ b/src/api/haianAutoWarehouse/palletChangeStation.js
@@ -0,0 +1,7 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+// 海安-获取可选区域（choose_able=Y）- rqrq
+export const getAreaOptionsForChange = data => createAPI(`/haiAnWcsIntegration/getAreaOptionsForChange`, 'post', data)
+
+// 海安-按区域获取站点清单（locationCode/status）- rqrq
+export const getStationsByArea = data => createAPI(`/haiAnWcsIntegration/getStationsByArea`, 'post', data)
diff --git a/src/api/haianAutoWarehouse/palletPacking.js b/src/api/haianAutoWarehouse/palletPacking.js
new file mode 100644
index 0000000..2e9b61d
--- /dev/null
+++ b/src/api/haianAutoWarehouse/palletPacking.js
@@ -0,0 +1,75 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+// 海安-检查栈板并返回基础信息（含位置清单）- rqrq
+export const checkPalletExists = data => createAPI(`/haiAnWcsIntegration/checkPalletExists`, 'post', data)
+
+// 海安-简单查询栈板信息（查看托盘入口）- rqrq
+export const getPalletInfoSimple = data => createAPI(`/haiAnWcsIntegration/getPalletInfoSimple`, 'post', data)
+
+// 海安-获取栈板明细 - rqrq
+export const getPalletDetails = data => createAPI(`/haiAnWcsIntegration/getPalletDetails`, 'post', data)
+
+// 海安-扫进保存明细 - rqrq
+export const savePalletDetail = data => createAPI(`/haiAnWcsIntegration/savePalletDetail`, 'post', data)
+
+// 海安-扫出删除明细 - rqrq
+export const deletePalletDetail = data => createAPI(`/haiAnWcsIntegration/deletePalletDetail`, 'post', data)
+
+// 海安-分拣扫回恢复原明细 - rqrq
+export const restorePalletDetail = data => createAPI(`/haiAnWcsIntegration/restorePalletDetail`, 'post', data)
+
+// 海安-查询标签当前所在明细 - rqrq
+export const getLabelInfo = data => createAPI(`/haiAnWcsIntegration/getLabelInfo`, 'post', data)
+
+// 海安-编辑位置时获取可用层数 - rqrq
+export const getLayersForEdit = data => createAPI(`/haiAnWcsIntegration/getLayersForEdit`, 'post', data)
+
+// 海安-更新标签位置层数 - rqrq
+export const updatePalletDetailPosition = data => createAPI(`/haiAnWcsIntegration/updatePalletDetailPosition`, 'post', data)
+
+// 海安-获取指定层可用位置 - rqrq
+export const getAvailablePositionsForLayer = data => createAPI(`/haiAnWcsIntegration/getAvailablePositionsForLayer`, 'post', data)
+
+// 海安-获取栈板扩展信息（托盘类型/站点等）- rqrq
+export const getPalletInfo = data => createAPI(`/haiAnWcsIntegration/getPalletInfo`, 'post', data)
+
+// 海安-获取托盘类型列表（由海安后端统一路由）- rqrq
+export const getPalletTypeList = data => createAPI(`/haiAnWcsIntegration/getPalletTypeList`, 'post', data)
+
+// 海安-获取托盘类型位置配置（由海安后端统一路由）- rqrq
+export const getPalletTypeAreas = data => createAPI(`/haiAnWcsIntegration/getPalletTypeAreas`, 'post', data)
+
+// 海安-更新栈板类型与自动分拣配置 - rqrq
+export const updatePalletTypeAndAutoSort = data => createAPI(`/haiAnWcsIntegration/updatePalletTypeAndAutoSort`, 'post', data)
+
+// 海安-提交分拣 - rqrq
+export const completePalletAssemblyForFenJian = data => createAPI(`/haiAnWcsIntegration/completePalletAssemblyForFenJian`, 'post', data)
+
+// 海安-组盘运输入库（立库接口分流）- rqrq
+export const callPalletToStationWithUpdateZuPan = data => createAPI(`/haiAnWcsIntegration/callPalletToStationWithUpdateZuPan`, 'post', data)
+
+// 海安-调用空托盘 - rqrq
+export const callEmptyPalletToStation = data => createAPI(`/haiAnWcsIntegration/callEmptyPalletToStation`, 'post', data)
+
+// 海安-结束分拣 - rqrq
+export const finishSorting = data => createAPI(`/haiAnWcsIntegration/finishSorting`, 'post', data)
+
+// 海安-查询分拣清单 - rqrq
+export const getSortingList = data => createAPI(`/haiAnWcsIntegration/getSortingList`, 'post', data)
+
+// 海安-查看托盘预留标签列表 - rqrq
+export const getPalletReservedLabels = data => createAPI(`/haiAnWcsIntegration/getPalletReservedLabels`, 'post', data)
+
+// 海安-一键取消托盘预留 - rqrq
+export const batchCancelReserve = data => createAPI(`/haiAnWcsIntegration/batchCancelReserve`, 'post', data)
+
+// 海安-旧页面兼容占位（当前无需调用）- rqrq
+export const getPalletPositions = data => createAPI(`/haiAnWcsIntegration/checkPalletExists`, 'post', data)
+export const getLayersByPosition = data => createAPI(`/haiAnWcsIntegration/getLayersForEdit`, 'post', data)
+export const validateLabel = data => createAPI(`/haiAnWcsIntegration/getLabelInfo`, 'post', data)
+export const getAgvStations = data => createAPI(`/haiAnWcsIntegration/getStationsByArea`, 'post', data)
+export const getAvailableAgvStations = data => createAPI(`/haiAnWcsIntegration/getStationsByArea`, 'post', data)
+export const callPalletToStation = data => createAPI(`/haiAnWcsIntegration/callPalletToStationWithUpdateZuPan`, 'post', data)
+export const createPalletTransportTask = data => createAPI(`/haiAnWcsIntegration/callPalletToStationWithUpdateZuPan`, 'post', data)
+export const completePalletAssembly = data => createAPI(`/haiAnWcsIntegration/completePalletAssemblyForFenJian`, 'post', data)
+export const finishSortingNoAgv = data => createAPI(`/haiAnWcsIntegration/finishSorting`, 'post', data)
diff --git a/src/router/index.js b/src/router/index.js
index 54f0977..0f4b179 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -148,6 +148,11 @@ const globalRoutes = [
   {path: "/palletSortingNoAgv",name: "palletSortingNoAgv", component: resolve => require(["@/views/modules/automatedWarehouse/palletSortingNoAgv.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
   {path: "/palletMerge",name: "palletMerge", component: resolve => require(["@/views/modules/automatedWarehouse/palletMerge.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
   {path: "/callOutForHetuo",name: "palletMerge", component: resolve => require(["@/views/modules/automatedWarehouse/callOutForHetuo.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
+  // 海安立库固定路由（工厂54）- rqrq
+  {path: "/haianCallOutToStation",name: "haianCallOutToStation", component: resolve => require(["@/views/modules/haianAutoWarehouse/haianCallOutToStation.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
+  {path: "/haianPalletPacking",name: "haianPalletPacking", component: resolve => require(["@/views/modules/haianAutoWarehouse/haianPalletPacking.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
+  {path: "/haianPalletSorting",name: "haianPalletSorting", component: resolve => require(["@/views/modules/haianAutoWarehouse/haianPalletSorting.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
+  {path: "/haianPalletSearch",name: "haianPalletSearch", component: resolve => require(["@/views/modules/haianAutoWarehouse/haianPalletSearch.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
 
 ]
 
diff --git a/src/views/main.vue b/src/views/main.vue
index 86bda25..3323ee8 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -120,6 +120,39 @@
           </div> -->
         </div>
       </div>
+      <!-- 海安立库操作（固定开放工厂54）- rqrq -->
+      <div class="section" v-site-auth="'54'">
+        <div class="section-header">
+          <span class="bullet">•</span>
+          <span class="section-title">海安立库操作</span>
+        </div>
+        <div class="button-grid">
+          <div class="menu-item" v-site-auth="'54'" @click="navigateWithWarehouseCheck('haianCallOutToStation')">
+            <div class="menu-icon purchase">
+              <van-icon name="shopping-cart-o" size="24" />
+            </div>
+            <div class="menu-text">海安立库取货</div>
+          </div>
+          <div class="menu-item" v-site-auth="'54'" @click="navigateWithWarehouseCheck('haianPalletPacking')">
+            <div class="menu-icon purchase">
+              <van-icon name="shopping-cart-o" size="24" />
+            </div>
+            <div class="menu-text">海安组盘入库</div>
+          </div>
+          <div class="menu-item" v-site-auth="'54'" @click="navigateWithWarehouseCheck('haianPalletSorting')">
+            <div class="menu-icon purchase">
+              <van-icon name="shopping-cart-o" size="24" />
+            </div>
+            <div class="menu-text">海安分拣组盘</div>
+          </div>
+          <div class="menu-item" v-site-auth="'54'" @click="navigateWithWarehouseCheck('haianPalletSearch')">
+            <div class="menu-icon purchase">
+              <van-icon name="shopping-cart-o" size="24" />
+            </div>
+            <div class="menu-text">海安查看托盘</div>
+          </div>
+        </div>
+      </div>
       <div class="section" v-site-auth="'55'">
         <div class="section-header">
           <span class="bullet">•</span>
diff --git a/src/views/modules/haianAutoWarehouse/haianCallOutToStation.vue b/src/views/modules/haianAutoWarehouse/haianCallOutToStation.vue
new file mode 100644
index 0000000..446c78d
--- /dev/null
+++ b/src/views/modules/haianAutoWarehouse/haianCallOutToStation.vue
@@ -0,0 +1,538 @@
+<template>
+  <div>
+    <div class="pda-container">
+      <!-- 头部栏 - rqrq -->
+      <div class="header-bar">
+        <div class="header-left" @click="handleBack">
+          <i class="el-icon-arrow-left"></i>
+          <span>Call料到指定位置</span>
+        </div>
+        <div class="header-right" @click="$router.push({ path: '/' })">
+          首页
+        </div>
+      </div>
+
+      <div class="table-body" style="max-height: 500px; overflow-y: auto;">
+        <div class="main-content form-section">
+          <!-- 表单区域 - rqrq -->
+          <div class="input-group">
+            <label class="input-label">物料编码</label>
+            <el-input
+              v-model="formData.partNo"
+              placeholder="请输入物料编码"
+              class="form-input"
+              ref="partNoInput"
+              clearable
+
+            />
+          </div>
+          <!--          @blur="handlePartNoBlur"-->
+          <!-- 栈板编码搜索框 - rqrq -->
+          <div class="input-group">
+            <label class="input-label">栈板编码</label>
+            <el-input
+              v-model="formData.palletId"
+              placeholder="请输入栈板编码"
+              class="form-input"
+              clearable
+            />
+          </div>
+
+          <!--          <div class="input-group">-->
+          <!--            <label class="input-label">物料名称</label>-->
+          <!--            <el-input-->
+          <!--              v-model="formData.partDesc"-->
+          <!--              disabled-->
+          <!--              class="form-input"-->
+          <!--            />-->
+          <!--          </div>-->
+
+          <div class="input-group">
+            <label class="input-label">批号</label>
+            <el-input
+              v-model="formData.batchNo"
+              class="form-input"
+              clearable
+            />
+          </div>
+
+          <div class="bottom-actions" style="display: flex; gap: 10px; flex-wrap: nowrap;">
+            <button class="action-btn secondary" @click="confirmDo" style="flex: 1;">
+              查询
+            </button>
+
+            <button class="action-btn secondary" @click="cleanData" style="flex: 1;">
+              清空
+            </button>
+
+            <button
+              class="action-btn secondary"
+              @click="handleTransportPallet"
+              :disabled="!selectedPallet"
+              style="flex: 1;"
+            >
+              运输栈板
+            </button>
+          </div>
+        </div>
+
+        <!-- 栈板列表 - rqrq（单选模式）-->
+        <div v-if="palletList.length > 0" class="rma-list">
+          <div class="list-title" style="flex: 0.75">可用栈板列表（单选）</div>
+
+          <el-form>
+            <el-row v-for="(pallet, index) in palletList" :key="index" class="rma-row">
+              <el-col :span="24">
+                <div class="rma-item" @click="selectPallet(pallet)" :class="{ 'selected': isSelected(pallet) }">
+                  <div class="item-info">
+                    <span class="part-no">栈板号: {{ pallet.palletId }}</span>
+                    <!-- rqrq - 如果有物料编码，显示明细；否则只显示栈板 -->
+                    <span class="batch-qty" v-if="pallet.partNo">
+                      物料: {{ pallet.partNo }} | 数量: {{ pallet.qty }}
+                    </span>
+                    <span class="batch-qty" v-if="pallet.partNo && pallet.batchNo">
+                      | 批号: {{ pallet.batchNo }}
+                    </span>
+                    <span class="batch-qty" v-if="pallet.partNo && pallet.receiveDate">
+                      | 接收日期: {{ pallet.receiveDate }}
+                    </span>
+                  </div>
+                  <div class="item-status">
+                    <i class="el-icon-check" v-if="isSelected(pallet)"></i>
+                  </div>
+                </div>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </div>
+    </div>
+
+    <!-- 选择区域和站点弹窗 - rqrq -->
+    <el-dialog
+      title="选择目标位置"
+      :visible.sync="locationModalVisible"
+      width="90%"
+      :close-on-click-modal="false"
+      :show-close="false"
+      :modal="true"
+      :modal-append-to-body="true"
+      :append-to-body="true"
+    >
+      <div class="location-selection">
+        <!-- 选择区域 - rqrq -->
+        <div class="input-group">
+          <label class="input-label">选择区域</label>
+          <el-select
+            v-model="selectedArea"
+            placeholder="请选择区域"
+            style="width: 100%;"
+            @change="handleAreaChange"
+          >
+            <el-option
+              v-for="area in areaOptions"
+              :key="area.areaId"
+              :label="area.areaDesc"
+              :value="area.areaId"
+            />
+          </el-select>
+        </div>
+
+        <!-- 选择站点 - rqrq -->
+        <div class="input-group">
+          <label class="input-label">选择站点</label>
+          <el-select
+            v-model="selectedStation"
+            placeholder="请选择站点"
+            style="width: 100%;"
+            :disabled="!selectedArea"
+          >
+            <el-option label="自动分配" value=""></el-option>
+            <el-option
+              v-for="station in stationOptions"
+              :key="station.stationId"
+              :label="`${station.stationId} (${station.stationCode})`"
+              :value="station.stationCode"
+            />
+          </el-select>
+        </div>
+      </div>
+
+      <div slot="footer" class="dialog-footer" style="display: flex; gap: 8px;">
+        <button class="action-btn secondary" @click="locationModalVisible=false" style="flex: 1;">
+          取消
+        </button>
+        <button
+          class="action-btn primary"
+          @click="handleConfirmLocation"
+          :disabled="submitLoading || !selectedArea"
+          style="flex: 1;">
+          {{ submitLoading ? '处理中...' : '确认' }}
+        </button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  getShopOrderFromIFSWithOrderNo,
+  getPalletList
+} from '../../../api/haianAutoWarehouse/callOut'
+import {
+  getAreaOptionsForChange,
+  getStationsByArea
+} from '../../../api/haianAutoWarehouse/palletChangeStation'
+import {
+  callOutToStation
+} from '../../../api/haianAutoWarehouse/callOutToStation'
+
+export default {
+  name: 'haianCallOutToStation',
+  data() {
+    return {
+      username: localStorage.getItem('username'),
+
+      // 表单数据 - rqrq
+      formData: {
+        palletId: '',
+        partNo: '',
+        partDesc: '',
+        batchNo: '',
+        site: this.$store.state.user.site
+      },
+
+      // 栈板列表 - rqrq
+      palletList: [],
+      selectedPallet: null, // 单选模式 - rqrq
+
+      // 位置选择 - rqrq
+      locationModalVisible: false,
+      selectedArea: '',
+      selectedStation: '',
+      areaOptions: [],
+      stationOptions: [],
+
+      // 加载状态 - rqrq
+      loading: false,
+      submitLoading: false
+    };
+  },
+  computed: {
+    // 海安页面site统一来自store，缺失即阻断业务提交 - rqrq
+    site() {
+      return this.$store.state.user.site
+    }
+  },
+  methods: {
+    // 返回上一页 - rqrq
+    handleBack() {
+      // 离开页面前统一清理状态，避免keep-alive缓存导致二次进入残留查询结果 - rqrq
+      this.resetPage(false);
+      this.$router.back();
+    },
+
+    // 海安Call料页统一重置：退出和重进都走同一套清理逻辑，保证页面状态可预期 - rqrq
+    resetPage(needFocus = true) {
+      this.formData = {
+        palletId: '',
+        partNo: '',
+        partDesc: '',
+        batchNo: '',
+        site: this.site
+      };
+      this.palletList = [];
+      this.selectedPallet = null;
+      this.locationModalVisible = false;
+      this.selectedArea = '';
+      this.selectedStation = '';
+      this.areaOptions = [];
+      this.stationOptions = [];
+      this.loading = false;
+      this.submitLoading = false;
+      if (needFocus) {
+        this.$nextTick(() => {
+          if (this.$refs.partNoInput) {
+            this.$refs.partNoInput.focus();
+          }
+        });
+      }
+    },
+
+    // 处理物料编码失去焦点事件 - rqrq
+    async handlePartNoBlur() {
+      const partNo = this.formData.partNo;
+      if (!partNo) {
+        this.formData.partDesc = '';
+        return;
+      }
+
+      this.loading = true;
+      getShopOrderFromIFSWithOrderNo({
+        site: this.formData.site,
+        partNo: partNo
+      }).then(({ data }) => {
+        this.loading = false;
+        if (data.code === 0) {
+          let rows = data.rows
+          if (rows.length > 0) {
+            this.formData.partDesc = rows[0].description || '';
+          } else {
+            this.formData.partDesc = '';
+            this.$alert('没有找到该物料编码', '错误', {
+              confirmButtonText: '确定',
+            })
+          }
+        } else {
+          this.formData.partDesc = '';
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定',
+          })
+        }
+      })
+    },
+
+    // 查询栈板列表 - rqrq
+    confirmDo() {
+      if ((!this.formData.partNo || this.formData.partNo === '') &&
+          (!this.formData.palletId || this.formData.palletId === '')) {
+        this.$alert('请输入物料编码或栈板编码', '提示', {
+          confirmButtonText: '确定'
+        });
+        return;
+      }
+      if (!this.site) {
+        this.$alert('当前用户缺少site，无法查询', '提示', {
+          confirmButtonText: '确定'
+        });
+        return;
+      }
+
+      const queryParams = {
+        site: this.site
+      };
+
+      if (this.formData.palletId && this.formData.palletId.trim()) {
+        queryParams.palletId = this.formData.palletId.trim();
+      }
+
+      if (this.formData.partNo && this.formData.partNo.trim()) {
+        queryParams.partNo = this.formData.partNo.trim();
+      }
+
+      if (this.formData.batchNo && this.formData.batchNo.trim()) {
+        queryParams.batchNo = this.formData.batchNo.trim();
+      }
+
+      getPalletList(queryParams).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.palletList = data.rows || [];
+          if (this.palletList.length === 0) {
+            this.$message.warning('未找到满足条件的栈板');
+          } else {
+            this.$message.success(`找到 ${this.palletList.length} 个栈板`);
+          }
+          this.selectedPallet = null; // 清空选中 - rqrq
+        } else {
+          this.$alert(data.msg || '查询失败', '错误', {
+            confirmButtonText: '确定'
+          });
+          this.palletList = [];
+          this.selectedPallet = null;
+        }
+      }).catch(error => {
+        console.error('查询栈板列表失败:', error);
+        this.$alert(error.message || '查询失败', '错误', {
+          confirmButtonText: '确定'
+        });
+        this.palletList = [];
+        this.selectedPallet = null;
+      });
+    },
+
+    // 选择栈板（单选模式）- rqrq
+    selectPallet(pallet) {
+      if (this.selectedPallet && this.selectedPallet.palletId === pallet.palletId) {
+        // 如果点击已选中的栈板，取消选择 - rqrq
+        this.selectedPallet = null;
+        this.$message.success('已取消选择');
+      } else {
+        // 选择新栈板 - rqrq
+        this.selectedPallet = {
+          site: pallet.site,
+          palletId: pallet.palletId,
+          partNo: pallet.partNo || '',
+          qty: pallet.qty || 0,
+          batchNo: pallet.batchNo || this.formData.batchNo || ''
+        };
+        this.$message.success(`已选择栈板: ${pallet.palletId}`);
+      }
+    },
+
+    // 判断栈板是否被选中 - rqrq
+    isSelected(pallet) {
+      return this.selectedPallet && this.selectedPallet.palletId === pallet.palletId;
+    },
+
+    // 处理运输栈板按钮 - rqrq
+    handleTransportPallet() {
+      if (!this.selectedPallet) {
+        this.$alert('请选择一个栈板', '提示', {
+          confirmButtonText: '确定'
+        });
+        return;
+      }
+
+      // 加载区域选项并打开弹窗 - rqrq
+      this.loadAreaOptions();
+      this.locationModalVisible = true;
+    },
+
+    // 加载区域选项 - rqrq
+    loadAreaOptions() {
+      getAreaOptionsForChange({
+        site: this.site
+      }).then(({ data }) => {
+        if (data.code === 0) {
+          // 过滤掉Z199区域，Call料到指定位置不允许选择Z199 - rqrq
+          const allOptions = data.rows || [];
+          this.areaOptions = allOptions.filter(area => area.areaId !== 'Z199');
+        } else {
+          this.areaOptions = [];
+          this.$alert('获取区域选项失败', '错误', {
+            confirmButtonText: '确定'
+          });
+        }
+      }).catch(error => {
+        console.error('获取区域选项失败:', error);
+        this.areaOptions = [];
+      });
+    },
+
+    // 区域变化 - rqrq
+    handleAreaChange(areaId) {
+      this.selectedStation = '';
+      this.stationOptions = [];
+
+      if (!areaId) {
+        return;
+      }
+
+      getStationsByArea({
+        site: this.site,
+        areaId: areaId
+      }).then(({ data }) => {
+        if (data.code === 0) {
+          this.stationOptions = data.rows || [];
+        } else {
+          this.stationOptions = [];
+          this.$alert('获取站点选项失败', '错误', {
+            confirmButtonText: '确定'
+          });
+        }
+      }).catch(error => {
+        console.error('获取站点选项失败:', error);
+        this.stationOptions = [];
+      });
+    },
+
+    // 确认位置选择 - rqrq
+    handleConfirmLocation() {
+      if (!this.selectedArea) {
+        this.$alert('请选择目标区域', '提示', {
+          confirmButtonText: '确定'
+        });
+        return;
+      }
+
+      // 二次确认 - rqrq
+      this.$confirm('确定要叫料并运输到指定位置？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.submitLoading = true;
+
+        const params = {
+          site: this.site,
+          palletId: this.selectedPallet.palletId,
+          partNo: this.selectedPallet.partNo,
+          qty: this.selectedPallet.qty,
+          batchNo: this.selectedPallet.batchNo,
+          targetArea: this.selectedArea,
+          targetStation: this.selectedStation || '', // 空表示自动分配 - rqrq
+          username: this.username
+        };
+
+        // 调用后端接口 - rqrq
+        callOutToStation(params).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.$message.success('任务下达成功');
+            this.locationModalVisible = false;
+            this.cleanData();
+          } else {
+            this.$alert(data.msg || '任务下达失败', '错误', {
+              confirmButtonText: '确定'
+            });
+          }
+        }).catch(error => {
+          console.error('任务下达失败:', error);
+          this.$alert(error.message || '任务下达失败', '错误', {
+            confirmButtonText: '确定'
+          });
+        }).finally(() => {
+          this.submitLoading = false;
+        });
+      }).catch(() => {
+        // 用户取消 - rqrq
+      });
+    },
+
+    // 清空数据 - rqrq
+    cleanData() {
+      // 手工点击“清空”时复用标准重置逻辑，确保和退出重进行为一致 - rqrq
+      this.resetPage(true);
+    }
+  },
+  // keep-alive页面重新激活时统一重置，避免历史查询条件残留 - rqrq
+  activated() {
+    this.resetPage(true);
+  },
+  // 离开页面时主动清理缓存状态，防止下次进入展示旧数据 - rqrq
+  beforeRouteLeave(to, from, next) {
+    this.resetPage(false);
+    next();
+  },
+  mounted() {
+    this.resetPage(true);
+  }
+};
+</script>
+
+<style scoped>
+/* 按钮禁用状态样式 - rqrq */
+.action-btn:disabled {
+  opacity: 0.6;
+  cursor: not-allowed;
+  background-color: #ccc !important;
+  border-color: #ccc !important;
+}
+
+/* 位置选择区域样式 - rqrq */
+.location-selection {
+  padding: 10px 0;
+}
+
+.dialog-footer {
+  text-align: center;
+}
+
+/* 修复模态框层级问题 - rqrq */
+::v-deep .el-dialog__wrapper {
+  z-index: 2000 !important;
+}
+
+::v-deep .el-overlay {
+  z-index: 2000 !important;
+}
+</style>
diff --git a/src/views/modules/haianAutoWarehouse/haianPalletPacking.vue b/src/views/modules/haianAutoWarehouse/haianPalletPacking.vue
new file mode 100644
index 0000000..dbb0b5d
--- /dev/null
+++ b/src/views/modules/haianAutoWarehouse/haianPalletPacking.vue
@@ -0,0 +1,1216 @@
+<template>
+  <div class="pda-container">
+    <div class="header-bar">
+      <div class="header-left" @click="handleBack">
+        <i class="el-icon-arrow-left"></i>
+        <span>组盘入库</span>
+      </div>
+      <div class="header-right" @click="$router.push({ path: '/' })">首页</div>
+    </div>
+
+    <div class="table-body" style="max-height: 500px; overflow-y: auto;">
+      <div class="main-content form-section">
+        <!-- 第一行：栈板扫描 - rqrq -->
+        <div class="input-group">
+          <label class="input-label">栈板编码</label>
+          <div style="display: flex; gap: 8px;">
+            <el-input
+              v-model="palletCode"
+              placeholder="请扫描栈板编码"
+              class="form-input"
+              style="flex: 0.75;"
+              clearable
+              inputmode="none"
+              autocomplete="off"
+              autocorrect="off"
+              spellcheck="false"
+              @keyup.enter.native="handlePalletScan"
+              ref="palletInput"
+            />
+            <button
+              class="action-btn secondary"
+              style="flex: 0.25; margin: 0;"
+              @click="handleCallPallet"
+            >
+              Call栈板
+            </button>
+          </div>
+        </div>
+
+        <!-- 第二行：栈板类型和自动分拣 (扫描栈板后显示) - rqrq -->
+        <div v-if="palletScanned" class="input-group">
+          <div style="display: flex; gap: 8px; align-items: end;">
+            <div style="flex: 0.65;">
+              <label class="input-label">栈板类型</label>
+              <el-select
+                v-model="currentPalletType"
+                placeholder="请选择栈板类型"
+                style="width: 100%;"
+                :disabled="palletTypeDisabled"
+                @change="handlePalletTypeChange"
+              >
+                <el-option
+                  v-for="type in palletTypeOptions"
+                  :key="type.palletType"
+                  :label="`${type.palletType} - ${type.typeDesc}`"
+                  :value="type.palletType"
+                />
+              </el-select>
+            </div>
+            <div style="flex: 0.35;">
+              <label class="input-label">自动分拣</label>
+              <el-select
+                v-model="currentAutoSort"
+                placeholder="请选择"
+                style="width: 100%;"
+                :disabled="autoSortDisabled"
+                @change="handleAutoSortChange"
+              >
+                <el-option label="是" value="Y"></el-option>
+                <el-option label="否" value="N"></el-option>
+              </el-select>
+            </div>
+          </div>
+        </div>
+
+        <!-- 第2.5行：是否强制整托出库 (扫描栈板后显示) - rqrq -->
+        <div v-if="palletScanned" class="input-group">
+          <el-checkbox
+            v-model="forceFullPalletOut"
+            :disabled="palletTypeDisabled"
+            @change="handleForceFullPalletOutChange"
+            style="width: 100%;"
+          >
+            是否强制整托出库
+          </el-checkbox>
+        </div>
+
+        <!-- 第三行：当前栈板站点显示 (扫描栈板后显示) - rqrq -->
+        <div v-if="palletScanned" class="input-group">
+          <label class="input-label">当前站点</label>
+          <div style="display: flex; gap: 8px;">
+            <el-input
+              v-model="currentPalletStation"
+              placeholder="栈板当前站点"
+              class="form-input"
+              readonly
+              style="flex: 0.75;"
+            />
+            <button
+              class="action-btn secondary"
+              style="flex: 0.25; margin: 0; white-space: nowrap;"
+              @click="refreshTable"
+            >
+              刷新
+            </button>
+          </div>
+        </div>
+
+        <!-- 第四行：扫进/扫出选择 (扫描栈板后显示) - rqrq -->
+        <div v-if="palletScanned" class="input-group">
+          <div style="display: flex; gap: 8px; align-items: center;">
+            <div style="flex: 0.75;">
+              <el-radio-group v-model="operationType" style="display: flex;">
+                <el-radio label="in" style="margin-right: 0px; white-space: nowrap;">扫进</el-radio>
+                <el-radio label="out" style="white-space: nowrap;">扫出</el-radio>
+              </el-radio-group>
+            </div>
+            <button
+              class="action-btn secondary"
+              style="flex: 0.25; margin: 0; white-space: nowrap;"
+              :disabled="currentPalletType === ''"
+              @click="showScanModal"
+            >
+              扫描条码
+            </button>
+          </div>
+        </div>
+      </div>
+
+      <!-- 栈板明细表格 (扫描栈板后显示) - rqrq -->
+      <div v-if="palletScanned" class="rma-list">
+        <div class="list-title-row" style="display: flex; gap: 8px; align-items: center; padding: 0;">
+          <div class="list-title" style="flex: 0.4; margin: 0;">
+            <button class="action-btn primary" style="margin: 0;" @click="showDetailModal">
+              {{ '明细' }}
+            </button>
+          </div>
+          <button class="action-btn warning" style="flex: 0.3; margin: 0;" @click="showScanOutModal" :disabled="scanOutList.length === 0">
+            扫出({{ scanOutList.length }})
+          </button>
+          <button class="action-btn secondary" style="flex: 0.3; margin: 0;" @click="openTransportModal" :disabled="!currentPalletStation">运输入库</button>
+        </div>
+        <div class="list-title" style="flex: 0.5; margin: 0;">
+          <label style="margin-left: 5px;">条码数:{{ detailList.length }}</label>
+        </div>
+        <div class="detail-table">
+          <div class="table-header">
+            <div class="col-position">位置</div>
+            <div class="col-layer">层数</div>
+            <div class="col-serial">标签号</div>
+          </div>
+          <div
+            v-for="(detail, index) in detailList"
+            :key="index"
+            class="table-row"
+          >
+            <div class="col-position">{{ detail.position }}</div>
+            <div class="col-layer">{{ detail.layer }}</div>
+            <div class="col-serial">{{ detail.serialNo }}</div>
+          </div>
+          <div v-if="detailList.length === 0" class="table-row empty-row">
+            <div class="empty-hint">暂无栈板明细数据</div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- 浏览明细弹窗 - rqrq -->
+    <el-dialog
+      :title="'已扫描数量:' + detailList.length"
+      :visible.sync="detailModalVisible"
+      width="90%"
+      :close-on-click-modal="false"
+      :show-close="false"
+      :append-to-body="true"
+    >
+      <div class="table-body" style="max-height: 240px; overflow-y: auto;">
+        <div class="detail-table">
+          <div class="table-header">
+            <div class="col-position">位置</div>
+            <div class="col-layer">层数</div>
+            <div class="col-serial">标签号</div>
+          </div>
+          <div v-for="(detail, index) in detailList" :key="index" class="table-row">
+            <div class="col-position">{{ detail.position }}</div>
+            <div class="col-layer">{{ detail.layer }}</div>
+            <div class="col-serial">{{ detail.serialNo }}</div>
+          </div>
+          <div v-if="detailList.length === 0" class="table-row empty-row">
+            <div class="empty-hint">暂无栈板明细数据</div>
+          </div>
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <button class="action-btn secondary" style="margin-left: 10px;" @click="detailModalVisible = false">取消</button>
+      </div>
+    </el-dialog>
+
+    <!-- 查看扫出弹窗 - rqrq -->
+    <el-dialog
+      :title="'扫出记录 (共' + scanOutList.length + '条)'"
+      :visible.sync="scanOutModalVisible"
+      width="90%"
+      :close-on-click-modal="false"
+      :show-close="false"
+      :append-to-body="true"
+    >
+      <div class="table-body" style="max-height: 300px; overflow-y: auto;">
+        <div class="detail-table">
+          <div class="table-header">
+            <div class="col-position">位置</div>
+            <div class="col-layer">层数</div>
+            <div class="col-serial">标签号</div>
+          </div>
+          <div
+            v-for="(detail, index) in scanOutList"
+            :key="index"
+            class="table-row"
+          >
+            <div class="col-position">{{ detail.position }}</div>
+            <div class="col-layer">{{ detail.layer }}</div>
+            <div class="col-serial">{{ detail.serialNo }}</div>
+          </div>
+          <div v-if="scanOutList.length === 0" class="table-row empty-row">
+            <div class="empty-hint">暂无扫出记录</div>
+          </div>
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <button class="action-btn secondary" @click="scanOutModalVisible = false">关闭</button>
+      </div>
+    </el-dialog>
+
+    <!-- 扫码模态框：网格层数与原PDA页面保持一致 - rqrq -->
+    <el-dialog
+      title="扫描标签"
+      :visible.sync="scanModalVisible"
+      width="90%"
+      :close-on-click-modal="false"
+      :show-close="false"
+      :modal="true"
+      :modal-append-to-body="true"
+      :append-to-body="true"
+    >
+      <div class="scan-modal-content">
+        <!-- 扫进时显示层数选择和位置网格 - rqrq -->
+        <div v-if="operationType === 'in'" class="modal-form">
+          <!-- 层数选择（混装托盘不显示） - rqrq -->
+          <div v-if="!currentMixedMode && scanLayerOptions.length > 0" class="input-group">
+            <label class="input-label">层数（当前选择：第{{ scanLayer }}层）</label>
+            <div class="layer-grid">
+              <div
+                v-for="layer in scanLayerOptions"
+                :key="layer"
+                class="layer-item"
+                :class="{
+                  'layer-selected': scanLayer === layer
+                }"
+                @click="handleLayerClick(layer)"
+              >
+                {{ layer }}
+              </div>
+            </div>
+          </div>
+
+          <!-- 位置网格选择器 - rqrq -->
+          <div class="input-group">
+            <label class="input-label">
+              位置{{ currentSelectedPosition ? `（当前选择：${currentSelectedPosition}）` : '' }}
+              <span v-if="positionGridLoading" style="color: #909399; font-size: 12px;">（加载中...）</span>
+            </label>
+            <div class="position-grid" :class="[
+              {'position-grid-loading': positionGridLoading},
+              getPositionGridClass
+            ]">
+              <div
+                v-for="(item, index) in displayPositionGrid"
+                :key="index"
+                class="position-item"
+                :class="{
+                  'position-disabled': positionGridLoading || !availablePositions.includes(item.position),
+                  'position-selected': currentSelectedPosition === item.position,
+                  'position-loading': positionGridLoading,
+                  'position-placeholder': item.isPlaceholder
+                }"
+                @click="handlePositionClick(item.position)"
+              >
+                <template v-if="!item.isPlaceholder">{{ item.position }}({{ item.count }})</template>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <!-- 标签扫描 - rqrq -->
+        <div class="input-group">
+          <label class="input-label">标签二维码</label>
+          <el-input
+            ref="scanInput"
+            v-model="scanCode"
+            placeholder="请扫描标签二维码"
+            class="form-input"
+            clearable
+            :disabled="operationType === 'in' && !currentSelectedPosition"
+            @keyup.enter.native="handleLabelScan"
+            inputmode="none"
+            autocomplete="off"
+            autocorrect="off"
+            spellcheck="false"
+          />
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <button class="action-btn secondary" style="margin-left: 10px;" @click="closeScanModal">取消</button>
+      </div>
+    </el-dialog>
+
+    <!-- Call空托盘弹窗 - rqrq -->
+    <el-dialog
+      title="调用空托盘"
+      :visible.sync="callEmptyModalVisible"
+      width="90%"
+      :close-on-click-modal="false"
+      :show-close="false"
+      :append-to-body="true"
+    >
+      <div class="input-group">
+        <label class="input-label">区域</label>
+        <el-select v-model="callEmptyForm.areaId" placeholder="请选择区域" style="width: 100%;" @change="handleAreaChangeForCall">
+          <el-option v-for="a in areaOptions" :key="a.areaId" :label="a.areaDesc" :value="a.areaId" />
+        </el-select>
+      </div>
+      <div class="input-group">
+        <label class="input-label">站点</label>
+        <el-select v-model="callEmptyForm.stationCode" placeholder="请选择站点" style="width: 100%;" :disabled="!callEmptyForm.areaId">
+          <el-option v-for="s in stationOptions" :key="s.stationCode" :label="`${s.stationCode} (${s.status || '-'})`" :value="s.stationCode" />
+        </el-select>
+      </div>
+      <div class="input-group">
+        <label class="input-label">栈板类型</label>
+        <el-select v-model="callEmptyForm.palletType" placeholder="请选择栈板类型" style="width: 100%;">
+          <el-option v-for="t in callEmptyPalletTypeOptions" :key="t.palletType" :label="`${t.palletType} - ${t.typeDesc}`" :value="t.palletType" />
+        </el-select>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <button class="action-btn primary" @click="submitCallEmpty" :disabled="callEmptyLoading">{{ callEmptyLoading ? '处理中...' : '确认' }}</button>
+        <button class="action-btn secondary" style="margin-left: 8px;" @click="callEmptyModalVisible = false" :disabled="callEmptyLoading">取消</button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import {
+  checkPalletExists,
+  getPalletDetails,
+  savePalletDetail,
+  deletePalletDetail,
+  getPalletInfo,
+  getPalletTypeList,
+  updatePalletTypeAndAutoSort,
+  getAvailablePositionsForLayer,
+  callEmptyPalletToStation,
+  callPalletToStationWithUpdateZuPan
+} from '../../../api/haianAutoWarehouse/palletPacking'
+import { getAreaOptionsForChange, getStationsByArea } from '../../../api/haianAutoWarehouse/palletChangeStation'
+
+export default {
+  name: 'haianPalletPacking',
+  data() {
+    return {
+      site: this.$store.state.user.site,
+      palletCode: '',
+      palletScanned: false,
+      operationType: 'in',
+      currentPalletFamily: '',
+      currentPalletType: '',
+      currentAutoSort: 'N',
+      currentPalletStation: '',
+      forceFullPalletOut: false,
+      palletTypeDisabled: false,
+      autoSortDisabled: false,
+      currentWcsAutoSort: '',
+      currentMaxLayer: 0,
+      positionOptions: [],
+      palletTypeOptions: [],
+      callEmptyPalletTypeOptions: [],
+      detailList: [],
+      scanOutList: [],
+      detailModalVisible: false,
+      scanOutModalVisible: false,
+      palletInfo: {
+        palletType: '',
+        autoSort: 'N',
+        locationCode: ''
+      },
+      // 扫码模态框字段：与原PDA页面保持一致，按网格位置 + 层数扫入 - rqrq
+      scanModalVisible: false,
+      scanCode: '',
+      scanPosition: '',
+      scanLayer: 1,
+      scanLayerOptions: [],
+      needRefreshOnClose: false,
+      positionGrid: [],
+      availablePositions: [],
+      currentSelectedPosition: '',
+      currentMixedMode: false,
+      positionGridLoading: false,
+      areaOptions: [],
+      stationOptions: [],
+      callEmptyModalVisible: false,
+      callEmptyLoading: false,
+      callEmptyForm: {
+        areaId: '',
+        stationCode: '',
+        palletType: ''
+      },
+      transportLoading: false
+    }
+  },
+  computed: {
+    // 根据位置数量决定网格布局，确保与原PDA扫码弹窗一致 - rqrq
+    getPositionGridClass() {
+      const len = this.positionGrid.length
+      if (len === 1) return 'position-grid-1'
+      if (len === 2) return 'position-grid-4'
+      if (len === 4) return 'position-grid-4'
+      return 'position-grid-9'
+    },
+    // 2宫格场景采用对角展示，其余按原位置顺序展示 - rqrq
+    displayPositionGrid() {
+      const len = this.positionGrid.length
+      if (len === 2) {
+        const pos1 = this.positionGrid.find((p) => p.position === '1') || { position: '1', count: 0 }
+        const pos2 = this.positionGrid.find((p) => p.position === '2') || { position: '2', count: 0 }
+        return [
+          { ...pos1, isPlaceholder: false },
+          { position: '', count: 0, isPlaceholder: true },
+          { position: '', count: 0, isPlaceholder: true },
+          { ...pos2, isPlaceholder: false }
+        ]
+      }
+      return this.positionGrid.map((p) => ({ ...p, isPlaceholder: false }))
+    }
+  },
+  methods: {
+    // 统一校验site是否存在，海安接口必须显式传site - rqrq
+    ensureSite() {
+      if (!this.site) {
+        this.$alert('当前用户缺少site，无法执行海安组盘业务', '提示', { confirmButtonText: '确定' })
+        return false
+      }
+      return true
+    },
+    handleBack() {
+      // 返回首页前先清空海安组盘页面状态，避免keep-alive导致二次进入残留旧数据 - rqrq
+      this.resetPage(false)
+      this.$router.back()
+    },
+    // 海安组盘页统一重置方法：退出和重进都走同一套清理逻辑，保证状态一致性 - rqrq
+    resetPage(needFocus = true) {
+      this.site = this.$store.state.user.site
+      this.palletCode = ''
+      this.palletScanned = false
+      this.operationType = 'in'
+      this.currentPalletFamily = ''
+      this.currentPalletType = ''
+      this.currentAutoSort = 'N'
+      this.currentPalletStation = ''
+      this.forceFullPalletOut = false
+      this.palletTypeDisabled = false
+      this.autoSortDisabled = false
+      this.currentWcsAutoSort = ''
+      this.currentMaxLayer = 0
+      this.positionOptions = []
+      this.palletTypeOptions = []
+      this.callEmptyPalletTypeOptions = []
+      this.detailList = []
+      this.scanOutList = []
+      this.detailModalVisible = false
+      this.scanOutModalVisible = false
+      this.palletInfo = {
+        palletType: '',
+        autoSort: 'N',
+        locationCode: ''
+      }
+      this.scanModalVisible = false
+      this.scanCode = ''
+      this.scanPosition = ''
+      this.scanLayer = 1
+      this.scanLayerOptions = []
+      this.needRefreshOnClose = false
+      this.positionGrid = []
+      this.availablePositions = []
+      this.currentSelectedPosition = ''
+      this.currentMixedMode = false
+      this.positionGridLoading = false
+      this.areaOptions = []
+      this.stationOptions = []
+      this.callEmptyModalVisible = false
+      this.callEmptyLoading = false
+      this.callEmptyForm = {
+        areaId: '',
+        stationCode: '',
+        palletType: ''
+      }
+      this.transportLoading = false
+      if (needFocus) {
+        this.$nextTick(() => {
+          if (this.$refs.palletInput) {
+            this.$refs.palletInput.focus()
+          }
+        })
+      }
+    },
+    handlePalletScan() {
+      if (!this.ensureSite()) {
+        return
+      }
+      if (!this.palletCode || !this.palletCode.trim()) {
+        this.$alert('请输入栈板编码', '提示', { confirmButtonText: '确定' })
+        return
+      }
+      checkPalletExists({
+        site: this.site,
+        palletId: this.palletCode.trim()
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.palletCode = data.palletId
+          this.positionOptions = data.positions || []
+          this.palletScanned = true
+          this.scanOutList = []
+          this.scanCode = ''
+          this.scanPosition = ''
+          this.scanLayer = 1
+          this.currentSelectedPosition = ''
+          this.loadPalletInfo()
+          this.refreshTable()
+        } else {
+          this.$alert((data && data.msg) || '栈板校验失败', '错误', { confirmButtonText: '确定' })
+        }
+      }).catch((error) => {
+        this.$alert(error.message || '栈板校验失败', '错误', { confirmButtonText: '确定' })
+      })
+    },
+    loadPalletInfo() {
+      getPalletInfo({
+        site: this.site,
+        palletId: this.palletCode
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          const row = data.row || {}
+          this.currentPalletFamily = row.palletFamily || ''
+          this.currentPalletType = row.palletType || ''
+          this.currentAutoSort = row.autoSort || 'N'
+          this.currentPalletStation = row.locationCode || ''
+          this.forceFullPalletOut = Number(row.soreType) === 3
+          this.palletInfo.palletType = this.currentPalletType
+          this.palletInfo.autoSort = this.currentAutoSort
+          this.palletInfo.locationCode = this.currentPalletStation
+          this.loadPalletTypeList()
+        }
+      })
+    },
+    // 当前栈板改类型时，必须按该栈板大分类过滤可选类型，避免跨大类误选 - rqrq
+    loadPalletTypeList() {
+      getPalletTypeList({
+        site: this.site,
+        palletFamily: this.currentPalletFamily || '',
+        active: 'Y'
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.palletTypeOptions = data.rows || []
+          const selectedType = this.palletTypeOptions.find((item) => item.palletType === this.currentPalletType)
+          this.currentWcsAutoSort = selectedType ? (selectedType.wcsAutoSort || 'N') : ''
+          this.currentMaxLayer = selectedType ? Number(selectedType.maxLayer || 0) : 0
+          this.updateAutoSortControl()
+        }
+      })
+    },
+    // 调用空托盘必须获取全量可用类型，不按当前栈板大分类做过滤 - rqrq
+    loadAllPalletTypeListForCallEmpty() {
+      getPalletTypeList({
+        site: this.site,
+        palletFamily: '',
+        active: 'Y'
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.callEmptyPalletTypeOptions = data.rows || []
+          const hasSelectedType = this.callEmptyPalletTypeOptions.some((item) => item.palletType === this.callEmptyForm.palletType)
+          if (!hasSelectedType) {
+            this.callEmptyForm.palletType = ''
+          }
+        } else {
+          this.callEmptyPalletTypeOptions = []
+          this.callEmptyForm.palletType = ''
+        }
+      }).catch(() => {
+        this.callEmptyPalletTypeOptions = []
+        this.callEmptyForm.palletType = ''
+      })
+    },
+    refreshTable() {
+      getPalletDetails({
+        site: this.site,
+        palletId: this.palletCode,
+        position: '',
+        layer: null
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.detailList = data.details || []
+        } else {
+          this.detailList = []
+        }
+        // 明细存在时锁定托盘类型，避免已组盘后改类型导致规则不一致 - rqrq
+        this.palletTypeDisabled = this.detailList.length > 0
+        this.updateAutoSortControl()
+      }).catch(() => {
+        this.detailList = []
+        this.palletTypeDisabled = false
+        this.updateAutoSortControl()
+      })
+    },
+    handlePalletTypeChange() {
+      const selectedType = this.palletTypeOptions.find((item) => item.palletType === this.currentPalletType)
+      this.currentWcsAutoSort = selectedType ? (selectedType.wcsAutoSort || 'N') : ''
+      this.currentMaxLayer = selectedType ? Number(selectedType.maxLayer || 0) : 0
+      // A0103类型要求强制整托出库，避免部分扫出导致业务冲突 - rqrq
+      if (this.currentPalletType === 'A0103'||this.currentPalletType === 'A0206') {
+        this.forceFullPalletOut = true
+      }
+      this.updateAutoSortControl()
+      this.savePalletTypeConfig()
+    },
+    handleAutoSortChange() {
+      this.savePalletTypeConfig()
+    },
+    handleForceFullPalletOutChange() {
+      this.savePalletTypeConfig()
+    },
+    // 根据托盘类型能力与强制整托规则动态控制自动分拣可编辑性 - rqrq
+    updateAutoSortControl() {
+      if (this.forceFullPalletOut || this.currentPalletType === 'A0103') {
+        this.currentAutoSort = 'N'
+        this.autoSortDisabled = true
+        return
+      }
+      if (this.currentWcsAutoSort === 'N') {
+        this.currentAutoSort = 'N'
+        this.autoSortDisabled = true
+        return
+      }
+      this.autoSortDisabled = this.detailList.length > 0
+    },
+    // 更新托盘类型与自动分拣设置，保持海安后端状态一致 - rqrq
+    savePalletTypeConfig() {
+      updatePalletTypeAndAutoSort({
+        site: this.site,
+        palletId: this.palletCode,
+        palletType: this.currentPalletType,
+        autoSort: this.currentAutoSort,
+        forceFullPalletOut: this.forceFullPalletOut
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.palletInfo.palletType = this.currentPalletType
+          this.palletInfo.autoSort = this.currentAutoSort
+          this.$message.success('托盘配置已更新')
+        } else {
+          this.$alert((data && data.msg) || '托盘配置更新失败', '错误', { confirmButtonText: '确定' })
+        }
+      })
+    },
+    // 沿用原页面入口命名，点击Call栈板时打开空托盘调用弹窗 - rqrq
+    handleCallPallet() {
+      this.openCallEmptyModal()
+    },
+    // 打开扫码弹窗并初始化网格数据，交互与原PDA页面一致 - rqrq
+    showScanModal() {
+      this.scanModalVisible = true
+      this.scanCode = ''
+      this.currentSelectedPosition = ''
+      this.needRefreshOnClose = false
+      if (this.operationType === 'in') {
+        this.scanLayer = 1
+        this.loadLayerOptions()
+      } else {
+        this.$nextTick(() => {
+          if (this.$refs.scanInput) {
+            this.$refs.scanInput.focus()
+          }
+        })
+      }
+    },
+    showDetailModal() {
+      this.detailModalVisible = true
+    },
+    showScanOutModal() {
+      this.scanOutModalVisible = true
+    },
+    // 计算当前可选层数并刷新位置网格，保持“按层扫描”体验一致 - rqrq
+    loadLayerOptions() {
+      getPalletDetails({
+        site: this.site,
+        palletId: this.palletCode,
+        position: '',
+        layer: null
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          const details = data.details || []
+          let maxExistingLayer = 0
+          if (details.length > 0) {
+            maxExistingLayer = Math.max(...details.map((d) => d.layer || 0))
+          }
+          if (this.currentMaxLayer === 0) {
+            this.currentMixedMode = false
+            this.scanLayerOptions = Array.from({ length: maxExistingLayer + 1 }, (_, i) => i + 1)
+          } else {
+            this.currentMixedMode = false
+            this.scanLayerOptions = Array.from({ length: this.currentMaxLayer }, (_, i) => i + 1)
+          }
+          this.loadAvailablePositions()
+        } else {
+          this.$alert((data && data.msg) || '获取栈板信息失败', '错误', { confirmButtonText: '确定' })
+        }
+      }).catch(() => {
+        this.$alert('获取栈板信息失败', '错误', { confirmButtonText: '确定' })
+      })
+    },
+    // 按层加载位置网格与可扫位置，确保禁用态/加载态与原页面一致 - rqrq
+    loadAvailablePositions() {
+      this.positionGridLoading = true
+      this.availablePositions = []
+      getPalletDetails({
+        site: this.site,
+        palletId: this.palletCode,
+        position: '',
+        layer: this.scanLayer
+      }).then(({ data: detailData }) => {
+        const positionCountMap = {}
+        if (detailData && detailData.code === 0) {
+          const details = detailData.details || []
+          details.forEach((detail) => {
+            const pos = detail.position
+            positionCountMap[pos] = (positionCountMap[pos] || 0) + 1
+          })
+        }
+        return getAvailablePositionsForLayer({
+          site: this.site,
+          palletId: this.palletCode,
+          layer: this.scanLayer
+        }).then(({ data }) => {
+          if (data && data.code === 0) {
+            const result = data.data || {}
+            const positions = result.positions || []
+            this.availablePositions = result.availablePositions || []
+            this.positionGrid = positions.map((position) => ({
+              position,
+              count: positionCountMap[position] || 0
+            }))
+          } else {
+            this.availablePositions = []
+            this.positionGrid = []
+            this.$alert((data && data.msg) || '获取位置信息失败', '错误', { confirmButtonText: '确定' })
+          }
+        })
+      }).catch(() => {
+        this.availablePositions = []
+        this.positionGrid = []
+        this.$alert('获取位置信息失败', '错误', { confirmButtonText: '确定' })
+      }).finally(() => {
+        this.positionGridLoading = false
+      })
+    },
+    handleLayerClick(layer) {
+      if (this.scanLayer === layer) {
+        return
+      }
+      this.scanLayer = layer
+      this.currentSelectedPosition = ''
+      this.loadAvailablePositions()
+    },
+    handlePositionClick(position) {
+      if (this.positionGridLoading) {
+        this.$message.warning('位置信息加载中，请稍候')
+        return
+      }
+      if (!this.availablePositions.includes(position)) {
+        this.$message.warning('该位置不可用')
+        return
+      }
+      this.currentSelectedPosition = position
+      this.scanPosition = position
+      this.$nextTick(() => {
+        if (this.$refs.scanInput) {
+          this.$refs.scanInput.focus()
+        }
+      })
+    },
+    moveFocusToScanInput() {
+      this.$nextTick(() => {
+        if (this.$refs.scanInput) {
+          this.$refs.scanInput.focus()
+        }
+      })
+    },
+    closeScanModal() {
+      this.scanModalVisible = false
+      if (this.needRefreshOnClose) {
+        this.refreshTable()
+        this.needRefreshOnClose = false
+      }
+    },
+    // 扫码提交：扫进用网格位置信息，扫出沿用原有删除逻辑 - rqrq
+    handleLabelScan() {
+      if (!this.ensureSite()) {
+        return
+      }
+      if (!this.scanCode || !this.scanCode.trim()) {
+        this.$alert('请输入标签编码', '错误', { confirmButtonText: '确定' })
+        return
+      }
+      if (this.operationType === 'in') {
+        if (!this.scanPosition) {
+          this.$alert('请选择位置', '错误', { confirmButtonText: '确定' })
+          return
+        }
+        if (!this.scanLayer) {
+          this.$alert('请选择层数', '错误', { confirmButtonText: '确定' })
+          return
+        }
+        savePalletDetail({
+          site: this.site,
+          palletId: this.palletCode,
+          position: this.scanPosition,
+          layer: this.scanLayer,
+          serialNo: this.scanCode,
+          sortFlag: 0
+        }).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.$message.success('扫进成功')
+            this.needRefreshOnClose = true
+            this.scanCode = ''
+            this.loadLayerOptions()
+            this.moveFocusToScanInput()
+          } else {
+            this.$alert((data && data.msg) || '扫进失败', '错误', { confirmButtonText: '确定' })
+          }
+        }).catch((error) => {
+          this.$alert(error.message || '扫进失败', '错误', { confirmButtonText: '确定' })
+        })
+      } else {
+        const scanOutItem = this.detailList.find((item) => item.serialNo === this.scanCode)
+        deletePalletDetail({
+          site: this.site,
+          palletId: this.palletCode,
+          serialNo: this.scanCode
+        }).then(({ data }) => {
+          if (data && data.code === 0) {
+            if (scanOutItem) {
+              this.scanOutList.push({
+                position: scanOutItem.position,
+                layer: scanOutItem.layer,
+                serialNo: scanOutItem.serialNo
+              })
+            }
+            this.$message.success('扫出成功')
+            this.needRefreshOnClose = true
+            this.scanCode = ''
+            this.moveFocusToScanInput()
+          } else {
+            this.$alert((data && data.msg) || '扫出失败', '错误', { confirmButtonText: '确定' })
+          }
+        }).catch((error) => {
+          this.$alert(error.message || '扫出失败', '错误', { confirmButtonText: '确定' })
+        })
+      }
+    },
+    loadAreaOptions() {
+      getAreaOptionsForChange({ site: this.site }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.areaOptions = data.rows || []
+        } else {
+          this.areaOptions = []
+        }
+      }).catch(() => {
+        this.areaOptions = []
+      })
+    },
+    openCallEmptyModal() {
+      if (!this.ensureSite()) {
+        return
+      }
+      this.callEmptyForm = { areaId: '', stationCode: '', palletType: this.currentPalletType || '' }
+      this.stationOptions = []
+      this.loadAreaOptions()
+      // 调用空托盘弹窗固定加载全量类型，不能复用当前栈板“按大分类过滤”的下拉 - rqrq
+      this.loadAllPalletTypeListForCallEmpty()
+      this.callEmptyModalVisible = true
+    },
+    handleAreaChangeForCall() {
+      this.callEmptyForm.stationCode = ''
+      if (!this.callEmptyForm.areaId) {
+        this.stationOptions = []
+        return
+      }
+      getStationsByArea({
+        site: this.site,
+        areaId: this.callEmptyForm.areaId
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.stationOptions = data.rows || []
+        } else {
+          this.stationOptions = []
+        }
+      }).catch(() => {
+        this.stationOptions = []
+      })
+    },
+    submitCallEmpty() {
+      if (!this.callEmptyForm.areaId || !this.callEmptyForm.stationCode || !this.callEmptyForm.palletType) {
+        this.$alert('请完整选择区域、站点和栈板类型', '提示', { confirmButtonText: '确定' })
+        return
+      }
+      this.callEmptyLoading = true
+      callEmptyPalletToStation({
+        site: this.site,
+        stationCode: this.callEmptyForm.stationCode,
+        palletType: this.callEmptyForm.palletType
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.$message.success('调用空托盘成功')
+          this.callEmptyModalVisible = false
+        } else {
+          this.$alert((data && data.msg) || '调用空托盘失败', '错误', { confirmButtonText: '确定' })
+        }
+      }).catch((error) => {
+        this.$alert(error.message || '调用空托盘失败', '错误', { confirmButtonText: '确定' })
+      }).finally(() => {
+        this.callEmptyLoading = false
+      })
+    },
+    openTransportModal() {
+      if (!this.ensureSite()) {
+        return
+      }
+      if (!this.palletScanned) {
+        this.$alert('请先扫描栈板', '提示', { confirmButtonText: '确定' })
+        return
+      }
+      // 栈板未绑定当前库位时禁止手工触发运输入库，避免无站点上下文误发请求 - rqrq
+      if (!this.currentPalletStation || !this.currentPalletStation.trim()) {
+        this.$alert('当前栈板没有库位，不允许执行运输入库', '提示', { confirmButtonText: '确定' })
+        return
+      }
+      this.$confirm('是否对此栈板发起入库请求？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.submitTransport()
+      }).catch(() => {
+        // 用户取消确认弹框时不执行任何操作，避免误触后仍发请求 - rqrq
+      })
+    },
+    submitTransport() {
+      if (this.transportLoading) {
+        return
+      }
+      this.transportLoading = true
+      // 海安运输入库不再选择目标区域/站点，只对当前栈板发起入库请求 - rqrq
+      callPalletToStationWithUpdateZuPan({
+        site: this.site,
+        palletId: this.palletCode,
+        startStation: this.palletInfo.locationCode || ''
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.$message.success('运输入库任务已提交')
+        } else {
+          this.$alert((data && data.msg) || '运输入库失败', '错误', { confirmButtonText: '确定' })
+        }
+      }).catch((error) => {
+        this.$alert(error.message || '运输入库失败', '错误', { confirmButtonText: '确定' })
+      }).finally(() => {
+        this.transportLoading = false
+      })
+    }
+  },
+  // keep-alive页面每次重新激活都强制重置，避免“退出再进入”出现旧数据残留 - rqrq
+  activated() {
+    this.resetPage(true)
+  },
+  // 离开海安组盘页时统一清理状态，防止返回菜单后缓存脏数据 - rqrq
+  beforeRouteLeave(to, from, next) {
+    this.resetPage(false)
+    next()
+  },
+  mounted() {
+    this.resetPage(true)
+  }
+}
+</script>
+
+<style scoped>
+.detail-table {
+  background: white;
+  border-radius: 6px;
+  overflow: hidden;
+  border: 1px solid #e0e0e0;
+}
+
+.table-header,
+.table-row {
+  display: flex;
+  align-items: center;
+  padding: 8px;
+  border-bottom: 1px solid #e0e0e0;
+}
+
+.table-header {
+  background: #f5f5f5;
+  font-weight: bold;
+  font-size: 14px;
+}
+
+.col-position {
+  flex: 1;
+  text-align: center;
+}
+
+.col-layer {
+  flex: 1;
+  text-align: center;
+}
+
+.col-serial {
+  flex: 4;
+  text-align: center;
+  word-break: break-all;
+}
+
+.empty-row {
+  justify-content: center;
+  align-items: center;
+  padding: 20px;
+  border-bottom: none;
+}
+
+.empty-hint {
+  text-align: center;
+  color: #999;
+  width: 100%;
+}
+
+.scan-modal-content {
+  padding: 10px 0;
+}
+
+.modal-form {
+  margin-bottom: 16px;
+}
+
+.dialog-footer {
+  text-align: center;
+}
+
+.action-btn:disabled {
+  opacity: 0.6;
+  cursor: not-allowed;
+  background-color: #ccc !important;
+  border-color: #ccc !important;
+}
+
+.action-btn.warning {
+  background-color: #f59e0b;
+  border-color: #f59e0b;
+  color: #fff;
+}
+
+::v-deep .el-dialog__wrapper {
+  z-index: 2000 !important;
+}
+
+::v-deep .el-overlay {
+  z-index: 2000 !important;
+}
+
+::v-deep .el-radio {
+  margin-right: 8px !important;
+}
+
+::v-deep .el-radio__label {
+  font-size: 14px;
+}
+
+/* 层数网格样式，保持与原PDA页面一致 - rqrq */
+.layer-grid {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  margin-top: 8px;
+}
+
+.layer-item {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  min-width: 50px;
+  height: 45px;
+  padding: 0 12px;
+  background-color: #fff;
+  border: 2px solid #dcdfe6;
+  border-radius: 6px;
+  font-size: 15px;
+  font-weight: bold;
+  cursor: pointer;
+  transition: all 0.3s;
+  user-select: none;
+}
+
+.layer-item:hover {
+  border-color: #409eff;
+  background-color: #ecf5ff;
+}
+
+.layer-item.layer-selected {
+  border-color: #409eff;
+  background-color: #409eff;
+  color: #fff;
+}
+
+/* 位置网格样式，保持与原PDA页面一致 - rqrq */
+.position-grid {
+  display: grid;
+  gap: 10px;
+  margin-top: 8px;
+  position: relative;
+}
+
+.position-grid.position-grid-1 {
+  grid-template-columns: 1fr;
+  grid-template-rows: 1fr;
+}
+
+.position-grid.position-grid-4 {
+  grid-template-columns: repeat(2, 1fr);
+  grid-template-rows: repeat(2, 1fr);
+  grid-auto-flow: column;
+}
+
+.position-grid.position-grid-9 {
+  grid-template-columns: repeat(3, 1fr);
+  grid-template-rows: repeat(3, 1fr);
+  grid-auto-flow: row;
+}
+
+.position-item.position-placeholder {
+  background-color: #f0f0f0 !important;
+  border: 1px dashed #d0d0d0 !important;
+  color: transparent !important;
+  cursor: not-allowed !important;
+  pointer-events: none !important;
+}
+
+.position-grid.position-grid-loading {
+  opacity: 0.7;
+  pointer-events: none;
+}
+
+.position-item {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 60px;
+  background-color: #fff;
+  border: 2px solid #dcdfe6;
+  border-radius: 6px;
+  font-size: 16px;
+  font-weight: bold;
+  cursor: pointer;
+  transition: all 0.3s;
+  user-select: none;
+}
+
+.position-item:hover:not(.position-disabled) {
+  border-color: #409eff;
+  background-color: #ecf5ff;
+}
+
+.position-item.position-selected {
+  border-color: #409eff;
+  background-color: #409eff;
+  color: #fff;
+}
+
+.position-item.position-disabled {
+  background-color: #f5f7fa;
+  color: #c0c4cc;
+  cursor: not-allowed;
+  opacity: 0.6;
+}
+
+.position-item.position-loading {
+  background: linear-gradient(90deg, #f5f7fa 25%, #e4e7ed 50%, #f5f7fa 75%);
+  background-size: 200% 100%;
+  animation: loading 1.5s ease-in-out infinite;
+}
+
+@keyframes loading {
+  0% {
+    background-position: 200% 0;
+  }
+  100% {
+    background-position: -200% 0;
+  }
+}
+</style>
diff --git a/src/views/modules/haianAutoWarehouse/haianPalletSearch.vue b/src/views/modules/haianAutoWarehouse/haianPalletSearch.vue
new file mode 100644
index 0000000..2c9a9c8
--- /dev/null
+++ b/src/views/modules/haianAutoWarehouse/haianPalletSearch.vue
@@ -0,0 +1,601 @@
+<template>
+  <div>
+    <div class="pda-container">
+      <!-- 头部栏 -->
+      <div class="header-bar">
+        <div class="header-left" @click="handleBack">
+          <i class="el-icon-arrow-left"></i>
+          <span>查看托盘</span>
+        </div>
+        <div class="header-right" @click="$router.push({ path: '/' })">
+          首页
+        </div>
+      </div>
+      <div class="table-body" style="max-height: 500px; overflow-y: auto;">
+      <div class="main-content form-section">
+        <!-- 栈板扫描 - rqrq -->
+        <div class="input-group">
+          <label class="input-label">栈板编码</label>
+            <el-input
+              v-model="palletCode"
+              placeholder="请扫描栈板编码"
+              class="form-input"
+              clearable
+              @keyup.enter.native="handlePalletScan"
+              ref="palletInput"
+            />
+        </div>
+
+        <!-- 筛选条件 (扫描栈板后显示) - rqrq -->
+        <div v-if="palletScanned" class="input-group">
+          <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>
+            <button
+              class="action-btn secondary"
+              style="flex: 0.25; margin: 0; white-space: nowrap;"
+              @click="refreshTable"
+            >
+              刷新
+            </button>
+          </div>
+        </div>
+      </div>
+
+      <!-- 栈板明细表格 (扫描栈板后显示) - rqrq -->
+      <div v-if="palletScanned" class="rma-list">
+        <div class="list-title-row" style="display: flex; gap: 8px; align-items: center; padding: 0;">
+          <div class="list-title" style="flex: 1; margin: 0; display: flex; align-items: center; flex-wrap: wrap; gap: 5px;">
+            <button class="action-btn primary" style="margin: 0;" @click="showDetailModal" >
+                {{ '浏览明细' }}
+              </button>
+            <label style="margin-left: 5px;">条码数:{{detailList.length}}</label>
+            <!-- 预留清单按钮 - rqrq -->
+            <button
+              class="action-btn"
+              :class="reserveCount > 0 ? 'warning' : 'secondary'"
+              style="margin: 0; margin-left: 10px;"
+              @click="showReserveModal">
+              预留清单({{ reserveCount }})
+            </button>
+          </div>
+        </div>
+        <div class="detail-table">
+          <div class="table-header">
+            <div class="col-position">位置</div>
+            <div class="col-layer">层数</div>
+            <div class="col-serial">标签号</div>
+          </div>
+          <div
+            v-for="(detail, index) in detailList"
+            :key="index"
+            class="table-row"
+          >
+            <div class="col-position">{{ detail.position }}</div>
+            <div class="col-layer">{{ detail.layer }}</div>
+            <div class="col-serial">{{ detail.serialNo }}</div>
+          </div>
+          <!-- 暂无数据提示 -->
+          <div v-if="detailList.length === 0" class="table-row empty-row">
+            <div class="empty-hint">暂无栈板明细数据</div>
+          </div>
+        </div>
+      </div>
+      </div>
+    </div>
+    <!-- 浏览明细弹窗 - rqrq -->
+      <el-dialog
+      :title="'栈板明细 (共'+detailList.length+'条)'"
+        :visible.sync="detailModalVisible"
+        width="90%"
+        :close-on-click-modal="false"
+        :show-close="false"
+        :modal="true"
+        :modal-append-to-body="true"
+        :append-to-body="true"
+      >
+      <div class="table-body" style="max-height: 400px; overflow-y: auto;">
+          <div class="detail-table">
+            <div class="table-header">
+              <div class="col-position">位置</div>
+              <div class="col-layer">层数</div>
+              <div class="col-serial">标签号</div>
+            </div>
+            <div
+              v-for="(detail, index) in detailList"
+              :key="index"
+              class="table-row"
+            >
+              <div class="col-position">{{ detail.position }}</div>
+              <div class="col-layer">{{ detail.layer }}</div>
+              <div class="col-serial">{{ detail.serialNo }}</div>
+            </div>
+            <!-- 暂无数据提示 -->
+            <div v-if="detailList.length === 0" class="table-row empty-row">
+              <div class="empty-hint">暂无栈板明细数据</div>
+            </div>
+          </div>
+        </div>
+        <div slot="footer" class="dialog-footer">
+        <button class="action-btn secondary" @click="detailModalVisible=false">关闭</button>
+      </div>
+    </el-dialog>
+
+    <!-- 预留清单弹窗 - rqrq -->
+    <el-dialog
+      :title="'预留清单 (共'+reserveCount+'条)'"
+      :visible.sync="reserveModalVisible"
+      width="95%"
+      :close-on-click-modal="false"
+      :show-close="false"
+      :modal="true"
+      :modal-append-to-body="true"
+      :append-to-body="true"
+    >
+      <div class="table-body" style="max-height: 350px; overflow-y: auto;">
+        <div class="detail-table">
+          <div class="table-header reserve-header">
+            <div class="col-serial-reserve">标签号</div>
+            <div class="col-ref">申请单号</div>
+            <div class="col-ref">订单号</div>
+          </div>
+          <div
+            v-for="(item, index) in reservedLabels"
+            :key="index"
+            class="table-row"
+          >
+            <div class="col-serial-reserve">{{ item.serialNo || '-' }}</div>
+            <div class="col-ref">{{ item.reserveOrderRef1 || '-' }}</div>
+            <div class="col-ref">{{ item.reserveOrderRef3 || '-' }}</div>
+          </div>
+          <!-- 暂无数据提示 -->
+          <div v-if="reservedLabels.length === 0" class="table-row empty-row">
+            <div class="empty-hint">暂无预留标签</div>
+          </div>
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer" style="display: flex; gap: 10px; justify-content: center;">
+        <button class="action-btn secondary" @click="reserveModalVisible=false" :disabled="cancelReserveLoading">关闭</button>
+        <button
+          class="action-btn danger"
+          @click="handleBatchCancelReserve"
+          :disabled="cancelReserveLoading || reservedLabels.length === 0 || locationCode === '1101'"
+          v-if="reservedLabels.length > 0"
+        >
+          {{ cancelReserveLoading ? '取消中...' : '一键取消预留' }}
+        </button>
+      </div>
+      <!-- 库位1101提示 - rqrq -->
+      <div v-if="locationCode === '1101'" class="reserve-warning">
+        <i class="el-icon-warning"></i> 栈板在立库异常位上，不允许取消预留
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  getPalletInfoSimple,
+  getPalletDetails,
+  getPalletReservedLabels,
+  batchCancelReserve
+} from '../../../api/haianAutoWarehouse/palletPacking'
+
+export default {
+  name: 'haianPalletSearch',
+  data() {
+    return {
+      site: this.$store.state.user.site,
+      palletCode: '',
+      palletScanned: false,
+      detailModalVisible: false,
+
+      // 筛选条件 - rqrq
+      selectedPosition: '',
+      positionOptions: [],
+
+      // 栈板明细 - rqrq
+      detailList: [],
+
+      // 栈板库位 - rqrq
+      locationCode: '',
+
+      // 预留清单相关 - rqrq
+      reserveModalVisible: false,
+      reservedLabels: [],
+      reserveCount: 0,
+      cancelReserveLoading: false
+    };
+  },
+  methods: {
+    // 返回上一页 - rqrq
+    handleBack() {
+      // 返回菜单前清空托盘查询状态，避免keep-alive缓存导致数据残留 - rqrq
+      this.resetPage(false)
+      this.$router.back();
+    },
+
+    // 重置页面到初始状态 - rqrq
+    resetPage(needFocus = true) {
+      this.site = this.$store.state.user.site;
+      this.palletCode = '';
+      this.palletScanned = false;
+      this.selectedPosition = '';
+      this.positionOptions = [];
+      this.detailList = [];
+      this.detailModalVisible = false;
+      this.locationCode = '';
+      this.reserveModalVisible = false;
+      this.reservedLabels = [];
+      this.reserveCount = 0;
+      this.cancelReserveLoading = false;
+
+      // 聚焦到栈板输入框 - rqrq
+      if (needFocus) {
+        this.$nextTick(() => {
+          if (this.$refs.palletInput) {
+            this.$refs.palletInput.focus();
+          }
+        });
+      }
+    },
+
+    // 扫描栈板（使用无校验的简单查询）- rqrq
+    handlePalletScan() {
+      if (!this.site) {
+        this.$alert('当前用户缺少site，无法执行海安托盘查询', '提示', {
+          confirmButtonText: '确定'
+        });
+        return;
+      }
+      if (!this.palletCode.trim()) {
+        this.$alert('请输入栈板编码', '提示', {
+          confirmButtonText: '确定'
+        });
+        return;
+      }
+
+      getPalletInfoSimple({
+        site: this.site,
+        palletId: this.palletCode
+      }).then(({ data }) => {
+        if (data.code === 0) {
+          this.palletCode = data.palletId;
+          this.palletScanned = true;
+          this.positionOptions = data.positions || [];
+          this.locationCode = data.locationCode || '';
+          this.refreshTable();
+          this.loadReservedLabels(); // 加载预留标签数量 - rqrq
+        } else {
+          let errorMsg = data.msg || '栈板不存在';
+          if (errorMsg.length > 100) {
+            errorMsg = errorMsg.substring(0, 100) + '...';
+          }
+          this.$alert(errorMsg, '错误', {
+            confirmButtonText: '确定',
+            callback: () => {
+              this.palletCode = '';
+              this.$nextTick(() => {
+                if (this.$refs.palletInput) {
+                  this.$refs.palletInput.focus();
+                }
+              });
+            }
+          });
+        }
+      }).catch(error => {
+        console.error('查询栈板失败:', error);
+        let errorMsg = error.message || '查询栈板失败';
+        if (errorMsg.length > 100) {
+          errorMsg = errorMsg.substring(0, 100) + '...';
+        }
+        this.$alert(errorMsg, '错误', {
+          confirmButtonText: '确定',
+          callback: () => {
+            this.palletCode = '';
+            this.$nextTick(() => {
+              if (this.$refs.palletInput) {
+                this.$refs.palletInput.focus();
+              }
+            });
+          }
+        });
+      });
+    },
+
+
+    // 刷新表格 - rqrq
+    refreshTable() {
+      getPalletDetails({
+        site: this.site,
+        palletId: this.palletCode,
+        position: this.selectedPosition,
+        layer: ''
+      }).then(({ data }) => {
+        if (data.code === 0) {
+          this.detailList = data.details || [];
+        } else {
+          this.detailList = [];
+        }
+      }).catch(error => {
+        console.error('获取栈板明细失败:', error);
+        this.detailList = [];
+      });
+    },
+
+    // 显示明细弹窗 - rqrq
+    showDetailModal() {
+      this.detailModalVisible = true;
+    },
+
+    // 显示预留清单弹窗 - rqrq
+    showReserveModal() {
+      this.loadReservedLabels();
+      this.reserveModalVisible = true;
+    },
+
+    // 加载预留标签列表 - rqrq
+    loadReservedLabels() {
+      getPalletReservedLabels({
+        site: this.site,
+        palletId: this.palletCode
+      }).then(({ data }) => {
+        if (data.code === 0 && data.data) {
+          this.reservedLabels = data.data.reservedLabels || [];
+          this.reserveCount = data.data.reserveCount || 0;
+          this.locationCode = data.data.locationCode || '';
+        } else {
+          this.reservedLabels = [];
+          this.reserveCount = 0;
+        }
+      }).catch(error => {
+        console.error('获取预留标签列表失败:', error);
+        this.reservedLabels = [];
+        this.reserveCount = 0;
+      });
+    },
+
+    // 一键取消预留 - rqrq
+    handleBatchCancelReserve() {
+      if (this.locationCode === '1101') {
+        this.$alert('栈板在库位1101上，不允许取消预留', '错误', { confirmButtonText: '确定' });
+        return;
+      }
+
+      this.$confirm('确定要取消所有预留标签吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.doBatchCancelReserve();
+      }).catch(() => {
+        // 用户取消
+      });
+    },
+
+    // 执行批量取消预留 - rqrq
+    doBatchCancelReserve() {
+      this.cancelReserveLoading = true;
+
+      batchCancelReserve({
+        site: this.site,
+        palletId: this.palletCode
+      }).then(({ data }) => {
+        if (data.code === 0) {
+          this.$message.success('取消预留成功');
+          this.reserveModalVisible = false;
+          // 重新加载预留标签列表 - rqrq
+          this.loadReservedLabels();
+        } else {
+          this.$alert(data.msg || '取消预留失败', '错误', { confirmButtonText: '确定' });
+        }
+      }).catch(error => {
+        console.error('批量取消预留失败:', error);
+        this.$alert('取消预留异常', '错误', { confirmButtonText: '确定' });
+      }).finally(() => {
+        this.cancelReserveLoading = false;
+      });
+    }
+  },
+  // keep-alive页面每次激活统一重置，保证海安“退出再进入”无历史残留 - rqrq
+  activated() {
+    this.resetPage(true);
+  },
+  // 离开页面时主动清理缓存状态，避免下次进入展示旧查询结果 - rqrq
+  beforeRouteLeave(to, from, next) {
+    this.resetPage(false);
+    next();
+  },
+  mounted() {
+    this.resetPage(true);
+  }
+};
+</script>
+
+<style scoped>
+/* 表格样式 */
+.detail-table {
+  background: white;
+  border-radius: 6px;
+  overflow: hidden;
+  border: 1px solid #e0e0e0;
+}
+
+.table-header,
+.table-row {
+  display: flex;
+  align-items: center;
+  padding: 8px;
+  border-bottom: 1px solid #e0e0e0;
+}
+
+.table-header {
+  background: #f5f5f5;
+  font-weight: bold;
+  font-size: 14px;
+}
+
+.table-row {
+  font-size: 13px;
+}
+
+.table-row:last-child {
+  border-bottom: none;
+}
+
+.col-position {
+  flex: 1;
+  text-align: center;
+}
+
+.col-layer {
+  flex: 1;
+  text-align: center;
+}
+
+.col-serial {
+  flex: 4;
+  text-align: center;
+  word-break: break-all;
+}
+
+/* 空数据提示 */
+.empty-hint {
+  text-align: center;
+  color: #999;
+  padding: 20px;
+  background: white;
+  border-radius: 6px;
+  margin-top: 16px;
+}
+
+/* 模态框样式 */
+.scan-modal-content {
+  padding: 10px 0;
+}
+
+.modal-form {
+  margin-bottom: 16px;
+}
+
+.dialog-footer {
+  text-align: center;
+}
+
+/* 修复模态框层级问题 */
+::v-deep .el-dialog__wrapper {
+  z-index: 2000 !important;
+}
+
+::v-deep .el-overlay {
+  z-index: 2000 !important;
+}
+
+/* 修复单选框样式 */
+::v-deep .el-radio {
+  margin-right: 8px !important;
+}
+
+::v-deep .el-radio__label {
+  font-size: 14px;
+}
+
+/* 标题行样式 */
+.list-title-row {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 8px;
+}
+
+.list-title-row .list-title {
+  margin: 0;
+  flex: 1;
+}
+
+/* 空数据行样式 */
+.empty-row {
+  justify-content: center;
+  align-items: center;
+  padding: 20px;
+  border-bottom: none;
+}
+
+.empty-row .empty-hint {
+  text-align: center;
+  color: #999;
+  width: 100%;
+}
+
+/* 预留清单相关样式 - rqrq */
+.action-btn.warning {
+  background: #E6A23C;
+  color: white;
+  border: none;
+}
+
+.action-btn.warning:hover {
+  background: #d99429;
+}
+
+.action-btn.danger {
+  background: #F56C6C;
+  color: white;
+  border: none;
+}
+
+.action-btn.danger:hover:not(:disabled) {
+  background: #e45656;
+}
+
+.action-btn.danger:disabled {
+  background: #ccc;
+  cursor: not-allowed;
+  opacity: 0.6;
+}
+
+.reserve-header {
+  font-size: 12px;
+}
+
+.col-serial-reserve {
+  flex: 2;
+  text-align: center;
+  word-break: break-all;
+  font-size: 12px;
+}
+
+.col-ref {
+  flex: 1.5;
+  text-align: center;
+  word-break: break-all;
+  font-size: 12px;
+}
+
+.reserve-warning {
+  text-align: center;
+  color: #E6A23C;
+  padding: 10px;
+  font-size: 14px;
+  background: #fdf6ec;
+  border-radius: 4px;
+  margin-top: 10px;
+}
+
+.reserve-warning i {
+  margin-right: 5px;
+}
+
+</style>
diff --git a/src/views/modules/haianAutoWarehouse/haianPalletSorting.vue b/src/views/modules/haianAutoWarehouse/haianPalletSorting.vue
new file mode 100644
index 0000000..3818068
--- /dev/null
+++ b/src/views/modules/haianAutoWarehouse/haianPalletSorting.vue
@@ -0,0 +1,1064 @@
+<template>
+  <div class="pda-container">
+    <div class="header-bar">
+      <div class="header-left" @click="handleBack">
+        <i class="el-icon-arrow-left"></i>
+        <span>人工分拣组盘</span>
+      </div>
+      <div class="header-right" @click="$router.push({ path: '/' })">首页</div>
+    </div>
+
+    <div class="table-body" style="max-height: 500px; overflow-y: auto;">
+      <div class="main-content form-section">
+        <!-- 第一行：栈板扫描 + 结束分拣按钮，保持与原PDA页面一致 - rqrq -->
+        <div class="input-group">
+          <label class="input-label">栈板编码</label>
+          <div style="display: flex; gap: 8px;">
+            <el-input
+              v-model="palletCode"
+              placeholder="请扫描栈板编码"
+              class="form-input"
+              style="flex: 0.75;"
+              clearable
+              inputmode="none"
+              autocomplete="off"
+              autocorrect="off"
+              spellcheck="false"
+              @keyup.enter.native="handlePalletScan"
+              ref="palletInput"
+            />
+            <button class="action-btn secondary" style="flex: 0.25; margin: 0;" @click="submitFinishSorting" :disabled="finishSortingLoading || detailList.length === 0">
+              {{ finishSortingLoading ? '处理中...' : '结束分拣' }}
+            </button>
+          </div>
+        </div>
+
+        <!-- 第二行：栈板类型和自动分拣，保持与原PDA页面一致 - rqrq -->
+        <div v-if="palletScanned" class="input-group">
+          <div style="display: flex; gap: 8px; align-items: end;">
+            <div style="flex: 0.65;">
+              <label class="input-label">栈板类型</label>
+              <el-select
+                v-model="currentPalletType"
+                placeholder="请选择栈板类型"
+                style="width: 100%;"
+                :disabled="palletTypeDisabled"
+                @change="handlePalletTypeChange"
+              >
+                <el-option
+                  v-for="type in palletTypeOptions"
+                  :key="type.palletType"
+                  :label="`${type.palletType} - ${type.typeDesc}`"
+                  :value="type.palletType"
+                />
+              </el-select>
+            </div>
+            <div style="flex: 0.35;">
+              <label class="input-label">自动分拣</label>
+              <el-select
+                v-model="currentAutoSort"
+                placeholder="请选择"
+                style="width: 100%;"
+                :disabled="autoSortDisabled"
+                @change="handleAutoSortChange"
+              >
+                <el-option label="是" value="Y"></el-option>
+                <el-option label="否" value="N"></el-option>
+              </el-select>
+            </div>
+          </div>
+        </div>
+
+        <!-- 第2.5行：是否强制整托出库，保持与原PDA页面一致 - rqrq -->
+        <div v-if="palletScanned" class="input-group">
+          <el-checkbox
+            v-model="forceFullPalletOut"
+            :disabled="palletTypeDisabled"
+            @change="handleForceFullPalletOutChange"
+            style="width: 100%;"
+          >
+            是否强制整托出库
+          </el-checkbox>
+        </div>
+
+        <!-- 第三行：当前站点 + 刷新，保持与原PDA页面一致 - rqrq -->
+        <div v-if="palletScanned" class="input-group">
+          <label class="input-label">当前站点</label>
+          <div style="display: flex; gap: 8px;">
+            <el-input
+              v-model="currentPalletStation"
+              placeholder="栈板当前站点"
+              class="form-input"
+              readonly
+              style="flex: 0.75;"
+            />
+            <button
+              class="action-btn secondary"
+              style="flex: 0.25; margin: 0; white-space: nowrap;"
+              @click="refreshTable"
+            >
+              刷新
+            </button>
+          </div>
+        </div>
+
+        <!-- 第四行：扫进/扫回 + 扫描按钮，保持与原PDA页面一致 - rqrq -->
+        <div v-if="palletScanned" class="input-group">
+          <div style="display: flex; gap: 8px; align-items: center;">
+            <div style="flex: 0.75;">
+              <el-radio-group v-model="operationType" style="display: flex;">
+                <el-radio label="in" style="margin-right: 0px; white-space: nowrap;">扫进</el-radio>
+                <el-radio label="out" style="white-space: nowrap;">扫回</el-radio>
+              </el-radio-group>
+            </div>
+            <button
+              class="action-btn secondary"
+              style="flex: 0.25; margin: 0; white-space: nowrap;"
+              :disabled="currentPalletType === ''"
+              @click="showScanModal"
+            >
+              扫描条码
+            </button>
+          </div>
+        </div>
+      </div>
+
+      <!-- 分拣明细区域，按钮排版与原PDA页面一致 - rqrq -->
+      <div v-if="palletScanned" class="rma-list">
+        <div class="list-title-row" style="display: flex; gap: 8px; align-items: center; padding: 0;">
+          <div class="list-title" style="flex: 0.75; margin: 0;">
+            <button class="action-btn primary" style="flex: 0.25; margin: 0;" @click="showDetailModal" :disabled="submitSortingLoading">
+              浏览明细
+            </button>
+            <label style="margin-left: 5px;">条码数:{{ detailList.length }}</label>
+          </div>
+          <button class="action-btn primary" style="flex: 0.25; margin: 0;" @click="submitSorting" :disabled="submitSortingLoading">
+            {{ submitSortingLoading ? '处理中...' : '提交分拣' }}
+          </button>
+        </div>
+        <div class="detail-table">
+          <div class="table-header">
+            <div class="col-position">位置</div>
+            <div class="col-layer">层数</div>
+            <div class="col-serial">标签号</div>
+          </div>
+          <div v-for="(item, index) in detailList" :key="index" class="table-row">
+            <div class="col-position">{{ item.position }}</div>
+            <div class="col-layer">{{ item.layer }}</div>
+            <div class="col-serial">{{ item.serialNo }}</div>
+          </div>
+          <div v-if="detailList.length === 0" class="table-row empty-row">
+            <div class="empty-hint">暂无分拣明细数据</div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- 浏览明细弹窗，保持与原PDA页面一致 - rqrq -->
+    <el-dialog
+      :title="'已扫描数量:' + detailList.length"
+      :visible.sync="detailModalVisible"
+      width="90%"
+      :close-on-click-modal="false"
+      :show-close="false"
+      :append-to-body="true"
+    >
+      <div class="table-body" style="max-height: 240px; overflow-y: auto;">
+        <div class="detail-table">
+          <div class="table-header">
+            <div class="col-position">位置</div>
+            <div class="col-layer">层数</div>
+            <div class="col-serial">标签号</div>
+          </div>
+          <div v-for="(item, index) in detailList" :key="index" class="table-row">
+            <div class="col-position">{{ item.position }}</div>
+            <div class="col-layer">{{ item.layer }}</div>
+            <div class="col-serial">{{ item.serialNo }}</div>
+          </div>
+          <div v-if="detailList.length === 0" class="table-row empty-row">
+            <div class="empty-hint">暂无分拣明细数据</div>
+          </div>
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <button class="action-btn secondary" style="margin-left: 10px;" @click="detailModalVisible = false">取消</button>
+      </div>
+    </el-dialog>
+
+    <!-- 扫码模态框：网格层数与原PDA页面保持一致 - rqrq -->
+    <el-dialog
+      title="扫描标签"
+      :visible.sync="scanModalVisible"
+      width="90%"
+      :close-on-click-modal="false"
+      :show-close="false"
+      :modal="true"
+      :modal-append-to-body="true"
+      :append-to-body="true"
+    >
+      <div class="scan-modal-content">
+        <!-- 扫进时显示层数选择和位置网格 - rqrq -->
+        <div v-if="operationType === 'in'" class="modal-form">
+          <!-- 层数选择（混装托盘不显示） - rqrq -->
+          <div v-if="!currentMixedMode && scanLayerOptions.length > 0" class="input-group">
+            <label class="input-label">层数（当前选择：第{{ scanLayer }}层）</label>
+            <div class="layer-grid">
+              <div
+                v-for="layer in scanLayerOptions"
+                :key="layer"
+                class="layer-item"
+                :class="{
+                  'layer-selected': scanLayer === layer
+                }"
+                @click="handleLayerClick(layer)"
+              >
+                {{ layer }}
+              </div>
+            </div>
+          </div>
+
+          <!-- 位置网格选择器 - rqrq -->
+          <div class="input-group">
+            <label class="input-label">
+              位置{{ currentSelectedPosition ? `（当前选择：${currentSelectedPosition}）` : '' }}
+              <span v-if="positionGridLoading" style="color: #909399; font-size: 12px;">（加载中...）</span>
+            </label>
+            <div class="position-grid" :class="[
+              {'position-grid-loading': positionGridLoading},
+              getPositionGridClass
+            ]">
+              <div
+                v-for="(item, index) in displayPositionGrid"
+                :key="index"
+                class="position-item"
+                :class="{
+                  'position-disabled': positionGridLoading || !availablePositions.includes(item.position),
+                  'position-selected': currentSelectedPosition === item.position,
+                  'position-loading': positionGridLoading,
+                  'position-placeholder': item.isPlaceholder
+                }"
+                @click="handlePositionClick(item.position)"
+              >
+                <template v-if="!item.isPlaceholder">{{ item.position }}({{ item.count }})</template>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <!-- 标签扫描 - rqrq -->
+        <div class="input-group">
+          <label class="input-label">标签二维码</label>
+          <el-input
+            ref="scanInput"
+            v-model="scanCode"
+            placeholder="请扫描标签二维码"
+            class="form-input"
+            clearable
+            :disabled="operationType === 'in' && !currentSelectedPosition"
+            @keyup.enter.native="handleLabelScan"
+            inputmode="none"
+            autocomplete="off"
+            autocorrect="off"
+            spellcheck="false"
+          />
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <button class="action-btn secondary" style="margin-left: 10px;" @click="closeScanModal">取消</button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  checkPalletExists,
+  getPalletDetails,
+  savePalletDetail,
+  restorePalletDetail,
+  getLabelInfo,
+  getPalletInfo,
+  getPalletTypeList,
+  updatePalletTypeAndAutoSort,
+  getAvailablePositionsForLayer,
+  completePalletAssemblyForFenJian,
+  finishSorting,
+  getSortingList
+} from '../../../api/haianAutoWarehouse/palletPacking'
+
+export default {
+  name: 'haianPalletSorting',
+  data() {
+    return {
+      site: this.$store.state.user.site,
+      palletCode: '',
+      palletScanned: false,
+      operationType: 'in',
+      detailModalVisible: false,
+      currentPalletType: '',
+      currentAutoSort: 'N',
+      currentPalletStation: '',
+      forceFullPalletOut: false,
+      palletTypeDisabled: false,
+      autoSortDisabled: false,
+      currentWcsAutoSort: '',
+      currentMaxLayer: 0,
+      positionOptions: [],
+      palletTypeOptions: [],
+      detailList: [],
+      sortingList: [],
+      // 分拣扫回缓存：记录扫进前原位置信息，便于扫回恢复 - rqrq
+      originalDetailCache: {},
+      palletInfo: {
+        palletType: '',
+        autoSort: 'N',
+        locationCode: ''
+      },
+      // 扫码模态框字段：与原PDA页面保持一致，按网格位置 + 层数扫入 - rqrq
+      scanModalVisible: false,
+      scanCode: '',
+      scanPosition: '',
+      scanLayer: 1,
+      scanLayerOptions: [],
+      needRefreshOnClose: false,
+      positionGrid: [],
+      availablePositions: [],
+      currentSelectedPosition: '',
+      currentMixedMode: false,
+      positionGridLoading: false,
+      submitSortingLoading: false,
+      finishSortingLoading: false,
+    }
+  },
+  computed: {
+    // 根据位置数量决定网格布局，确保与原PDA扫码弹窗一致 - rqrq
+    getPositionGridClass() {
+      const len = this.positionGrid.length
+      if (len === 1) return 'position-grid-1'
+      if (len === 2) return 'position-grid-4'
+      if (len === 4) return 'position-grid-4'
+      return 'position-grid-9'
+    },
+    // 2宫格场景采用对角展示，其余按原位置顺序展示 - rqrq
+    displayPositionGrid() {
+      const len = this.positionGrid.length
+      if (len === 2) {
+        const pos1 = this.positionGrid.find((p) => p.position === '1') || { position: '1', count: 0 }
+        const pos2 = this.positionGrid.find((p) => p.position === '2') || { position: '2', count: 0 }
+        return [
+          { ...pos1, isPlaceholder: false },
+          { position: '', count: 0, isPlaceholder: true },
+          { position: '', count: 0, isPlaceholder: true },
+          { ...pos2, isPlaceholder: false }
+        ]
+      }
+      return this.positionGrid.map((p) => ({ ...p, isPlaceholder: false }))
+    }
+  },
+  methods: {
+    ensureSite() {
+      if (!this.site) {
+        this.$alert('当前用户缺少site，无法执行海安分拣业务', '提示', { confirmButtonText: '确定' })
+        return false
+      }
+      return true
+    },
+    handleBack() {
+      // 返回上一页前先清空分拣页状态，避免keep-alive缓存导致二次进入残留旧数据 - rqrq
+      this.resetPage(false)
+      this.$router.back()
+    },
+    // 海安分拣页统一重置方法：退出和重进都走同一逻辑，避免状态漂移 - rqrq
+    resetPage(needFocus = true) {
+      this.site = this.$store.state.user.site
+      this.palletCode = ''
+      this.palletScanned = false
+      this.operationType = 'in'
+      this.detailModalVisible = false
+      this.currentPalletType = ''
+      this.currentAutoSort = 'N'
+      this.currentPalletStation = ''
+      this.forceFullPalletOut = false
+      this.palletTypeDisabled = false
+      this.autoSortDisabled = false
+      this.currentWcsAutoSort = ''
+      this.currentMaxLayer = 0
+      this.positionOptions = []
+      this.detailList = []
+      this.sortingList = []
+      this.originalDetailCache = {}
+      this.palletInfo = { palletType: '', autoSort: 'N', locationCode: '' }
+      this.scanCode = ''
+      this.scanPosition = ''
+      this.scanLayer = 1
+      this.scanModalVisible = false
+      this.scanLayerOptions = []
+      this.needRefreshOnClose = false
+      this.positionGrid = []
+      this.availablePositions = []
+      this.currentSelectedPosition = ''
+      this.currentMixedMode = false
+      this.positionGridLoading = false
+      this.submitSortingLoading = false
+      this.finishSortingLoading = false
+      if (needFocus) {
+        this.$nextTick(() => {
+          if (this.$refs.palletInput) {
+            this.$refs.palletInput.focus()
+          }
+        })
+      }
+    },
+    handlePalletScan() {
+      if (!this.ensureSite()) {
+        return
+      }
+      if (!this.palletCode || !this.palletCode.trim()) {
+        this.$alert('请输入栈板编码', '提示', { confirmButtonText: '确定' })
+        return
+      }
+      checkPalletExists({
+        site: this.site,
+        palletId: this.palletCode.trim()
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.palletCode = data.palletId
+          this.positionOptions = data.positions || []
+          this.palletScanned = true
+          this.scanCode = ''
+          this.scanPosition = ''
+          this.scanLayer = 1
+          this.currentSelectedPosition = ''
+          this.sortingList = []
+          this.originalDetailCache = {}
+          this.loadPalletInfo()
+          this.refreshTable()
+        } else {
+          this.$alert((data && data.msg) || '栈板校验失败', '错误', { confirmButtonText: '确定' })
+        }
+      }).catch((error) => {
+        this.$alert(error.message || '栈板校验失败', '错误', { confirmButtonText: '确定' })
+      })
+    },
+    loadPalletInfo() {
+      getPalletInfo({
+        site: this.site,
+        palletId: this.palletCode
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          const row = data.row || {}
+          this.currentPalletType = row.palletType || ''
+          this.currentAutoSort = row.autoSort || 'N'
+          this.currentPalletStation = row.locationCode || ''
+          this.forceFullPalletOut = Number(row.soreType) === 3
+          this.palletInfo.palletType = this.currentPalletType
+          this.palletInfo.autoSort = this.currentAutoSort
+          this.palletInfo.locationCode = this.currentPalletStation
+          this.loadPalletTypeList()
+        }
+      })
+    },
+    // 读取托盘类型清单并推导自动分拣能力，保证海安页面与原PDA页面交互一致 - rqrq
+    loadPalletTypeList() {
+      getPalletTypeList({
+        site: this.site,
+        palletFamily: '',
+        active: 'Y'
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.palletTypeOptions = data.rows || []
+          const selectedType = this.palletTypeOptions.find((item) => item.palletType === this.currentPalletType)
+          this.currentWcsAutoSort = selectedType ? (selectedType.wcsAutoSort || 'N') : ''
+          this.currentMaxLayer = selectedType ? Number(selectedType.maxLayer || 0) : 0
+          this.updateAutoSortControl()
+        }
+      })
+    },
+    refreshTable() {
+      getPalletDetails({
+        site: this.site,
+        palletId: this.palletCode,
+        position: '',
+        layer: null
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.detailList = data.details || []
+        } else {
+          this.detailList = []
+        }
+        this.palletTypeDisabled = this.detailList.length > 0
+        this.updateAutoSortControl()
+      }).catch(() => {
+        this.detailList = []
+        this.palletTypeDisabled = false
+        this.updateAutoSortControl()
+      })
+    },
+    handlePalletTypeChange() {
+      const selectedType = this.palletTypeOptions.find((item) => item.palletType === this.currentPalletType)
+      this.currentWcsAutoSort = selectedType ? (selectedType.wcsAutoSort || 'N') : ''
+      this.currentMaxLayer = selectedType ? Number(selectedType.maxLayer || 0) : 0
+      if (this.currentPalletType === 'A0103') {
+        this.forceFullPalletOut = true
+      }
+      this.updateAutoSortControl()
+      this.savePalletTypeConfig()
+    },
+    handleAutoSortChange() {
+      this.savePalletTypeConfig()
+    },
+    handleForceFullPalletOutChange() {
+      this.savePalletTypeConfig()
+    },
+    // 统一自动分拣禁用策略：强制整托、类型不支持、已有明细三类场景锁定 - rqrq
+    updateAutoSortControl() {
+      if (this.forceFullPalletOut || this.currentPalletType === 'A0103') {
+        this.currentAutoSort = 'N'
+        this.autoSortDisabled = true
+        return
+      }
+      if (this.currentWcsAutoSort === 'N') {
+        this.currentAutoSort = 'N'
+        this.autoSortDisabled = true
+        return
+      }
+      this.autoSortDisabled = this.detailList.length > 0
+    },
+    savePalletTypeConfig() {
+      updatePalletTypeAndAutoSort({
+        site: this.site,
+        palletId: this.palletCode,
+        palletType: this.currentPalletType,
+        autoSort: this.currentAutoSort,
+        forceFullPalletOut: this.forceFullPalletOut
+      })
+    },
+    // 打开扫码弹窗并初始化网格数据，交互与原PDA页面一致 - rqrq
+    showScanModal() {
+      this.scanModalVisible = true
+      this.scanCode = ''
+      this.currentSelectedPosition = ''
+      this.needRefreshOnClose = false
+      if (this.operationType === 'in') {
+        this.scanLayer = 1
+        this.loadLayerOptions()
+      } else {
+        this.$nextTick(() => {
+          if (this.$refs.scanInput) {
+            this.$refs.scanInput.focus()
+          }
+        })
+      }
+    },
+    showDetailModal() {
+      this.detailModalVisible = true
+    },
+    // 计算当前可选层数并刷新位置网格，保持“按层扫描”体验一致 - rqrq
+    loadLayerOptions() {
+      getPalletDetails({
+        site: this.site,
+        palletId: this.palletCode,
+        position: '',
+        layer: null
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          const details = data.details || []
+          let maxExistingLayer = 0
+          if (details.length > 0) {
+            maxExistingLayer = Math.max(...details.map((d) => d.layer || 0))
+          }
+          if (this.currentMaxLayer === 0) {
+            this.currentMixedMode = false
+            this.scanLayerOptions = Array.from({ length: maxExistingLayer + 1 }, (_, i) => i + 1)
+          } else {
+            this.currentMixedMode = false
+            this.scanLayerOptions = Array.from({ length: this.currentMaxLayer }, (_, i) => i + 1)
+          }
+          this.loadAvailablePositions()
+        } else {
+          this.$alert((data && data.msg) || '获取栈板信息失败', '错误', { confirmButtonText: '确定' })
+        }
+      }).catch(() => {
+        this.$alert('获取栈板信息失败', '错误', { confirmButtonText: '确定' })
+      })
+    },
+    // 按层加载位置网格与可扫位置，确保禁用态/加载态与原页面一致 - rqrq
+    loadAvailablePositions() {
+      this.positionGridLoading = true
+      this.availablePositions = []
+      getPalletDetails({
+        site: this.site,
+        palletId: this.palletCode,
+        position: '',
+        layer: this.scanLayer
+      }).then(({ data: detailData }) => {
+        const positionCountMap = {}
+        if (detailData && detailData.code === 0) {
+          const details = detailData.details || []
+          details.forEach((detail) => {
+            const pos = detail.position
+            positionCountMap[pos] = (positionCountMap[pos] || 0) + 1
+          })
+        }
+        return getAvailablePositionsForLayer({
+          site: this.site,
+          palletId: this.palletCode,
+          layer: this.scanLayer
+        }).then(({ data }) => {
+          if (data && data.code === 0) {
+            const result = data.data || {}
+            const positions = result.positions || []
+            this.availablePositions = result.availablePositions || []
+            this.positionGrid = positions.map((position) => ({
+              position,
+              count: positionCountMap[position] || 0
+            }))
+          } else {
+            this.availablePositions = []
+            this.positionGrid = []
+            this.$alert((data && data.msg) || '获取位置信息失败', '错误', { confirmButtonText: '确定' })
+          }
+        })
+      }).catch(() => {
+        this.availablePositions = []
+        this.positionGrid = []
+        this.$alert('获取位置信息失败', '错误', { confirmButtonText: '确定' })
+      }).finally(() => {
+        this.positionGridLoading = false
+      })
+    },
+    handleLayerClick(layer) {
+      if (this.scanLayer === layer) {
+        return
+      }
+      this.scanLayer = layer
+      this.currentSelectedPosition = ''
+      this.loadAvailablePositions()
+    },
+    handlePositionClick(position) {
+      if (this.positionGridLoading) {
+        this.$message.warning('位置信息加载中，请稍候')
+        return
+      }
+      if (!this.availablePositions.includes(position)) {
+        this.$message.warning('该位置不可用')
+        return
+      }
+      this.currentSelectedPosition = position
+      this.scanPosition = position
+      this.$nextTick(() => {
+        if (this.$refs.scanInput) {
+          this.$refs.scanInput.focus()
+        }
+      })
+    },
+    moveFocusToScanInput() {
+      this.$nextTick(() => {
+        if (this.$refs.scanInput) {
+          this.$refs.scanInput.focus()
+        }
+      })
+    },
+    closeScanModal() {
+      this.scanModalVisible = false
+      if (this.needRefreshOnClose) {
+        this.refreshTable()
+        this.needRefreshOnClose = false
+      }
+    },
+    loadSortingListIfNeeded() {
+      if (this.sortingList.length > 0) {
+        return Promise.resolve(this.sortingList)
+      }
+      return getSortingList({
+        site: this.site,
+        palletId: this.palletCode
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.sortingList = data.rfidList || []
+          return this.sortingList
+        }
+        throw new Error((data && data.msg) || '获取分拣清单失败')
+      })
+    },
+    // 分拣扫码：扫进需命中分拣清单并缓存原位置，扫回需按缓存恢复 - rqrq
+    handleLabelScan() {
+      if (!this.ensureSite()) {
+        return
+      }
+      if (!this.scanCode || !this.scanCode.trim()) {
+        this.$alert('请输入标签编码', '错误', { confirmButtonText: '确定' })
+        return
+      }
+      if (this.operationType === 'in') {
+        if (!this.scanPosition) {
+          this.$alert('请选择位置', '错误', { confirmButtonText: '确定' })
+          return
+        }
+        if (!this.scanLayer) {
+          this.$alert('请选择层数', '错误', { confirmButtonText: '确定' })
+          return
+        }
+        this.loadSortingListIfNeeded()
+          .then((list) => {
+            if (list.length === 0) {
+              throw new Error('当前不存在分拣任务')
+            }
+            if (!list.includes(this.scanCode)) {
+              throw new Error('该标签不在分拣清单中')
+            }
+            return getLabelInfo({
+              site: this.site,
+              serialNo: this.scanCode
+            }).then(({ data }) => {
+              const original = data && data.code === 0 ? data.row : null
+              return savePalletDetail({
+                site: this.site,
+                palletId: this.palletCode,
+                position: this.scanPosition,
+                layer: this.scanLayer,
+                serialNo: this.scanCode,
+                sortFlag: 1
+              }).then(({ data: saveData }) => {
+                if (saveData && saveData.code === 0) {
+                  if (original) {
+                    this.originalDetailCache[this.scanCode] = {
+                      palletId: original.palletId || '',
+                      position: original.position || '',
+                      layer: original.layer || 1,
+                      partNo: original.partNo || '',
+                      createDate: original.createDate,
+                      createBy: original.createBy || '',
+                      wcsFlag: original.wcsFlag || 1
+                    }
+                  }
+                  this.$message.success('分拣扫进成功')
+                  this.needRefreshOnClose = true
+                  this.scanCode = ''
+                  this.loadLayerOptions()
+                  this.moveFocusToScanInput()
+                  return
+                }
+                throw new Error((saveData && saveData.msg) || '分拣扫进失败')
+              })
+            })
+          })
+          .catch((error) => {
+            this.$alert(error.message || '分拣扫进失败', '错误', { confirmButtonText: '确定' })
+            this.scanCode = ''
+            this.moveFocusToScanInput()
+          })
+      } else {
+        const original = this.originalDetailCache[this.scanCode]
+        if (!original) {
+          this.$alert('未找到该标签原始位置缓存，无法扫回', '提示', { confirmButtonText: '确定' })
+          this.scanCode = ''
+          this.moveFocusToScanInput()
+          return
+        }
+        restorePalletDetail({
+          site: this.site,
+          serialNo: this.scanCode,
+          originalPalletId: original.palletId,
+          originalPosition: original.position,
+          originalLayer: original.layer,
+          partNo: original.partNo,
+          createDate: original.createDate,
+          createBy: original.createBy,
+          wcsFlag: original.wcsFlag
+        }).then(({ data }) => {
+          if (data && data.code === 0) {
+            delete this.originalDetailCache[this.scanCode]
+            this.$message.success('分拣扫回成功')
+            this.needRefreshOnClose = true
+            this.scanCode = ''
+            this.moveFocusToScanInput()
+          } else {
+            this.$alert((data && data.msg) || '分拣扫回失败', '错误', { confirmButtonText: '确定' })
+          }
+        }).catch((error) => {
+          this.$alert(error.message || '分拣扫回失败', '错误', { confirmButtonText: '确定' })
+        })
+      }
+    },
+    submitSorting() {
+      if (!this.ensureSite()) {
+        return
+      }
+      if (!this.palletScanned) {
+        this.$alert('请先扫描栈板', '提示', { confirmButtonText: '确定' })
+        return
+      }
+      this.submitSortingLoading = true
+      completePalletAssemblyForFenJian({
+        site: this.site,
+        palletId: this.palletCode
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.sortingList = []
+          this.$message.success('分拣提交成功')
+        } else {
+          this.$alert((data && data.msg) || '分拣提交失败', '错误', { confirmButtonText: '确定' })
+        }
+      }).catch((error) => {
+        this.$alert(error.message || '分拣提交失败', '错误', { confirmButtonText: '确定' })
+      }).finally(() => {
+        this.submitSortingLoading = false
+      })
+    },
+    // 结束分拣动作仅走海安后端分流，不创建WMS运输任务 - rqrq
+    submitFinishSorting() {
+      if (!this.ensureSite()) {
+        return
+      }
+      if (!this.palletScanned) {
+        this.$alert('请先扫描栈板', '提示', { confirmButtonText: '确定' })
+        return
+      }
+      this.finishSortingLoading = true
+      finishSorting({
+        site: this.site,
+        palletId: this.palletCode
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.$message.success('结束分拣成功')
+          this.resetPage()
+        } else {
+          this.$alert((data && data.msg) || '结束分拣失败', '错误', { confirmButtonText: '确定' })
+        }
+      }).catch((error) => {
+        this.$alert(error.message || '结束分拣失败', '错误', { confirmButtonText: '确定' })
+      }).finally(() => {
+        this.finishSortingLoading = false
+      })
+    }
+  },
+  // keep-alive页面重新激活时统一重置，确保每次进入都是干净态 - rqrq
+  activated() {
+    this.resetPage(true)
+  },
+  // 离开页面时主动清空，避免返回菜单后二次进入看到上次分拣数据 - rqrq
+  beforeRouteLeave(to, from, next) {
+    this.resetPage(false)
+    next()
+  },
+  mounted() {
+    this.resetPage(true)
+  }
+}
+</script>
+
+<style scoped>
+.detail-table {
+  background: white;
+  border-radius: 6px;
+  overflow: hidden;
+  border: 1px solid #e0e0e0;
+}
+
+.table-header,
+.table-row {
+  display: flex;
+  align-items: center;
+  padding: 8px;
+  border-bottom: 1px solid #e0e0e0;
+}
+
+.table-header {
+  background: #f5f5f5;
+  font-weight: bold;
+  font-size: 14px;
+}
+
+.col-position {
+  flex: 1;
+  text-align: center;
+}
+
+.col-layer {
+  flex: 1;
+  text-align: center;
+}
+
+.col-serial {
+  flex: 4;
+  text-align: center;
+  word-break: break-all;
+}
+
+.empty-row {
+  justify-content: center;
+  align-items: center;
+  padding: 20px;
+  border-bottom: none;
+}
+
+.empty-hint {
+  text-align: center;
+  color: #999;
+  width: 100%;
+}
+
+.scan-modal-content {
+  padding: 10px 0;
+}
+
+.modal-form {
+  margin-bottom: 16px;
+}
+
+.dialog-footer {
+  text-align: center;
+}
+
+.action-btn.warning {
+  background-color: #E6A23C;
+  border-color: #E6A23C;
+  color: white;
+}
+
+.action-btn:disabled {
+  opacity: 0.6;
+  cursor: not-allowed;
+  background-color: #ccc !important;
+  border-color: #ccc !important;
+}
+
+::v-deep .el-dialog__wrapper {
+  z-index: 2000 !important;
+}
+
+::v-deep .el-overlay {
+  z-index: 2000 !important;
+}
+
+::v-deep .el-radio {
+  margin-right: 8px !important;
+}
+
+::v-deep .el-radio__label {
+  font-size: 14px;
+}
+
+/* 层数网格样式，保持与原PDA页面一致 - rqrq */
+.layer-grid {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  margin-top: 8px;
+}
+
+.layer-item {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  min-width: 50px;
+  height: 45px;
+  padding: 0 12px;
+  background-color: #fff;
+  border: 2px solid #dcdfe6;
+  border-radius: 6px;
+  font-size: 15px;
+  font-weight: bold;
+  cursor: pointer;
+  transition: all 0.3s;
+  user-select: none;
+}
+
+.layer-item:hover {
+  border-color: #409eff;
+  background-color: #ecf5ff;
+}
+
+.layer-item.layer-selected {
+  border-color: #409eff;
+  background-color: #409eff;
+  color: #fff;
+}
+
+/* 位置网格样式，保持与原PDA页面一致 - rqrq */
+.position-grid {
+  display: grid;
+  gap: 10px;
+  margin-top: 8px;
+  position: relative;
+}
+
+.position-grid.position-grid-1 {
+  grid-template-columns: 1fr;
+  grid-template-rows: 1fr;
+}
+
+.position-grid.position-grid-4 {
+  grid-template-columns: repeat(2, 1fr);
+  grid-template-rows: repeat(2, 1fr);
+  grid-auto-flow: column;
+}
+
+.position-grid.position-grid-9 {
+  grid-template-columns: repeat(3, 1fr);
+  grid-template-rows: repeat(3, 1fr);
+  grid-auto-flow: row;
+}
+
+.position-item.position-placeholder {
+  background-color: #f0f0f0 !important;
+  border: 1px dashed #d0d0d0 !important;
+  color: transparent !important;
+  cursor: not-allowed !important;
+  pointer-events: none !important;
+}
+
+.position-grid.position-grid-loading {
+  opacity: 0.7;
+  pointer-events: none;
+}
+
+.position-item {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 60px;
+  background-color: #fff;
+  border: 2px solid #dcdfe6;
+  border-radius: 6px;
+  font-size: 16px;
+  font-weight: bold;
+  cursor: pointer;
+  transition: all 0.3s;
+  user-select: none;
+}
+
+.position-item:hover:not(.position-disabled) {
+  border-color: #409eff;
+  background-color: #ecf5ff;
+}
+
+.position-item.position-selected {
+  border-color: #409eff;
+  background-color: #409eff;
+  color: #fff;
+}
+
+.position-item.position-disabled {
+  background-color: #f5f7fa;
+  color: #c0c4cc;
+  cursor: not-allowed;
+  opacity: 0.6;
+}
+
+.position-item.position-loading {
+  background: linear-gradient(90deg, #f5f7fa 25%, #e4e7ed 50%, #f5f7fa 75%);
+  background-size: 200% 100%;
+  animation: loading 1.5s ease-in-out infinite;
+}
+
+@keyframes loading {
+  0% {
+    background-position: 200% 0;
+  }
+  100% {
+    background-position: -200% 0;
+  }
+}
+</style>