From 4c226bb9b18494358fb484463fffb7566d224ffa Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 23 十二月 2024 16:53:42 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 aa06289..5ba0403 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
@@ -250,7 +250,6 @@
Agv agv = agvService.getById(agvId);
if (!agvService.judgeEnable(agv.getId(), true)) {
return;
-// throw new CoolException("AGV[" + agv.getUuid() + "]褰撳墠涓嶅彲鐢�...");
}
if (!Cools.isEmpty(taskService.selectInSts(agvId, TaskStsType.ASSIGN, TaskStsType.PROGRESS))) {
throw new CoolException("AGV[" + agv.getUuid() + "]鍒嗛厤浠诲姟澶辫触锛屽凡瀛樺湪鎵ц浠诲姟...");
@@ -1042,8 +1041,9 @@
if (Cools.isEmpty(actionList)) {
return;
}
+ long actionIssuedSts = ActionStsType.ISSUED.val();
for (Action action : actionList) {
- action.setActionSts(ActionStsType.ISSUED.val());
+ action.setActionSts(actionIssuedSts);
action.setStartTime(now);
action.setIoTime(now);
action.setUpdateTime(now);
@@ -1054,17 +1054,18 @@
// task
List<Long> taskIds = actionService.selectTaskIdsByGroupId(actionGroupId);
+ long taskAssignSts = TaskStsType.ASSIGN.val();
+ long taskProgressSts = TaskStsType.PROGRESS.val();
for (Long taskId : taskIds) {
Task task = taskService.getById(taskId);
- if (task.getTaskSts().equals(TaskStsType.ASSIGN.val())) {
- task.setTaskSts(TaskStsType.PROGRESS.val());
+ if (task.getTaskSts().equals(taskAssignSts)) {
+ task.setTaskSts(taskProgressSts);
task.setUpdateTime(now);
if (!taskService.updateById(task)) {
throw new BusinessException(task.getSeqNum() + "浠诲姟鏇存柊澶辫触");
}
}
}
-
Agv agv = agvService.getById(actionList.get(0).getAgvId());
AgvAction agvAction = new AgvAction(agv.getUuid(), actionGroupId);
--
Gitblit v1.9.1