From 6cbb420754e6e29fa134a6afca4514b8dfd62918 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 13 一月 2026 16:14:49 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java | 507 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 355 insertions(+), 152 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java
index c62fe74..2918e16 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java
@@ -2,17 +2,19 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.acs.framework.common.Cools;
-import com.zy.acs.manager.common.utils.LocUtils;
-import com.zy.acs.manager.core.domain.Lane;
+import com.zy.acs.manager.common.utils.CommonUtil;
+import com.zy.acs.manager.core.domain.AgvCntDto;
+import com.zy.acs.manager.core.domain.FilterLaneDto;
+import com.zy.acs.manager.core.domain.LaneDto;
+import com.zy.acs.manager.core.domain.TaskPosDto;
import com.zy.acs.manager.manager.entity.*;
-import com.zy.acs.manager.manager.enums.StatusType;
-import com.zy.acs.manager.manager.enums.TaskStsType;
-import com.zy.acs.manager.manager.enums.TaskTypeType;
+import com.zy.acs.manager.manager.enums.*;
import com.zy.acs.manager.manager.service.*;
import com.zy.acs.manager.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.stream.Collectors;
@@ -23,6 +25,8 @@
@Slf4j
@Service
public class AllocateService {
+
+ public static final Integer OUTBOUND_TASKS_ALLOCATE_LIMIT = 5;
@Autowired
private AgvService agvService;
@@ -41,37 +45,104 @@
@Autowired
private LocService locService;
@Autowired
- private LaneService laneService;
+ private LaneBuilder laneBuilder;
+ @Autowired
+ private AgvAreaDispatcher agvAreaDispatcher;
+ @Autowired
+ private SegmentService segmentService;
/**
* get available agv list which is idle
*/
- private List<Agv> getAvailableAgv() {
- List<Agv> result = new ArrayList<>();
- List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
- Collections.shuffle(agvList);
+ private List<String> getAvailableAgvNos(List<Long> agvIds, boolean hasRunning) {
+ List<Agv> agvList = Cools.isEmpty(agvIds)
+ ? agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val))
+ : agvIds.stream().map(agvService::getById).filter(Agv::getStatusBool).collect(Collectors.toList());
+
+ List<String> result = new ArrayList<>();
for (Agv agv : agvList) {
-
- // 1. without running tasks
- if (0 < taskService.count(new LambdaQueryWrapper<Task>()
- .eq(Task::getAgvId, agv.getId())
- .and(i ->
- i.eq(Task::getTaskSts, TaskStsType.ASSIGN.val())
- .or().eq(Task::getTaskSts, TaskStsType.PROGRESS.val())
- )
- )) {
- continue;
+ if (!hasRunning) {
+ // 1. without running tasks
+ if (0 < taskService.count(new LambdaQueryWrapper<Task>()
+ .eq(Task::getAgvId, agv.getId())
+ .and(i -> i
+ .eq(Task::getTaskSts, TaskStsType.ASSIGN.val())
+ .or()
+ .eq(Task::getTaskSts, TaskStsType.PROGRESS.val())
+ )
+ )) {
+ continue;
+ }
}
-
// 2. in idle status
if (!agvService.judgeEnable(agv.getId(), true)) {
continue;
}
- result.add(agv);
+ result.add(agv.getUuid());
+ }
+
+ if (!Cools.isEmpty(result)) {
+ Collections.shuffle(result);
}
return result;
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public synchronized String execute(Task task, AllocateSupport inbound, AllocateSupport normal) {
+ // inbound roller station
+ Sta rollerOriSta = getInboundRollerSta(task);
+ String inboundAgv = tryAllocateForRoller(task, rollerOriSta, true);
+ if (!Cools.isEmpty(inboundAgv)) {
+ inbound.success(task, inboundAgv, rollerOriSta);
+ return inboundAgv;
+ }
+
+ // outbound roller station
+ Sta rollerDestSta = getOutboundRollerSta(task);
+ String outboundAgv = tryAllocateForRoller(task, rollerDestSta, false);
+ if (!Cools.isEmpty(outboundAgv)) {
+ normal.success(task, outboundAgv, rollerDestSta);
+ return outboundAgv;
+ }
+
+ String normalAgv = this.normalExecute(task);
+ if (!Cools.isEmpty(normalAgv)) {
+ normal.success(task, normalAgv, null);
+ return normalAgv;
+ }
+
+ return null;
+ }
+
+ private String tryAllocateForRoller(Task task, Sta rollerSta, boolean inbound) {
+ if (rollerSta == null) {
+ return null;
+ }
+
+ List<String> availableAgvNos = this.getAvailableAgvNos(agvAreaDispatcher.getAgvNosByTask(task), true);
+ FilterLaneDto filterLaneDto = this.filterThroughLane(task, availableAgvNos);
+ if (filterLaneDto == null) {
+ return null;
+ }
+
+ String agvNo = inbound
+ ? this.checkoutAgvForInboundRoller(task, rollerSta, filterLaneDto.getActualAvailableAgvNos())
+ : this.checkoutAgvForOutboundRoller(task, rollerSta, filterLaneDto.getActualAvailableAgvNos());
+ if (Cools.isEmpty(agvNo)) {
+ return null;
+ }
+
+ // record lane hash for later dispatch/traffic-control logic
+ if (filterLaneDto.getOriginLaneDto() != null) {
+ task.setOriLaneHash(filterLaneDto.getOriginLaneDto().getHashCode());
+ }
+ if (filterLaneDto.getDestinationLaneDto() != null) {
+ task.setDestLaneHash(filterLaneDto.getDestinationLaneDto().getHashCode());
+ }
+
+ return agvNo;
}
/**
@@ -83,26 +154,152 @@
*
* it can break the limit of the number of agv backpack
*/
- public synchronized Agv execute(Task task) {
- List<Agv> availableAgvList = getAvailableAgv();
- if (Cools.isEmpty(availableAgvList)) {
- log.warn("No available agv to assign the task[{}]", task.getSeqNum());
+ public synchronized String normalExecute(Task task) {
+ List<String> availableAgvNos = this.getAvailableAgvNos(agvAreaDispatcher.getAgvNosByTask(task), false);
+// List<String> availableAgvNos = this.getAvailableAgvNos(null);
+ if (Cools.isEmpty(availableAgvNos)) {
+// log.warn("No available agv to assign the task[{}]", task.getSeqNum());
return null;
}
- List<String> availableAgvNos = availableAgvList.stream().map(Agv::getUuid).distinct().collect(Collectors.toList());
+
+ // calc lane
+ FilterLaneDto filterLaneDto = this.filterThroughLane(task, availableAgvNos);
+ if (null == filterLaneDto) {
+ return null;
+ }
+ LaneDto originLaneDto = filterLaneDto.getOriginLaneDto();
+ LaneDto destinationLaneDto = filterLaneDto.getDestinationLaneDto();
+ List<String> actualAvailableAgvNos = filterLaneDto.getActualAvailableAgvNos();
+ if (Cools.isEmpty(actualAvailableAgvNos)) {
+ return null;
+ }
+
+ // choose min number of running task
+ actualAvailableAgvNos.sort((o1, o2) -> Integer.compare(
+ calcAllocateWeight(o2, task),
+ calcAllocateWeight(o1, task)
+ ));
+
+ if (null != originLaneDto) {
+ task.setOriLaneHash(originLaneDto.getHashCode());
+ }
+ if (null != destinationLaneDto) {
+ task.setDestLaneHash(destinationLaneDto.getHashCode());
+ }
+
+ return actualAvailableAgvNos.get(0);
+ }
+
+ private String checkoutAgvForInboundRoller(Task task, Sta sta, List<String> availableAgvNos) {
+ if (Cools.isEmpty(availableAgvNos, task, sta)) {
+ return null;
+ }
+
+ for (String agvNo : availableAgvNos) {
+ Long agvId = agvService.getAgvId(agvNo);
+ Code currentCode = agvDetailService.getCurrentCode(agvId);
+ if (null == currentCode) {
+ continue;
+ }
+
+ // only checkout the agv which at sta code position
+ if (!sta.getCode().equals(currentCode.getId())) {
+ continue;
+ }
+
+ // has running task and within oriSta
+// int taskCnt = taskService.count(new LambdaQueryWrapper<Task>()
+// .eq(Task::getAgvId, agvId)
+// .eq(Task::getOriSta, sta.getId())
+// .and(wrapper -> wrapper
+// .eq(Task::getTaskSts, TaskStsType.ASSIGN.val())
+// .or()
+// .eq(Task::getTaskSts, TaskStsType.PROGRESS.val())
+// )
+// );
+// if (taskCnt == 0) {
+// continue;
+// }
+ // in TransferStationHandler.hasDelayAtSta
+ Segment currSeg = segmentService.getRollerWaiting(agvId, sta.getCode(), TaskPosDto.PosType.ORI_STA);
+ if (null == currSeg) {
+ continue;
+ }
+
+ // has enough backpack space to load
+ Integer backpack = agvService.getBackpack(agvId);
+ List<Integer> usedBackpacks = segmentService.selectUsedBackpacks(null, agvId);
+ if (usedBackpacks.size() >= backpack) {
+ continue;
+ }
+
+ return agvNo;
+ }
+
+ return null;
+ }
+
+ private String checkoutAgvForOutboundRoller(Task task, Sta sta, List<String> availableAgvNos) {
+ if (Cools.isEmpty(availableAgvNos, task, sta)) {
+ return null;
+ }
+
+ List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>()
+ .eq(Task::getDestSta, sta.getId())
+ .eq(Task::getTaskSts, TaskStsType.WAITING.val())
+ .isNotNull(Task::getAgvId)
+ );
+ if (Cools.isEmpty(taskList)) {
+ return null;
+ }
+
+ List<AgvCntDto> cntDtoList = new ArrayList<>();
+ for (Task t : taskList) {
+ AgvCntDto cntDto = new AgvCntDto(t.getAgvId());
+ if (AgvCntDto.has(cntDtoList, cntDto)) {
+ AgvCntDto dto = AgvCntDto.find(cntDtoList, cntDto);
+ assert null != dto;
+ dto.setCount(dto.getCount() + 1);
+ } else {
+ cntDtoList.add(cntDto);
+ }
+ }
+
+ cntDtoList.sort(new Comparator<AgvCntDto>() {
+ @Override
+ public int compare(AgvCntDto o1, AgvCntDto o2) {
+ return o1.getCount() - o2.getCount();
+ }
+ });
+
+ for (AgvCntDto cntDto : cntDtoList) {
+
+ if (cntDto.getAgvId() >= OUTBOUND_TASKS_ALLOCATE_LIMIT) {
+ continue;
+ }
+ return agvService.getAgvNo(cntDto.getAgvId());
+ }
+
+ return null;
+ }
+
+ public FilterLaneDto filterThroughLane(Task task, List<String> availableAgvNos) {
+ if (Cools.isEmpty(availableAgvNos, task)) {
+ return null;
+ }
Integer maxAgvCountInLane = configService.getVal("maxAgvCountInLane", Integer.class);
// checkout lane
- Lane originLane = taskService.checkoutOriginLane(task);
- Lane destinationLane = taskService.checkoutDestinationLane(task);
-
+ LaneDto originLaneDto = taskService.checkoutOriginLane(task);
+ LaneDto destinationLaneDto = taskService.checkoutDestinationLane(task);
// allocate about origin
List<String> availableAgvNosByOriLane = new ArrayList<>(availableAgvNos);
- if (null != originLane) {
- List<String> agvNosByOriLane = findAgvNosByLane(originLane); // the agv list that had tasks in this lane
- if (!Cools.isEmpty(agvNosByOriLane) && agvNosByOriLane.size() >= maxAgvCountInLane) {
+ if (null != originLaneDto) {
+ List<String> agvNosByOriLane = findAgvNosByLane(originLaneDto); // the agv list that had tasks in this lane
+ // if full lane
+ if (agvNosByOriLane.size() >= maxAgvCountInLane) {
availableAgvNosByOriLane = Cools.getIntersection(agvNosByOriLane, availableAgvNos);
}
@@ -113,9 +310,9 @@
// allocate about destination
List<String> availableAgvNosByDestLane = new ArrayList<>(availableAgvNos);
- if (null != destinationLane) {
- List<String> agvNosByDestLane = findAgvNosByLane(destinationLane);
- if (!Cools.isEmpty(agvNosByDestLane) && agvNosByDestLane.size() >= maxAgvCountInLane) {
+ if (null != destinationLaneDto) {
+ List<String> agvNosByDestLane = findAgvNosByLane(destinationLaneDto);
+ if (agvNosByDestLane.size() >= maxAgvCountInLane) {
availableAgvNosByDestLane = Cools.getIntersection(agvNosByDestLane, availableAgvNos);
}
@@ -131,43 +328,27 @@
log.warn("No available agv to assign the task destination[{}]", task.getSeqNum());
return null;
}
-
List<String> actualAvailableAgvNos = Cools.getIntersection(availableAgvNosByOriLane, availableAgvNosByDestLane);
if (Cools.isEmpty(actualAvailableAgvNos)) {
log.warn("No available agv to assign the task[{}]", task.getSeqNum());
return null;
}
- // choose min number of running task
- actualAvailableAgvNos.sort(new Comparator<String>() {
- @Override
- public int compare(String agvNo1, String agvNo2) {
- return calcAllocateWeight(agvNo1, task) - calcAllocateWeight(agvNo2, task);
- }
- });
-
-
- if (null != originLane) {
- task.setOriLaneHash(originLane.getHashCode());
- }
- if (null != destinationLane) {
- task.setDestLaneHash(destinationLane.getHashCode());
- }
-
- return agvService.selectByUuid(actualAvailableAgvNos.stream().findFirst().orElse(null));
+ return new FilterLaneDto(originLaneDto, destinationLaneDto, actualAvailableAgvNos);
}
- private List<String> findAgvNosByLane(Lane lane) {
- if (null == lane) {
- return null;
+ public List<String> findAgvNosByLane(LaneDto laneDto) {
+ if (null == laneDto) {
+ return new ArrayList<>();
}
- List<Task> taskList = taskService.findRunningTasksByLaneHash(lane.getHashCode());
+ List<Task> taskList = taskService.findRunningTasksByLaneHash(laneDto.getHashCode());
if (Cools.isEmpty(taskList)) {
- return null;
+ return new ArrayList<>();
}
- return taskList.stream().map(task -> {
- return agvService.getById(task.getAgvId()).getUuid();
- }).distinct().collect(Collectors.toList());
+ return taskList.stream()
+ .map(task -> agvService.getById(task.getAgvId()).getUuid())
+ .distinct()
+ .collect(Collectors.toList());
}
private List<String> validBackpackLimit(List<String> agvNoList) {
@@ -175,28 +356,28 @@
return new ArrayList<>();
}
return agvNoList.stream().filter(agvNo -> {
- Agv agv = agvService.selectByUuid(agvNo);
- AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
- List<Task> runningTasks = taskService.findRunningTasksByAgv(agv.getId());
- return runningTasks.size() < agvModel.getBackpack();
+ Long agvId = agvService.getAgvId(agvNo);
+ int transportTasksCount = taskService.findTransportTasksCountByAgv(agvId);
+ AgvModel agvModel = agvModelService.getByAgvNo(agvNo);
+ return transportTasksCount < agvModel.getBackpack();
}).collect(Collectors.toList());
}
// calculate wight = backpack + distance
private int calcAllocateWeight(String agvNo, Task task) {
int weight = 0;
- Agv agv = agvService.selectByUuid(agvNo);
+ Long agvId = agvService.getAgvId(agvNo);
// backpack
- List<Task> runningTasks = taskService.findRunningTasksByAgv(agv.getId());
- if (!Cools.isEmpty(runningTasks)) {
- weight = weight + runningTasks.size() * 100000;
+ Integer transportTasksCount = taskService.findTransportTasksCountByAgv(agvId);
+ if (!Cools.isEmpty(transportTasksCount)) {
+ weight = weight + transportTasksCount * 100000;
}
// distance
// from
- AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
- Code agvCurrCode = codeService.getById(agvDetail.getRecentCode());
+ AgvDetail agvDetail = agvDetailService.selectByAgvId(agvId);
+ Code agvCurrCode = codeService.getCacheById(agvDetail.getRecentCode());
Double[] fromPosition = new Double[]{agvCurrCode.getX(), agvCurrCode.getY()};
// to
Code firstCode = null;
@@ -205,118 +386,140 @@
case LOC_TO_LOC:
case LOC_TO_STA:
Loc oriLoc = locService.getById(task.getOriLoc());
- firstCode = codeService.getById(oriLoc.getCode());
+ firstCode = codeService.getCacheById(oriLoc.getCode());
break;
case STA_TO_LOC:
case STA_TO_STA:
Sta oriSta = staService.getById(task.getOriSta());
- firstCode = codeService.getById(oriSta.getCode());
+ firstCode = codeService.getCacheById(oriSta.getCode());
break;
case TO_CHARGE:
case TO_STANDBY:
case MOVE:
- firstCode = codeService.getById(task.getDestCode());
+ firstCode = codeService.getCacheById(task.getDestCode());
break;
default:
- firstCode = codeService.getById(task.getDestCode());
+ firstCode = codeService.getCacheById(task.getDestCode());
break;
}
assert null != firstCode;
Double[] toPosition = new Double[]{firstCode.getX(), firstCode.getY()};
// calculate distance
- weight = weight + this.calcPositionDistance(fromPosition, toPosition);
+ weight = weight + CommonUtil.calcDistance(fromPosition, toPosition);
// return opposite
return -weight;
}
- private int calcPositionDistance(Double[] from, Double[] to) {
- return (int) (Math.abs(to[0] - from[0]) + Math.abs(to[1] - from[1]));
+ public Boolean validCapacityOfLane(String agvNo, Code code) {
+ LaneDto laneDto = laneBuilder.search(code.getData());
+ if (null != laneDto) {
+ Integer maxAgvCountInLane = configService.getVal("maxAgvCountInLane", Integer.class);
+
+ List<String> agvNosByLane = this.findAgvNosByLane(laneDto);
+ agvNosByLane.remove(agvNo);
+ if (agvNosByLane.size() >= maxAgvCountInLane) {
+ return false;
+ }
+ }
+
+ return true;
}
- public synchronized Agv execute(Task task, Map<String, List<Long>> taskAllot, List<Long> taskIds) {
- String oriLocNo = task.getOriLoc$();
- int oriLocRow = LocUtils.getRow(oriLocNo);
- String destLocNo = task.getDestLoc$();
- int destLocRow = LocUtils.getRow(destLocNo);
- Agv hit = null;
+ // The Permutations and combinations for task
- List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
- Collections.shuffle(agvList);
- for (Agv agv : agvList) {
- AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
- int allotTaskCount = 0;
- List<Long> allotTaskIds = taskAllot.get(agv.getUuid());
- if (!Cools.isEmpty(allotTaskIds)) {
- allotTaskCount = allotTaskIds.size();
- }
- if (allotTaskCount >= agvModel.getBackpack()) {
- continue;
- }
- if (taskService.count(new LambdaQueryWrapper<Task>()
- .eq(Task::getAgvId, agv.getId())
- .notIn(Task::getId, taskIds)
- .and(i -> {
- i.eq(Task::getTaskSts, TaskStsType.WAITING.val()) // 宸茬粡鏈墂aiting浠诲姟鐨勮溅涓嶈兘鍐嶅垎閰�
- .or().eq(Task::getTaskSts, TaskStsType.ASSIGN.val())
- .or().eq(Task::getTaskSts, TaskStsType.PROGRESS.val());
- })) > 0) {
- log.info(agv.getUuid() + "鍙稟GV涓嶅彲鐢紝宸茬粡瀛樺湪杩涜涓殑浠诲姟...");
- continue;
- }
- if (!agvService.judgeEnable(agv.getId(), true)) {
- log.info(agv.getUuid() + "鍙稟GV涓嶅彲鐢紝" + task.getSeqNum() + "浠诲姟鏃犳硶璁＄畻...");
- continue;
+ public Double[] pac(Double[] currPosition, List<List<TaskPosDto>> list) {
+ List<TaskPosDto> theFirstOne = list.get(0);
+ List<TaskPosDto> theLastOne = list.get(list.size() - 1);
+
+ if (list.size() == 1) {
+ TaskPosDto head = theFirstOne.get(0);
+ TaskPosDto tail = theFirstOne.get(theFirstOne.size() - 1);
+
+ int distanceByHead = CommonUtil.calcDistance(currPosition, head.getXy());
+ int distanceByTail = CommonUtil.calcDistance(currPosition, tail.getXy());
+
+ if (distanceByTail < distanceByHead) {
+ Collections.reverse(theFirstOne);
}
- hit = agv;
- break;
+ } else {
+ TaskPosDto headOfFirst = theFirstOne.get(0);
+ TaskPosDto tailOfFirst = theFirstOne.get(theFirstOne.size() - 1);
+
+ TaskPosDto headOfLast = theLastOne.get(0);
+ TaskPosDto tailOfLast = theLastOne.get(theLastOne.size() - 1);
+
+ int distanceByHeadOfFirst = CommonUtil.calcDistance(currPosition, headOfFirst.getXy());
+ int distanceByTailOfFirst = CommonUtil.calcDistance(currPosition, tailOfFirst.getXy());
+
+ int distanceByHeadOfLast = CommonUtil.calcDistance(currPosition, headOfLast.getXy());
+ int distanceByTailOfLast = CommonUtil.calcDistance(currPosition, tailOfLast.getXy());
+
+ if (Math.min(distanceByHeadOfLast, distanceByTailOfLast) < Math.min(distanceByHeadOfFirst, distanceByTailOfFirst)) {
+ Collections.reverse(list);
+
+ if (distanceByTailOfLast < distanceByHeadOfLast) {
+ Collections.reverse(theLastOne);
+ }
+ } else {
+ if (distanceByTailOfFirst < distanceByHeadOfFirst) {
+ Collections.reverse(theFirstOne);
+ }
+ }
}
- return hit;
+ theLastOne = list.get(list.size() - 1);
+ return theLastOne.get(theLastOne.size() - 1).getXy();
}
- public synchronized Agv execute1(Task task, Map<String, List<Long>> taskAllot, List<Long> taskIds) {
- String oriLocNo = task.getOriLoc$();
- int oriLocRow = LocUtils.getRow(oriLocNo);
- String destLocNo = task.getDestLoc$();
- int destLocRow = LocUtils.getRow(destLocNo);
- Agv agv = null;
- if (oriLocRow <= 2 && destLocRow <= 2) {
- agv = agvService.selectByUuid(String.valueOf(1));
- }
- if (oriLocRow > 2 && destLocRow > 2) {
- agv = agvService.selectByUuid(String.valueOf(2));
- }
- assert agv != null;
- AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
- int allotTaskCount = 0;
- List<Long> allotTaskIds = taskAllot.get(agv.getUuid());
- if (!Cools.isEmpty(allotTaskIds)) {
- allotTaskCount = allotTaskIds.size();
- }
- if (allotTaskCount >= agvModel.getBackpack()) {
- return null;
- }
- if (taskService.count(new LambdaQueryWrapper<Task>()
- .eq(Task::getAgvId, agv.getId())
- .notIn(Task::getId, taskIds)
- .and(i -> {
- i.eq(Task::getTaskSts, TaskStsType.WAITING.val()) // 宸茬粡鏈墂aiting浠诲姟鐨勮溅涓嶈兘鍐嶅垎閰�
- .or().eq(Task::getTaskSts, TaskStsType.ASSIGN.val())
- .or().eq(Task::getTaskSts, TaskStsType.PROGRESS.val());
- })) > 0) {
- log.info(agv.getUuid() + "鍙稟GV涓嶅彲鐢紝宸茬粡瀛樺湪杩涜涓殑浠诲姟...");
- return null;
- }
- if (!agvService.judgeEnable(agv.getId(), true)) {
- log.info(agv.getUuid() + "鍙稟GV涓嶅彲鐢紝" + task.getSeqNum() + "浠诲姟鏃犳硶璁＄畻...");
- return null;
- }
- return agv;
+ // about roller --------------------------------------------
+
+ private Sta getInboundRollerSta(Task task) {
+ TaskTypeType type = TaskTypeType.get(task.getTaskTypeEl());
+ switch (Objects.requireNonNull(type)) {
+ case STA_TO_LOC:
+ case STA_TO_STA:
+ Long oriStaId = task.getOriSta();
+ if (null == oriStaId) {
+ return null;
+ }
+ Sta oriSta = staService.getById(oriStaId);
+ if (oriSta == null || Cools.isEmpty(oriSta.getStaType())) {
+ return null;
+ }
+ if (StaTypeType.ROLLER.val() != oriSta.getStaType()) {
+ return null;
+ }
+ return oriSta;
+ default:
+ return null;
+ }
+ }
+
+ private Sta getOutboundRollerSta(Task task) {
+ TaskTypeType type = TaskTypeType.get(task.getTaskTypeEl());
+ switch (Objects.requireNonNull(type)) {
+ case LOC_TO_STA:
+ case STA_TO_STA:
+ Long destStaId = task.getDestSta();
+ if (null == destStaId) {
+ return null;
+ }
+ Sta destSta = staService.getById(destStaId);
+ if (destSta == null || Cools.isEmpty(destSta.getStaType())) {
+ return null;
+ }
+ if (StaTypeType.ROLLER.val() != destSta.getStaType()) {
+ return null;
+ }
+ return destSta;
+ default:
+ return null;
+ }
}
}
--
Gitblit v1.9.1