From ee5046d151a858339aa137790bc830efe7f55980 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 18 六月 2025 15:13:14 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 15 +++++++++++----
1 files changed, 11 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 7825f26..67b6356 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
@@ -288,7 +288,7 @@
try {
// valid -----------------------------------------------
Agv agv = agvService.getById(agvId);
- if (!agvService.judgeEnable(agv.getId(), false)) {
+ if (!agvService.judgeEnable(agv.getId(), false, true)) {
return;
}
if (!Cools.isEmpty(taskService.selectInSts(agvId, TaskStsType.ASSIGN, TaskStsType.PROGRESS))) {
@@ -529,13 +529,14 @@
/**
* 鍏呯數 鍥炲緟鏈轰綅浠诲姟
+ * zc 鏂板浜嗘槸鍚﹀己鍒讹紝寮哄埗璇存槑鐢辩敤鎴峰彂璧凤紝灏忚溅鍦ㄨ秴杩囦綆鐢甸噺灏卞彲浠ュ仛绉诲姩鍏呯數鍘诲緟鏈轰綅
*/
@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(Long agvId, TaskTypeType taskType, String destination, Jam jam) {
+ public boolean buildMinorTask(Long agvId, TaskTypeType taskType, String destination, Jam jam,boolean force) {
if (Cools.isEmpty(agvId, taskType)) { return false; }
try {
String agvNo = agvService.getAgvNo(agvId);
- if (!agvService.judgeEnable(agvId)) {
+ if (!agvService.judgeEnable(agvId,false, force)) {
return false;
}
if (!Cools.isEmpty(taskService.selectInSts(agvId, TaskStsType.ASSIGN, TaskStsType.PROGRESS))) {
@@ -1213,6 +1214,13 @@
if (Cools.isEmpty(actionList)) {
return;
}
+
+ Long agvId = actionList.get(0).getAgvId();
+ String agvNo = agvService.getAgvNo(agvId);
+ if (!agvService.judgeOnline(agvId)) {
+ return;
+ }
+
long actionIssuedSts = ActionStsType.ISSUED.val();
for (Action action : actionList) {
action.setActionSts(actionIssuedSts);
@@ -1239,7 +1247,6 @@
}
}
- String agvNo = agvService.getAgvNo(actionList.get(0).getAgvId());
AgvAction agvAction = new AgvAction(agvNo, actionGroupId);
for (Action action : actionList) {
switch (Objects.requireNonNull(ActionTypeType.get(action.getActionTypeEl()))) {
--
Gitblit v1.9.1