From 9d679954fa2282454a8e94e7a6d107c506483765 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com>
Date: Mon, 15 Jun 2026 13:21:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms/coil):=20=E4=BF=AE=E5=A4=8D=E9=92=A2?=
 =?UTF-8?q?=E5=8D=B7=E9=A2=86=E6=96=99=E5=92=8C=E5=90=88=E5=B9=B6=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E7=9A=84=E9=80=BB=E8=BE=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 新增根据酸洗动作类型设置锁值的逻辑
2. 修复合并页面钢卷选择器的筛选条件和匹配逻辑
---
 klp-ui/src/views/wms/coil/merge.vue     |  4 ++--
 klp-ui/src/views/wms/coil/panels/do.vue | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/klp-ui/src/views/wms/coil/merge.vue b/klp-ui/src/views/wms/coil/merge.vue
index 2665951e..a07fa2a4 100644
--- a/klp-ui/src/views/wms/coil/merge.vue
+++ b/klp-ui/src/views/wms/coil/merge.vue
@@ -86,7 +86,7 @@
                       <span class="pending-value">{{ formatTime(pending.updateTime) }}</span>
                     </div>
                   </div>
-                  <coil-selector @select="selectCoil($event, index)">
+                  <coil-selector @select="selectCoil($event, index)" :filters="{ exclusiveStatus: 0 }">
                     <div class="pending-coil-item">
                       选择其他钢卷
                     </div>
@@ -510,7 +510,7 @@ export default {
     renderPendingMergeList() {
       // 从pendingMergeList中筛选出不好含在sourceCoils中的,通过enterCoilNo
       if (this.pendingMergeList.length > 0) {
-        return this.pendingMergeList.filter(pending => !this.sourceCoils.some(source => source.enterCoilNo === pending.enterCoilNo))
+        return this.pendingMergeList.filter(pending => !this.sourceCoils.some(source => source.actionId === pending.actionId))
       }
       return [];
     },
diff --git a/klp-ui/src/views/wms/coil/panels/do.vue b/klp-ui/src/views/wms/coil/panels/do.vue
index 9c6edb7b..47bdaff1 100644
--- a/klp-ui/src/views/wms/coil/panels/do.vue
+++ b/klp-ui/src/views/wms/coil/panels/do.vue
@@ -660,6 +660,15 @@ export default {
 
       this.$set(row, 'picking', true)
 
+      let lockValue = undefined;
+      if (this.acidRollingActionType == 11) {
+        lockValue = 3
+      } else if (this.acidRollingActionType == 120) {
+        lockValue = 4
+      } else if (this.acidRollingActionType >= 200 && this.acidRollingActionType <= 299) {
+        lockValue = 5
+      }
+
       const pendingData = {
         coilId: row.coilId,
         currentCoilNo: row.currentCoilNo,
@@ -668,7 +677,8 @@ export default {
         sourceType: 'manual', // 手动创建
         warehouseId: row.warehouseId,
         priority: 0, // 默认普通优先级
-        remark: `PC端领料创建-${this.label}`
+        remark: `PC端领料创建-${this.label}`,
+        lockValue
       }
 
       this.$modal.confirm(`是否确认从${row.warehouseName || '仓库'}领料${row.currentCoilNo || '物料'}？`).then(() => {