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 | 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/ZyStationV4Thread.java | 1 +
src/main/webapp/components/DevpCard.js | 1 +
src/main/java/com/zy/core/thread/impl/v5/StationV5StatusReader.java | 1 +
src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java | 1 +
src/main/java/com/zy/core/plugin/GslProcess.java | 6 +++++-
9 files changed, 19 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 00bfc2f..38fd630 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -129,6 +129,7 @@
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()); // 鎶ヨ淇℃伅
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 dc96049..ce3e093 100644
--- a/src/main/java/com/zy/asrs/domain/vo/StationLatestDataVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/StationLatestDataVo.java
@@ -41,6 +41,9 @@
// 鍚姩鍏ュ簱
private boolean enableIn;
+ // 鍏ュ簱鏉＄爜绔欏紓甯�
+ private boolean inBarcodeError;
+
// 鎵樼洏楂樺害
private Integer palletHeight;
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 a8783ca..2075962 100644
--- a/src/main/java/com/zy/core/model/protocol/StationProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StationProtocol.java
@@ -47,6 +47,9 @@
// 鍚姩鍏ュ簱
private boolean enableIn;
+ //鍏ュ簱鏉＄爜绔欏紓甯�
+ private boolean inBarcodeError;
+
// 鎵樼洏楂樺害
private Integer palletHeight;
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 c9c9568..0dac68e 100644
--- a/src/main/java/com/zy/core/network/entity/ZyStationStatusEntity.java
+++ b/src/main/java/com/zy/core/network/entity/ZyStationStatusEntity.java
@@ -68,6 +68,9 @@
//鍚姩鍏ュ簱
private boolean enableIn = false;
+ //鍏ュ簱鏉＄爜绔欏紓甯�
+ private boolean inBarcodeError = false;
+
@Override
public ZyStationStatusEntity clone() {
try {
diff --git a/src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java b/src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java
index 482eea7..a549e35 100644
--- a/src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java
@@ -153,6 +153,7 @@
boolean[] status2 = siemensNet.getByteTransform().TransBool(result.Content, i * 10 + 7, 1);
statusEntity.setEnableIn(status2[1]);//鍚姩鍏ュ簱
statusEntity.setRunBlock(status2[2]);//閲嶆柊瑙勫垝璺嚎
+ statusEntity.setInBarcodeError(status2[3]);//鍏ュ簱鏉＄爜绔欏紓甯�
Integer palletHeight = null;
if (status[7]) {
diff --git a/src/main/java/com/zy/core/plugin/GslProcess.java b/src/main/java/com/zy/core/plugin/GslProcess.java
index 51553df..f079fc9 100644
--- a/src/main/java/com/zy/core/plugin/GslProcess.java
+++ b/src/main/java/com/zy/core/plugin/GslProcess.java
@@ -195,7 +195,11 @@
}
if (stationProtocol.getError() <= 0) {
- return true;
+ return true;//绔欑偣鏃犳晠闅�
+ }
+
+ if (!stationProtocol.isInBarcodeError()) {
+ return true;//绔欑偣鏃犲紓甯�
}
Object lock = redisUtil.get(RedisKeyType.GENERATE_STATION_BACK_LIMIT.key + stationProtocol.getStationId());
diff --git a/src/main/java/com/zy/core/thread/impl/ZyStationV4Thread.java b/src/main/java/com/zy/core/thread/impl/ZyStationV4Thread.java
index e7d93b9..0d53791 100644
--- a/src/main/java/com/zy/core/thread/impl/ZyStationV4Thread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZyStationV4Thread.java
@@ -160,6 +160,7 @@
stationProtocol.setBarcode(statusEntity.getBarcode());
stationProtocol.setRunBlock(statusEntity.isRunBlock());
stationProtocol.setEnableIn(statusEntity.isEnableIn());
+ stationProtocol.setInBarcodeError(statusEntity.isInBarcodeError());
stationProtocol.setWeight(statusEntity.getWeight());
stationProtocol.setTaskWriteIdx(statusEntity.getTaskWriteIdx());
stationProtocol.setTaskBufferItems(statusEntity.getTaskBufferItems());
diff --git a/src/main/java/com/zy/core/thread/impl/v5/StationV5StatusReader.java b/src/main/java/com/zy/core/thread/impl/v5/StationV5StatusReader.java
index a053956..d38818f 100644
--- a/src/main/java/com/zy/core/thread/impl/v5/StationV5StatusReader.java
+++ b/src/main/java/com/zy/core/thread/impl/v5/StationV5StatusReader.java
@@ -99,6 +99,7 @@
stationProtocol.setTaskWriteIdx(statusEntity.getTaskWriteIdx());
stationProtocol.setTaskBufferItems(statusEntity.getTaskBufferItems());
stationProtocol.setIoMode(statusEntity.getIoMode());
+ stationProtocol.setInBarcodeError(statusEntity.isInBarcodeError());
if (statusEntity.getTaskNo() != null && statusEntity.getTaskNo() > 0) {
taskNoSet.add(statusEntity.getTaskNo());
}
diff --git a/src/main/webapp/components/DevpCard.js b/src/main/webapp/components/DevpCard.js
index 94deb26..e5c8bbb 100644
--- a/src/main/webapp/components/DevpCard.js
+++ b/src/main/webapp/components/DevpCard.js
@@ -288,6 +288,7 @@
{ label: "婊℃澘淇″彿", value: MonitorCardKit.yesNo(item.fullPlt) },
{ label: "杩愯闃诲", value: MonitorCardKit.yesNo(item.runBlock) },
{ label: "鍚姩鍏ュ簱", value: MonitorCardKit.yesNo(item.enableIn) },
+ { label: "鍏ュ簱鏉＄爜绔欏紓甯�", value: MonitorCardKit.yesNo(item.inBarcodeError) },
{ label: "鎵樼洏楂樺害", value: this.orDash(item.palletHeight) },
{ label: "鏉＄爜", value: this.orDash(item.barcode), code: true, type: "barcode" },
{ label: "閲嶉噺", value: this.orDash(item.weight) },
--
Gitblit v1.9.1