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

fix

Browse Source
This commit is contained in:
psh
2024-08-05 11:07:51 +08:00
parent 7bf57e5be1
commit 328c495186
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java
View File

@@ -95,7 +95,7 @@ public class KGHJRKTask extends AbstractTask {
} }
task.setPoint_code2(point.getNext_wait_point()); task.setPoint_code2(point.getNext_wait_point());
task.setTask_status(TaskStatus.CREATED.getCode()); task.setTask_status(TaskStatus.CREATED.getCode());
task.setRemark(""); task.setRemark(point.getPoint_code());
taskService.update(task); taskService.update(task);
//发起任务时先把点位占用，防止发起重复任务 //发起任务时先把点位占用，防止发起重复任务
@@ -264,6 +264,14 @@ public class KGHJRKTask extends AbstractTask {
endPointObj.setIng_task_code(""); endPointObj.setIng_task_code("");
endPointObj.setIs_lock(false); endPointObj.setIs_lock(false);
pointService.update(endPointObj); pointService.update(endPointObj);
}else{
//如果等待点未二次分配取消，通过remark找到初始锁定点位解锁软锁
endPointObj = pointService.getById(taskObj.getRemark());
if (ObjectUtil.isNotEmpty(endPointObj)) {
endPointObj.setIng_task_code("");
endPointObj.setIs_lock(false);
pointService.update(endPointObj);
}
} }
taskObj.setRemark("任务取消"); taskObj.setRemark("任务取消");
taskObj.setTask_status(TaskStatus.CANCELED.getCode()); taskObj.setTask_status(TaskStatus.CANCELED.getCode());