From e0cee09916a315d6012b8d44b4c493c4f3adc5d1 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 31 三月 2026 17:05:49 +0800
Subject: [PATCH] #出入库模式
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 1 +
src/main/java/com/zy/asrs/domain/vo/StationLatestDataVo.java | 3 +++
src/main/java/com/zy/core/model/protocol/StationProtocol.java | 3 +++
src/main/java/com/zy/core/network/entity/ZyStationStatusEntity.java | 3 +++
src/main/java/com/zy/core/thread/impl/ZyStationThread.java | 1 +
src/main/webapp/components/DevpCard.js | 10 ++++++++++
6 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 5a5f0c4..00bfc2f 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -135,6 +135,7 @@
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("_", "-");
diff --git a/src/main/java/com/zy/asrs/domain/vo/StationLatestDataVo.java b/src/main/java/com/zy/asrs/domain/vo/StationLatestDataVo.java
index b3ec94c..dc96049 100644
--- a/src/main/java/com/zy/asrs/domain/vo/StationLatestDataVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/StationLatestDataVo.java
@@ -61,6 +61,9 @@
//閲嶉噺
private Double weight;
+ //鍑哄叆搴撴ā寮� 1:鍏ュ簱 2:鍑哄簱
+ private Integer ioMode;
+
//浠诲姟鍙啓鍖�
private Integer taskWriteIdx;
diff --git a/src/main/java/com/zy/core/model/protocol/StationProtocol.java b/src/main/java/com/zy/core/model/protocol/StationProtocol.java
index 7d4838b..a8783ca 100644
--- a/src/main/java/com/zy/core/model/protocol/StationProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StationProtocol.java
@@ -62,6 +62,9 @@
//閲嶉噺
private Double weight;
+ //鍑哄叆搴撴ā寮� 1:鍏ュ簱 2:鍑哄簱
+ private Integer ioMode;
+
//WCS绯荤粺鎶ヨ
private String systemWarning;
diff --git a/src/main/java/com/zy/core/network/entity/ZyStationStatusEntity.java b/src/main/java/com/zy/core/network/entity/ZyStationStatusEntity.java
index fed4b4f..c9c9568 100644
--- a/src/main/java/com/zy/core/network/entity/ZyStationStatusEntity.java
+++ b/src/main/java/com/zy/core/network/entity/ZyStationStatusEntity.java
@@ -53,6 +53,9 @@
//閲嶉噺
private Double weight;
+ //鍑哄叆搴撴ā寮� 1:鍏ュ簱 2:鍑哄簱
+ private Integer ioMode;
+
//浠诲姟鍙啓鍖�
private Integer taskWriteIdx;
diff --git a/src/main/java/com/zy/core/thread/impl/ZyStationThread.java b/src/main/java/com/zy/core/thread/impl/ZyStationThread.java
index 8b42cdd..a4a1e98 100644
--- a/src/main/java/com/zy/core/thread/impl/ZyStationThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZyStationThread.java
@@ -145,6 +145,7 @@
stationProtocol.setRunBlock(statusEntity.isRunBlock());
stationProtocol.setEnableIn(statusEntity.isEnableIn());
stationProtocol.setWeight(statusEntity.getWeight());
+ stationProtocol.setIoMode(statusEntity.getIoMode());
recentArrivalTracker.observe(statusEntity.getStationId(), statusEntity.getTaskNo(), statusEntity.isLoading());
}
diff --git a/src/main/webapp/components/DevpCard.js b/src/main/webapp/components/DevpCard.js
index 77ddc73..d9eb322 100644
--- a/src/main/webapp/components/DevpCard.js
+++ b/src/main/webapp/components/DevpCard.js
@@ -176,6 +176,15 @@
orDash: function (value) {
return MonitorCardKit.orDash(value);
},
+ formatIoMode: function (value) {
+ if (value === 1 || value === "1") {
+ return "鍏ュ簱";
+ }
+ if (value === 2 || value === "2") {
+ return "鍑哄簱";
+ }
+ return "--";
+ },
getStatusLabel: function (item) {
return item && item.autoing ? "鑷姩" : "鎵嬪姩";
},
@@ -265,6 +274,7 @@
{ label: "宸ヤ綔鍙�", value: this.orDash(item.taskNo) },
{ label: "鐩爣绔�", value: this.orDash(item.targetStaNo) },
{ label: "妯″紡", value: item.autoing ? "鑷姩" : "鎵嬪姩" },
+ { label: "鍑哄叆搴撴ā寮�", value: this.formatIoMode(item.ioMode) },
{ label: "鏈夌墿", value: MonitorCardKit.yesNo(item.loading) },
{ label: "鍙叆", value: MonitorCardKit.yesNo(item.inEnable) },
{ label: "鍙嚭", value: MonitorCardKit.yesNo(item.outEnable) },
--
Gitblit v1.9.1