From 2170edf1ba597d50dcf4ca82afa718a946a2278b Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 24 二月 2025 14:52:13 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java | 20 ++++++++++++++++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java | 5 +++--
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/JamService.java | 3 +++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/SegmentService.java | 2 +-
4 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/JamService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/JamService.java
index 61d58b3..854b47c 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/JamService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/JamService.java
@@ -35,4 +35,7 @@
Boolean checkIfFinish(Long avoAgv, String currCodeData);
boolean deprecate(Long id, Long loginUserId);
+
+ boolean isAvoidSeg(Long currSeg);
+
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/SegmentService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/SegmentService.java
index 1d38f7f..2a721d2 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/SegmentService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/SegmentService.java
@@ -12,7 +12,7 @@
Segment getNextStepOfInit(Long travelId, Integer serial);
- Segment getPreviousStepOfFinish(Long travelId, Integer serial);
+ Segment getPreviousStepOfFinish(Long travelId, Integer serial, String memo);
List<Segment> getJustWaitingSeg(Long agvId);
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java
index dbd148b..a6cdb5d 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java
@@ -7,10 +7,12 @@
import com.zy.acs.manager.manager.entity.Jam;
import com.zy.acs.manager.manager.entity.Segment;
import com.zy.acs.manager.manager.enums.JamStateType;
+import com.zy.acs.manager.manager.enums.SegmentStateType;
import com.zy.acs.manager.manager.mapper.JamMapper;
import com.zy.acs.manager.manager.service.AgvService;
import com.zy.acs.manager.manager.service.CodeService;
import com.zy.acs.manager.manager.service.JamService;
+import com.zy.acs.manager.manager.service.SegmentService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -26,6 +28,8 @@
private CodeService codeService;
@Autowired
private AgvService agvService;
+ @Autowired
+ private SegmentService segmentService;
@Override
public Jam getJam(Long agvId, Long jamCode, Long jamSeg) {
@@ -127,4 +131,20 @@
return this.updateById(jam);
}
+ @Override
+ public boolean isAvoidSeg(Long currSeg) {
+ List<Jam> list = this.list(new LambdaQueryWrapper<Jam>()
+ .eq(Jam::getAvoSeg, currSeg)
+ .eq(Jam::getState, JamStateType.RUNNING.toString()));
+ if (!Cools.isEmpty(list)) {
+ for (Jam jam : list) {
+ Segment jamSeg = segmentService.getById(jam.getJamSeg());
+ if (jamSeg.getState().equals(SegmentStateType.WAITING.toString()) || jamSeg.getState().equals(SegmentStateType.RUNNING.toString())) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java
index 64c1e25..b8eca35 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java
@@ -58,11 +58,12 @@
}
@Override
- public Segment getPreviousStepOfFinish(Long travelId, Integer serial) {
+ public Segment getPreviousStepOfFinish(Long travelId, Integer serial, String memo) {
return this.getOne(new LambdaQueryWrapper<Segment>()
.eq(Segment::getTravelId, travelId)
.eq(Segment::getSerial, serial - 1)
- .eq(Segment::getState, SegmentStateType.FINISH.toString())
+// .eq(Segment::getState, SegmentStateType.FINISH.toString())
+ .eq(Segment::getMemo, memo)
);
}
--
Gitblit v1.9.1