zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/dto/OpenBusSubmitParam.java
@@ -14,6 +14,6 @@ private String batchNo; private List<TaskDto> taskList = new ArrayList<>(); private List<TaskDto> tasks = new ArrayList<>(); } zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java
@@ -126,9 +126,9 @@ taskDto.setPriority(100); taskDto.setTaskNo(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19)); param.getTaskList().add(taskDto); param.getTasks().add(taskDto); } if (Cools.isEmpty(param.getTaskList())) { return; } if (Cools.isEmpty(param.getTasks())) { return; } mainService.generateBusAndTask(param, memo); } @@ -182,9 +182,9 @@ taskDto.setPriority(100); taskDto.setTaskNo(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19)); param.getTaskList().add(taskDto); param.getTasks().add(taskDto); } if (Cools.isEmpty(param.getTaskList())) { return; } if (Cools.isEmpty(param.getTasks())) { return; } mainService.generateBusAndTask(param, memo); } @@ -228,9 +228,9 @@ taskDto.setDestLoc(idleLoc.getLocNo()); taskDto.setTaskNo(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19)); param.getTaskList().add(taskDto); param.getTasks().add(taskDto); } if (Cools.isEmpty(param.getTaskList())) { return; } if (Cools.isEmpty(param.getTasks())) { return; } mainService.generateBusAndTask(param, memo); } zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/ConveyorAutoRunScheduler.java
@@ -137,9 +137,9 @@ taskDto.setPriority(100); taskDto.setTaskNo(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19)); param.getTaskList().add(taskDto); param.getTasks().add(taskDto); } if (Cools.isEmpty(param.getTaskList())) { return; } if (Cools.isEmpty(param.getTasks())) { return; } mainService.generateBusAndTask(param, memo); } zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
@@ -108,7 +108,7 @@ throw new BusinessException(errorMsg); } String batch = busSubmitParam.getBatchNo(); List<TaskDto> taskDtoList = busSubmitParam.getTaskList(); List<TaskDto> taskDtoList = busSubmitParam.getTasks(); if (Cools.isEmpty(taskDtoList)) { throw new BusinessException("taskList can't be empty!"); } zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java
@@ -111,7 +111,7 @@ if (!Cools.isEmpty(dto.getDestLoc())) { taskDto.setDestLoc(locService.getById(dto.getDestLoc()).getLocNo()); } submitParam.getTaskList().add(taskDto); submitParam.getTasks().add(taskDto); } Bus bus = mainService.generateBusAndTask(submitParam, param.getMemo()); return R.ok("Save Success").add(bus); zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java
@@ -41,7 +41,7 @@ if (Cools.isEmpty(param)) { return; } List<TaskDto> taskList = param.getTaskList(); List<TaskDto> taskList = param.getTasks(); if (Cools.isEmpty(taskList)) { return; } @@ -75,7 +75,7 @@ Set<String> oriLocNoSet = new HashSet<>(); Set<String> destStaNoSet = new HashSet<>(); Set<String> destLocNoSet = new HashSet<>(); for (TaskDto dto : param.getTaskList()) { for (TaskDto dto : param.getTasks()) { if (!Cools.isEmpty(dto.getOriSta()) && !Cools.isEmpty(dto.getOriLoc())) { return "OriSta and OriLoc cannot exist at the same time!"; }
