From d2bb7362d92f0809572e15f8299ac608fe263a87 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期一, 21 四月 2025 16:23:47 +0800
Subject: [PATCH] 输送线命令下发失败重新推送队列

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index de63401..7a36322 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -195,7 +195,11 @@
                             }
                         } else {
                             staProtocol.setWorkNo((short) 9995);
-                            staProtocol.setStaNo((short) (inSta.getStaNo() + 1));
+                            if (inSta.getStaNo() != 402) {
+                                staProtocol.setStaNo((short) (inSta.getStaNo() + 1));
+                            } else {
+                                staProtocol.setStaNo((short) (inSta.getStaNo() - 1));
+                            }
                             devpThread.setPakMk(staProtocol.getSiteId(), false);
                             boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
 
@@ -452,6 +456,7 @@
                     staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
                     staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
                     devpThread.setPakMk(staProtocol.getSiteId(), false);
+                    log.warn("鐩樼偣鍐嶅叆搴撶粰杈撻�佺嚎涓嬪彂鍛戒护鍓嶏細{}",JSON.toJSON(staProtocol));
                     boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                     if (!result) {
                         log.error("鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", devp.getId());

--
Gitblit v1.9.1