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;
     }
 
     /**