From a42ae1ffc20459dc46a88590bc4a94f9280f2d3d Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 10 五月 2024 15:31:28 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java
index 53e0ad3..49dbbc6 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java
@@ -41,7 +41,7 @@
redisCommand.setAssignCommand(assignCommand);//鍛戒护
//浠诲姟鏁版嵁淇濆瓨鍒皉edis
if (redisUtil.set(DeviceRedisConstant.LIFT_WORK_FLAG + assignCommand.getTaskNo(), JSON.toJSONString(redisCommand))) {
- liftProtocol.setTaskNo(assignCommand.getTaskNo());
+ liftThread.setSyncTaskNo(assignCommand.getTaskNo());
return true;
}
return false;
@@ -68,11 +68,8 @@
return false;
}
- //鎻愬崌鏈哄浜庤嚜鍔ㄣ�佸氨缁�佺┖闂�
- if (!(liftProtocol.getModel()
- && liftProtocol.getReady()
- && !liftProtocol.getRun())
- ) {
+ //鍒ゆ柇鎻愬崌鏈烘槸鍚︾┖闂�
+ if (!liftThread.isIdle()) {
return false;
}
--
Gitblit v1.9.1