From e9a4418c14ef68fb454300b092c413e8df259ec2 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 13 四月 2024 11:50:56 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/MotionTimer.java | 207 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 131 insertions(+), 76 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 a638e93..10f3f7d 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
@@ -2,9 +2,7 @@
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wcs.core.entity.Task;
-import com.zy.asrs.wcs.core.kernel.command.AgvCommandService;
-import com.zy.asrs.wcs.core.kernel.command.CraneCommandService;
-import com.zy.asrs.wcs.core.kernel.command.ShuttleCommandService;
+import com.zy.asrs.wcs.core.kernel.command.*;
import com.zy.asrs.wcs.core.model.enums.DeviceCtgType;
import com.zy.asrs.wcs.core.model.enums.MotionCtgType;
import com.zy.asrs.wcs.core.model.enums.MotionStsType;
@@ -34,17 +32,17 @@
private MotionService motionService;
@Autowired
private AgvCommandService agvCommandService;
-// @Autowired
-// private ConveyorCommandService conveyorCommandService;
+ @Autowired
+ private ConveyorCommandService conveyorCommandService;
@Autowired
private CraneCommandService craneCommandService;
-// @Autowired
-// private LiftCommandService liftCommandService;
+ @Autowired
+ private LiftCommandService liftCommandService;
@Autowired
private ShuttleCommandService shuttleCommandService;
// @Scheduled(cron = "0/1 * * * * ? ")
- public synchronized void executeWrkMast() {
+ public synchronized void executeTask() {
Date now = new Date();
// ANALYZE_INBOUND
for (Task task : taskService.selectByAnalyzeSts()) {
@@ -60,7 +58,7 @@
continue;
}
- // 鏇存柊wrkMast
+ // 鏇存柊Task
switch (TaskStsType.query(task.getTaskSts())) {
case ANALYZE_INBOUND:
task.setTaskSts(TaskStsType.EXECUTE_INBOUND.sts);
@@ -89,7 +87,7 @@
continue;
}
- // 鏇存柊wrkMast
+ // 鏇存柊Task
switch (TaskStsType.query(task.getTaskSts())) {
case EXECUTE_INBOUND:
task.setTaskSts(TaskStsType.COMPLETE_INBOUND.sts);
@@ -107,68 +105,125 @@
}
}
-// @Scheduled(cron = "0/1 * * * * ? ")
-// public synchronized void executeWrkCharge() {
-// Date now = new Date();
-// // ANALYZE_INBOUND
-// for (WrkCharge wrkCharge : wrkChargeMapper.selectByAnalyzeSts()) {
-// Motion executingMotion = motionService.selectOfTop1(wrkCharge.getUuid(), MotionStsType.EXECUTING.val());
-// if (executingMotion != null) {//瀛樺湪姝ｅ湪鎵ц鐨刴otion
-// continue;
-// }
-//
-// Motion motion = motionService.selectOfTop1(wrkCharge.getUuid(), MotionStsType.INIT.val());
-// if (null != motion) {
-// boolean result = this.executeMotion(motion);
-// if (!result) {
-// continue;
-// }
-// // 鏇存柊wrkMast
-// switch (WrkMastStsType.query(wrkCharge.getWrkSts())) {
-// case ANALYZE_CHARGE:
-// wrkCharge.setWrkSts(WrkMastStsType.EXECUTE_CHARGE.sts);
-// break;
-// case ANALYZE_MOVE:
-// wrkCharge.setWrkSts(WrkMastStsType.EXECUTE_MOVE.sts);
-// break;
-// }
-// wrkCharge.setModiTime(now);
-// if (wrkChargeMapper.updateById(wrkCharge) == 0) {
-// log.error("{}鍏朵粬宸ヤ綔妗ｆ洿鏂扮姸鎬佸け璐ワ紒", wrkCharge.getWrkNo());
-// }
-// }
-// }
-// // EXECUTE_INBOUND
-// for (WrkCharge wrkCharge : wrkChargeMapper.selectByExecuteSts()) {
-// if (!motionService.hasRunningMotion(wrkCharge.getUuid())) {
-// Motion motion = motionService.selectOfTop1(wrkCharge.getUuid(), MotionStsType.WAITING.val());
-// if (null != motion) {
-// boolean result = this.executeMotion(motion);
-// if (!result) {
-// continue;
-// }
-// } else {
-// if (motionService.selectOfTop1(wrkCharge.getUuid(), MotionStsType.EXECUTING.val()) != null) {
-// continue;
-// }
-//
-// // 鏇存柊wrkMast
-// switch (WrkMastStsType.query(wrkCharge.getWrkSts())) {
-// case EXECUTE_CHARGE:
-// wrkCharge.setWrkSts(WrkMastStsType.CHARGE_WORKING.sts);
-// break;
-// case EXECUTE_MOVE:
-// wrkCharge.setWrkSts(WrkMastStsType.COMPLETE_MOVE.sts);
-// break;
-// }
-// wrkCharge.setModiTime(now);
-// if (wrkChargeMapper.updateById(wrkCharge) == 0) {
-// log.error("{}浠栧伐浣滄。鏇存柊鐘舵�佸け璐ワ紒", wrkCharge.getWrkNo());
-// }
-// }
-// }
-// }
-// }
+ @Scheduled(cron = "0/1 * * * * ? ")
+ public synchronized void executeChargeTask() {
+ Date now = new Date();
+ // ANALYZE_CHARGE
+ for (Task taskCharge : taskService.selectChargeByAnalyzeSts()) {
+ Motion executingMotion = motionService.selectOfTop1(taskCharge.getUuid(), MotionStsType.EXECUTING.val(), taskCharge.getHostId());
+ if (executingMotion != null) {//瀛樺湪姝ｅ湪鎵ц鐨刴otion
+ continue;
+ }
+
+ Motion motion = motionService.selectOfTop1(taskCharge.getUuid(), MotionStsType.INIT.val(), taskCharge.getHostId());
+ if (null != motion) {
+ boolean result = this.executeMotion(motion);
+ if (!result) {
+ continue;
+ }
+ // 鏇存柊Task
+ switch (TaskStsType.query(taskCharge.getTaskSts())) {
+ case ANALYZE_CHARGE:
+ taskCharge.setTaskSts(TaskStsType.EXECUTE_CHARGE.sts);
+ break;
+ case ANALYZE_MOVE:
+ taskCharge.setTaskSts(TaskStsType.EXECUTE_MOVE.sts);
+ break;
+ }
+ taskCharge.setUpdateTime(now);
+ if (!taskService.updateById(taskCharge)) {
+ log.error("{}鍏朵粬宸ヤ綔妗ｆ洿鏂扮姸鎬佸け璐ワ紒", taskCharge.getTaskNo());
+ }
+ }
+ }
+ // EXECUTE_CHARGE
+ for (Task taskCharge : taskService.selectChargeByExecuteSts()) {
+ if (!motionService.hasRunningMotion(taskCharge.getUuid(), taskCharge.getHostId())) {
+ Motion motion = motionService.selectOfTop1(taskCharge.getUuid(), MotionStsType.WAITING.val(), taskCharge.getHostId());
+ if (null != motion) {
+ boolean result = this.executeMotion(motion);
+ if (!result) {
+ continue;
+ }
+ } else {
+ if (motionService.selectOfTop1(taskCharge.getUuid(), MotionStsType.EXECUTING.val(), taskCharge.getHostId()) != null) {
+ continue;
+ }
+
+ // 鏇存柊Task
+ switch (TaskStsType.query(taskCharge.getTaskSts())) {
+ case EXECUTE_CHARGE:
+ taskCharge.setTaskSts(TaskStsType.CHARGE_WORKING.sts);
+ break;
+ case EXECUTE_MOVE:
+ taskCharge.setTaskSts(TaskStsType.COMPLETE_MOVE.sts);
+ break;
+ }
+ taskCharge.setUpdateTime(now);
+ if (!taskService.updateById(taskCharge)) {
+ log.error("{}浠栧伐浣滄。鏇存柊鐘舵�佸け璐ワ紒", taskCharge.getTaskNo());
+ }
+ }
+ }
+ }
+ }
+
+ @Scheduled(cron = "0/1 * * * * ? ")
+ public synchronized void executeManualTask() {
+ Date now = new Date();
+ // ANALYZE_MANUAL
+ for (Task task : taskService.selectManualByAnalyzeSts()) {
+ Motion executingMotion = motionService.selectOfTop1(task.getUuid(), MotionStsType.EXECUTING.val(), task.getHostId());
+ if (executingMotion != null) {//瀛樺湪姝ｅ湪鎵ц鐨刴otion
+ continue;
+ }
+
+ Motion motion = motionService.selectOfTop1(task.getUuid(), MotionStsType.INIT.val(), task.getHostId());
+ if (null != motion) {
+ boolean result = this.executeMotion(motion);
+ if (!result) {
+ continue;
+ }
+ // 鏇存柊Task
+ switch (TaskStsType.query(task.getTaskSts())) {
+ case ANALYZE_MANUAL:
+ task.setTaskSts(TaskStsType.EXECUTE_MANUAL.sts);
+ break;
+ }
+ task.setUpdateTime(now);
+ if (!taskService.updateById(task)) {
+ log.error("{}鍏朵粬宸ヤ綔妗ｆ洿鏂扮姸鎬佸け璐ワ紒", task.getTaskNo());
+ }
+ }
+ }
+ // EXECUTE_MANUAL
+ for (Task task : taskService.selectManualByExecuteSts()) {
+ if (!motionService.hasRunningMotion(task.getUuid(), task.getHostId())) {
+ Motion motion = motionService.selectOfTop1(task.getUuid(), MotionStsType.WAITING.val(), task.getHostId());
+ if (null != motion) {
+ boolean result = this.executeMotion(motion);
+ if (!result) {
+ continue;
+ }
+ } else {
+ if (motionService.selectOfTop1(task.getUuid(), MotionStsType.EXECUTING.val(), task.getHostId()) != null) {
+ continue;
+ }
+
+ // 鏇存柊Task
+ switch (TaskStsType.query(task.getTaskSts())) {
+ case EXECUTE_MANUAL:
+ task.setTaskSts(TaskStsType.COMPLETE_MANUAL.sts);
+ break;
+ }
+ task.setUpdateTime(now);
+ if (!taskService.updateById(task)) {
+ log.error("{}浠栧伐浣滄。鏇存柊鐘舵�佸け璐ワ紒", task.getTaskNo());
+ }
+ }
+ }
+ }
+ }
@Scheduled(cron = "0/1 * * * * ? ")
public void scanMotionByExecuting() {
@@ -182,7 +237,7 @@
Boolean executeRes = Boolean.FALSE;
switch (Objects.requireNonNull(MotionCtgType.get(motion.getMotionCtgEl())).deviceCtg) {
case CONVEYOR:
-// executeRes = conveyorCommandService.accept(motion);
+ executeRes = conveyorCommandService.accept(motion);
break;
case CRANE:
executeRes = craneCommandService.accept(motion);
@@ -191,7 +246,7 @@
executeRes = shuttleCommandService.accept(motion);
break;
case LIFT:
-// executeRes = liftCommandService.accept(motion);
+ executeRes = liftCommandService.accept(motion);
break;
case AGV:
executeRes = agvCommandService.accept(motion);
@@ -223,13 +278,13 @@
case CRANE:
break;
case LIFT:
-// executeRes = liftCommandService.finish(motion);
+ executeRes = liftCommandService.finish(motion);
break;
case SHUTTLE:
executeRes = shuttleCommandService.finish(motion);
break;
case CONVEYOR:
-// executeRes = conveyorCommandService.finish(motion);
+ executeRes = conveyorCommandService.finish(motion);
break;
default:
break;
--
Gitblit v1.9.1