From a1cd6d27c1cb1143f14297da2235e797d8d6d91b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 25 九月 2024 14:54:40 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 371d75b..434718d 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
@@ -93,7 +93,11 @@
@SuppressWarnings("all")
@Transactional
- public void generateBusAndTask(OpenBusSubmitParam busSubmitParam, String memo) {
+ public Bus generateBusAndTask(OpenBusSubmitParam busSubmitParam, String memo) {
+ String errorMsg = busService.checkoutValid(busSubmitParam);
+ if (!Cools.isEmpty(errorMsg)) {
+ throw new BusinessException(errorMsg);
+ }
String batch = busSubmitParam.getBatch();
List<TaskDto> taskDtoList = busSubmitParam.getTaskList();
if (Cools.isEmpty(taskDtoList)) {
@@ -110,7 +114,7 @@
Date now = new Date();
Bus bus = new Bus();
bus.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
- bus.setSeqNum(batch);
+ bus.setBusNo(batch);
bus.setStartTime(now);
bus.setBusSts(BusStsType.RECEIVE.val());
bus.setMemo(memo);
@@ -183,7 +187,7 @@
}
}
-
+ return bus;
}
/**
@@ -281,8 +285,9 @@
return 0;
}
});
- if (taskList.size() > agv.getStage()) {
- taskList = taskList.subList(0, agv.getStage());
+ Integer backpack = agvService.getBackpack(agv);
+ if (taskList.size() > backpack) {
+ taskList = taskList.subList(0, backpack);
}
/**
@@ -349,7 +354,7 @@
}
- if (backpackLev > agv.getStage()) {
+ if (backpackLev > backpack) {
throw new BusinessException("瑙ｆ瀽Task澶辫触,AGV鑳岀瘬宸叉弧......");
}
--
Gitblit v1.9.1