From 15a5af2e4dac574cf3681e4c1f62fcf1e08a7661 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 10 五月 2025 09:57:25 +0800
Subject: [PATCH] wcs监控界面堆垛机详情
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index d7da4a6..a8fa26e 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -17,6 +17,7 @@
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.mapper.ReportQueryMapper;
+import com.zy.asrs.mapper.TaskWrkMapper;
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.DeviceErrorService;
@@ -42,6 +43,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -70,6 +72,9 @@
private DeviceErrorService deviceErrorService;
@Autowired
private BasCrnpService basCrnpService;
+
+ @Resource
+ private TaskWrkMapper taskWrkMapper;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -330,14 +335,15 @@
}
if (crnProtocol.getTaskNo() > 0) {
+ TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(crnProtocol.getTaskNo()));
WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
- if (wrkMast != null) {
- vo.setSourceStaNo(wrkMast.getSourceStaNo$());
- vo.setStaNo(wrkMast.getStaNo$());
- vo.setWrkSts(wrkMast.getWrkSts$()); // 宸ヤ綔鐘舵��
- vo.setIoType(wrkMast.getIoType$()); // 鍏ュ嚭搴撶被鍨�
- vo.setSourceLocNo(wrkMast.getSourceLocNo$());
- vo.setLocNo(wrkMast.getLocNo$());
+ if (taskWrk != null) {
+ vo.setSourceStaNo(taskWrk.getStartPoint());
+ vo.setStaNo(taskWrk.getTargetPoint());
+ vo.setWrkSts(taskWrk.getWrkSts$()); // 宸ヤ綔鐘舵��
+ vo.setIoType(taskWrk.getIoType$()); // 鍏ュ嚭搴撶被鍨�
+ vo.setSourceLocNo(taskWrk.getStartPoint());
+ vo.setLocNo(taskWrk.getTargetPoint());
vo.setCrnStatus(crnProtocol.getStatusType().desc);
vo.setError(""); // todo
}
--
Gitblit v1.9.1