From 483b15d6380b072cd89d53a151e696aa9d5d0e07 Mon Sep 17 00:00:00 2001 From: zhaoyf <1783123481@qq.com> Date: Mon, 10 Aug 2026 08:54:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E7=82=B9=E4=BD=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/tasks/connector/FTGTask.java | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/connector/FTGTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/connector/FTGTask.java index 40022a7..56d661d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/connector/FTGTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/connector/FTGTask.java @@ -35,6 +35,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; import java.util.Comparator; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -197,9 +198,27 @@ public class FTGTask extends AbstractTask { SchBasePoint schBasePoint = pointService.selectByPointCode(point); if (ObjectUtil.isNotEmpty(schBasePoint)) { try { + + SchBaseTask one = taskService.getOne( + Wrappers.lambdaQuery(SchBaseTask.class) + .and(w -> w + .eq(SchBaseTask::getPoint_code1, point) + .or() + .eq(SchBaseTask::getPoint_code2, point) + ) + .in(SchBaseTask::getTask_status, + TaskStatus.APPLY.getCode(), + TaskStatus.CREATED.getCode(), + TaskStatus.ISSUED.getCode(), + TaskStatus.EXECUTING.getCode()) + .orderByDesc(SchBaseTask::getCreate_time) + .last("limit 1") + ); LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(SchBasePoint.class) - .eq(SchBasePoint::getPoint_code, point) - .set(SchBasePoint::getIs_lock, false); + .eq(SchBasePoint::getPoint_code, point); + if (Objects.equals(one.getTask_id(), taskObj.getTask_id())){ + updateWrapper.set(SchBasePoint::getIs_lock, false); + } if (StrUtil.isNotEmpty(pointStatus)) { if (status == 0) { updateWrapper.set(SchBasePoint::getPoint_status, pointStatus)