From 40d95599c1ac6ef89d465e031132d9c627a7f0bc Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 19 十一月 2025 13:38:54 +0800
Subject: [PATCH] #增加出入库模式
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index f159b5f..00aa8a4 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -24,15 +24,14 @@
import com.zy.core.CrnThread;
import com.zy.core.DevpThread;
import com.zy.core.Slave;
+import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.CrnModeType;
import com.zy.core.enums.SlaveType;
-import com.zy.core.model.CrnSlave;
-import com.zy.core.model.DevpSlave;
-import com.zy.core.model.LedSlave;
-import com.zy.core.model.RgvSlave;
+import com.zy.core.model.*;
import com.zy.core.model.protocol.CrnProtocol;
+import com.zy.core.model.protocol.LiftProtocol;
import com.zy.core.model.protocol.RgvProtocol;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
@@ -410,4 +409,46 @@
return R.ok();
}
+ @GetMapping("/getIoMode")
+ public R getIoMode() {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ if (devpThread == null) {
+ return R.error("绾跨▼涓嶅瓨鍦�");
+ }
+
+ LiftProtocol liftProtocol = devpThread.getLiftStatus();
+ if (liftProtocol == null) {
+ return R.error("绾跨▼涓嶅瓨鍦�");
+ }
+
+ return R.ok().add(liftProtocol.getIoMode());
+ }
+
+ @PostMapping("/switchIoMode")
+ public R switchIoMode() {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ if (devpThread == null) {
+ return R.error("绾跨▼涓嶅瓨鍦�");
+ }
+
+ LiftProtocol liftProtocol = devpThread.getLiftStatus();
+ if (liftProtocol == null) {
+ return R.error("绾跨▼涓嶅瓨鍦�");
+ }
+
+ //妫�娴嬫槸鍚﹁繕鏈変换鍔℃病鍋氬畬
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>());
+ if (!wrkMasts.isEmpty()) {
+ return R.error("绯荤粺浠诲姟鏈畬鎴愶紝璇峰畬鎴愬悗鍐嶅垏鎹㈡ā寮�");
+ }
+
+ int switchIoMode = 1;
+ if (liftProtocol.getIoMode() == 1) {
+ switchIoMode = 2;
+ }
+
+ boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(3, switchIoMode));
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1