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

opt: 分切暂存送料多校验是否任务未完成

Browse Source
This commit is contained in:
liyongde
2025-01-13 14:44:15 +08:00
parent 93838880c3
commit 3680fe7b49
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
View File

@@ -60,6 +60,7 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@@ -1511,6 +1512,16 @@ public class SlitterServiceImpl implements SlitterService {
if (SlitterConstant.SLITTER_NO.equals(point.getIs_used())) { if (SlitterConstant.SLITTER_NO.equals(point.getIs_used())) {
data.put("status", "已禁用"); data.put("status", "已禁用");
} }
List<SchBaseTask> list = taskService.list(new LambdaQueryWrapper<SchBaseTask>()
.eq(SchBaseTask::getIs_delete, "0")
.ne(SchBaseTask::getTask_status, "07")
.and(la -> la.eq(SchBaseTask::getPoint_code1, pointCode).or()
.eq(SchBaseTask::getPoint_code2, pointCode).or()
.eq(SchBaseTask::getPoint_code3, pointCode).or()
.eq(SchBaseTask::getPoint_code4, pointCode)));
if (list.size() > 0) {
data.put("status", data.getString("status") + ", 请等待任务完成！");
}
return res; return res;
} }