From 0836f55508cc79dfa3554a67058955ebf4830f62 Mon Sep 17 00:00:00 2001
From: DELL <DELL@qq.com>
Date: 星期四, 27 十一月 2025 15:11:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 5953427..3707d60 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -1,7 +1,5 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
@@ -15,17 +13,14 @@
import com.zy.asrs.domain.vo.RgvLatestDataVo;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
-import com.zy.asrs.utils.Utils;
import com.zy.common.CodeRes;
-import com.zy.common.model.MapNode;
import com.zy.common.utils.RedisUtil;
-import com.zy.core.News;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.CrnModeType;
-import com.zy.core.enums.MapNodeType;
import com.zy.core.enums.RedisKeyType;
import com.zy.core.enums.RgvStatusType;
import com.zy.core.enums.SlaveType;
+import com.zy.core.enums.WrkIoType;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.model.protocol.StationProtocol;
import com.zy.core.properties.SystemProperties;
@@ -55,7 +50,7 @@
@Autowired
private BasCrnpErrService basCrnpErrService;
@Autowired
- private BasMapService basMapService;
+ private WrkLastnoService wrkLastnoService;
@Autowired
private RedisUtil redisUtil;
@Autowired
@@ -91,6 +86,9 @@
public R stationLatestData() {
List<StationLatestDataVo> vos = new ArrayList<>();
+ WrkLastno inTaskRange = wrkLastnoService.selectById(WrkIoType.IN.id);
+ WrkLastno outTaskRange = wrkLastnoService.selectById(WrkIoType.OUT.id);
+
List<DeviceConfig> devpList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Devp)));
for (DeviceConfig deviceConfig : devpList) {
@@ -119,6 +117,12 @@
vo.setError(stationProtocol.getError()); // 閿欒鐮�
vo.setBarcode(stationProtocol.getBarcode()); // 鏉＄爜
String stationStatus = StationStatusType.process(stationProtocol).toString().toLowerCase().replaceAll("_", "-");
+ if (stationProtocol.isAutoing() && stationProtocol.isLoading() && stationProtocol.getTaskNo() > 0) {
+ String taskClass = getStationTaskClass(stationProtocol.getTaskNo(), inTaskRange, outTaskRange);
+ if (taskClass != null) {
+ stationStatus = taskClass;
+ }
+ }
vo.setStationStatus(stationStatus);
vos.add(vo);
}
@@ -127,6 +131,26 @@
return R.ok().add(vos);
}
+ private String getStationTaskClass(Integer taskNo, WrkLastno inTaskRange, WrkLastno outTaskRange) {
+ if (taskNo == null || taskNo <= 0) {
+ return null;
+ }
+ if (isInRange(taskNo, inTaskRange)) {
+ return "machine-pakin";
+ }
+ if (isInRange(taskNo, outTaskRange)) {
+ return "machine-pakout";
+ }
+ return null;
+ }
+
+ private boolean isInRange(Integer taskNo, WrkLastno taskRange) {
+ if (taskRange == null || taskRange.getSNo() == null || taskRange.getENo() == null) {
+ return false;
+ }
+ return taskNo >= taskRange.getSNo() && taskNo <= taskRange.getENo();
+ }
+
@PostMapping("/latest/data/crn")
@ManagerAuth(memo = "鍫嗗灈鏈哄疄鏃舵暟鎹�")
public R crnLatestData() {
--
Gitblit v1.9.1