From bfac8bfa522289b8d2c0b66c50c4bf8b8d75c0e1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 29 十月 2024 14:27:02 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
index 8da6ca8..1e752b6 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
@@ -67,6 +67,8 @@
@Autowired
private ValidService validService;
@Autowired
+ private AllocateService allocateService;
+ @Autowired
private CodeService codeService;
@Autowired
private MapService mapService;
@@ -88,8 +90,7 @@
private TrafficService trafficService;
@Autowired
private AgvModelService agvModelService;
- @Autowired
- private MissionAssignService missionAssignService;
+
@SuppressWarnings("all")
@Transactional
@@ -214,7 +215,7 @@
List<Long> taskIds = taskList.stream().map(Task::getId).distinct().collect(Collectors.toList());
for (Task task : taskList) {
- Agv agv = missionAssignService.execute(task);
+ Agv agv = allocateService.execute(task);
if (null == agv) {
log.warn("Task[{}] has an issue锛� because it failed to checkout agv which is idle...", task.getSeqNum());
continue;
@@ -498,16 +499,22 @@
switch (taskType) {
case TO_CHARGE:
case TO_STANDBY:
- List<FuncSta> funcStaList = funcStaService.list(new LambdaQueryWrapper<FuncSta>()
- .eq(FuncSta::getType, FuncStaType.query(taskType).toString())
- .eq(FuncSta::getAgvId, agv.getId())
- .eq(FuncSta::getState, FuncStaStateType.IDLE.toString())
- .eq(FuncSta::getStatus, StatusType.ENABLE.val)
- );
- if (!Cools.isEmpty(funcStaList)) {
- FuncSta funcSta = funcStaList.get(0);
+ List<FuncSta> idleFunStaList = funcStaService.findInIdleStatus(FuncStaType.query(taskType), agv.getId());
+ if (!Cools.isEmpty(idleFunStaList)) {
+ FuncSta funcSta = funcStaService.checkoutClosestFunSta(agvDetail.getRecentCode(), idleFunStaList);
endCode = codeService.getById(funcSta.getCode());
}
+
+// List<FuncSta> funcStaList = funcStaService.list(new LambdaQueryWrapper<FuncSta>()
+// .eq(FuncSta::getType, FuncStaType.query(taskType).toString())
+// .eq(FuncSta::getAgvId, agv.getId())
+// .eq(FuncSta::getState, FuncStaStateType.IDLE.toString())
+// .eq(FuncSta::getStatus, StatusType.ENABLE.val)
+// );
+// if (!Cools.isEmpty(funcStaList)) {
+// FuncSta funcSta = funcStaList.get(0);
+// endCode = codeService.getById(funcSta.getCode());
+// }
break;
case MOVE:
endCode = codeService.selectByData(destination);
--
Gitblit v1.9.1