fix: 更新日志优化,绑定操作人,任务判断扩大

This commit is contained in:
2025-12-26 15:52:21 +08:00
parent 49c0f63ac4
commit 947580243b

View File

@@ -1469,6 +1469,7 @@ public class SlitterServiceImpl implements SlitterService {
@Override
public JSONObject toSubvolumeBinding(JSONObject param) {
// param : container_name, point_code
log.info("用户{} 操作子卷绑定:{}", SecurityUtils.getCurrentNickName(), param);
String containerName = param.getString("container_name");
String pointCode1 = param.getString("point_code");
if (ObjectUtil.isEmpty(containerName)) {
@@ -1480,7 +1481,7 @@ public class SlitterServiceImpl implements SlitterService {
throw new BadRequestException("子卷号:[" + containerName + "] 的分切计划没找到,检查是否推送或者子卷号是否正确!");
}
// 校验是否存在任务
List<SchBaseTask> taskList = taskService.checkHaveStartTask(pointCode1);
List<SchBaseTask> taskList = taskService.checkHaveTask(pointCode1);
if (taskList.size() > 0) {
throw new BadRequestException("操作失败,点位[" + pointCode1 + "]存在未完成的任务!");
}
@@ -1506,6 +1507,7 @@ public class SlitterServiceImpl implements SlitterService {
}
pointCode.setPoint_status("3");
slittingproductionplanService.updateBatchById(plans);
TaskUtils.updateOptMessageByBCutPoint(pointCode);
bcutpointivtService.updateById(pointCode);
JSONObject res = new JSONObject();
res.put("status", HttpStatus.HTTP_OK);
@@ -1534,7 +1536,7 @@ public class SlitterServiceImpl implements SlitterService {
@Override
public JSONObject toShaftBinding(JSONObject param) {
log.info("气胀轴绑定:{}", param);
log.info("用户{} 操作气胀轴绑定:{}", SecurityUtils.getCurrentNickName(), param);
// param : container_name, point_code
String containerName = param.getString("container_name");
String pointCode1 = param.getString("point_code");
@@ -1551,7 +1553,7 @@ public class SlitterServiceImpl implements SlitterService {
throw new BadRequestException("子卷号:[" + containerName + "] 的分切计划没找到,检查是否推送或者子卷号是否正确!");
}
// 校验是否存在任务
List<SchBaseTask> taskList = taskService.checkHaveStartTask(pointCode1);
List<SchBaseTask> taskList = taskService.checkHaveTask(pointCode1);
if (taskList.size() > 0) {
throw new BadRequestException("操作失败,点位[" + pointCode1 + "]存在未完成的任务!");
}
@@ -1579,6 +1581,7 @@ public class SlitterServiceImpl implements SlitterService {
}
pointCode.setPoint_status("2");
slittingproductionplanService.updateBatchById(plans);
TaskUtils.updateOptMessageByBCutPoint(pointCode);
bcutpointivtService.updateById(pointCode);
JSONObject res = new JSONObject();
res.put("status", HttpStatus.HTTP_OK);