From aa3476e8ff45d168f0bb9376ed3a114610a65f12 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 25 十二月 2024 08:39:12 +0800
Subject: [PATCH] 添加工厂判断逻辑及优化库位查找
---
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 70c1b84..8627132 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) {
+ public String emptyPlateIn(String station, String containerCode, Short containerType, Long userId, boolean emptyAutoIn,String factory) {
Date now = new Date();
@@ -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);
+ agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true,factory);
} else {
- agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false);
+ agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false,factory);
}
} 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);
+ agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true,factory);
} else {
if (isCurrLev.get()) {
- agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
+ agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true,factory);
} else {
- agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false);
+ agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false,factory);
}
//agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
}
--
Gitblit v1.9.1