From d3119a7643717d1cd93c8d2e8ca9617acf91e561 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 10 五月 2025 10:02:50 +0800
Subject: [PATCH] wcs监控界面输送线详情

---
 src/main/java/com/zy/asrs/controller/ConsoleController.java |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 7ab8b55..a3bc0b4 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -284,14 +284,16 @@
                     vo.setWorkNo(staProtocol.getWorkNo());   // 宸ヤ綔鍙�
 
                     if (staProtocol.getWorkNo() > 0) {
-                        WrkMast wrkMast = wrkMastService.selectById(staProtocol.getWorkNo());
-                        if (wrkMast != null) {
-                            vo.setWrkSts(wrkMast.getWrkSts$());   // 宸ヤ綔鐘舵��
-                            vo.setIoType(wrkMast.getIoType$());   //  鍏ュ嚭搴撶被鍨�
-                            vo.setSourceStaNo(wrkMast.getSourceStaNo$());
-                            vo.setStaNo(wrkMast.getStaNo$());
-                            vo.setSourceLocNo(wrkMast.getSourceLocNo$());
-                            vo.setLocNo(wrkMast.getLocNo$());
+//                        WrkMast wrkMast = wrkMastService.selectById(staProtocol.getWorkNo());
+                        TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(staProtocol.getWorkNo()));
+
+                        if (taskWrk != null) {
+                            vo.setWrkSts(taskWrk.getWrkSts$());   // 宸ヤ綔鐘舵��
+                            vo.setIoType(taskWrk.getIoType$());   //  鍏ュ嚭搴撶被鍨�
+                            vo.setSourceStaNo(taskWrk.getStartPoint());
+                            vo.setStaNo(taskWrk.getTargetPoint());
+                            vo.setSourceLocNo(taskWrk.getStartPoint());
+                            vo.setLocNo(taskWrk.getTargetPoint());
                         }
                     }
 

--
Gitblit v1.9.1