From bd9d305718423039775503510694df088ea8b41b Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期三, 21 一月 2026 12:47:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StationProtocol.java | 21 ++++++++++++++++++++-
src/main/java/com/zy/core/thread/impl/ZyStationThread.java | 9 +++++++++
src/main/java/com/zy/core/thread/impl/ZyStationV3Thread.java | 9 +++++++++
src/main/java/com/zy/core/plugin/FakeProcess.java | 8 ++++++++
4 files changed, 46 insertions(+), 1 deletions(-)
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 c2c9f52..0d4a589 100644
--- a/src/main/java/com/zy/core/model/protocol/StationProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StationProtocol.java
@@ -1,5 +1,8 @@
package com.zy.core.model.protocol;
+import com.core.common.SpringUtils;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.WrkMastService;
import lombok.Data;
import java.util.Map;
@@ -7,7 +10,7 @@
@Data
public class StationProtocol {
- // 绔欑偣缂栧彿
+ // 绔欑偣缂栧彿
private Integer stationId;
// ----------------------------------------------------------------
@@ -58,6 +61,9 @@
//閲嶉噺
private Double weight;
+ //WCS绯荤粺鎶ヨ
+ private String systemWarning;
+
/**
* 鎵╁睍鏁版嵁
*/
@@ -73,4 +79,17 @@
return null;
}
+ public String getSuperTaskNo() {
+ if(taskNo == null){
+ return "0";
+ }
+
+ WrkMastService wrkMastService = SpringUtils.getBean(WrkMastService.class);
+ WrkMast wrkMast = wrkMastService.selectByWorkNo(taskNo);
+ if(wrkMast == null){
+ return "0";
+ }
+ return String.valueOf(wrkMast.getWmsWrkNo());
+ }
+
}
diff --git a/src/main/java/com/zy/core/plugin/FakeProcess.java b/src/main/java/com/zy/core/plugin/FakeProcess.java
index 7588105..7daf0eb 100644
--- a/src/main/java/com/zy/core/plugin/FakeProcess.java
+++ b/src/main/java/com/zy/core/plugin/FakeProcess.java
@@ -493,6 +493,8 @@
wmsOperateUtils.applyInTaskAsync(barcode, stationIdVal,
stationProtocol.getPalletHeight());
redisUtil.set(RedisKeyType.GENERATE_IN_TASK_LIMIT.key + stationId, "lock", 2);
+
+ stationProtocol.setSystemWarning("璇锋眰鍏ュ簱澶辫触锛學MS杩斿洖=" + response);
continue;
}
@@ -515,6 +517,8 @@
continue;
}
MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
+
+ stationProtocol.setSystemWarning("");
} else {
// 鎺ュ彛杩斿洖闈�200锛岄噸鏂板彂璧疯姹�
News.error("WMS鍏ュ簱鎺ュ彛杩斿洖闈�200锛岄噸鏂板彂璧疯姹傦紝barcode={}锛宻tationId={}锛宺esponse={}", barcode,
@@ -522,6 +526,8 @@
wmsOperateUtils.applyInTaskAsync(barcode, stationIdVal,
stationProtocol.getPalletHeight());
redisUtil.set(RedisKeyType.GENERATE_IN_TASK_LIMIT.key + stationId, "lock", 2);
+
+ stationProtocol.setSystemWarning("璇锋眰鍏ュ簱澶辫触锛學MS杩斿洖=" + response);
}
} else {
// 3. 娌℃湁鍝嶅簲缁撴灉锛屾鏌ユ槸鍚︽湁璇锋眰姝ｅ湪杩涜涓�
@@ -531,6 +537,8 @@
wmsOperateUtils.applyInTaskAsync(barcode, stationIdVal,
stationProtocol.getPalletHeight());
redisUtil.set(RedisKeyType.GENERATE_IN_TASK_LIMIT.key + stationId, "lock", 2);
+
+ stationProtocol.setSystemWarning("璇锋眰鍏ュ簱澶辫触锛學MS鏃犺繑鍥�");
}
}
}
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 62ea5a9..802f7e6 100644
--- a/src/main/java/com/zy/core/thread/impl/ZyStationThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZyStationThread.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.utils.Utils;
@@ -142,6 +143,14 @@
stationProtocol.setEnableIn(statusEntity.isEnableIn());
stationProtocol.setWeight(statusEntity.getWeight());
}
+
+ if (!Cools.isEmpty(stationProtocol.getSystemWarning())) {
+ if (stationProtocol.isAutoing()
+ && !stationProtocol.isLoading()
+ ) {
+ stationProtocol.setSystemWarning("");
+ }
+ }
}
}
diff --git a/src/main/java/com/zy/core/thread/impl/ZyStationV3Thread.java b/src/main/java/com/zy/core/thread/impl/ZyStationV3Thread.java
index 92cadb7..792bc65 100644
--- a/src/main/java/com/zy/core/thread/impl/ZyStationV3Thread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZyStationV3Thread.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasDevp;
@@ -147,6 +148,14 @@
stationProtocol.setEnableIn(statusEntity.isEnableIn());
stationProtocol.setWeight(statusEntity.getWeight());
}
+
+ if (!Cools.isEmpty(stationProtocol.getSystemWarning())) {
+ if (stationProtocol.isAutoing()
+ && !stationProtocol.isLoading()
+ ) {
+ stationProtocol.setSystemWarning("");
+ }
+ }
}
}
--
Gitblit v1.9.1