From 9fb7c7678174c0fea9bf7c96dca8c24b165d0a48 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 04 一月 2025 13:20:57 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
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 af8c23b..7f37644 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
@@ -5,6 +5,7 @@
import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.manager.entity.Code;
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.mapper.JamMapper;
import com.zy.acs.manager.manager.service.AgvService;
@@ -40,13 +41,23 @@
return null;
}
+ /**
+ * 鍥犱负浣犺�岄樆濉炵殑杞�,鐜板湪浣犲凡缁忓湪閬胯鐐逛簡
+ * 浣犵殑涓嬩竴涓猻egment鏄笉鏄張浼氬鑷撮樆濉�
+ */
+ @Override
+ public List<Jam> getUnfinishedOriginJamByAvo(Long avoAgv, Long currCode, Long currSeg) {
+ return this.baseMapper.selectUnfinishedJamByAvo(avoAgv, currCode, null);
+ }
+
@Override
public Jam getCycleJam(Long jamAgv, Long jamSeg, String avoAgvNo) {
List<Jam> jams = this.list(new LambdaQueryWrapper<Jam>()
.eq(Jam::getJamAgv, jamAgv)
.eq(Jam::getJamSeg, jamSeg)
- .eq(Jam::getAvoAgv, agvService.selectByUuid(avoAgvNo).getId())
+ .eq(Jam::getAvoAgv, agvService.getAgvId(avoAgvNo))
.eq(Jam::getCycleAvo, 1)
+ .ne(Jam::getState, JamStateType.DEPRECATED.toString())
// .eq(Jam::getState, JamStateType.RUNNING.toString())
);
if (!Cools.isEmpty(jams)) {
@@ -56,6 +67,18 @@
}
@Override
+ public List<Jam> getJamFromSegmentByAvo(Segment jamSeg, String avoAgvNo) {
+ Long avoAgvId = agvService.getAgvId(avoAgvNo);
+ return this.baseMapper.selectJamFromSegmentByAvo(jamSeg.getId(), avoAgvId);
+ }
+
+ @Override
+ public List<Jam> getUnfinishedAvoSegByAvo(String avoAgvNo, Segment currSeg) {
+ Long agvId = agvService.getAgvId(avoAgvNo);
+ return this.baseMapper.selectUnfinishedAvoSegByAvo(agvId, null);
+ }
+
+ @Override
public List<Jam> queryByAvoid(Long avoAgv, JamStateType jamState) {
if (null == avoAgv) {
return null;
--
Gitblit v1.9.1