From c514b7d8ad8a3f89b81c949e265446b4f09a4bb5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 20 十一月 2024 16:46:30 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
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 d894204..545cfc7 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
@@ -45,6 +45,8 @@
private CodeService codeService;
@Autowired
private SegmentService segmentService;
+ @Autowired
+ private TaskService taskService;
@Override
public PageResult<AgvResult> pageRel(PageParam<Agv, BaseParam> pageParam) {
@@ -73,16 +75,24 @@
public Boolean judgeEnable(Long agvId, Boolean withBattery) {
Agv agv = this.getById(agvId);
AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
- if (segmentService.count(new LambdaQueryWrapper<Segment>()
+ if (0 < segmentService.count(new LambdaQueryWrapper<Segment>()
.eq(Segment::getAgvId, agvId)
.and( i -> {
// i.eq(Segment::getState, SegmentStateType.WAITING.toString()).or()
i.eq(Segment::getState, SegmentStateType.RUNNING.toString());
})
- ) > 0) {
- log.warn("[{}]鍙稟gv姝ｅ湪蹇欑 -segment......", agv.getUuid());
+ )) {
+ 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;
@@ -148,9 +158,9 @@
@Override
public Integer getBackpack(Agv agv) {
- if (null != agv.getStage()) {
- return agv.getStage();
- }
+// if (null != agv.getStage()) {
+// return agv.getStage();
+// }
AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
assert null != agvModel;
return agvModel.getBackpack();
--
Gitblit v1.9.1