小修改

src/api/haianAutoWarehouse/palletMerge.js

@@ -2,9 +2,12 @@ import { createAPI } from "@/utils/httpRequest.js";
 
 // ========== 海安-合托相关接口 ========== - rqrq
 
-// 海安-校验托盘（来源/目标通用）- rqrq
+// 海安-校验来源托盘：必须已有明细 - rqrq
 export const checkPalletForMerge = data => createAPI(`/haiAnWcsIntegration/checkPalletForMerge`, 'post', data)
 
+// 海安-校验目标托盘：允许没有明细，空托可作为合托接收方 - rqrq
+export const checkTargetPalletForMerge = data => createAPI(`/haiAnWcsIntegration/checkTargetPalletForMerge`, 'post', data)
+
 // 海安-校验目标托盘类型是否为混装托盘 - rqrq
 export const checkTargetPalletType = data => createAPI(`/haiAnWcsIntegration/checkTargetPalletType`, 'post', data)
 

src/views/modules/haianAutoWarehouse/haianPalletMerge.vue

@@ -141,6 +141,7 @@
 import palletDetailState from './palletDetailState'
 import {
   checkPalletForMerge,
+  checkTargetPalletForMerge,
   checkTargetPalletType,
   getPalletDetailForMerge,
   executePalletMerge
@@ -302,8 +303,8 @@ export default {
         return
       }
 
-      // 先校验目标托盘是否存在（后台会处理LR并返回真实托盘号）- rqrq
-      checkPalletForMerge({
+      // 目标托盘允许没有明细，不能走来源校验，否则空托会被拒成“不能作为来源托盘” - rqrq
+      checkTargetPalletForMerge({
         site: this.site,
         palletId: scannedCode
       }).then(({ data }) => {

src/views/modules/haianAutoWarehouse/haianPalletPacking.vue

@@ -74,6 +74,14 @@
           </div>
         </div>
 
+        <!-- 海安组盘高度必须由现场选择，提交时随托盘保存并传给WCS - rqrq -->
+        <div v-if="palletScanned" 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" />
+          </el-select>
+        </div>
+
         <div v-if="palletScanned && currentPalletType === 'A0206'" class="input-group">
           <label class="input-label">手工备注</label>
           <el-input
@@ -395,6 +403,13 @@ export default {
       currentPalletFamily: '',
       currentPalletType: '',
       currentAutoSort: 'N',
+      currentHeight: '',
+      heightOptions: [
+        { label: '低于600', value: 'HEIGHT_LT_600' },
+        { label: '600-1100', value: 'HEIGHT_600_1100' },
+        { label: '1100-1500', value: 'HEIGHT_1100_1500' },
+        { label: '>=1500', value: 'HEIGHT_GE_1500' }
+      ],
       currentPalletStation: '',
       manualRemark: '',
       savedManualRemark: '',
@@ -520,6 +535,7 @@ export default {
       this.currentPalletFamily = ''
       this.currentPalletType = ''
       this.currentAutoSort = 'N'
+      this.currentHeight = ''
       this.currentPalletStation = ''
       this.forceFullPalletOut = false
       this.palletTypeDisabled = false
@@ -620,6 +636,7 @@ 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 || ''
@@ -1107,6 +1124,10 @@ export default {
         return
       }
       // 栈板未绑定当前库位时禁止手工触发运输入库，避免无站点上下文误发请求 - rqrq
+      if (!this.currentHeight) {
+        this.$alert('请选择托盘高度', '提示', { confirmButtonText: '确定' })
+        return
+      }
       if (!this.currentPalletStation || !this.currentPalletStation.trim()) {
         this.$alert('当前栈板没有库位，不允许执行运输入库', '提示', { confirmButtonText: '确定' })
         return
@@ -1130,6 +1151,7 @@ export default {
       callPalletToStationWithUpdateZuPan({
         site: this.site,
         palletId: this.palletCode,
+        height: this.currentHeight,
         startStation: this.palletInfo.locationCode || ''
       }).then(({ data }) => {
         if (data && data.code === 0) {

src/views/modules/haianAutoWarehouse/haianPalletSorting.vue

@@ -69,6 +69,14 @@
           </div>
         </div>
 
+        <!-- 手工分拣组盘高度为必填，提交时随托盘保存并传给WCS - rqrq -->
+        <div v-if="palletScanned" 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" />
+          </el-select>
+        </div>
+
         <!-- 第2.5行：是否强制整托出库，保持与原PDA页面一致 - rqrq -->
         <div v-if="palletScanned" class="input-group">
           <el-checkbox
@@ -377,6 +385,13 @@ export default {
       detailModalVisible: false,
       currentPalletType: '',
       currentAutoSort: 'N',
+      currentHeight: '',
+      heightOptions: [
+        { label: '低于600', value: 'HEIGHT_LT_600' },
+        { label: '600-1100', value: 'HEIGHT_600_1100' },
+        { label: '1100-1500', value: 'HEIGHT_1100_1500' },
+        { label: '>=1500', value: 'HEIGHT_GE_1500' }
+      ],
       currentPalletStation: '',
       // 被分拣源盘标记：由后端按海安新增被分拣站数组返回，前端不自行猜点位；R1-R4 是手工分拣区 - rqrq
       sortedSourceFlag: false,
@@ -593,6 +608,7 @@ export default {
       this.detailModalVisible = false
       this.currentPalletType = ''
       this.currentAutoSort = 'N'
+      this.currentHeight = ''
       this.currentPalletStation = ''
       this.sortedSourceFlag = false
       this.forceFullPalletOut = false
@@ -682,6 +698,7 @@ export default {
           const row = data.row || {}
           this.currentPalletType = row.palletType || ''
           this.currentAutoSort = row.autoSort || 'N'
+          this.currentHeight = row.height || ''
           this.currentPalletStation = row.locationCode || ''
           this.forceFullPalletOut = Number(row.soreType) === 3
           this.palletInfo.palletType = this.currentPalletType
@@ -1091,10 +1108,15 @@ export default {
         this.$alert('请先扫描栈板', '提示', { confirmButtonText: '确定' })
         return
       }
+      if (!this.currentHeight) {
+        this.$alert('请选择托盘高度', '提示', { confirmButtonText: '确定' })
+        return
+      }
       this.submitSortingLoading = true
       completePalletAssemblyForFenJian({
         site: this.site,
-        palletId: this.palletCode
+        palletId: this.palletCode,
+        height: this.currentHeight
       }).then(({ data }) => {
         if (data && data.code === 0) {
           const sortedSource = this.sortedSourceFlag
@@ -1128,10 +1150,15 @@ export default {
         this.$alert('请先扫描栈板', '提示', { confirmButtonText: '确定' })
         return
       }
+      if (!this.currentHeight) {
+        this.$alert('请选择托盘高度', '提示', { confirmButtonText: '确定' })
+        return
+      }
       this.finishSortingLoading = true
       finishSorting({
         site: this.site,
-        palletId: this.palletCode
+        palletId: this.palletCode,
+        height: this.currentHeight
       }).then(({ data }) => {
         if (data && data.code === 0) {
           this.$message.success('结束分拣成功')