diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java index 9fa1fc5..b1b70d5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java +++ b/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.setTask_status(TaskStatus.CREATED.getCode()); - task.setRemark(point.getPoint_code()); + task.setPoint_code3(point.getPoint_code()); taskService.update(task); //发起任务时先把点位占用,防止发起重复任务 @@ -253,7 +253,7 @@ public class KGHJRKTask extends AbstractTask { endPointObj.setIs_lock(false); pointService.update(endPointObj); //为了防止中途产生变动,导致二次分配非原先锁定位置,最开始锁定的remark也重新解锁下 - endPointObj = pointService.getById(taskObj.getRemark()); + endPointObj = pointService.getById(taskObj.getPoint_code3()); if (ObjectUtil.isNotEmpty(endPointObj)) { endPointObj.setIng_task_code(""); endPointObj.setIs_lock(false); @@ -270,8 +270,8 @@ public class KGHJRKTask extends AbstractTask { endPointObj.setIs_lock(false); pointService.update(endPointObj); }else{ - //如果等待点未二次分配取消,通过remark找到初始锁定点位解锁软锁 - endPointObj = pointService.getById(taskObj.getRemark()); + //如果等待点未二次分配取消,通过Point_code3找到初始锁定点位解锁软锁 + endPointObj = pointService.getById(taskObj.getPoint_code3()); if (ObjectUtil.isNotEmpty(endPointObj)) { endPointObj.setIng_task_code(""); endPointObj.setIs_lock(false);