From 16171041fc0e2e86a5e56504e00a3d4742ad60a9 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 19 六月 2024 15:53:43 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java
index 69172ff..3ca11e8 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java
@@ -34,7 +34,7 @@
@SuppressWarnings("all")
public class SurayLiftThread implements LiftThread {
- private static final String API_URL = "http://127.0.0.1:8082";
+ private static String API_URL = "http://127.0.0.1:8082";
private Device device;
private RedisUtil redisUtil;
@@ -43,6 +43,7 @@
public SurayLiftThread(Device device,RedisUtil redisUtil) {
this.device = device;
this.redisUtil = redisUtil;
+ API_URL = "http://" + device.getIp() + ":" + device.getPort();
}
@Override
@@ -63,9 +64,9 @@
try {
readStatus();
- //鎻愬崌鏈哄浜庤繍琛岀姸鎬侊紝灏嗘爣璁扮疆涓篺alse
+ //鎻愬崌鏈哄浜庤繍琛岀姸鎬侊紝灏嗘爣璁扮疆涓簍rue
if (liftProtocol.getRun()) {
- liftProtocol.setPakMk(false);
+ liftProtocol.setPakMk(true);
}
} catch (Exception e) {
OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆戣鍙栨彁鍗囨満鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), device.getId(), device.getIp(), device.getPort()));
@@ -345,10 +346,11 @@
// 鍒ゆ柇鎻愬崌鏈烘槸鍚﹁嚜鍔ㄣ�佸氨缁�佺┖闂层�佹湭閿佸畾
if (this.liftProtocol.getModel()
&& !this.liftProtocol.getRun()
+ && this.liftProtocol.getPakMk()
&& this.liftProtocol.getReady()
-// && this.liftProtocol.getPakMk()
&& this.liftProtocol.getErrorCode().equals("0")
- && this.liftProtocol.getProtocolStatusType().equals(LiftProtocolStatusType.IDLE)
+ && (this.liftProtocol.getProtocolStatusType().equals(LiftProtocolStatusType.IDLE)
+ || this.liftProtocol.getProtocolStatusType().equals(LiftProtocolStatusType.WAITING))
&& !extend.getLock()
) {
return true;
@@ -357,6 +359,36 @@
}
@Override
+ public boolean isDeviceIdle() {
+ return isDeviceIdle(null);
+ }
+
+ @Override
+ public boolean isDeviceIdle(ExecuteSupport support) {
+ if (null != support) {
+ Boolean judgement = support.judgement();
+ if (judgement != null && !judgement) {
+ return true;
+ }
+ }
+
+ // 鍒ゆ柇鎻愬崌鏈烘槸鍚﹁嚜鍔ㄣ�佸氨缁�佺┖闂�
+ if (this.liftProtocol.getModel()
+ && !this.liftProtocol.getRun()
+ && this.liftProtocol.getErrorCode().equals("0")
+ ) {
+ if (this.liftProtocol.getTaskNo() == 0) {
+ //鏃犱换鍔℃儏鍐典笅妫�娴嬫槸鍚﹀氨缁�
+ if (!this.liftProtocol.getReady()) {
+ return false;
+ }
+ }
+ return true;
+ }
+ return false;
+ }
+
+ @Override
public boolean setProtocolStatus(LiftProtocolStatusType status) {
this.liftProtocol.setProtocolStatus(status);
return true;
--
Gitblit v1.9.1