From 4e70a88e1ed6704ec6fca7baac8d0dbe95d0feb1 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 26 二月 2025 08:57:55 +0800
Subject: [PATCH] agv站点修改
---
src/main/java/com/zy/asrs/controller/CrnController.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 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..e6c8399 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;
@@ -248,7 +249,7 @@
command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
- boolean locSts = isLocSts(param.getRow().toString(), param.getBay().toString(), param.getLev().toString());
+ short locSts = isLocSts(param.getRow(), param.getBay(), param.getLev());
command.setTraySize(locSts);
return crnControl(command)?R.ok():R.error();
}
@@ -267,7 +268,7 @@
command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
- boolean locSts = isLocSts(param.getSourceRow().toString(), param.getSourceBay().toString(), param.getSourceLev().toString());
+ short locSts = isLocSts(param.getSourceRow(), param.getSourceBay(), param.getSourceLev());
command.setTraySize(locSts);
return crnControl(command)?R.ok():R.error();
}
@@ -293,6 +294,12 @@
if (sourceLoc.getLocType1() != loc.getLocType1()){
return R.error("搴撲綅绫诲瀷涓嶄竴鑷�");
}
+ short locSts1 = isLocSts(param.getRow(), param.getBay(), param.getLev());
+ short locSts2 = isLocSts(param.getSourceRow(), param.getSourceBay(), param.getSourceLev());
+ if (locSts1 != locSts2){
+ return R.error("搴撲綅涓嶅尮閰�");
+ }
+ command.setTraySize(locSts1);
// VersionUtils.locMoveCheckLocType(sourceLoc, loc);
return crnControl(command)?R.ok():R.error();
}
@@ -382,6 +389,8 @@
command.setDestinationPosZ((short) 0); // 鐩爣搴撲綅灞�
return crnControl(command)?R.ok():R.error();
}
+
+
// @ManagerAuth(memo = "鏆傚仠")
// @PostMapping("/operator/pause")
@@ -508,16 +517,15 @@
}
}
- private boolean isLocSts(String row,String bay,String lev){
- String loc = String.format("%2d",row)+String.format("%3d",bay)+String.format("%2d",lev);
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", loc));
+ private short isLocSts(Short row,Short bay,Short lev){
+// String loc = String.format("%2d",row)+String.format("%3d",bay)+String.format("%2d",lev);
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", row).eq("bay1", bay).eq("lev1", lev));
if (Cools.isEmpty(locMast)){
- return false;
+ return 0;
}
- if (locMast.getLocType1() == 2){
- return true;
- }
- return false;
+
+ return locMast.getLocType1();
}
--
Gitblit v1.9.1