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/service/impl/MainServiceImpl.java | 4 +-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/MotionTimer.java | 24 ++++++------
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasShuttleController.java | 6 ++-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Task.java | 5 ++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java | 3 +
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/TaskStsType.java | 20 ----------
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/TaskStsController.java | 2
9 files changed, 28 insertions(+), 40 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();
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/TaskStsController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/TaskStsController.java
index fea3bc6..b0326ad 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/TaskStsController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/TaskStsController.java
@@ -88,7 +88,7 @@
wrapper.like(TaskSts::getName, condition);
}
taskStsService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
- item -> vos.add(new KeyValVo(item.getId(), item.getName()))
+ item -> vos.add(new KeyValVo(Integer.valueOf(item.getUuid()), item.getName()))
);
return R.ok().add(vos);
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Task.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Task.java
index 04eb896..4ec07d8 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Task.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Task.java
@@ -3,6 +3,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.wcs.core.service.BusService;
import com.zy.asrs.wcs.core.service.TaskCtgService;
import com.zy.asrs.wcs.core.service.TaskStsService;
@@ -334,7 +335,9 @@
public String getTaskSts$(){
TaskStsService service = SpringUtils.getBean(TaskStsService.class);
- TaskSts taskSts = service.getById(this.taskSts);
+ TaskSts taskSts = service.getOne(new LambdaQueryWrapper<TaskSts>()
+ .eq(TaskSts::getUuid, String.valueOf(this.taskSts))
+ .eq(TaskSts::getHostId, this.hostId));
if (!Cools.isEmpty(taskSts)){
return String.valueOf(taskSts.getName());
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java
index f2ce497..9e0b818 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java
@@ -988,7 +988,7 @@
*/
public List<Motion> generateShuttleManualMotion(Task task) {
List<Motion> motionList = new ArrayList<>();
- if (task.getTaskSts() != TaskStsType.NEW_MOVE.getId()) {
+ if (task.getTaskSts() != TaskStsType.NEW_MANUAL.sts) {
return motionList;
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java
index e276f9a..b805fc3 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java
@@ -63,6 +63,9 @@
public Boolean accept(Motion motion) {
Integer deviceNo = Integer.parseInt(motion.getDevice());
ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, deviceNo);
+ if (shuttleThread == null) {
+ return false;
+ }
ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
if (null == shuttleProtocol) {
return false;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/TaskStsType.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/TaskStsType.java
index 6b8b3e5..43d5aa1 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/TaskStsType.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/TaskStsType.java
@@ -55,24 +55,4 @@
throw new CoolException("TaskStsType Error!!!");
}
- public static TaskStsType queryById(Long id) {
- TaskStsService taskStsService = SpringUtils.getBean(TaskStsService.class);
- TaskSts taskSts = taskStsService.getById(id);
- if (taskSts == null) {
- throw new CoolException("TaskStsType Error!!!");
- }
- return query(Long.valueOf(taskSts.getUuid()));
- }
-
- public Long getId() {
- TaskStsService taskStsService = SpringUtils.getBean(TaskStsService.class);
- TaskSts taskSts = taskStsService.getOne(new LambdaQueryWrapper<TaskSts>()
- .eq(TaskSts::getUuid, sts)
- .eq(TaskSts::getStatus, 1));
- if (taskSts == null) {
- throw new CoolException("TaskStsType Error!!!");
- }
- return taskSts.getId();
- }
-
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
index a342164..e7c5592 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
@@ -268,7 +268,7 @@
Task task = new Task();
task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
task.setTaskNo(String.valueOf(Utils.getTaskNo("CHARGE")));
- task.setTaskSts(TaskStsType.NEW_CHARGE.getId());
+ task.setTaskSts(TaskStsType.NEW_CHARGE.sts);
task.setTaskCtg(taskCtg.getId());
task.setPriority(10);
task.setOriginSite(null);
@@ -365,7 +365,7 @@
Task task = new Task();
task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
task.setTaskNo(String.valueOf(Utils.getTaskNo("MOVE")));
- task.setTaskSts(TaskStsType.NEW_MOVE.getId());
+ task.setTaskSts(TaskStsType.NEW_MOVE.sts);
task.setTaskCtg(taskCtg.getId());
task.setPriority(10);
task.setOriginSite(null);
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);
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java
index 8188546..58d0e4b 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java
@@ -177,7 +177,7 @@
Task task = new Task();
task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
task.setTaskNo(String.valueOf(Utils.getTaskNo("MOVE")));
- task.setTaskSts(TaskStsType.NEW_MOVE.getId());
+ task.setTaskSts(TaskStsType.NEW_MOVE.sts);
task.setTaskCtg(taskCtg.getId());
task.setPriority(10);
task.setOriginSite(null);
--
Gitblit v1.9.1