Browse Source

remark有别的作用,预算等待点用Point_code3

master
psh 6 months ago
parent
commit
9ddbd22e6a
  1. 8
      lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java

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

@ -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(point.getPoint_code()); task.setPoint_code3(point.getPoint_code());
taskService.update(task); taskService.update(task);
//发起任务时先把点位占用,防止发起重复任务 //发起任务时先把点位占用,防止发起重复任务
@ -253,7 +253,7 @@ public class KGHJRKTask extends AbstractTask {
endPointObj.setIs_lock(false); endPointObj.setIs_lock(false);
pointService.update(endPointObj); pointService.update(endPointObj);
//为了防止中途产生变动,导致二次分配非原先锁定位置,最开始锁定的remark也重新解锁下 //为了防止中途产生变动,导致二次分配非原先锁定位置,最开始锁定的remark也重新解锁下
endPointObj = pointService.getById(taskObj.getRemark()); endPointObj = pointService.getById(taskObj.getPoint_code3());
if (ObjectUtil.isNotEmpty(endPointObj)) { if (ObjectUtil.isNotEmpty(endPointObj)) {
endPointObj.setIng_task_code(""); endPointObj.setIng_task_code("");
endPointObj.setIs_lock(false); endPointObj.setIs_lock(false);
@ -270,8 +270,8 @@ public class KGHJRKTask extends AbstractTask {
endPointObj.setIs_lock(false); endPointObj.setIs_lock(false);
pointService.update(endPointObj); pointService.update(endPointObj);
}else{ }else{
//如果等待点未二次分配取消,通过remark找到初始锁定点位解锁软锁 //如果等待点未二次分配取消,通过Point_code3找到初始锁定点位解锁软锁
endPointObj = pointService.getById(taskObj.getRemark()); endPointObj = pointService.getById(taskObj.getPoint_code3());
if (ObjectUtil.isNotEmpty(endPointObj)) { if (ObjectUtil.isNotEmpty(endPointObj)) {
endPointObj.setIng_task_code(""); endPointObj.setIng_task_code("");
endPointObj.setIs_lock(false); endPointObj.setIs_lock(false);

Loading…
Cancel
Save