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 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); // 默认普通优先级