zy-acs-manager/src/main/java/com/zy/acs/manager/common/domain/TaskDto.java
@@ -8,7 +8,7 @@ @Data public class TaskDto { private String seqNum; private String taskNo; private String oriLoc;
File was renamed from zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/param/OpenBusSubmitParam.java @@ -1,4 +1,4 @@ package com.zy.acs.manager.manager.controller.param; package com.zy.acs.manager.core.integrate.dto; import com.zy.acs.manager.common.domain.TaskDto; import lombok.Data; @@ -12,7 +12,7 @@ @Data public class OpenBusSubmitParam { private String batch; private String batchNo; private List<TaskDto> taskList = new ArrayList<>();
New file @@ -0,0 +1,12 @@ package com.zy.acs.manager.core.integrate.dto; import lombok.Data; @Data public class TaskUplinkParam { private String batchNo; private String taskNo; } zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/OpenController.java
@@ -4,10 +4,9 @@ import com.zy.acs.framework.common.R; import com.zy.acs.manager.system.controller.BaseController; import com.zy.acs.manager.core.service.MainService; import com.zy.acs.manager.manager.controller.param.OpenBusSubmitParam; import com.zy.acs.manager.core.integrate.dto.OpenBusSubmitParam; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java
@@ -7,7 +7,7 @@ import com.zy.acs.framework.common.SnowflakeIdWorker; import com.zy.acs.manager.common.domain.TaskDto; import com.zy.acs.manager.core.service.*; import com.zy.acs.manager.manager.controller.param.OpenBusSubmitParam; import com.zy.acs.manager.core.integrate.dto.OpenBusSubmitParam; import com.zy.acs.manager.manager.entity.*; import com.zy.acs.manager.manager.enums.*; import com.zy.acs.manager.manager.service.*; @@ -86,7 +86,7 @@ Collections.shuffle(stockList); OpenBusSubmitParam param = new OpenBusSubmitParam(); param.setBatch(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19)); param.setBatchNo(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19)); for (int i = 0; i < Math.min(agvModel.getBackpack(), stockList.size()) ; i++) { Sta stockSta = stockList.get(i); String staCode = codeService.getCacheById(stockSta.getCode()).getData(); @@ -124,7 +124,7 @@ taskDto.setOriSta(stockSta.getStaNo()); taskDto.setDestLoc(idleLoc.getLocNo()); taskDto.setPriority(100); taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19)); taskDto.setTaskNo(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19)); param.getTaskList().add(taskDto); } @@ -142,7 +142,7 @@ Collections.shuffle(idleList); OpenBusSubmitParam param = new OpenBusSubmitParam(); param.setBatch(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19)); param.setBatchNo(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19)); for (int i = 0; i < Math.min(agvModel.getBackpack(), idleList.size()) ; i++) { Sta idleSta = idleList.get(i); String staCode = codeService.getCacheById(idleSta.getCode()).getData(); @@ -180,7 +180,7 @@ taskDto.setOriLoc(stockLoc.getLocNo()); taskDto.setDestSta(idleSta.getStaNo()); taskDto.setPriority(100); taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19)); taskDto.setTaskNo(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19)); param.getTaskList().add(taskDto); } @@ -218,7 +218,7 @@ Collections.shuffle(idleLocList); OpenBusSubmitParam param = new OpenBusSubmitParam(); param.setBatch(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19)); param.setBatchNo(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19)); for (int i = 0; i < Math.min(maxCapacity, Math.min(stockLocList.size(), idleLocList.size())); i++) { Loc stockLoc = stockLocList.get(i); Loc idleLoc = idleLocList.get(i); @@ -226,7 +226,7 @@ TaskDto taskDto = new TaskDto(); taskDto.setOriLoc(stockLoc.getLocNo()); taskDto.setDestLoc(idleLoc.getLocNo()); taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19)); taskDto.setTaskNo(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19)); param.getTaskList().add(taskDto); } zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/ConveyorAutoRunScheduler.java
@@ -8,7 +8,7 @@ import com.zy.acs.manager.common.domain.TaskDto; import com.zy.acs.manager.core.service.AreaGovernService; import com.zy.acs.manager.core.service.MainService; import com.zy.acs.manager.manager.controller.param.OpenBusSubmitParam; import com.zy.acs.manager.core.integrate.dto.OpenBusSubmitParam; import com.zy.acs.manager.manager.entity.*; import com.zy.acs.manager.manager.enums.AgvModelType; import com.zy.acs.manager.manager.enums.BusStsType; @@ -97,7 +97,7 @@ Collections.shuffle(idleList); OpenBusSubmitParam param = new OpenBusSubmitParam(); param.setBatch(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19)); param.setBatchNo(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19)); for (int i = 0; i < agvModel.getBackpack() ; i++) { Sta idleSta = idleList.get(i); String staCode = codeService.getCacheById(idleSta.getCode()).getData(); @@ -135,7 +135,7 @@ taskDto.setOriLoc(stockLoc.getLocNo()); taskDto.setDestSta(idleSta.getStaNo()); taskDto.setPriority(100); taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19)); taskDto.setTaskNo(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19)); param.getTaskList().add(taskDto); } zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
@@ -23,7 +23,7 @@ import com.zy.acs.manager.core.domain.TaskPosDto; import com.zy.acs.manager.core.integrate.conveyor.ConveyorStationService; import com.zy.acs.manager.core.service.astart.MapDataDispatcher; import com.zy.acs.manager.manager.controller.param.OpenBusSubmitParam; import com.zy.acs.manager.core.integrate.dto.OpenBusSubmitParam; import com.zy.acs.manager.manager.entity.*; import com.zy.acs.manager.manager.enums.*; import com.zy.acs.manager.manager.service.*; @@ -107,7 +107,7 @@ if (!Cools.isEmpty(errorMsg)) { throw new BusinessException(errorMsg); } String batch = busSubmitParam.getBatch(); String batch = busSubmitParam.getBatchNo(); List<TaskDto> taskDtoList = busSubmitParam.getTaskList(); if (Cools.isEmpty(taskDtoList)) { throw new BusinessException("taskList can't be empty!"); zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/ValidService.java
@@ -45,13 +45,13 @@ List<Task> taskList = new ArrayList<>(); String uplinkSts = uplinkProperties.getEnabled() ? TaskUplinkStateType.PENDING.toString() : TaskUplinkStateType.SKIPPED.toString(); for (TaskDto taskDto : taskDtoList) { if (Cools.isEmpty(taskDto.getSeqNum())) { if (Cools.isEmpty(taskDto.getTaskNo())) { throw new BusinessException("Task seqNum can't be empty!"); } Task task = new Task(); taskList.add(task); task.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3)); task.setSeqNum(taskDto.getSeqNum()); task.setSeqNum(taskDto.getTaskNo()); task.setPriority(taskDto.getPriority()); // ori -------------------------- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java
@@ -11,7 +11,7 @@ import com.zy.acs.manager.common.utils.ExcelUtil; import com.zy.acs.manager.core.service.MainService; import com.zy.acs.manager.manager.controller.param.BusCreateParam; import com.zy.acs.manager.manager.controller.param.OpenBusSubmitParam; import com.zy.acs.manager.core.integrate.dto.OpenBusSubmitParam; import com.zy.acs.manager.manager.entity.Bus; import com.zy.acs.manager.manager.entity.Task; import com.zy.acs.manager.manager.enums.BusStsType; @@ -94,10 +94,10 @@ @PostMapping("/bus/save") public R save(@RequestBody BusCreateParam param) { OpenBusSubmitParam submitParam = new OpenBusSubmitParam(); submitParam.setBatch(param.getBusNo()); submitParam.setBatchNo(param.getBusNo()); for (TaskIdByLongDto dto : param.getTaskList()) { TaskDto taskDto = new TaskDto(); taskDto.setSeqNum(dto.getSeqNum()); taskDto.setTaskNo(dto.getSeqNum()); taskDto.setPriority(dto.getPriority()); if (!Cools.isEmpty(dto.getOriSta())) { taskDto.setOriSta(staService.getById(dto.getOriSta()).getStaNo()); zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/BusService.java
@@ -1,7 +1,7 @@ package com.zy.acs.manager.manager.service; import com.baomidou.mybatisplus.extension.service.IService; import com.zy.acs.manager.manager.controller.param.OpenBusSubmitParam; import com.zy.acs.manager.core.integrate.dto.OpenBusSubmitParam; import com.zy.acs.manager.manager.entity.Bus; import com.zy.acs.manager.manager.enums.BusStsType;
@@ -6,7 +6,7 @@ import com.zy.acs.framework.common.Cools; import com.zy.acs.framework.exception.CoolException; import com.zy.acs.manager.common.domain.TaskDto; import com.zy.acs.manager.manager.controller.param.OpenBusSubmitParam; import com.zy.acs.manager.core.integrate.dto.OpenBusSubmitParam; import com.zy.acs.manager.manager.entity.Bus; import com.zy.acs.manager.manager.entity.Loc; import com.zy.acs.manager.manager.entity.Task; @@ -67,7 +67,7 @@ if (null == param) { return BaseRes.PARAM; } if (Cools.isEmpty(param.getBatch())) { if (Cools.isEmpty(param.getBatchNo())) { return "Batch cannot be empty!"; } this.test(param); @@ -119,8 +119,8 @@ destLocNoSet.add(dto.getDestLoc()); } } if (Cools.isEmpty(dto.getSeqNum())) { dto.setSeqNum(taskService.generateSeqNum()); if (Cools.isEmpty(dto.getTaskNo())) { dto.setTaskNo(taskService.generateSeqNum()); } }
