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

fix:修改所有写死的管制点

Browse Source
This commit is contained in:
zhouz
2025-06-12 15:04:20 +08:00
parent 917bf37baa
commit 285605b151
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java
View File

@@ -84,7 +84,7 @@ public class AutoSendDjqToGzq extends Prun{
//todo 新增NG卷放置临时管制区135136，只取空不补空 //todo 新增NG卷放置临时管制区135136，只取空不补空
List<BstIvtPackageinfoivt> ivtLists = List<BstIvtPackageinfoivt> ivtLists =
gzqPackageinfoivtList.stream() gzqPackageinfoivtList.stream()
.filter(r -> r.getPoint_code().equals("ZXQ_135") || r.getPoint_code().equals("ZXQ_136")) .filter(r -> r.getPoint_status().equals(4))
.collect(Collectors.toList()); .collect(Collectors.toList());
if (ObjectUtils.isEmpty(ivtLists)) { if (ObjectUtils.isEmpty(ivtLists)) {
log.info("待检区->管制区agv自动搬运任务暂无可用空位,子卷号为：" + djqPackageinfoivtList.get(0).getContainer_name()); log.info("待检区->管制区agv自动搬运任务暂无可用空位,子卷号为：" + djqPackageinfoivtList.get(0).getContainer_name());

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendGzqToDjq.java
View File

@@ -68,7 +68,7 @@ public class AutoSendGzqToDjq extends Prun{
//todo 新增NG卷放置临时管制区135136，只取空不补空 //todo 新增NG卷放置临时管制区135136，只取空不补空
List<BstIvtPackageinfoivt> ivtLists = List<BstIvtPackageinfoivt> ivtLists =
gzqIvtList.stream() gzqIvtList.stream()
.filter(r -> r.getPoint_code().equals("ZXQ_135") || r.getPoint_code().equals("ZXQ_136")) .filter(r -> r.getPoint_status().equals("4"))
.collect(Collectors.toList()); .collect(Collectors.toList());
if (ObjectUtils.isNotEmpty(ivtLists)) { if (ObjectUtils.isNotEmpty(ivtLists)) {
pointCode3 = ivtLists.get(0).getPoint_code(); pointCode3 = ivtLists.get(0).getPoint_code();

4
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java
View File

@@ -111,7 +111,7 @@ public class AutoSendVehicleToDjq extends Prun{
//todo 新增NG卷放置临时管制区135136，只取空不补空 //todo 新增NG卷放置临时管制区135136，只取空不补空
packageList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("管制区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)")); packageList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("管制区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)"));
packageList = packageList.stream() packageList = packageList.stream()
.filter(r -> !r.getPoint_code().equals("ZXQ_135") && !r.getPoint_code().equals("ZXQ_136")) .filter(r -> !r.getPoint_status().equals("4"))
.collect(Collectors.toList()); .collect(Collectors.toList());
task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)")); task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)"));
} else { } else {
@@ -120,7 +120,7 @@ public class AutoSendVehicleToDjq extends Prun{
} else { } else {
packageList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("管制区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->待检区)")); packageList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("管制区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->待检区)"));
packageList = packageList.stream() packageList = packageList.stream()
.filter(r -> !r.getPoint_code().equals("ZXQ_135") && !r.getPoint_code().equals("ZXQ_136")) .filter(r -> r.getPoint_status().equals("4"))
.collect(Collectors.toList()); .collect(Collectors.toList());
if (ObjectUtils.isEmpty(packageList)) { if (ObjectUtils.isEmpty(packageList)) {
packageList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)")); packageList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)"));