From ba554f3db080b64d74bb283a899a0b2b5dbcf376 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期五, 22 八月 2025 13:59:56 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/jx-gt-crn-wcs' into jx-gt-crn-wcs --- src/main/java/com/zy/asrs/controller/SiteController.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java index aa555ad..3702701 100644 --- a/src/main/java/com/zy/asrs/controller/SiteController.java +++ b/src/main/java/com/zy/asrs/controller/SiteController.java @@ -81,6 +81,7 @@ list.add(vo); StaProtocol staProtocol = station.get(devp.getDevNo()); if (null == staProtocol) { continue; } + vo.setWorkNo(staProtocol.getWorkNo()); vo.setAutoing(staProtocol.stateType == DevpStateType.AUTO?"Y":"N"); // 鑷姩 vo.setLoading(staProtocol.workType == DevpWorkType.BUSY?"Y":"N"); // 鏈夌墿 vo.setInEnable(staProtocol.requestType == DevpRequestType.IN?"Y":"N"); // 鍙叆 -- Gitblit v1.9.1