From 41ace7c0738ba39750b2809d5077dd0d7640ced8 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 07 四月 2026 10:03:34 +0800
Subject: [PATCH] #入库条码站异常信号点
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 7cc8cee..38fd630 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -16,6 +16,7 @@
import com.zy.asrs.domain.vo.FakeTaskTraceVo;
import com.zy.asrs.domain.vo.StationLatestDataVo;
import com.zy.asrs.domain.vo.RgvLatestDataVo;
+import com.zy.asrs.domain.vo.StationTaskTraceVo;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
@@ -32,6 +33,7 @@
import com.zy.core.thread.RgvThread;
import com.zy.core.model.protocol.RgvProtocol;
import com.zy.core.network.fake.FakeTaskTraceRegistry;
+import com.zy.core.trace.StationTaskTraceRegistry;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -65,6 +67,8 @@
private StationCycleCapacityService stationCycleCapacityService;
@Autowired
private FakeTaskTraceRegistry fakeTaskTraceRegistry;
+ @Autowired
+ private StationTaskTraceRegistry stationTaskTraceRegistry;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -125,12 +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);
@@ -160,10 +168,10 @@
}
private boolean isInRange(Integer taskNo, WrkLastno taskRange) {
- if (taskRange == null || taskRange.getSNo() == null || taskRange.getENo() == null) {
+ if (taskRange == null || taskRange.getsNo() == null || taskRange.geteNo() == null) {
return false;
}
- return taskNo >= taskRange.getSNo() && taskNo <= taskRange.getENo();
+ return taskNo >= taskRange.getsNo() && taskNo <= taskRange.geteNo();
}
@PostMapping("/latest/data/crn")
@@ -285,6 +293,13 @@
return R.ok().add(traceList);
}
+ @PostMapping("/latest/data/station/trace")
+ @ManagerAuth(memo = "杈撻�佷换鍔¤建杩瑰疄鏃舵暟鎹�")
+ public R stationTaskTraceLatestData() {
+ List<StationTaskTraceVo> traceList = stationTaskTraceRegistry.listLatestTraces();
+ return R.ok().add(traceList);
+ }
+
// @PostMapping("/latest/data/barcode")
// @ManagerAuth(memo = "鏉＄爜鎵弿浠疄鏃舵暟鎹�")
// public R barcodeLatestData(){
--
Gitblit v1.9.1