From 0ecb13952da74e8ba4a019b61299cec548218efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Mon, 9 Nov 2026 11:40:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../haianAutoWarehouse/haianPalletPacking.vue | 21 ++-----------------
 .../haianAutoWarehouse/haianPalletSorting.vue | 16 +++++++-------
 2 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/src/views/modules/haianAutoWarehouse/haianPalletPacking.vue b/src/views/modules/haianAutoWarehouse/haianPalletPacking.vue
index 71bceda..a385802 100644
--- a/src/views/modules/haianAutoWarehouse/haianPalletPacking.vue
+++ b/src/views/modules/haianAutoWarehouse/haianPalletPacking.vue
@@ -74,14 +74,6 @@
           </div>
         </div>
 
-        <!-- 海安组盘高度选填；已选值随请求保存并传给WCS，未选时由后端复用托盘高度或默认档位 - rqrq -->
-        <div v-if="palletScanned" class="input-group">
-          <label class="input-label">托盘高度</label>
-          <el-select v-model="currentHeight" placeholder="请选择托盘高度（可选）" clearable style="width: 100%;" :disabled="interfaceBusy">
-            <el-option v-for="item in heightOptions" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </div>
-
         <div v-if="palletScanned && currentPalletType === 'A0206'" class="input-group">
           <label class="input-label">手工备注</label>
           <el-input
@@ -408,13 +400,6 @@ export default {
       currentPalletFamily: '',
       currentPalletType: '',
       currentAutoSort: 'N',
-      currentHeight: '',
-      // 海安组盘将原第三、第四高度档合并为一个选项，编码与后端及历史数据迁移保持一致。- rqrq
-      heightOptions: [
-        { label: '低于600', value: 'HEIGHT_LT_600' },
-        { label: '600-1100', value: 'HEIGHT_600_1100' },
-        { label: '1100-1650', value: 'HEIGHT_1100_1650' }
-      ],
       currentPalletStation: '',
       manualRemark: '',
       savedManualRemark: '',
@@ -542,7 +527,6 @@ export default {
       this.currentPalletFamily = ''
       this.currentPalletType = ''
       this.currentAutoSort = 'N'
-      this.currentHeight = ''
       this.currentPalletStation = ''
       this.forceFullPalletOut = false
       this.palletTypeDisabled = false
@@ -645,7 +629,6 @@ export default {
           this.currentPalletFamily = row.palletFamily || ''
           this.currentPalletType = row.palletType || ''
           this.currentAutoSort = row.autoSort || 'N'
-          this.currentHeight = row.height || ''
           this.currentPalletStation = row.locationCode || ''
           this.forceFullPalletOut = Number(row.soreType) === 3
           this.manualRemark = row.manualRemark || ''
@@ -1209,8 +1192,8 @@ export default {
       callPalletToStationWithUpdateZuPan({
         site: this.site,
         palletId: this.palletCode,
-        // 高度选填，空值由后端优先复用托盘已保存高度，无保存值时按默认档位下发 - rqrq
-        height: this.currentHeight,
+        // 组盘运输入库不选高度，固定传空，由后端按空值下发 - rqrq
+        height: '',
         startStation: this.palletInfo.locationCode || ''
       }).then(({ data }) => {
         if (data && data.code === 0) {
diff --git a/src/views/modules/haianAutoWarehouse/haianPalletSorting.vue b/src/views/modules/haianAutoWarehouse/haianPalletSorting.vue
index 7c1dbc7..9ce0b81 100644
--- a/src/views/modules/haianAutoWarehouse/haianPalletSorting.vue
+++ b/src/views/modules/haianAutoWarehouse/haianPalletSorting.vue
@@ -69,8 +69,8 @@
           </div>
         </div>
 
-        <!-- 手工分拣组盘高度为必填，提交时随托盘保存并传给WCS - rqrq -->
-        <div v-if="palletScanned" class="input-group">
+        <!-- 只有被分拣通知回库显示高度且必选；提交分拣和结束分拣不展示，请求传空 - rqrq -->
+        <div v-if="palletScanned && sortedSourceFlag" class="input-group">
           <label class="input-label">托盘高度</label>
           <el-select v-model="currentHeight" placeholder="请选择托盘高度" style="width: 100%;" :disabled="interfaceBusy">
             <el-option v-for="item in heightOptions" :key="item.value" :label="item.label" :value="item.value" />
@@ -1273,7 +1273,8 @@ export default {
         this.$alert('请先扫描栈板', '提示', { confirmButtonText: '确定' })
         return
       }
-      if (!this.currentHeight) {
+      // 通知回库必须带页面选择的高度；工作盘提交分拣不选高度，传空 - rqrq
+      if (this.sortedSourceFlag && !this.currentHeight) {
         this.$alert('请选择托盘高度', '提示', { confirmButtonText: '确定' })
         return
       }
@@ -1281,7 +1282,7 @@ export default {
       completePalletAssemblyForFenJian({
         site: this.site,
         palletId: this.palletCode,
-        height: this.currentHeight
+        height: this.sortedSourceFlag ? this.currentHeight : ''
       }).then(({ data }) => {
         if (data && data.code === 0) {
           const sortedSource = this.sortedSourceFlag
@@ -1315,15 +1316,12 @@ export default {
         this.$alert('请先扫描栈板', '提示', { confirmButtonText: '确定' })
         return
       }
-      if (!this.currentHeight) {
-        this.$alert('请选择托盘高度', '提示', { confirmButtonText: '确定' })
-        return
-      }
       this.finishSortingLoading = true
+      // 结束分拣不选高度，固定传空 - rqrq
       finishSorting({
         site: this.site,
         palletId: this.palletCode,
-        height: this.currentHeight
+        height: ''
       }).then(({ data }) => {
         if (data && data.code === 0) {
           this.$message.success('结束分拣成功')