From 6994981f40f1573f54de1a1e402a7743073cf38e Mon Sep 17 00:00:00 2001
From: fyxc <fyxc@qq.com>
Date: 星期四, 22 五月 2025 14:26:30 +0800
Subject: [PATCH] server commit file
---
src/main/java/com/zy/asrs/controller/CrnController.java | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 95052a6..cd3019a 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -35,6 +35,7 @@
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;
+import com.zy.core.thread.RgvThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -293,6 +294,7 @@
if (sourceLoc.getLocType1() != loc.getLocType1()){
return R.error("搴撲綅绫诲瀷涓嶄竴鑷�");
}
+ command.setTraySize(loc.getLocType1() == 2);
// VersionUtils.locMoveCheckLocType(sourceLoc, loc);
return crnControl(command)?R.ok():R.error();
}
@@ -383,6 +385,44 @@
return crnControl(command)?R.ok():R.error();
}
+ @ManagerAuth(memo = "鎭㈠鑱旀満浠诲姟")
+ @PostMapping("/operator/taskRe")
+ public R taskRe(CrnOperatorParam param){
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, param.getCrnNo());
+ if (crnThread == null) {
+ return R.error("鍫嗗灈鏈轰笉鍦ㄧ嚎");
+ }
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol == null) {
+ return R.error("鍫嗗灈鏈轰笉鍦ㄧ嚎");
+ }
+
+ if (MessageQueue.offer(SlaveType.Crn, param.getCrnNo(), new Task(4, null))) {
+ return R.ok();
+ } else {
+ return R.error("鍛戒护涓嬪彂澶辫触");
+ }
+ }
+
+ @ManagerAuth(memo = "娓呴櫎鑱旀満浠诲姟")
+ @PostMapping("/operator/taskClear")
+ public R crnTaskClear(CrnOperatorParam param){
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, param.getCrnNo());
+ if (crnThread == null) {
+ return R.error("鍫嗗灈鏈轰笉鍦ㄧ嚎");
+ }
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol == null) {
+ return R.error("鍫嗗灈鏈轰笉鍦ㄧ嚎");
+ }
+
+ if (MessageQueue.offer(SlaveType.Crn, param.getCrnNo(), new Task(5, null))) {
+ return R.ok();
+ } else {
+ return R.error("鍛戒护涓嬪彂澶辫触");
+ }
+ }
+
// @ManagerAuth(memo = "鏆傚仠")
// @PostMapping("/operator/pause")
// public R crnPause(CrnOperatorParam param){
--
Gitblit v1.9.1