From a454c4e3e56ed63a7676348f260a240fa18be481 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 05 六月 2025 14:02:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/CrnController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 05e21e0..387ea02 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;
@@ -126,6 +127,9 @@
vo.setForkOffset(crnProtocol.getForkPosType().desc); // 璐у弶浣嶇疆
vo.setLiftPos(crnProtocol.getLiftPosType().desc);
vo.setWalkPos(crnProtocol.getWalkPos()==1?"涓嶅湪瀹氫綅":"鍦ㄥ畾浣�");
+ if(crnProtocol.getAlarm() == 10){
+ crnProtocol.setAlarm((short) 0);
+ }
vo.setWarnCode(String.valueOf(crnProtocol.getAlarm()));
if (crnProtocol.getAlarm() > 0) {
BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
@@ -384,6 +388,8 @@
return crnControl(command)?R.ok():R.error();
}
+
+
// @ManagerAuth(memo = "鏆傚仠")
// @PostMapping("/operator/pause")
// public R crnPause(CrnOperatorParam param){
@@ -510,7 +516,10 @@
}
private boolean isLocSts(String row,String bay,String lev){
- String loc = String.format("%2d",row)+String.format("%3d",bay)+String.format("%2d",lev);
+ int rowInt = Integer.parseInt(row);
+ int bayInt = Integer.parseInt(bay);
+ int levInt = Integer.parseInt(lev);
+ String loc = String.format("%2d",rowInt)+String.format("%3d",bayInt)+String.format("%2d",levInt);
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", loc));
if (Cools.isEmpty(locMast)){
return false;
--
Gitblit v1.9.1