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/controller/BasShuttleController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasShuttleController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasShuttleController.java
index 763cdfe..b5a01f7 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasShuttleController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasShuttleController.java
@@ -148,7 +148,7 @@
Task task = new Task();
task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
task.setTaskNo(String.valueOf(Utils.getTaskNo("MANUAL")));
- task.setTaskSts(TaskStsType.NEW_MANUAL.getId());
+ task.setTaskSts(TaskStsType.NEW_MANUAL.sts);
task.setTaskCtg(taskCtg.getId());
task.setPriority(10);
task.setOriginSite(null);
@@ -165,6 +165,8 @@
return R.error();
}
+ task = taskService.getById(task.getId());
+
// generate motion list
List<Motion> motionList = analyzeService.generateShuttleManualMotion(task);
if (Cools.isEmpty(motionList)) {
@@ -173,7 +175,7 @@
}
motionService.batchInsert(motionList, task.getUuid(), Integer.valueOf(task.getTaskNo()));
- task.setTaskSts(TaskStsType.ANALYZE_MANUAL.getId());
+ task.setTaskSts(TaskStsType.ANALYZE_MANUAL.sts);
if (!taskService.updateById(task)) {
News.error("淇濆瓨{}鍙峰洓鍚戠┛姊溅鎵嬪姩浠诲姟澶辫触!!!", shuttleNo);
return R.error();
--
Gitblit v1.9.1