Compare commits
2 Commits
aa286d66f2
...
b61cea837a
| Author | SHA1 | Date | |
|---|---|---|---|
| b61cea837a | |||
| 09c8b9cc4a |
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
/**
|
||||
* 特殊分卷 - 第二步:逐个创建子钢卷
|
||||
|
||||
@@ -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); // 默认普通优先级
|
||||
|
||||
Reference in New Issue
Block a user