From 8e6a6ee229b8a14ec3cac6b428921cbde8dcf53d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 15 十一月 2024 09:24:25 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
index 4fcedee..0c0703d 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
@@ -491,12 +491,10 @@
* 鍏呯數 鍥炲緟鏈轰綅浠诲姟
*/
@Transactional(propagation = Propagation.REQUIRES_NEW) // although there is a Transactional here that the lock is isolated, but we can't join the caller's Transactional
- public boolean buildMinorTask(Agv agv, AgvDetail agvDetail, TaskTypeType taskType, String destination) {
+ public boolean buildMinorTask(Agv agv, TaskTypeType taskType, String destination, Jam jam) {
if (Cools.isEmpty(agv, taskType)) { return false; }
try {
- if (null == agvDetail) {
- agvDetail = agvDetailService.selectByAgvId(agv.getId());
- }
+ AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
if (!agvService.judgeEnable(agv.getId())) {
return false;
}
@@ -602,6 +600,10 @@
}
if (!segmentService.save(next)) {
throw new BusinessException("segment failed to save");
+ } else {
+ if (null != jam && i == 0) {
+ jam.setAvoSeg(next.getId());
+ }
}
}
--
Gitblit v1.9.1