|
|
@@ -680,7 +680,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public R splitDetails(List<ProcessOperationDetailSplitVo> processOperationDetailSplitVos) {
|
|
|
log.debug("开始执行工序作业明细指定卷数拆分逻辑");
|
|
|
-// ApsUtils.checkScheduling(null);
|
|
|
+ ApsUtils.checkScheduling(null);
|
|
|
boolean qtyError = processOperationDetailSplitVos.stream().anyMatch(data -> data.getSplitQty() == 0);
|
|
|
if (qtyError) {
|
|
|
log.error("存在拆分数量为0的工序作业明细数据");
|
|
|
@@ -712,7 +712,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
|
|
|
.collect(Collectors.toList());
|
|
|
if (processId.isEmpty()) {
|
|
|
log.error("无法根据工序作业明细获取工序作业信息");
|
|
|
- throw new CustomException("无法获取到工序作业信息");
|
|
|
+ throw new CustomException("无法获取到工序作业信息");
|
|
|
}
|
|
|
List<ApsProcessOperationDo> apsProcessOperationDos = (List<ApsProcessOperationDo>) apsProcessOperationService.listByIds(processId);
|
|
|
// 合并加工
|
|
|
@@ -747,11 +747,11 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
|
|
|
int unFinishRoll = currentProcessEquDo.getPlanprocessrall() - currentProcessEquDo.getStartingroll() - currentProcessEquDo.getCancelroll();
|
|
|
if (unFinishRoll <= 0) {
|
|
|
log.error("当前暂无可拆分的卷数信息");
|
|
|
- throw new RuntimeException("该作业已全部开工，不能拆分");
|
|
|
+ throw new CustomException("该作业已全部开工，不能拆分");
|
|
|
}
|
|
|
if (splitQty > unFinishRoll) {
|
|
|
log.error("拆分数量:{}大于待加工卷数:{}", splitQty, unFinishRoll);
|
|
|
- throw new RuntimeException("拆分数量大于待加工卷数，不能拆分");
|
|
|
+ throw new CustomException("拆分数量大于待加工卷数，不能拆分");
|
|
|
}
|
|
|
ApsProcessOperationProcessEquDo newDo = new ApsProcessOperationProcessEquDo();
|
|
|
BeanUtils.copyProperties(currentProcessEquDo, newDo);
|
xiahan