From 2dd641969aa20b81156bd421acb777e8c3fc9725 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 04 六月 2024 16:51:59 +0800
Subject: [PATCH] # 地图优化
---
src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
index 9c46105..1a40d13 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
@@ -196,7 +196,7 @@
}
private ReturnT<String> doHandMove2(AgvWrkMast agvWrkMast) {
Date now = new Date();
- AgvBasDevp devpNo = agvCommonService.getDevpNo(3, 1);
+ AgvBasDevp devpNo = agvCommonService.getDevpNo(3, 1, "Y", "Y");
if (Cools.isEmpty(devpNo)) {
throw new CoolException("鏆傛棤绌洪棽鎺ラ┏浣�");
}
@@ -349,7 +349,7 @@
} else if(agvLocMast.getFloor() == 2) {
floor = "F2";
}
- List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("io_type", 109).or().eq("io_type", 113).like("source_loc_no", floor));
+ List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("io_type", 109).like("source_loc_no", floor).or().eq("io_type", 113));
if (agvWrkMasts.size() >= 5) {
throw new CoolException("鏆傚仠鍥炴祦");
}
--
Gitblit v1.9.1