From d4acff72f3584fea27a9a3d8bd151187393fe9c0 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 27 十一月 2025 11:38:45 +0800
Subject: [PATCH] #
---
src/main/webapp/views/watch/console.html | 6 ++++++
src/main/java/com/zy/core/plugin/NormalProcess.java | 26 +++++++++++++++-----------
src/main/java/com/zy/asrs/controller/ConsoleController.java | 1 +
src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java | 3 +++
src/main/webapp/static/css/watch/console_vue.css | 2 +-
5 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index bb4e35c..5953427 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -151,6 +151,7 @@
// 浣跨敤瀹為檯鍒楀�间綔涓哄亸绉诲弬鑰冿紝閬垮厤闅忔満鍧愭爣瀵艰嚧鐣岄潰婕傜Щ
vo.setOffset(Double.valueOf(crnProtocol.getBay()));
vo.setBay(crnProtocol.getBay()); // 褰撳墠鍒�
+ vo.setTaskNo(crnProtocol.getTaskNo());
/**
* 鍫嗗灈鏈虹姸鎬佸垽鏂�
*/
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java
index fa1c45f..589c7e8 100644
--- a/src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java
@@ -13,6 +13,9 @@
// 鍫嗗灈鏈虹紪鍙�
private Integer crnId;
+ //宸ヤ綔鍙�
+ private Integer taskNo;
+
// 鍋忕Щ閲�
private Double offset;
diff --git a/src/main/java/com/zy/core/plugin/NormalProcess.java b/src/main/java/com/zy/core/plugin/NormalProcess.java
index 28979e7..724af19 100644
--- a/src/main/java/com/zy/core/plugin/NormalProcess.java
+++ b/src/main/java/com/zy/core/plugin/NormalProcess.java
@@ -1,28 +1,32 @@
package com.zy.core.plugin;
-import com.alibaba.fastjson.JSON;
-import com.zy.asrs.service.BasMapService;
+import com.zy.core.utils.CrnOperateProcessUtils;
+import com.zy.core.utils.StationOperateProcessUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
-import java.util.List;
@Slf4j
@Component
public class NormalProcess implements MainProcessPluginApi{
@Autowired
- private BasMapService basMapService;
+ private CrnOperateProcessUtils crnOperateUtils;
+ @Autowired
+ private StationOperateProcessUtils stationOperateProcessUtils;
@Override
public void run() {
- getLevList();
- }
-
- private void getLevList() {
- List<Integer> list = basMapService.getLevList();
- System.out.println(JSON.toJSONString(list));
+ //鎵ц鍫嗗灈鏈轰换鍔�
+ crnOperateUtils.crnIoExecute();
+ //鍫嗗灈鏈轰换鍔℃墽琛屽畬鎴�-鍏峰浠跨湡鑳藉姏
+ crnOperateUtils.crnIoExecuteFinish();
+ //鎵ц杈撻�佺珯鐐瑰叆搴撲换鍔�
+ stationOperateProcessUtils.stationInExecute();
+ //鎵ц杈撻�佺珯鐐瑰嚭搴撲换鍔�
+ stationOperateProcessUtils.stationOutExecute();
+ //妫�娴嬭緭閫佺珯鐐瑰嚭搴撲换鍔℃墽琛屽畬鎴�
+ stationOperateProcessUtils.stationOutExecuteFinish();
}
}
diff --git a/src/main/webapp/static/css/watch/console_vue.css b/src/main/webapp/static/css/watch/console_vue.css
index 8e6fd32..5349f63 100644
--- a/src/main/webapp/static/css/watch/console_vue.css
+++ b/src/main/webapp/static/css/watch/console_vue.css
@@ -110,7 +110,7 @@
/* 鍏ュ簱 */
.machine-pakin {
- background-color: rgb(163, 214, 242);
+ background-color: rgb(48, 191, 252);
}
/* 鍑哄簱 */
diff --git a/src/main/webapp/views/watch/console.html b/src/main/webapp/views/watch/console.html
index 976ded0..8f678de 100644
--- a/src/main/webapp/views/watch/console.html
+++ b/src/main/webapp/views/watch/console.html
@@ -228,6 +228,12 @@
var crnEl = $("#crn-" + crns[i].crnId);
crnEl.attr("class", "crn-item " + crns[i].crnStatus);
+ if (crns[i].taskNo != null && crns[i].taskNo > 0) {
+ crnEl.html(crns[i].crnId + "[" + crns[i].taskNo + "]");
+ } else {
+ crnEl.html(crns[i].crnId);
+ }
+
let bay = parseInt(crns[i].bay, 10);
if (isNaN(bay) || bay < 1 || bay === -2) {
bay = 1;
--
Gitblit v1.9.1