From 09c8b9cc4a548aaedc08d43238dc455819042c05 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Wed, 11 Mar 2026 14:18:11 +0800
Subject: [PATCH] =?UTF-8?q?feat(material):=20=E9=92=A2=E5=8D=B7=E7=89=B9?=
 =?UTF-8?q?=E6=AE=8A=E5=88=86=E5=8D=B7=E5=8A=9F=E8=83=BD=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E7=B1=BB=E5=9E=8B=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在IWmsMaterialCoilService接口中为startSpecialSplit方法添加actionType参数
- 在WmsMaterialCoilController控制器中接收前端传递的操作类型参数
- 在WmsMaterialCoilServiceImpl实现类中将操作类型参数传递给待处理动作对象
- 修改事务处理逻辑以支持动态操作类型设置
---
 .../java/com/klp/controller/WmsMaterialCoilController.java | 7 +++++--
 .../main/java/com/klp/service/IWmsMaterialCoilService.java | 2 +-
 .../com/klp/service/impl/WmsMaterialCoilServiceImpl.java   | 4 ++--
 3 files changed, 8 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 c49ed292..d98036df 100644
--- a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java
@@ -375,9 +375,12 @@ public class WmsMaterialCoilController extends BaseController {
     @PostMapping("/specialSplit/start")
     public R<Long> startSpecialSplit(
         @NotNull(message = "钢卷ID不能为空")
-        @RequestParam Long coilId) {
+        @RequestParam Long coilId,
+        @NotNull(message = "操作类型不能为空")
+        @RequestParam Integer actionType
+    ) {
         try {
-            Boolean result = iWmsMaterialCoilService.startSpecialSplit(coilId);
+            Boolean result = iWmsMaterialCoilService.startSpecialSplit(coilId, actionType);
             if (Boolean.TRUE.equals(result)) {
                 return R.ok();
             }
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 2c50fbda..c68b8594 100644
--- a/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java
+++ b/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java
@@ -192,7 +192,7 @@ public interface IWmsMaterialCoilService {
      * @param coilId 被分卷的钢卷ID
      * @return 待操作记录ID
      */
-    Boolean startSpecialSplit(@NotNull(message = "钢卷ID不能为空") Long coilId);
+    Boolean startSpecialSplit(@NotNull(message = "钢卷ID不能为空") Long coilId, Integer actionType);
 
     /**
      * 特殊分卷 - 第二步：逐个创建子钢卷
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 c5e043d6..f007fe98 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
@@ -3886,7 +3886,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean startSpecialSplit(Long coilId) {
+    public Boolean startSpecialSplit(Long coilId, Integer actionType) {
         // 1. 查询钢卷信息
         WmsMaterialCoil coil = baseMapper.selectById(coilId);
         if (coil == null) {
@@ -3923,7 +3923,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
         WmsCoilPendingActionBo pendingActionBo = new WmsCoilPendingActionBo();
         pendingActionBo.setCoilId(coilId);
         pendingActionBo.setCurrentCoilNo(coil.getCurrentCoilNo());
-        pendingActionBo.setActionType(501); // 领料操作类型
+        pendingActionBo.setActionType(actionType); // 领料操作类型
         pendingActionBo.setActionStatus(0); // 待处理
         pendingActionBo.setSourceType("manual"); // 手动创建
         pendingActionBo.setPriority(0); // 默认普通优先级