diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java
index be64ef1c..145e9fa5 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java
@@ -274,6 +274,9 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer
         validEntityBeforeSave(add);
         if (add.getCoilId() != null){
             WmsMaterialCoil materialCoil = materialCoilMapper.selectById(add.getCoilId());
+            if (materialCoil == null) {
+                throw new RuntimeException("关联的钢卷不存在");
+            }
             if (materialCoil.getDataType() == 0) {
                 throw new RuntimeException("该钢卷为历史钢卷不能被操作");
             }
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 14f5d8e0..6d24cb8c 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
@@ -1658,8 +1658,8 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
             result = updateBySingle(bo, qrcodeStepType); // 返回新钢卷ID字符串
         }
 
-        // 如果有关联的操作记录ID，调用完成接口
-        if (bo.getActionId() != null && bo.getActionId() > 0 && bo.getHasMergeSplit() != 2) {
+        // 如果有关联的操作记录ID，调用完成接口（合卷已在mergeCoils中单独完成，此处跳过）
+        if (bo.getActionId() != null && bo.getActionId() > 0 && !Integer.valueOf(2).equals(bo.getHasMergeSplit())) {
             coilPendingActionService.completeAction(bo.getActionId(), result);
         }