From cd18df2ff664883dc2ded7b14d1d0f78b9c136a6 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期日, 30 六月 2024 17:20:54 +0800
Subject: [PATCH] 回退修改

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 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 39261ef..e5a7768 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -212,8 +212,10 @@
                     if (wrkMast != null) {
                         News.warn(""+mark+" - 4"+" - 婊℃墭鐩樺叆搴撳伐浣滄。涓凡瀛樺湪璇ョ珯鐘舵�佷负锛� 2.璁惧涓婅蛋 锛夌殑鏁版嵁,宸ヤ綔鍙�={}", wrkMast.getWrkNo());
                         if (devp.getId() == 2) {
-                            staProtocol.setWorkNo((short)9999);
-                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
+//                            staProtocol.setWorkNo((short)9999);
+//                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
+                            staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
+                            staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
                             devpThread.setPakMk(staProtocol.getSiteId(), false);
                             boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                             if (!result) {

--
Gitblit v1.9.1