From 4575b6f3425aa05b13d0e61b2eefd767949d2cf4 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 19 May 2026 15:37:53 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E9=92=A2?=
 =?UTF-8?q?=E5=8D=B7=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E5=9B=9E=E8=B0=83=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在批量或单个更新后统一处理返回结果
- 添加 actionId 验证逻辑以确保操作记录存在
- 集成 coilPendingActionService.completeAction 接口调用
- 实现更新成功后的操作记录状态同步
- 优化方法结构以支持操作完成后的后续处理
---
 .../klp/service/impl/WmsMaterialCoilServiceImpl.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
index db48d116..2fa05f60 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
@@ -1344,17 +1344,25 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String updateByBo(WmsMaterialCoilBo bo, String qrcodeStepType) {
+        String result;
         // 判断是否批量更新
         if (bo.getNewCoils() != null && !bo.getNewCoils().isEmpty()) {
             // 批量更新逻辑（分卷/合卷）
-            return updateByBatch(bo); // 分卷返回逗号分隔的ID，合卷返回单个ID
+            result = updateByBatch(bo); // 分卷返回逗号分隔的ID，合卷返回单个ID
         } else {
             // 单个更新逻辑，需要coilId
             if (bo.getCoilId() == null) {
                 throw new RuntimeException("钢卷ID不能为空");
             }
-            return updateBySingle(bo, qrcodeStepType); // 返回新钢卷ID字符串
+            result = updateBySingle(bo, qrcodeStepType); // 返回新钢卷ID字符串
         }
+        
+        // 如果有关联的操作记录ID，调用完成接口
+        if (bo.getActionId() != null && bo.getActionId() > 0) {
+            coilPendingActionService.completeAction(bo.getActionId(), result);
+        }
+        
+        return result;
     }
 
     /**