From 5e80208d619a3c1cf3bd0221e6f33d4b85344ceb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Wed, 15 Apr 2026 15:28:28 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E5=9C=A8=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=B6=E4=BC=A0=E9=80=92=E6=96=B0=E9=92=A2?=
 =?UTF-8?q?=E5=8D=B7ID=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改completeAction接口以接收新钢卷ID参数，并在多个视图中调用时传递该参数
---
 klp-ui/src/api/wms/pendingAction.js           |  7 ++-
 klp-ui/src/views/wms/coil/merge.vue           | 52 +------------------
 .../src/views/wms/coil/panels/stepSplit.vue   |  2 +-
 klp-ui/src/views/wms/coil/split.vue           |  2 +-
 klp-ui/src/views/wms/coil/typing.vue          |  7 +--
 5 files changed, 10 insertions(+), 60 deletions(-)

diff --git a/klp-ui/src/api/wms/pendingAction.js b/klp-ui/src/api/wms/pendingAction.js
index d6d17579..5826bcba 100644
--- a/klp-ui/src/api/wms/pendingAction.js
+++ b/klp-ui/src/api/wms/pendingAction.js
@@ -122,10 +122,13 @@ export function startProcess(actionId) {
 }
 
 // 完成操作
-export function completeAction(actionId) {
+export function completeAction(actionId, newCoilIds) {
   return request({
     url: `/wms/coilPendingAction/complete/${actionId}`,
-    method: 'put'
+    method: 'put',
+    params: {
+      newCoilIds: newCoilIds
+    }
   })
 }
 
diff --git a/klp-ui/src/views/wms/coil/merge.vue b/klp-ui/src/views/wms/coil/merge.vue
index c42985f7..a7b89ad1 100644
--- a/klp-ui/src/views/wms/coil/merge.vue
+++ b/klp-ui/src/views/wms/coil/merge.vue
@@ -292,7 +292,7 @@
 
 <script>
 import { getMaterialCoil, mergeMaterialCoil } from '@/api/wms/coil';
-import { listPendingAction, completeAction, addPendingAction, getPendingAction } from '@/api/wms/pendingAction';
+import { listPendingAction, getPendingAction } from '@/api/wms/pendingAction';
 import CoilSelector from '@/components/CoilSelector';
 import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect";
 import RawMaterialSelector from "@/components/KLPService/RawMaterialSelect";
@@ -700,12 +700,6 @@ export default {
 
     // 保存合卷
     async handleSave() {
-      // 验证源卷数量
-      // if (this.sourceCoils.length < 2) {
-      //   this.$message.error('至少需要2个源卷才能合卷');
-      //   return;
-      // }
-
       // 验证源卷信息
       for (let i = 0; i < this.sourceCoils.length; i++) {
         const item = this.sourceCoils[i];
@@ -758,7 +752,6 @@ export default {
           text: '正在合卷，请稍后...',
           background: 'rgba(0, 0, 0, 0.7)'
         });
-        // this.completeAllRelatedActions();
         await mergeMaterialCoil(mergeData);
 
         this.$message.success('合卷保存成功');
@@ -802,49 +795,6 @@ export default {
       });
     },
 
-    // 完成所有相关的待操作记录
-    async completeAllRelatedActions() {
-      try {
-        // 收集所有待操作ID
-        const actionIds = [];
-        const ncs = [];
-
-        // 当前页面的actionId（从路由参数获取）
-        // if (this.actionId) {
-        //   actionIds.push(this.actionId);
-        // }
-
-        // 从待合卷列表中选择的钢卷的actionId
-        this.sourceCoils.forEach(item => {
-          if (item.actionId) {
-            actionIds.push(item.actionId);
-          }
-          // 或许所有需要直接完成的
-          if (item.nc) {
-            ncs.push(item);
-          }
-        });
-
-        // 批量完成所有待操作
-        const promises1 = actionIds.map(id => completeAction(id));
-        const promises2 = ncs.map(item => {
-          addPendingAction({
-            actionType: this.actionTypeCode,  // 合卷操作
-            actionStatus: '2',  // 2表示已完成
-            coilId: item.coilId,
-            currentCoilNo: item.currentCoilNo || '',
-            priority: 0,
-            sourceType: 'manual',
-            completeTime: new Date()
-          })
-        });
-        await Promise.all(promises1.concat(promises2));
-      } catch (error) {
-        console.error('完成待操作失败:', error);
-        // 不影响主流程，只记录错误
-      }
-    },
-
     // 取消操作
     handleCancel() {
       console.log('取消合卷操作', this.$tab);
diff --git a/klp-ui/src/views/wms/coil/panels/stepSplit.vue b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
index c3c06ff2..52c06b6a 100644
--- a/klp-ui/src/views/wms/coil/panels/stepSplit.vue
+++ b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
@@ -721,7 +721,7 @@ export default {
           }
 
           // 2. 完成待办动作（根据业务逻辑调整）
-          const actionRes = await completeAction(this.actionId)
+          const actionRes = await completeAction(this.actionId, splitRes.data.childCoilIds.join(','))
           if (actionRes.code !== 200) {
             this.$message.error('完成待办动作失败：' + actionRes.msg)
             return
diff --git a/klp-ui/src/views/wms/coil/split.vue b/klp-ui/src/views/wms/coil/split.vue
index 8afbf7d6..b3a4e6f3 100644
--- a/klp-ui/src/views/wms/coil/split.vue
+++ b/klp-ui/src/views/wms/coil/split.vue
@@ -676,7 +676,7 @@ export default {
 
           // 如果是从待操作列表进来的，标记操作为完成
           if (this.actionId) {
-            await completeAction(this.actionId);
+            await completeAction(this.actionId, response.msg);
           }
 
           // 延迟返回，让用户看到成功提示
diff --git a/klp-ui/src/views/wms/coil/typing.vue b/klp-ui/src/views/wms/coil/typing.vue
index b0456616..fca4fef8 100644
--- a/klp-ui/src/views/wms/coil/typing.vue
+++ b/klp-ui/src/views/wms/coil/typing.vue
@@ -324,11 +324,9 @@
 </template>
 
 <script>
-import { getMaterialCoil, updateMaterialCoil, getMaterialCoilTrace, checkCoilNo } from '@/api/wms/coil';
+import { getMaterialCoil, updateMaterialCoil, getMaterialCoilTrace } from '@/api/wms/coil';
 import { completeAction, getPendingAction } from '@/api/wms/pendingAction';
 import { listWarehouse } from '@/api/wms/warehouse';
-import { listRawMaterialWithBom } from '@/api/wms/rawMaterial';
-import { listProductWithBom } from '@/api/wms/product';
 import { getAcidTypingPrefill } from '@/api/pocket/acidTyping';
 import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect";
 import RawMaterialSelect from "@/components/KLPService/RawMaterialSelect";
@@ -870,7 +868,6 @@ export default {
             enterCoilNo: this.currentInfo.enterCoilNo,
             supplierCoilNo: this.currentInfo.supplierCoilNo,
             abnormals: this.abnormals,
-            // 注意：不要传newCoils，否则会走批量更新逻辑
           };
 
           const response = await updateMaterialCoil(updateData);
@@ -880,7 +877,7 @@ export default {
 
             // 如果是从待操作列表进来的，标记操作为完成
             if (this.actionId) {
-              await completeAction(this.actionId);
+              await completeAction(this.actionId, response.msg);
             }
 
             // 延迟返回