From b40ae90237b1ce741dae89aed09047d0dfbffcf1 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 06 六月 2025 16:05:21 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/domain/param/RgvCircularShuttleParam.java | 2 ++
src/main/java/com/zy/asrs/controller/RgvController.java | 3 +++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 7 ++++++-
src/main/webapp/views/index.html | 4 ++++
4 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index 2bc391d..0e45ca0 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -468,6 +468,9 @@
if (rgvCircularShuttleParam.getStatus()==0){
rgvCircularShuttleParam.setStatus$(rgvProtocol.statusType.desc);
}
+ if (rgvCircularShuttleParam.getError()==0){
+ rgvCircularShuttleParam.setError$(rgvProtocol.getAlarm$());
+ }
}
}
}
diff --git a/src/main/java/com/zy/asrs/domain/param/RgvCircularShuttleParam.java b/src/main/java/com/zy/asrs/domain/param/RgvCircularShuttleParam.java
index f5e29d4..01043c5 100644
--- a/src/main/java/com/zy/asrs/domain/param/RgvCircularShuttleParam.java
+++ b/src/main/java/com/zy/asrs/domain/param/RgvCircularShuttleParam.java
@@ -25,7 +25,9 @@
* 0:姝ｅ父锛�1锛氱鐢�
*/
private Integer status;
+ private Integer error;
private String status$ = "鏈煡";
+ private String error$ = "-";
private Long position = 0L;
public RgvCircularShuttleParam(){};
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 9841de2..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));
@@ -617,8 +620,10 @@
&& rgvProtocol.getTaskNo1() == 0
&& rgvProtocol.getAlarm() == 0) {
if (!MessageQueue.offer(SlaveType.Rgv, rgvProtocol.getRgvNo(), new Task(5,devperimeter))) {
- log.error("RGV婕父鍚姩鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvNo, "婕父鎸囦护");
+ log.error("RGV婕父鍚姩鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvNo, "婕父鎸囦护锛岀洰鐨勫湴锛�"+devperimeter);
break;
+ } else {
+ log.info("RGV婕父鍚姩鍛戒护涓嬪彂鎴愬姛锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvNo, "婕父鎸囦护锛岀洰鐨勫湴锛�"+devperimeter);
}
}
}
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 78cec1e..0c65f15 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -354,6 +354,10 @@
label="鐘舵��">
</el-table-column>
<el-table-column
+ prop="error$"
+ label="寮傚父">
+ </el-table-column>
+ <el-table-column
label="鎿嶄綔"
type="template">
<template slot-scope="scope">
--
Gitblit v1.9.1