From 87b052cbd5bb44bf90ac4e9c4aeaf1cdcf5acf63 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期日, 22 六月 2025 15:30:44 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/core/enums/RgvStatusType.java | 4 ++--
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 25 +++++++++++++++++++++----
2 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index bf37cde..ac4aa17 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -80,8 +80,8 @@
private boolean reportSwitchAuto;
/*
- * 楠岃瘉璁稿彲璇佹槸鍚︽湁鏁�
- * */
+ * 楠岃瘉璁稿彲璇佹槸鍚︽湁鏁�
+ * */
public synchronized boolean licenseVerify() {
try{
// if (true) {
@@ -516,7 +516,7 @@
log.error("{}鍙稲GV灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�", rgvSlave.getId());
continue;
}
- if (rgvProtocol.getStatusType() == RgvStatusType.WAITING) {
+ if (rgvProtocol.getStatusType() == RgvStatusType.WAITING || rgvProtocol.getStatusType() == RgvStatusType.WAITING101) {
log.info("{}鍙峰皬杞︾瓑寰厀cs纭锛岀姸鎬亄}锛屽弬鏁皗}", rgvProtocol.getRgvNo(), rgvProtocol.getStatusType(), rgvProtocol);
}
// 鍙湁褰揜GV绛夊緟WCS纭銆佽嚜鍔�
@@ -577,6 +577,15 @@
}
} catch (Exception e){}
wrkMastService.updateById(wrkMast);
+ } else if (rgvProtocol.getStatusType() == RgvStatusType.WAITING101
+ && rgvProtocol.getModeType() == RgvModeType.AUTO
+ && rgvProtocol.getTaskNo1() != 0
+ ){
+ boolean rgvComplete = rgvComplete(rgvProtocol.getRgvNo());
+ if (!rgvComplete) {
+ log.error("灏忚溅澶嶄綅澶辫触锛屽皬杞﹀彿{}锛�", rgvProtocol.getRgvNo());
+ break;
+ }
}
} catch (Exception e) {
log.error("灏忚溅澶嶄綅绾跨▼鎶ラ敊锛�" + e);
@@ -601,7 +610,15 @@
) {
RgvCommand rgvCommand = new RgvCommand();
- if (!MessageQueue.offer(SlaveType.Rgv, rgvProtocol.getRgvNo(), new Task(6, rgvCommand))) {
+ rgvCommand.setRgvNo(rgvProtocol.getRgvNo());
+ rgvCommand.setAckFinish1((short) 0); // 宸ヤ綅1浠诲姟瀹屾垚纭浣�
+ rgvCommand.setTaskNo1(rgvProtocol.getTaskNo1());
+ rgvCommand.setTaskMode1(RgvTaskModeType.CANCEL); // 宸ヤ綅1浠诲姟妯″紡: 鍙栨秷
+ rgvCommand.setSourceStaNo1((short)-1); //宸ヤ綅1璧风偣
+ rgvCommand.setDestinationStaNo1((short)-1); //宸ヤ綅1鐩爣绔欑偣
+ rgvCommand.setCommand((short) 1); //宸ヤ綅1浠诲姟纭
+ rgvCommand.setRgvSome((short) 1);
+ if (!MessageQueue.offer(SlaveType.Rgv, rgvProtocol.getRgvNo(), new Task(4, rgvCommand))) {
//
log.error("RGV鍙栨秷鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvProtocol.getRgvNo(), JSON.toJSON(rgvCommand));
continue;
diff --git a/src/main/java/com/zy/core/enums/RgvStatusType.java b/src/main/java/com/zy/core/enums/RgvStatusType.java
index 1e306f5..a2413db 100644
--- a/src/main/java/com/zy/core/enums/RgvStatusType.java
+++ b/src/main/java/com/zy/core/enums/RgvStatusType.java
@@ -13,10 +13,10 @@
Outbound_operation_in_progress(7, "鍑虹珯杩愯涓�","#21618C"),
Outbound_completed(8, "鍑虹珯瀹屾垚","#85C1E9"),
ROAM(11, "婕父","#95A5A6"),
- CANCEL(101, "绛夊緟鍙栨秷","#95A5A6"),
+ CANCEL(12, "绛夊緟鍙栨秷","#95A5A6"),
WALK(20, "璧拌","#F1C40F"),
WAITING(100, "浠诲姟鎵ц瀹屾垚绛夊緟纭","#AED6F1"),
-// WAITING101(101, "浠诲姟鎵ц瀹屾垚绛夊緟纭","#AED6F1"),
+ WAITING101(101, "浠诲姟鎵ц瀹屾垚绛夊緟纭","#AED6F1"),
SOS110(110, "鎶ヨ","#E74C3C"),
SOS(999, "鏈煡","#FF0000")
;
--
Gitblit v1.9.1