From 3bb8c58c42badd5768cacfda3c9a5ccce9136e4e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 09 四月 2024 15:24:12 +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/DeviceTimer.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/DeviceTimer.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/DeviceTimer.java
index c127569..f464165 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/DeviceTimer.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/DeviceTimer.java
@@ -48,6 +48,9 @@
.eq(Device::getStatus, 1)
.eq(Device::getDeviceType, deviceType.getId()));
for (Device device : list) {
+ //灏忚溅绌洪棽涓旀湁璺戝簱绋嬪簭
+ shuttleAction.moveLoc(device);
+
Object object = redisUtil.get(DeviceRedisConstant.SHUTTLE_FLAG + device.getDeviceNo());
if (object == null) {
continue;
@@ -58,9 +61,6 @@
//瀛樺湪浠诲姟闇�瑕佹墽琛�
boolean result = shuttleAction.executeWork(device, taskNo);
}
-
- //灏忚溅绌洪棽涓旀湁璺戝簱绋嬪簭
- shuttleAction.moveLoc(device);
}
}
--
Gitblit v1.9.1