Compare commits

...

2 Commits

Author SHA1 Message Date
b61cea837a Merge remote-tracking branch 'origin/0.8.X' into 0.8.X 2026-03-11 14:18:19 +08:00
09c8b9cc4a feat(material): 钢卷特殊分卷功能新增操作类型参数
- 在IWmsMaterialCoilService接口中为startSpecialSplit方法添加actionType参数
- 在WmsMaterialCoilController控制器中接收前端传递的操作类型参数
- 在WmsMaterialCoilServiceImpl实现类中将操作类型参数传递给待处理动作对象
- 修改事务处理逻辑以支持动态操作类型设置
2026-03-11 14:18:11 +08:00
3 changed files with 8 additions and 5 deletions

View File

@@ -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();
}

View File

@@ -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);
/**
* 特殊分卷 - 第二步:逐个创建子钢卷

View File

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