From 98d120bd0633e4e0717d584cae5514132a18516b Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 18 十二月 2025 13:36:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 22 +++++++++++++++++++++-
1 files changed, 21 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 3707d60..6278bcb 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -1,6 +1,10 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
@@ -113,11 +117,12 @@
vo.setOutEnable(stationProtocol.isOutEnable()); // 鏄惁鍙嚭
vo.setEmptyMk(stationProtocol.isEmptyMk()); // 鏄惁绌烘澘
vo.setFullPlt(stationProtocol.isFullPlt()); // 鏄惁婊℃澘
+ vo.setRunBlock(stationProtocol.isRunBlock());// 杩愯鍫靛
vo.setPalletHeight(stationProtocol.getPalletHeight()); // 鎵樼洏楂樺害
vo.setError(stationProtocol.getError()); // 閿欒鐮�
vo.setBarcode(stationProtocol.getBarcode()); // 鏉＄爜
String stationStatus = StationStatusType.process(stationProtocol).toString().toLowerCase().replaceAll("_", "-");
- if (stationProtocol.isAutoing() && stationProtocol.isLoading() && stationProtocol.getTaskNo() > 0) {
+ if (stationProtocol.isAutoing() && stationProtocol.isLoading() && stationProtocol.getTaskNo() > 0 && !stationProtocol.isRunBlock()) {
String taskClass = getStationTaskClass(stationProtocol.getTaskNo(), inTaskRange, outTaskRange);
if (taskClass != null) {
stationStatus = taskClass;
@@ -217,6 +222,7 @@
}
RgvLatestDataVo vo = new RgvLatestDataVo();
vo.setRgvNo(rgvProtocol.getRgvNo());
+ vo.setTaskNo(rgvProtocol.getTaskNo());
vo.setTrackSiteNo(String.valueOf(rgvProtocol.getRgvPos()));
vo.setRgvStatus(RgvStatusType.get(rgvProtocol.getStatus()));
vos.add(vo);
@@ -315,4 +321,18 @@
return R.ok().add(mapNodeList);
}
+ @RequestMapping(value = "/map/locList")
+ public R mapLocList() {
+ Object object = redisUtil.get(RedisKeyType.LOC_MAST_MAP_LIST.key);
+ if (object != null) {
+ JSONArray data = JSON.parseArray(object.toString());
+ return R.ok().add(data);
+ }
+ EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
+ wrapper.eq("lev1", 1);
+ List<LocMast> locMasts = locMastService.selectList(wrapper);
+ redisUtil.set(RedisKeyType.LOC_MAST_MAP_LIST.key, JSON.toJSONString(locMasts), 60 * 60 * 24);
+ return R.ok().add(locMasts);
+ }
+
}
--
Gitblit v1.9.1