From b60ca6531a5f9361a82fae182883727e27081fe0 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 25 八月 2025 08:23:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/CrnController.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index e4fcfca..e6c8399 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -249,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();
}
@@ -268,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();
}
@@ -294,7 +294,12 @@
if (sourceLoc.getLocType1() != loc.getLocType1()){
return R.error("搴撲綅绫诲瀷涓嶄竴鑷�");
}
- command.setTraySize(loc.getLocType1() == 2);
+ 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();
}
@@ -512,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