From 19739dde0204df7351321da036bfc790559aae31 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 16 一月 2025 10:53:22 +0800
Subject: [PATCH] 修复AutoMoveScheduler和AgvWrkMastServiceImp中拼写错误并添加TODO
---
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index 8627132..d95a035 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -480,7 +480,7 @@
鍏ュ簱
*/
@Transactional
- public String emptyPlateIn(String station, String containerCode, Short containerType, Long userId, boolean emptyAutoIn,String factory) {
+ public String emptyPlateIn(String station, String containerCode, Short containerType, Long userId, boolean emptyAutoIn) {
Date now = new Date();
@@ -528,9 +528,9 @@
locType = 2;
} else if (containerType == 30) {
locType = 3;
- } else if (containerType == 31) {
+ } else if (containerType == 31) {
locType = 6;
- }else {
+ } else {
locType = agvBasDevp.getLocType1();
}
@@ -569,19 +569,19 @@
Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "elevatorTasks"));
if (Cools.isEmpty(config)) {
if (isCurrLev.get()) {
- agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true,factory);
+ agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
} else {
- agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false,factory);
+ agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false);
}
} else {
List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().like("loc_no", "02F1").like("source_loc_no", "F1"));
if (Integer.parseInt(config.getValue()) <= agvWrkMasts.size()) {
- agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true,factory);
+ agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
} else {
if (isCurrLev.get()) {
- agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true,factory);
+ agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
} else {
- agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false,factory);
+ agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false);
}
//agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
}
@@ -628,6 +628,9 @@
// 绔欑偣妫�娴�
AgvBasDevp agvBasDevp = agvBasDevpService.selectById(station);
+ if (Cools.isEmpty(agvBasDevp)) {
+ throw new CoolException("绔欑偣淇℃伅涓嶅瓨鍦�");
+ }
if (!agvBasDevp.getLocSts().equals("O")) {
throw new CoolException("褰撳墠宸ヤ綔浣嶇姸鎬佷负" + agvBasDevp.getLocSts() + ",鏃犳硶杩涜绌烘澘鍑哄簱");
}
--
Gitblit v1.9.1