From d74e41701d48afe3e36dbec7f242765fc47096ea Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期五, 05 十二月 2025 16:47:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java b/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java
index 22046ec..471249d 100644
--- a/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java
+++ b/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java
@@ -179,6 +179,10 @@
Map<String,Object> map=new HashMap<>();
map.put("to",ledId);
BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", ledId));
+ if (basDevp.getDevMk().equals("O")){
+ basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 1001));
+ }
+
if (basDevp == null ){
return;
}
@@ -188,7 +192,8 @@
return;
}
List<LedCommand> commandList = new ArrayList<>();
- if (basDevp.getWrkNo() != 0){
+
+ if (basDevp.getWrkNo() != 0 && basDevp.getLoading().equals("Y")){
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
if (null != wrkMast){
commandList = getCommandList(basDevp.getWrkNo().toString());
--
Gitblit v1.9.1