From 53f4cc4d271fc723f7a9a2f3de89c4ea8ede49a2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 四月 2024 13:30:01 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/MotionTimer.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/MotionTimer.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/MotionTimer.java
index 7ef0cb4..d8fcd42 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/MotionTimer.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/MotionTimer.java
@@ -62,12 +62,12 @@
}
// 鏇存柊Task
- switch (TaskStsType.queryById(task.getTaskSts())) {
+ switch (TaskStsType.query(task.getTaskSts())) {
case ANALYZE_INBOUND:
- task.setTaskSts(TaskStsType.EXECUTE_INBOUND.getId());
+ task.setTaskSts(TaskStsType.EXECUTE_INBOUND.sts);
break;
case ANALYZE_OUTBOUND:
- task.setTaskSts(TaskStsType.EXECUTE_OUTBOUND.getId());
+ task.setTaskSts(TaskStsType.EXECUTE_OUTBOUND.sts);
break;
}
task.setUpdateTime(now);
@@ -91,12 +91,12 @@
}
// 鏇存柊Task
- switch (TaskStsType.queryById(task.getTaskSts())) {
+ switch (TaskStsType.query(task.getTaskSts())) {
case EXECUTE_INBOUND:
- task.setTaskSts(TaskStsType.COMPLETE_INBOUND.getId());
+ task.setTaskSts(TaskStsType.COMPLETE_INBOUND.sts);
break;
case EXECUTE_OUTBOUND:
- task.setTaskSts(TaskStsType.COMPLETE_OUTBOUND.getId());
+ task.setTaskSts(TaskStsType.COMPLETE_OUTBOUND.sts);
break;
}
task.setUpdateTime(now);
@@ -171,11 +171,11 @@
// }
// }
-// @Scheduled(cron = "0/1 * * * * ? ")
+ @Scheduled(cron = "0/1 * * * * ? ")
public synchronized void executeManualTask() {
Date now = new Date();
// ANALYZE_MANUAL
- for (Task task : taskService.selectByAnalyzeSts()) {
+ for (Task task : taskService.selectManualByAnalyzeSts()) {
Motion executingMotion = motionService.selectOfTop1(task.getUuid(), MotionStsType.EXECUTING.val(), task.getHostId());
if (executingMotion != null) {//瀛樺湪姝ｅ湪鎵ц鐨刴otion
continue;
@@ -188,9 +188,9 @@
continue;
}
// 鏇存柊Task
- switch (TaskStsType.queryById(task.getTaskSts())) {
+ switch (TaskStsType.query(task.getTaskSts())) {
case ANALYZE_MANUAL:
- task.setTaskSts(TaskStsType.EXECUTE_MANUAL.getId());
+ task.setTaskSts(TaskStsType.EXECUTE_MANUAL.sts);
break;
}
task.setUpdateTime(now);
@@ -214,9 +214,9 @@
}
// 鏇存柊Task
- switch (TaskStsType.queryById(task.getTaskSts())) {
+ switch (TaskStsType.query(task.getTaskSts())) {
case EXECUTE_MANUAL:
- task.setTaskSts(TaskStsType.COMPLETE_MANUAL.getId());
+ task.setTaskSts(TaskStsType.COMPLETE_MANUAL.sts);
break;
}
task.setUpdateTime(now);
--
Gitblit v1.9.1