From c946b206b0923e8b9567a529b8fd5d2d684c8265 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期六, 17 五月 2025 20:03:42 +0800
Subject: [PATCH] 完成调试
---
src/main/java/com/zy/asrs/controller/CrnController.java | 18 ++++++++++++++++++
1 files changed, 18 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..11082d5 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,22 @@
return crnControl(command)?R.ok():R.error();
}
+ @ManagerAuth(memo = "鎭㈠鑱旀満浠诲姟")
+ @PostMapping("/operator/taskRe")
+ public R taskRe(CrnOperatorParam param){
+ CrnCommand command = new CrnCommand();
+ command.setTaskRe((short)1);
+ return crnControl(command)?R.ok():R.error();
+ }
+
+ @ManagerAuth(memo = "娓呴櫎鑱旀満浠诲姟")
+ @PostMapping("/operator/taskClear")
+ public R crnTaskClear(CrnOperatorParam param){
+ CrnCommand command = new CrnCommand();
+ command.setTaskClear((short)1);
+ return crnControl(command)?R.ok():R.error();
+ }
+
// @ManagerAuth(memo = "鏆傚仠")
// @PostMapping("/operator/pause")
// public R crnPause(CrnOperatorParam param){
--
Gitblit v1.9.1