From 356f4a75a2d47857930567744d8a368378553b83 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 26 十二月 2024 14:50:04 +0800
Subject: [PATCH] #logo
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 208b218..cbf90f9 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -29,6 +29,8 @@
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.CrnModeType;
+import com.zy.core.enums.DevpType.DevpStateType;
+import com.zy.core.enums.DevpType.DevpWorkType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
@@ -119,7 +121,7 @@
}
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
vo.setSiteStatus(SiteStatusType.process(staProtocol)); // 鐘舵��
- vo.setNearbySta(staProtocol.getNearbySta());
+// vo.setNearbySta(staProtocol.getNearbySta());
vos.add(vo);
}
return R.ok().add(vos);
@@ -238,8 +240,8 @@
}
}
- vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 鑷姩
- vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
+ vo.setAutoing(staProtocol.stateType == DevpStateType.AUTO?"Y":"N"); // 鑷姩
+ vo.setLoading(staProtocol.workType == DevpWorkType.BUSY?"Y":"N"); // 鏈夌墿
vo.setCanining(basDevp.getCanining()); // 鑳藉叆
vo.setCanouting(basDevp.getCanouting()); // 鑳藉嚭
--
Gitblit v1.9.1