From 9ddbd22e6ad8a2ef54496aee29e3be1f16416191 Mon Sep 17 00:00:00 2001 From: psh Date: Mon, 19 Aug 2024 13:31:29 +0800 Subject: [PATCH] =?UTF-8?q?remark=E6=9C=89=E5=88=AB=E7=9A=84=E4=BD=9C?= =?UTF-8?q?=E7=94=A8=EF=BC=8C=E9=A2=84=E7=AE=97=E7=AD=89=E5=BE=85=E7=82=B9?= =?UTF-8?q?=E7=94=A8Point=5Fcode3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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);