From c3434b1fe0132372b34ff0a46d84e6129a094bfc Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期四, 28 八月 2025 08:43:15 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 21 ++++++++++++++-------
1 files changed, 14 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 f884a90..75ea437 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -137,11 +137,11 @@
continue;
}
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
- if (crnProtocol == null) {
+ if (crnProtocol == null || Cools.isEmpty(crnProtocol.getLaneNo())) {
continue;
}
CrnLatestDataVo vo = new CrnLatestDataVo();
- vo.setCrnId(crn.getId()); // 鍫嗗灈鏈虹紪鍙�
+ vo.setCrnId(crnProtocol.getLaneNo()); // 鍫嗗灈鏈虹紪鍙�
// Short totalBay = locMastMapper.selectTotalBay();
@@ -318,15 +318,22 @@
}
CrnDetailVo vo = new CrnDetailVo();
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
- if (crnSlave.getId().equals(crnNo)) {
- BasCrnp basCrnp = basCrnpService.selectById(crnNo);
+
+ // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol == null || Cools.isEmpty(crnProtocol.getLaneNo())) {
+ continue;
+ }
+
+ if (crnProtocol.getLaneNo().equals(crnNo)) {
+ BasCrnp basCrnp = basCrnpService.selectById(crnProtocol.getCrnNo());
if (basCrnp == null) {
return R.error("鏁版嵁搴撶淮鎶ゅ紓甯�");
}
- SiemensCrnThread crnThread = (SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
- CrnProtocol crnProtocol = crnThread.getCrnProtocol();
- vo.setCrnNo(crnNo);
+ vo.setCrnNo(crnProtocol.getCrnNo());
+ vo.setLaneNo(crnProtocol.getLaneNo());
vo.setWorkNo(crnProtocol.getTaskNo());
vo.setCrnStatus(crnProtocol.getStatusType().desc);
--
Gitblit v1.9.1