From e14d3106c3ff8dcb974397227acd592cb53338cf Mon Sep 17 00:00:00 2001 From: whycq <10027870+whycq@user.noreply.gitee.com> Date: 星期三, 08 五月 2024 16:58:35 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 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 65a5db0..a565b5b 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java @@ -326,7 +326,9 @@ if (Cools.isEmpty(agvBasDevp)) { throw new CoolException("鏆傛棤"+ station + "绔欑偣"); } - if (containerType == 21 && agvBasDevp.getFloor() == 3) { + if (containerType == 40 && agvBasDevp.getFloor() == 3) { + locType = 5; + } else if (containerType == 21 && agvBasDevp.getFloor() == 3) { locType = 4; } else if (containerType == 20 && agvBasDevp.getFloor() == 3) { locType = 2; @@ -391,7 +393,7 @@ } //瀵绘壘鐩稿簲绫诲瀷鐨勭┖鎵樼洏 - AgvLocMast agvLocMast = agvLocMastService.selectEmptyZpallet(containerType); + AgvLocMast agvLocMast = agvLocMastService.selectEmptyZpallet(containerType,agvBasDevp.getFloor()); if(containerType == 0){ //绌烘澘鑷姩鍑哄簱锛屾牴鎹珯鐐圭被鍨嬮�夋嫨 agvLocMastService.selectEmptyZpalletByLocType1(agvBasDevp.getLocType1()); -- Gitblit v1.9.1