From f4603a10d8519827608636c5e7980b2d6d0be8e3 Mon Sep 17 00:00:00 2001
From: ytfl <ytfl@qq.com>
Date: 星期四, 05 二月 2026 09:14:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 1 +
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 ++--
src/main/webapp/views/console.html | 8 ++++++++
3 files changed, 11 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 884f484..72d125f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1212,10 +1212,10 @@
News.error("" + mark + " - 2" + " - 妫�娴嬪瓨鍦�1058绔欑偣锛屽瓨鍦ㄤ袱绗斿伐浣滀腑鐨勪换鍔★紝宸ヤ綔鍙�={}" + wrkMast.getWrkNo());
continue;
}
- } else if (wrkMast.getStaNo() == 1062) {
+ } else if (wrkMast.getStaNo() == 1064) {
List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
.in("wrk_sts", 12, 14)
- .eq("sta_no", 1062)
+ .eq("sta_no", 1064)
);
if (!Cools.isEmpty(inWrkMasts) && inWrkMasts.size() >= devpCheckTaskStackOver) {
News.error("" + mark + " - 2" + " - 妫�娴嬪瓨鍦�1062绔欑偣锛屽瓨鍦ㄤ袱绗斿伐浣滀腑鐨勪换鍔★紝宸ヤ綔鍙�={}" + wrkMast.getWrkNo());
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 27e31f3..50ae4b1 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -203,6 +203,7 @@
CrnCommand crnCommand = new CrnCommand();
crnCommand.setAckFinish((short)1);
if (write(crnCommand)) {
+ log.info(crnProtocol.getCrnNo()+"鍙峰爢鍨涙満浠诲姟绛夊緟wcs纭锛屽綋鍓嶇姸鎬�"+crnProtocol.getStatusType());
resetFlag = false;
}
}
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 513907f..903a372 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -664,6 +664,14 @@
}
}
});
+
+ //鑾峰彇RGV鏁版嵁
+ $.ajax({
+ url: baseUrl + "/console/latest/data/rgv",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {}
+ })
}
// 鎵爜鍣ㄥ疄鏃舵暟鎹幏鍙�
--
Gitblit v1.9.1