From f25bbbc769f14d18c39f11ba0e395a9f09431148 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期日, 11 五月 2025 12:13:06 +0800
Subject: [PATCH] #调试
---
src/main/java/com/zy/asrs/controller/CrnController.java | 8 +++++++-
1 files changed, 7 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 e4fcfca..387ea02 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -127,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());
@@ -513,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