From 3951add7a40f76bb403ead8c0acffb970d1bfa5c Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 06 六月 2025 17:24:53 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 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 03c9dbe..6769ec8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -576,6 +576,9 @@
                             if (!MessageQueue.offer(SlaveType.Rgv, rgvProtocol.getRgvNo(), new Task(2, rgvCommand))) {
                                 //
                                 log.error("RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvId, JSON.toJSON(rgvCommand));
+                                wrkMast.setLogErrTime(new Date());
+                                wrkMast.setLogErrMemo("RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={"+rgvId+"}===>璺宠繃");
+                                wrkMastService.updateById(wrkMast);
                                 break runRgv;
                             }
                             log.info("RGV鍛戒护涓嬪彂鎴愬姛锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvId, JSON.toJSON(rgvCommand));
@@ -616,9 +619,11 @@
                         && rgvProtocol.getStatusType() == RgvStatusType.IDLE
                         && rgvProtocol.getTaskNo1() == 0
                         && rgvProtocol.getAlarm() == 0) {
-                    if (!MessageQueue.offer(SlaveType.Rgv, rgvProtocol.getRgvNo(), new Task(4,devperimeter))) {
-                        log.error("RGV婕父鍚姩鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvNo, "婕父鎸囦护");
+                    if (!MessageQueue.offer(SlaveType.Rgv, rgvProtocol.getRgvNo(), new Task(5,devperimeter))) {
+                        log.error("RGV婕父鍚姩鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvNo, "婕父鎸囦护锛岀洰鐨勫湴锛�"+devperimeter);
                         break;
+                    } else {
+                        log.info("RGV婕父鍚姩鍛戒护涓嬪彂鎴愬姛锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvNo, "婕父鎸囦护锛岀洰鐨勫湴锛�"+devperimeter);
                     }
                 }
             }
@@ -675,7 +680,7 @@
                                     wrkMastService.updateById(wrkMast);
                                     continue;
                                 }else {
-                                    log.error("宸ヤ綔鍙�"+wrkMast.getWrkNo()+"浠诲姟瀹屾垚淇℃伅涓婁紶澶勭悊澶辫触");
+                                    log.error("宸ヤ綔鍙�"+wrkMast.getWrkNo()+"浠诲姟瀹屾垚淇℃伅涓婁紶澶勭悊澶辫触1");
                                 }
                             } else {
                                 //娴嬭瘯鐢�

--
Gitblit v1.9.1