From 087c562645c0df843f5c4938b58c1c856ba06009 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: Sat, 3 Oct 2026 22:22:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/haianAutoWarehouse/palletAssembly.js  |  3 ++
 src/api/haianAutoWarehouse/palletPacking.js   |  3 ++
 src/views/main.vue                            | 12 ++---
 .../haianPalletAssembly.vue                   | 48 +++++++++++++++++++
 .../haianAutoWarehouse/haianPalletPacking.vue | 48 +++++++++++++++++++
 5 files changed, 108 insertions(+), 6 deletions(-)

diff --git a/src/api/haianAutoWarehouse/palletAssembly.js b/src/api/haianAutoWarehouse/palletAssembly.js
index 04256c5..954e964 100644
--- a/src/api/haianAutoWarehouse/palletAssembly.js
+++ b/src/api/haianAutoWarehouse/palletAssembly.js
@@ -21,6 +21,9 @@ export const getPalletTypeList = data => createAPI(`/haiAnWcsIntegration/getPall
 // 海安-直接组盘页：更新托盘类型与自动分拣配置 - rqrq
 export const updatePalletTypeAndAutoSort = data => createAPI(`/haiAnWcsIntegration/updatePalletTypeAndAutoSort`, 'post', data)
 
+// 海安-直接组盘页：A0206失焦保存手工备注 - rqrq
+export const updatePalletManualRemark = data => createAPI(`/haiAnWcsIntegration/updatePalletManualRemark`, 'post', data)
+
 // 海安-直接组盘页：获取指定层可用位置 - rqrq
 export const getAvailablePositionsForLayer = data => createAPI(`/haiAnWcsIntegration/getAvailablePositionsForLayer`, 'post', data)
 
diff --git a/src/api/haianAutoWarehouse/palletPacking.js b/src/api/haianAutoWarehouse/palletPacking.js
index 8219ad1..1a8fcb5 100644
--- a/src/api/haianAutoWarehouse/palletPacking.js
+++ b/src/api/haianAutoWarehouse/palletPacking.js
@@ -42,6 +42,9 @@ export const getPalletTypeAreas = data => createAPI(`/haiAnWcsIntegration/getPal
 // 海安-更新栈板类型与自动分拣配置 - rqrq
 export const updatePalletTypeAndAutoSort = data => createAPI(`/haiAnWcsIntegration/updatePalletTypeAndAutoSort`, 'post', data)
 
+// 海安-组盘入库页：A0206失焦保存手工备注 - rqrq
+export const updatePalletManualRemark = data => createAPI(`/haiAnWcsIntegration/updatePalletManualRemark`, 'post', data)
+
 // 海安-提交分拣 - rqrq
 export const completePalletAssemblyForFenJian = data => createAPI(`/haiAnWcsIntegration/completePalletAssemblyForFenJian`, 'post', data)
 
diff --git a/src/views/main.vue b/src/views/main.vue
index b4e4f50..2df0aa9 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -200,12 +200,12 @@
 <!--            </div>-->
 <!--            <div class="menu-text">Call料</div>-->
 <!--          </div>-->
-          <div class="menu-item" v-site-auth="'54'" @click="navigateWithWarehouseCheck('haianPalletAssembly')">
-            <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('haianPalletAssembly')">-->
+<!--            <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('haianPalletManualMove')">
             <div class="menu-icon purchase">
               <van-icon name="shopping-cart-o" size="24" />
diff --git a/src/views/modules/haianAutoWarehouse/haianPalletAssembly.vue b/src/views/modules/haianAutoWarehouse/haianPalletAssembly.vue
index 06fd4a8..1d20826 100644
--- a/src/views/modules/haianAutoWarehouse/haianPalletAssembly.vue
+++ b/src/views/modules/haianAutoWarehouse/haianPalletAssembly.vue
@@ -67,6 +67,19 @@
           </div>
         </div>
 
+        <div v-if="palletScanned && currentPalletType === 'A0206'" class="input-group">
+          <label class="input-label">手工备注</label>
+          <el-input
+            v-model="manualRemark"
+            type="textarea"
+            :rows="2"
+            maxlength="200"
+            placeholder="请输入手工备注，离开输入框后自动保存"
+            :disabled="manualRemarkSaving || interfaceBusy"
+            @blur="handleManualRemarkBlur"
+          />
+        </div>
+
         <div v-if="palletScanned" class="input-group">
           <el-checkbox
             v-model="forceFullPalletOut"
@@ -318,6 +331,7 @@ import {
   getPalletInfo,
   getPalletTypeList,
   updatePalletTypeAndAutoSort,
+  updatePalletManualRemark,
   getAvailablePositionsForLayer,
   callEmptyPalletToStation,
   getAreaOptionsForChange,
@@ -338,6 +352,9 @@ export default {
       currentPalletType: '',
       currentAutoSort: 'N',
       currentPalletStation: '',
+      manualRemark: '',
+      savedManualRemark: '',
+      manualRemarkSaving: false,
       forceFullPalletOut: false,
       palletTypeDisabled: false,
       autoSortDisabled: false,
@@ -542,6 +559,8 @@ export default {
           this.scanPosition = ''
           this.scanLayer = 1
           this.currentSelectedPosition = ''
+          this.manualRemark = ''
+          this.savedManualRemark = ''
           this.loadPalletInfo()
           this.refreshTable()
         } else {
@@ -565,6 +584,8 @@ export default {
           this.currentAutoSort = row.autoSort || 'N'
           this.currentPalletStation = row.locationCode || ''
           this.forceFullPalletOut = Number(row.soreType) === 3
+          this.manualRemark = row.manualRemark || ''
+          this.savedManualRemark = this.manualRemark
           this.palletInfo.palletType = this.currentPalletType
           this.palletInfo.autoSort = this.currentAutoSort
           this.palletInfo.locationCode = row.locationCode || ''
@@ -651,6 +672,33 @@ export default {
     handleForceFullPalletOutChange() {
       this.savePalletTypeConfig()
     },
+    // A0206失焦才保存手工备注；内容和上次成功值相同则不请求，失败保留输入供再次离开重试 - rqrq
+    handleManualRemarkBlur() {
+      if (!this.palletScanned || this.currentPalletType !== 'A0206' || this.manualRemarkSaving) {
+        return
+      }
+      const nextRemark = (this.manualRemark || '').trim()
+      this.manualRemark = nextRemark
+      if (nextRemark === this.savedManualRemark) {
+        return
+      }
+      this.manualRemarkSaving = true
+      updatePalletManualRemark({
+        site: this.site,
+        palletId: this.palletCode,
+        manualRemark: nextRemark
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.savedManualRemark = nextRemark
+        } else {
+          this.$alert((data && data.msg) || '手工备注保存失败', '错误', { confirmButtonText: '确定' })
+        }
+      }).catch(() => {
+        this.$alert('手工备注保存失败', '错误', { confirmButtonText: '确定' })
+      }).finally(() => {
+        this.manualRemarkSaving = false
+      })
+    },
     updateAutoSortControl() {
       if (this.forceFullPalletOut || this.currentPalletType === 'A0103') {
         this.currentAutoSort = 'N'
diff --git a/src/views/modules/haianAutoWarehouse/haianPalletPacking.vue b/src/views/modules/haianAutoWarehouse/haianPalletPacking.vue
index b21399e..432f881 100644
--- a/src/views/modules/haianAutoWarehouse/haianPalletPacking.vue
+++ b/src/views/modules/haianAutoWarehouse/haianPalletPacking.vue
@@ -74,6 +74,19 @@
           </div>
         </div>
 
+        <div v-if="palletScanned && currentPalletType === 'A0206'" class="input-group">
+          <label class="input-label">手工备注</label>
+          <el-input
+            v-model="manualRemark"
+            type="textarea"
+            :rows="2"
+            maxlength="200"
+            placeholder="请输入手工备注，离开输入框后自动保存"
+            :disabled="manualRemarkSaving || interfaceBusy"
+            @blur="handleManualRemarkBlur"
+          />
+        </div>
+
         <!-- 第2.5行：是否强制整托出库 (扫描栈板后显示) - rqrq -->
         <div v-if="palletScanned" class="input-group">
           <el-checkbox
@@ -363,6 +376,7 @@ import {
   getPalletInfo,
   getPalletTypeList,
   updatePalletTypeAndAutoSort,
+  updatePalletManualRemark,
   getAvailablePositionsForLayer,
   callEmptyPalletToStation,
   callPalletToStationWithUpdateZuPan
@@ -382,6 +396,9 @@ export default {
       currentPalletType: '',
       currentAutoSort: 'N',
       currentPalletStation: '',
+      manualRemark: '',
+      savedManualRemark: '',
+      manualRemarkSaving: false,
       forceFullPalletOut: false,
       palletTypeDisabled: false,
       autoSortDisabled: false,
@@ -580,6 +597,8 @@ export default {
           this.scanPosition = ''
           this.scanLayer = 1
           this.currentSelectedPosition = ''
+          this.manualRemark = ''
+          this.savedManualRemark = ''
           this.loadPalletInfo()
           this.refreshTable()
         } else {
@@ -603,6 +622,8 @@ export default {
           this.currentAutoSort = row.autoSort || 'N'
           this.currentPalletStation = row.locationCode || ''
           this.forceFullPalletOut = Number(row.soreType) === 3
+          this.manualRemark = row.manualRemark || ''
+          this.savedManualRemark = this.manualRemark
           this.palletInfo.palletType = this.currentPalletType
           this.palletInfo.autoSort = this.currentAutoSort
           this.palletInfo.locationCode = this.currentPalletStation
@@ -691,6 +712,33 @@ export default {
     handleForceFullPalletOutChange() {
       this.savePalletTypeConfig()
     },
+    // A0206失焦才保存手工备注；内容和上次成功值相同则不请求，失败保留输入供再次离开重试 - rqrq
+    handleManualRemarkBlur() {
+      if (!this.palletScanned || this.currentPalletType !== 'A0206' || this.manualRemarkSaving) {
+        return
+      }
+      const nextRemark = (this.manualRemark || '').trim()
+      this.manualRemark = nextRemark
+      if (nextRemark === this.savedManualRemark) {
+        return
+      }
+      this.manualRemarkSaving = true
+      updatePalletManualRemark({
+        site: this.site,
+        palletId: this.palletCode,
+        manualRemark: nextRemark
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.savedManualRemark = nextRemark
+        } else {
+          this.$alert((data && data.msg) || '手工备注保存失败', '错误', { confirmButtonText: '确定' })
+        }
+      }).catch(() => {
+        this.$alert('手工备注保存失败', '错误', { confirmButtonText: '确定' })
+      }).finally(() => {
+        this.manualRemarkSaving = false
+      })
+    },
     // 根据托盘类型能力与强制整托规则动态控制自动分拣可编辑性 - rqrq
     updateAutoSortControl() {
       if (this.forceFullPalletOut || this.currentPalletType === 'A0103') {