From a40b27c3e22a152d7514d3148835238c23be303e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 10 四月 2024 14:41:14 +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 | 4 ++--
1 files changed, 2 insertions(+), 2 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 362443f..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
@@ -237,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);
@@ -284,7 +284,7 @@
executeRes = shuttleCommandService.finish(motion);
break;
case CONVEYOR:
-// executeRes = conveyorCommandService.finish(motion);
+ executeRes = conveyorCommandService.finish(motion);
break;
default:
break;
--
Gitblit v1.9.1