From 5e61001f8678d26ffdf230e640b32c3632220d58 Mon Sep 17 00:00:00 2001
From: ZY <zc>
Date: 星期二, 05 八月 2025 10:05:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlWcs' into xgmFlWcs
---
src/main/java/com/zy/asrs/controller/CrnController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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..5720631 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;
@@ -98,7 +99,7 @@
}
@PostMapping("/table/crn/state")
- @ManagerAuth(memo = "鍫嗗灈鏈轰俊鎭〃")
+ //@ManagerAuth(memo = "鍫嗗灈鏈轰俊鎭〃")
public R crnStateTable(){
List<CrnStateTableVo> list = new ArrayList<>();
List<BasCrnp> crnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().orderBy("crn_no"));
@@ -136,7 +137,6 @@
}
@PostMapping("/table/crn/msg")
- @ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹〃")
public R crnMsgTable(){
List<CrnMsgTableVo> list = new ArrayList<>();
List<BasCrnp> crnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().orderBy("crn_no"));
@@ -293,6 +293,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 +384,8 @@
return crnControl(command)?R.ok():R.error();
}
+
+
// @ManagerAuth(memo = "鏆傚仠")
// @PostMapping("/operator/pause")
// public R crnPause(CrnOperatorParam param){
--
Gitblit v1.9.1