From 0822ca7cc8af8b960b893523799722162538f0a4 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Sat, 18 Apr 2026 14:53:42 +0800
Subject: [PATCH] =?UTF-8?q?refactor(wms):=20=E4=BF=AE=E6=94=B9=E9=92=A2?=
 =?UTF-8?q?=E5=8D=B7=E5=90=88=E5=8D=B7=E5=8A=9F=E8=83=BD=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=8D=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将IWmsMaterialCoilService.mergeCoils方法返回值从Boolean改为Long
- 更新WmsMaterialCoilController.mergeCoils方法以返回合卷后的新钢卷ID
- 修改WmsMaterialCoilServiceImpl.mergeCoils实现以返回合并后的钢卷ID
- 移除原有的布尔返回值，改为返回实际的业务数据ID
- 保持事务处理和业务逻辑完整性
---
 .../java/com/klp/controller/WmsMaterialCoilController.java    | 4 ++--
 .../main/java/com/klp/service/IWmsMaterialCoilService.java    | 2 +-
 .../java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java
index 690be433..0e06aca7 100644
--- a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java
@@ -256,8 +256,8 @@ public class WmsMaterialCoilController extends BaseController {
     @Log(title = "钢卷物料表-合卷", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PostMapping("/merge")
-    public R<Void> mergeCoils(@Validated(EditGroup.class) @RequestBody WmsMaterialCoilBo bo) {
-        return toAjax(iWmsMaterialCoilService.mergeCoils(bo));
+    public R<Long> mergeCoils(@Validated(EditGroup.class) @RequestBody WmsMaterialCoilBo bo) {
+        return R.ok(iWmsMaterialCoilService.mergeCoils(bo));
     }
 
     /**
diff --git a/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java b/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java
index 6ba04439..c09dfe4b 100644
--- a/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java
+++ b/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java
@@ -73,7 +73,7 @@ public interface IWmsMaterialCoilService {
      * 如果传递了actionId，则更新操作记录状态为已完成，并设置完成时间和合卷后的钢卷ID到processedCoilIds
      * 如果未传actionId，则创建新的操作记录
      */
-    Boolean mergeCoils(WmsMaterialCoilBo bo);
+    Long mergeCoils(WmsMaterialCoilBo bo);
 
     /**
      * 简单更新钢卷物料表
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 fa40c2de..e9c34793 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
@@ -2899,7 +2899,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean mergeCoils(WmsMaterialCoilBo bo) {
+    public Long mergeCoils(WmsMaterialCoilBo bo) {
         if (bo.getNewCoils() == null || bo.getNewCoils().isEmpty()) {
             throw new RuntimeException("合卷操作需要提供参与合卷的钢卷列表");
         }
@@ -2980,7 +2980,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
             coilPendingActionService.updateByBo(pendingActionBo);
         }
 
-        return true;
+        return mergedCoilId;
     }
 
     /**