From 5159a57904369185dfd06a5ee8ad90115d129848 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 09 十二月 2024 10:00:53 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 1 -
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java | 2 +-
version/料箱AGV-RCS 通信协议 V0.1报头加长.xlsx | 0
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java | 2 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java | 12 ++----------
5 files changed, 4 insertions(+), 13 deletions(-)
diff --git "a/version/\346\226\231\347\256\261AGV-RCS \351\200\232\344\277\241\345\215\217\350\256\256 V0.1\346\212\245\345\244\264\345\212\240\351\225\277.xlsx" "b/version/\346\226\231\347\256\261AGV-RCS \351\200\232\344\277\241\345\215\217\350\256\256 V0.1\346\212\245\345\244\264\345\212\240\351\225\277.xlsx"
new file mode 100644
index 0000000..6392db7
--- /dev/null
+++ "b/version/\346\226\231\347\256\261AGV-RCS \351\200\232\344\277\241\345\215\217\350\256\256 V0.1\346\212\245\345\244\264\345\212\240\351\225\277.xlsx"
Binary files differ
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java
index abe9c47..9fde6cc 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java
@@ -172,7 +172,7 @@
// STOCK
List<Loc> stockList = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.STOCK.val()));
- if (Cools.isEmpty(stockList)) {
+ if (Cools.isEmpty(stockList) || stockList.size() < agvModel.getBackpack()) {
return;
}
Collections.shuffle(stockList);
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 1c7f530..69163e1 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
@@ -87,7 +87,7 @@
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());
+// 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());
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 aa06289..942003a 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
@@ -250,7 +250,6 @@
Agv agv = agvService.getById(agvId);
if (!agvService.judgeEnable(agv.getId(), true)) {
return;
-// throw new CoolException("AGV[" + agv.getUuid() + "]褰撳墠涓嶅彲鐢�...");
}
if (!Cools.isEmpty(taskService.selectInSts(agvId, TaskStsType.ASSIGN, TaskStsType.PROGRESS))) {
throw new CoolException("AGV[" + agv.getUuid() + "]鍒嗛厤浠诲姟澶辫触锛屽凡瀛樺湪鎵ц浠诲姟...");
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
index 068c61b..1136ac6 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
@@ -72,7 +72,7 @@
}
@Override
- public Boolean judgeEnable(Long agvId, Boolean withBattery) {
+ public Boolean judgeEnable(Long agvId, Boolean isLowBattery) {
Agv agv = this.getById(agvId);
AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
if (0 < segmentService.count(new LambdaQueryWrapper<Segment>()
@@ -85,14 +85,6 @@
log.warn("[{}]鍙稟gv姝ｅ湪蹇欑 - segment......", agv.getUuid());
return false;
}
-// if (0 < taskService.count(new LambdaQueryWrapper<Task>()
-// .eq(Task::getAgvId, agvId)
-// .eq(Task::getTaskType, TaskTypeType.TO_CHARGE.val())
-// .in(Task::getTaskSts, TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val())
-// )){
-// log.warn("[{}]鍙稟gv姝ｅ湪鍘诲厖鐢� - task......", agv.getUuid());
-// return false;
-// }
if (!this.judgeOnline(agv.getId())) {
log.warn("[{}]鍙稟gv涓嶆槸鍦ㄧ嚎鐘舵��......", agv.getUuid());
return false;
@@ -125,7 +117,7 @@
}
}
// with battery
- if (withBattery) {
+ if (isLowBattery) {
if (agvDetailService.isPowerLoss(agv, agvDetail, agvModel)) {
log.warn("[{}]鍙稟gv鐢甸噺涓嶈冻......", agv.getUuid());
return false;
--
Gitblit v1.9.1