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-13 15:20:20 +08:00
parent d74f04a80f
commit 409bad5fcb
2 changed files with 6 additions and 6 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/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_status().equals("4")) .filter(r -> PackageInfoIvtEnum.POINT_STATUS.code("管制区").equals(r.getPoint_status()))
.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();

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

@@ -33,7 +33,7 @@ import java.util.stream.Collectors;
@Slf4j @Slf4j
@Component @Component
@RequiredArgsConstructor @RequiredArgsConstructor
public class AutoSendVehicleToDjq extends Prun{ public class AutoSendVehicleToDjq extends Prun {
private final String THIS_CLASS = AutoSendVehicleToDjq.class.getName(); private final String THIS_CLASS = AutoSendVehicleToDjq.class.getName();
@Resource @Resource
private IschBaseTaskService taskService; private IschBaseTaskService taskService;
@@ -54,8 +54,8 @@ public class AutoSendVehicleToDjq extends Prun{
@Autowired @Autowired
public void run() { public void run() {
try { try {
this.sendVehicleToDjqOrGzq(IOSEnum.IS_NOTANDYES.code("否"),null); this.sendVehicleToDjqOrGzq(IOSEnum.IS_NOTANDYES.code("否"), null);
}catch (Exception ex){ } catch (Exception ex) {
log.error(ex.getMessage()); log.error(ex.getMessage());
} }
@@ -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_status().equals("4")) .filter(r -> !PackageInfoIvtEnum.POINT_STATUS.code("管制区").equals(r.getPoint_status()))
.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_status().equals("4")) .filter(r -> !r.getPoint_status().equals(PackageInfoIvtEnum.POINT_STATUS.code("管制区")))
.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("补空(装箱区->管制区)"));