From 2bdbfd1ac24d4e9a87daf6fb8b99ec32264d5752 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 21 十二月 2024 11:25:27 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 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 4dd476f..137f08f 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
@@ -3,8 +3,10 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.acs.framework.common.Cools;
+import com.zy.acs.manager.manager.entity.Agv;
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;
@@ -45,8 +47,8 @@
* 浣犵殑涓嬩竴涓猻egment鏄笉鏄張浼氬鑷撮樆濉�
*/
@Override
- public List<Jam> hasUnfinishedOriginJamByAvo(Long avoAgv, Long currCode, Long currSeg) {
- return this.baseMapper.selectUnfinishedJamByAvo(avoAgv, null, null);
+ public List<Jam> getUnfinishedOriginJamByAvo(Long avoAgv, Long currCode, Long currSeg) {
+ return this.baseMapper.selectUnfinishedJamByAvo(avoAgv, currCode, null);
}
@Override
@@ -56,6 +58,7 @@
.eq(Jam::getJamSeg, jamSeg)
.eq(Jam::getAvoAgv, agvService.selectByUuid(avoAgvNo).getId())
.eq(Jam::getCycleAvo, 1)
+ .ne(Jam::getState, JamStateType.DEPRECATED.toString())
// .eq(Jam::getState, JamStateType.RUNNING.toString())
);
if (!Cools.isEmpty(jams)) {
@@ -65,6 +68,18 @@
}
@Override
+ public List<Jam> getJamFromSegmentByAvo(Segment jamSeg, String avoAgvNo) {
+ Agv avoAgv = agvService.selectByUuid(avoAgvNo);
+ return this.baseMapper.selectJamFromSegmentByAvo(jamSeg.getId(), avoAgv.getId());
+ }
+
+ @Override
+ public List<Jam> getUnfinishedAvoSegByAvo(String avoAgvNo, Segment currSeg) {
+ Agv avoAgv = agvService.selectByUuid(avoAgvNo);
+ return this.baseMapper.selectUnfinishedAvoSegByAvo(avoAgv.getId(), null);
+ }
+
+ @Override
public List<Jam> queryByAvoid(Long avoAgv, JamStateType jamState) {
if (null == avoAgv) {
return null;
--
Gitblit v1.9.1