From 234415a381da98992240dc7c673614f49d1dee32 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 21 六月 2025 10:00:30 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java
index 323c180..2c7cc86 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java
@@ -48,6 +48,13 @@
@Autowired
private WaveService waveService;
+
+ /**
+ * @author Ryan
+ * @date 2025/6/20
+ * @description: 鍏ュ簱浠诲姟宸插畬鎴�
+ * @version 1.0
+ */
@Scheduled(cron = "0/15 * * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void inExecute() {
@@ -158,6 +165,13 @@
}
}
+
+ /**
+ * @author Ryan
+ * @date 2025/6/20
+ * @description: 鍑哄簱浠诲姟瀹屾垚
+ * @version 1.0
+ */
@Scheduled(cron = "0/10 * * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void outExecute() {
@@ -181,33 +195,26 @@
// if (diff < taskLogDiffDays) {
// continue;
// }
-
Long hostId = task.getHostId();
-
//淇濆瓨浠诲姟鏄庣粏鍘嗗彶妗�
List<TaskDetl> taskDetls = taskDetlService.getTaskDetlByTaskId(task.getId());
if (taskDetls.isEmpty()) {
throw new CoolException("浠诲姟鏄庣粏涓嶅瓨鍦�");
}
-
boolean flag = false;
for (TaskDetl taskDetl : taskDetls) {
if (taskDetl.getWaveId() == null) {
continue;
}
-
Wave wave = waveService.getById(taskDetl.getWaveId());
if (wave != null) {
flag = true;//娉㈡鏈畬鎴�
break;
}
}
-
if (flag) {
continue;
}
-
-
//淇濆瓨浠诲姟鍘嗗彶妗�
TaskLog taskLog = new TaskLog();
taskLog.sync(task);
--
Gitblit v1.9.1