From 63b01db83d9aad8a15276b4236a9a22e4aeef065 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 05 五月 2026 12:30:59 +0800
Subject: [PATCH] # Agent数据分析V3.0.1.7
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 943f9fa..59774ca 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -129,13 +129,16 @@
vo.setFullPlt(stationProtocol.isFullPlt()); // 鏄惁婊℃澘
vo.setRunBlock(stationProtocol.isRunBlock());// 杩愯鍫靛
vo.setEnableIn(stationProtocol.isEnableIn());// 鍚姩鍏ュ簱
+ vo.setInBarcodeError(stationProtocol.isInBarcodeError());// 鍏ュ簱鏉＄爜绔欏紓甯�
vo.setPalletHeight(stationProtocol.getPalletHeight()); // 鎵樼洏楂樺害
vo.setError(stationProtocol.getError()); // 閿欒鐮�
vo.setErrorMsg(stationProtocol.getErrorMsg()); // 鎶ヨ淇℃伅
vo.setBarcode(stationProtocol.getBarcode()); // 鏉＄爜
vo.setSystemWarning(stationProtocol.getSystemWarning()); // 绯荤粺鍛婅/涓氬姟鎻愮ず
vo.setWeight(stationProtocol.getWeight());//閲嶉噺
+ vo.setIoMode(stationProtocol.getIoMode());//鍑哄叆搴撴ā寮�
vo.setTaskWriteIdx(stationProtocol.getTaskWriteIdx());//浠诲姟鍙啓鍖�
+ vo.setTaskBufferItems(stationProtocol.getTaskBufferItems());//浠诲姟缂撳瓨鍖烘暟鎹�
String stationStatus = StationStatusType.process(stationProtocol).toString().toLowerCase().replaceAll("_", "-");
if (stationProtocol.isAutoing() && stationProtocol.isLoading() && stationProtocol.getTaskNo() > 0 && !stationProtocol.isRunBlock()) {
String taskClass = getStationTaskClass(stationProtocol.getTaskNo(), inTaskRange, outTaskRange);
@@ -196,6 +199,7 @@
vo.setOffset(Double.valueOf(crnProtocol.getBay()));
vo.setBay(crnProtocol.getBay()); // 褰撳墠鍒�
vo.setTaskNo(crnProtocol.getTaskNo());
+ vo.setLaserValue(crnProtocol.getLaserValue());
/**
* 鍫嗗灈鏈虹姸鎬佸垽鏂�
*/
@@ -293,7 +297,7 @@
@PostMapping("/latest/data/station/trace")
@ManagerAuth(memo = "杈撻�佷换鍔¤建杩瑰疄鏃舵暟鎹�")
public R stationTaskTraceLatestData() {
- List<StationTaskTraceVo> traceList = stationTaskTraceRegistry.listActiveTraces();
+ List<StationTaskTraceVo> traceList = stationTaskTraceRegistry.listLatestTraces();
return R.ok().add(traceList);
}
--
Gitblit v1.9.1