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

fix:修复重复点位问题

Browse Source
This commit is contained in:
zhaoyf
2026-08-10 08:54:49 +08:00
parent 8219355b92
commit 483b15d638
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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<SchBasePoint> 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)