From d3d3857cda8b4307d8f03bf15ec9fb2c98c34b64 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 17 十二月 2024 09:58:39 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 insertions(+), 0 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 9e3899c..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,10 +3,13 @@
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;
import com.zy.acs.manager.manager.service.CodeService;
import com.zy.acs.manager.manager.service.JamService;
import lombok.extern.slf4j.Slf4j;
@@ -22,6 +25,8 @@
@Autowired
private CodeService codeService;
+ @Autowired
+ private AgvService agvService;
@Override
public Jam getJam(Long agvId, Long jamCode, Long jamSeg) {
@@ -37,6 +42,43 @@
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::getCycleAvo, 1)
+ .ne(Jam::getState, JamStateType.DEPRECATED.toString())
+// .eq(Jam::getState, JamStateType.RUNNING.toString())
+ );
+ if (!Cools.isEmpty(jams)) {
+ return jams.stream().findFirst().orElse(null);
+ }
+ return null;
+ }
+
+ @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) {
--
Gitblit v1.9.1