From 89c7f6e5bcc21b0e8f83a2bc6d680e2ffe431e6f Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 13 一月 2025 09:38:29 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 2569b2c..dbd148b 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,7 +3,6 @@
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;
@@ -48,7 +47,7 @@
*/
@Override
public List<Jam> getUnfinishedOriginJamByAvo(Long avoAgv, Long currCode, Long currSeg) {
- return this.baseMapper.selectUnfinishedJamByAvo(avoAgv, null, null);
+ return this.baseMapper.selectUnfinishedJamByAvo(avoAgv, currCode, null);
}
@Override
@@ -56,8 +55,9 @@
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)) {
@@ -68,8 +68,14 @@
@Override
public List<Jam> getJamFromSegmentByAvo(Segment jamSeg, String avoAgvNo) {
- Agv avoAgv = agvService.selectByUuid(avoAgvNo);
- return this.baseMapper.selectJamFromSegmentByAvo(jamSeg.getId(), avoAgv.getId());
+ 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
@@ -90,7 +96,7 @@
return null;
}
Date now = new Date();
- Code code = codeService.selectByData(currCodeData);
+ Code code = codeService.getCacheByData(currCodeData);
List<Jam> jams = this.list(new LambdaQueryWrapper<Jam>()
.eq(Jam::getAvoAgv, avoAgv)
.eq(Jam::getAvoCode, code.getId())
--
Gitblit v1.9.1