root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
liyongde
2025-12-26 15:52:21 +08:00
parent 49c0f63ac4
commit 947580243b
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
View File

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