From 02909fe9a76b5ea2bca807df19ab798b007b0053 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 03 四月 2024 14:28:56 +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 | 9 +++++----
1 files changed, 5 insertions(+), 4 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..5a364fb 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
@@ -4,6 +4,7 @@
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.LiftCommandService;
import com.zy.asrs.wcs.core.kernel.command.ShuttleCommandService;
import com.zy.asrs.wcs.core.model.enums.DeviceCtgType;
import com.zy.asrs.wcs.core.model.enums.MotionCtgType;
@@ -38,8 +39,8 @@
// private ConveyorCommandService conveyorCommandService;
@Autowired
private CraneCommandService craneCommandService;
-// @Autowired
-// private LiftCommandService liftCommandService;
+ @Autowired
+ private LiftCommandService liftCommandService;
@Autowired
private ShuttleCommandService shuttleCommandService;
@@ -191,7 +192,7 @@
executeRes = shuttleCommandService.accept(motion);
break;
case LIFT:
-// executeRes = liftCommandService.accept(motion);
+ executeRes = liftCommandService.accept(motion);
break;
case AGV:
executeRes = agvCommandService.accept(motion);
@@ -223,7 +224,7 @@
case CRANE:
break;
case LIFT:
-// executeRes = liftCommandService.finish(motion);
+ executeRes = liftCommandService.finish(motion);
break;
case SHUTTLE:
executeRes = shuttleCommandService.finish(motion);
--
Gitblit v1.9.1