From e9a4418c14ef68fb454300b092c413e8df259ec2 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 13 四月 2024 11:50:56 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java
index 44aad5b..791709f 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java
@@ -78,7 +78,7 @@
return false;
}
}
- shuttleProtocol.setTaskNo(assignCommand.getTaskNo());
+ shuttleProtocol.setSyncTaskNo(assignCommand.getTaskNo());
return true;
}
return false;
@@ -112,9 +112,17 @@
}
//鍒ゆ柇璁惧鏄惁绌洪棽
- if (!shuttleThread.isIdle(() -> {
- return shuttleProtocol.getTaskNo().equals(taskNo);
- })) {
+ if (!shuttleThread.isDeviceIdle()) {
+ return false;
+ }
+// if (!shuttleThread.isIdle(() -> {
+// return shuttleProtocol.getTaskNo().equals(taskNo);
+// })) {
+// return false;
+// }
+
+ //鍒ゆ柇宸ヤ綔鍙锋槸鍚︾浉鍚�
+ if (!shuttleProtocol.getTaskNo().equals(taskNo)) {
return false;
}
@@ -151,10 +159,11 @@
// 鎵樼洏椤跺崌
//鍒ゆ柇鏄惁椤跺崌鍒颁綅
if (shuttleProtocol.getHasLift()) {
- //鍒ゆ柇鏄惁鏈夌墿
- if (shuttleProtocol.getHasPallet()) {
- command.setComplete(true);
- }
+ command.setComplete(true);
+// //鍒ゆ柇鏄惁鏈夌墿
+// if (shuttleProtocol.getHasPallet()) {
+// command.setComplete(true);
+// }
}
} else if (command.getMode() == ShuttleCommandModeType.PALLET_DOWN.id) {
// 鎵樼洏涓嬮檷鍛戒护
@@ -186,22 +195,22 @@
// 绯荤粺浠诲姟
if (assignCommand.getAuto()) {
-// if (!assignCommand.getCharge()) {
-// //瀵逛富绾跨▼鎶涘嚭绛夊緟纭鐘舵�亀aiting
-// shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.WAITING);
-// }else {
-// shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.CHARGING_WAITING);
-// }
+ if (!assignCommand.getCharge()) {
+ //瀵逛富绾跨▼鎶涘嚭绛夊緟纭鐘舵�亀aiting
+ shuttleThread.setProtocolStatus(ShuttleProtocolStatusType.WAITING);
+ }else {
+ shuttleThread.setProtocolStatus(ShuttleProtocolStatusType.CHARGING_WAITING);
+ }
News.info("鍥涘悜绌挎杞︿换鍔℃墽琛屼笅鍙戝畬鎴愮瓑寰呮墽琛岀粨鏉燂紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", shuttleProtocol.getShuttleNo(), JSON.toJSON(command));
// 鎵嬪姩浠诲姟
} else {
//鎵嬪姩妯″紡涓嶆姏鍑虹瓑寰呯姸鎬侊紝鐩存帴澶嶄綅绌洪棽鐘舵��
- shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);
+ shuttleThread.setProtocolStatus(ShuttleProtocolStatusType.IDLE);
//浠诲姟鍙锋竻闆�
- shuttleProtocol.setTaskNo(0);
+ shuttleThread.setSyncTaskNo(0);
//鏍囪澶嶄綅
- shuttleProtocol.setPakMk(true);
+ shuttleThread.setPakMk(true);
News.info("鍥涘悜绌挎杞︽墜鍔ㄤ换鍔℃墽琛屽畬鎴愶紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", shuttleProtocol.getShuttleNo(), JSON.toJSON(command));
}
@@ -220,6 +229,7 @@
return false;
}
+ shuttleThread.setProtocolStatus(ShuttleProtocolStatusType.WORKING);
commandStep++;
//鏇存柊redis鏁版嵁
redisCommand.setCommandStep(commandStep);
--
Gitblit v1.9.1