From 6eb6558c6e3f092a4585c39eae2b4a295400c5f6 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 05 五月 2026 08:12:43 +0800
Subject: [PATCH] 更新标准输送线程序代码；generateBusAndTask补充校验任务是否存校验逻辑
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 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 531f6f4..13c9d51 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
@@ -117,22 +117,27 @@
// 浼樺厛绾ф帓搴�
taskDtoList.sort((o1, o2) -> o2.getPriority() - o1.getPriority());
- // 鏍￠獙
- List<Task> taskList = validService.validTaskDtoList(taskDtoList);
-
- // 淇濆瓨鎬荤嚎
+ //鏌ヨbus鏄惁瀛樺湪锛岀敤浜庢娴嬫槸鍚﹀凡缁忓瓨鍦�
+ //鍦≧CS绯荤粺涓紝busNo鍜宼askNo缁勫悎璧锋潵纭畾鏄惁瀛樺湪
Date now = new Date();
- Bus bus = new Bus();
- bus.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
- bus.setBusNo(batchNo);
- bus.setStartTime(now);
- bus.setBusSts(BusStsType.RECEIVE.val());
- bus.setMemo(memo);
-
- if (!busService.save(bus)) {
- throw new BusinessException("Internal Server Error!");
+ Bus bus = busService.selectByBusNo(batchNo);
+ if (bus == null){
+ // 淇濆瓨鎬荤嚎
+ bus = new Bus();
+ bus.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
+ bus.setBusNo(batchNo);
+ bus.setStartTime(now);
+ bus.setBusSts(BusStsType.RECEIVE.val());
+ bus.setMemo(memo);
+ if (!busService.save(bus)) {
+ throw new BusinessException("Internal Server Error!");
+ }
}
+ // 鏍￠獙
+ List<Task> taskList = validService.validTaskDtoList(bus.getId(),taskDtoList);
+
+
// 淇濆瓨浠诲姟
for (Task task : taskList) {
task.setBusId(bus.getId());
--
Gitblit v1.9.1