From 4e5b7d1003f61841de9d550bf75e8376cdc32f51 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 13 四月 2026 17:02:52 +0800
Subject: [PATCH] #入库站异常信息

---
 src/main/java/com/zy/core/plugin/store/StoreInTaskGenerationService.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/core/plugin/store/StoreInTaskGenerationService.java b/src/main/java/com/zy/core/plugin/store/StoreInTaskGenerationService.java
index ab90be5..522b34f 100644
--- a/src/main/java/com/zy/core/plugin/store/StoreInTaskGenerationService.java
+++ b/src/main/java/com/zy/core/plugin/store/StoreInTaskGenerationService.java
@@ -69,7 +69,7 @@
             }
 
             StoreInTaskContext earlyContext = buildContext(basDevp, stationObjModel);
-            if (earlyContext == null || !handleErrorStationBack(earlyContext)) {
+            if (earlyContext == null || !handleErrorStationBack(policy, earlyContext)) {
                 return;
             }
 
@@ -188,7 +188,7 @@
         }
     }
 
-    private boolean handleErrorStationBack(StoreInTaskContext context) {
+    private boolean handleErrorStationBack(StoreInTaskPolicy policy, StoreInTaskContext context) {
         StationProtocol stationProtocol = context.getStationProtocol();
         if (stationProtocol == null) {
             return false;
@@ -255,6 +255,12 @@
             return false;
         }
         stationCommandDispatcher.dispatch(context.getBasDevp().getDevpNo(), command, "store-in-task", "station-back");
+        String errorMsg = Cools.isEmpty(stationProtocol.getErrorMsg()) ? "鏈煡寮傚父" : stationProtocol.getErrorMsg();
+        String warning = "鏉$爜绔欏紓甯搁��鍥烇紝鎶ヨ淇℃伅锛�" + errorMsg;
+        if (!Cools.isEmpty(stationProtocol.getSystemWarning())) {
+            warning = stationProtocol.getSystemWarning() + ";" + warning;
+        }
+        policy.setSystemWarning(context, warning);
         News.info("{}鎵爜绔欏紓甯革紝宸查��鍥炶嚦{},鏉$爜绔欑姸鎬侊細{}", stationProtocol.getTaskNo(),
                 backStation.getStationId(), JSON.toJSONString(stationProtocol));
         redisUtil.set(RedisKeyType.GENERATE_STATION_BACK_LIMIT.key + stationProtocol.getStationId(),

--
Gitblit v1.9.1